From 64f139d5805019ab628ad8fda56d696760a582b3 Mon Sep 17 00:00:00 2001 From: "Sean E. Russell" Date: Tue, 25 Feb 2020 13:22:12 -0600 Subject: NVIDIA support --- widgets/cpu.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'widgets') diff --git a/widgets/cpu.go b/widgets/cpu.go index 8e8819c..937aa8f 100644 --- a/widgets/cpu.go +++ b/widgets/cpu.go @@ -6,8 +6,7 @@ import ( "sync" "time" - psCpu "github.com/shirou/gopsutil/cpu" - + "github.com/xxxserxxx/gotop/devices" ui "github.com/xxxserxxx/gotop/termui" ) @@ -22,9 +21,9 @@ type CpuWidget struct { } func NewCpuWidget(updateInterval time.Duration, horizontalScale int, showAverageLoad bool, showPerCpuLoad bool) *CpuWidget { - cpuCount, err := psCpu.Counts(false) + cpuCount, err := devices.Counts(false) if err != nil { - log.Printf("failed to get CPU count from gopsutil: %v", err) + log.Printf("failed to get CPU count: %v", err) } formatString := "CPU%1d" if cpuCount > 10 { @@ -78,9 +77,9 @@ func (b *CpuWidget) Scale(i int) { func (self *CpuWidget) update() { if self.ShowAverageLoad { go func() { - percent, err := psCpu.Percent(self.updateInterval, false) + percent, err := devices.Percent(self.updateInterval, false) if err != nil { - log.Printf("failed to get average CPU usage percent from gopsutil: %v. self.updateInterval: %v. percpu: %v", err, self.updateInterval, false) + log.Printf("failed to get average CPU usage percent: %v. self.updateInterval: %v. percpu: %v", err, self.updateInterval, false) } else { self.Lock() defer self.Unlock() @@ -94,12 +93,12 @@ func (self *CpuWidget) update() { if self.ShowPerCpuLoad { go func() { - percents, err := psCpu.Percent(self.updateInterval, true) + percents, err := devices.Percent(self.updateInterval, true) if err != nil { - log.Printf("failed to get CPU usage percents from gopsutil: %v. self.updateInterval: %v. percpu: %v", err, self.updateInterval, true) + log.Printf("failed to get CPU usage percents: %v. self.updateInterval: %v. percpu: %v", err, self.updateInterval, true) } else { if len(percents) != int(self.CpuCount) { - log.Printf("error: number of CPU usage percents from gopsutil doesn't match CPU count. percents: %v. self.Count: %v", percents, self.CpuCount) + log.Printf("error: number of CPU usage percents doesn't match CPU count. percents: %v. self.Count: %v", percents, self.CpuCount) } else { self.Lock() defer self.Unlock() -- cgit v1.2.3