Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rebase development #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 30, 2024
Merged

Rebase development #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03bb092
fix: performance issue caused by the render calls
Md-Cake May 30, 2024
f745c4e
Merge pull request #23 from Md-Cake/feature/perfomance-issue-with-render
metaspartan May 30, 2024
4235de9
Optimize unused code
metaspartan May 30, 2024
b4a5270
Increment v0.1.8
metaspartan May 30, 2024
c41465d
Brew formula update for mactop version v0.1.8
goreleaserbot May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mactop.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
class Mactop < Formula
desc "Apple Silicon Monitor Top written in Go Lang"
homepage "https://github.com/context-labs/mactop"
version "0.1.7"
version "0.1.8"
depends_on :macos

on_arm do
url "https://github.com/context-labs/mactop/releases/download/v0.1.7/mactop_0.1.7_darwin_arm64.tar.gz"
sha256 "40857c92beb8e13fb6a50b1563adb7c7ced5c6dbdc56d35d3546e4a6c4ffc52a"
url "https://github.com/context-labs/mactop/releases/download/v0.1.8/mactop_0.1.8_darwin_arm64.tar.gz"
sha256 "a26bcfcf16ed7b0ac958c4d63664f683e8042c2db75b0bbae8ddd4263775610b"

def install
bin.install "mactop"
Expand Down
90 changes: 36 additions & 54 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,35 @@ type MemoryMetrics struct {
Total, Used, Available, SwapTotal, SwapUsed uint64
}

type EventThrottler struct {
timer *time.Timer
gracePeriod time.Duration

C chan struct{}
}

func NewEventThrottler(gracePeriod time.Duration) *EventThrottler {
return &EventThrottler{
timer: nil,
gracePeriod: gracePeriod,
C: make(chan struct{}, 1),
}
}

func (e *EventThrottler) Notify() {
if e.timer != nil {
return
}

e.timer = time.AfterFunc(e.gracePeriod, func() {
e.timer = nil
select {
case e.C <- struct{}{}:
default:
}
})
}

var (
cpu1Gauge, cpu2Gauge, gpuGauge, aneGauge *w.Gauge
TotalPowerChart *w.BarChart
Expand Down Expand Up @@ -173,7 +202,6 @@ func setupGrid() {

func switchGridLayout() {
if currentGridLayout == "default" {
ui.Clear()
newGrid := ui.NewGrid()
newGrid.Set(
ui.NewRow(1.0/2, // This row now takes half the height of the grid
Expand All @@ -196,9 +224,7 @@ func switchGridLayout() {
newGrid.SetRect(0, 0, termWidth, termHeight)
grid = newGrid
currentGridLayout = "alternative"
ui.Render(grid)
} else {
ui.Clear()
newGrid := ui.NewGrid()
newGrid.Set(
ui.NewRow(1.0/2,
Expand All @@ -219,7 +245,6 @@ func switchGridLayout() {
newGrid.SetRect(0, 0, termWidth, termHeight)
grid = newGrid
currentGridLayout = "default"
ui.Render(grid)
}
}

Expand All @@ -234,7 +259,7 @@ func main() {
err error
setColor, setInterval bool
)
version := "v0.1.7"
version := "v0.1.8"
for i := 1; i < len(os.Args); i++ {
switch os.Args[i] {
case "--help", "-h":
Expand Down Expand Up @@ -352,21 +377,24 @@ func main() {
appleSiliconModel := getSOCInfo()
go collectMetrics(done, cpuMetricsChan, gpuMetricsChan, netdiskMetricsChan, processMetricsChan, appleSiliconModel["name"].(string))
lastUpdateTime = time.Now()
needRender := NewEventThrottler(time.Duration(updateInterval/2) * time.Millisecond)
go func() {
for {
select {
case cpuMetrics := <-cpuMetricsChan:
updateCPUUI(cpuMetrics)
updateTotalPowerChart(cpuMetrics.PackageW)
ui.Render(grid)
needRender.Notify()
case gpuMetrics := <-gpuMetricsChan:
updateGPUUI(gpuMetrics)
ui.Render(grid)
needRender.Notify()
case netdiskMetrics := <-netdiskMetricsChan:
updateNetDiskUI(netdiskMetrics)
ui.Render(grid)
needRender.Notify()
case processMetrics := <-processMetricsChan:
updateProcessUI(processMetrics)
needRender.Notify()
case <-needRender.C:
ui.Render(grid)
case <-quit:
close(done)
Expand Down Expand Up @@ -489,7 +517,6 @@ func updateTotalPowerChart(newPowerValue float64) {
}
powerValues = nil
lastUpdateTime = currentTime
ui.Render(TotalPowerChart)
}
}

Expand All @@ -507,8 +534,6 @@ func updateCPUUI(cpuMetrics CPUMetrics) {
memoryMetrics := getMemoryMetrics()
memoryGauge.Title = fmt.Sprintf("Memory Usage: %.2f GB / %.2f GB (Swap: %.2f/%.2f GB)", float64(memoryMetrics.Used)/1024/1024/1024, float64(memoryMetrics.Total)/1024/1024/1024, float64(memoryMetrics.SwapUsed)/1024/1024/1024, float64(memoryMetrics.SwapTotal)/1024/1024/1024)
memoryGauge.Percent = int((float64(memoryMetrics.Used) / float64(memoryMetrics.Total)) * 100)
ui.Render(grid)
ui.Render(cpu1Gauge, cpu2Gauge, gpuGauge, aneGauge, memoryGauge, modelText, PowerChart)
}

func updateGPUUI(gpuMetrics GPUMetrics) {
Expand All @@ -532,7 +557,6 @@ func updateProcessUI(processMetrics []ProcessMetrics) {
for _, pm := range processMetrics {
ProcessInfo.Text += fmt.Sprintf("%d - %s: %.2f ms/s\n", pm.ID, pm.Name, pm.CPUUsage)
}
ui.Render(ProcessInfo)
}

func parseProcessMetrics(powermetricsOutput string, processMetrics []ProcessMetrics) []ProcessMetrics {
Expand Down Expand Up @@ -870,48 +894,6 @@ func getSOCInfo() map[string]interface{} {
"gpu_core_count": getGPUCores(),
}

switch socInfo["name"] {
case "Apple M1 Max":
socInfo["cpu_max_power"] = 30
socInfo["gpu_max_power"] = 60
case "Apple M1 Pro":
socInfo["cpu_max_power"] = 30
socInfo["gpu_max_power"] = 30
case "Apple M1":
socInfo["cpu_max_power"] = 20
socInfo["gpu_max_power"] = 20
case "Apple M1 Ultra":
socInfo["cpu_max_power"] = 60
socInfo["gpu_max_power"] = 120
case "Apple M2":
socInfo["cpu_max_power"] = 25
socInfo["gpu_max_power"] = 15
default:
socInfo["cpu_max_power"] = 20
socInfo["gpu_max_power"] = 20
}

switch socInfo["name"] {
case "Apple M1 Max":
socInfo["cpu_max_bw"] = 250
socInfo["gpu_max_bw"] = 400
case "Apple M1 Pro":
socInfo["cpu_max_bw"] = 200
socInfo["gpu_max_bw"] = 200
case "Apple M1":
socInfo["cpu_max_bw"] = 70
socInfo["gpu_max_bw"] = 70
case "Apple M1 Ultra":
socInfo["cpu_max_bw"] = 500
socInfo["gpu_max_bw"] = 800
case "Apple M2":
socInfo["cpu_max_bw"] = 100
socInfo["gpu_max_bw"] = 100
default:
socInfo["cpu_max_bw"] = 70
socInfo["gpu_max_bw"] = 70
}

return socInfo
}

Expand Down