Merge remote-tracking branch 'kraust/master' into nvidia

However, this drastically increases CPU use of gotop, so leaving this
unmerged at the moment.

2 files changed, 65 insertions, 11 deletions

diff --git a/widgets/mem_freebsd.go b/widgets/mem_freebsd.go
index 0d5b0b6..7d2472a 100644
--- a/widgets/mem_freebsd.go
+++ b/widgets/mem_freebsd.go
@@ -42,7 +42,10 @@ func gatherSwapInfo() (MemoryInfo, error) {
 		}
 	}
 
-	ss := strings.Split(strings.TrimSuffix(string(output), "\n"), " ")
+	s := strings.TrimSuffix(string(output), "\n")
+	s = strings.ReplaceAll(s, "\n", " ")
+	ss := strings.Split(s, " ")
+	ss = ss[((len(ss)/3)-1)*3:]
 
 	return convert(ss)
 }
diff --git a/widgets/temp_freebsd.go b/widgets/temp_freebsd.go
index 8d9eda6..c5d67b2 100644
--- a/widgets/temp_freebsd.go
+++ b/widgets/temp_freebsd.go
@@ -3,12 +3,11 @@
 package widgets
 
 import (
-	"fmt"
-	"log"
 	"os/exec"
 	"strconv"
 	"strings"
 
+	"github.com/rai-project/nvidia-smi"
 	"github.com/xxxserxxx/gotop/utils"
 )
 
@@ -37,31 +36,83 @@ func refineOutput(output []byte) (float64, error) {
 	return value, nil
 }
 
-func collectSensors() ([]sensorMeasurement, error) {
+func collectSysctlSensors() []sensorMeasurement {
 	var measurements []sensorMeasurement
 	for k, v := range sensorOIDS {
 		output, err := exec.Command("sysctl", "-n", k).Output()
 		if err != nil {
-			return nil, fmt.Errorf("failed to execute 'sysctl' command: %v", err)
+			continue
 		}
 
 		value, err := refineOutput(output)
 		if err != nil {
-			return nil, fmt.Errorf("failed to execute 'sysctl' command: %v", err)
+			continue
 		}
 
 		measurements = append(measurements, sensorMeasurement{v, value})
+	}
+
+	return measurements
+}
+
+func collectNvidiaSensors() []sensorMeasurement {
+	var measurements []sensorMeasurement
 
+	info, _ := nvidiasmi.New()
+	if info.HasGPU() {
+		for i := range info.GPUS {
+			gpu := info.GPUS[i]
+			var s sensorMeasurement
+			s.name = gpu.ProductName + " " + strconv.Itoa(i)
+			s.temperature, _ = strconv.ParseFloat(strings.ReplaceAll(gpu.GpuTemp, " C", ""), 10)
+			measurements = append(measurements, s)
+		}
 	}
-	return measurements, nil
 
+	return measurements
 }
 
-func (self *TempWidget) update() {
-	sensors, err := collectSensors()
-	if err != nil {
-		log.Printf("error received from gopsutil: %v", err)
+func collectAMDGPUSensors() []sensorMeasurement {
+	var measurments []sensorMeasurement
+
+	return measurments
+}
+
+func collectGPUSensors() []sensorMeasurement {
+	var measurements []sensorMeasurement
+
+	measurements = append(measurements, collectSysctlSensors()...)
+	measurements = append(measurements, collectNvidiaSensors()...)
+	measurements = append(measurements, collectAMDGPUSensors()...)
+
+	return measurements
+}
+
+func collectSensors() []sensorMeasurement {
+	var measurements []sensorMeasurement
+	for k, v := range sensorOIDS {
+		output, err := exec.Command("sysctl", "-n", k).Output()
+		if err != nil {
+			continue
+		}
+
+		value, err := refineOutput(output)
+		if err != nil {
+			continue
+		}
+
+		measurements = append(measurements, sensorMeasurement{v, value})
 	}
+
+	measurements = append(measurements, collectGPUSensors()...)
+
+	return measurements
+
+}
+
+func (self *TempWidget) update() {
+	sensors := collectSensors()
+
 	for _, sensor := range sensors {
 		switch self.TempScale {
 		case Fahrenheit: