simplify the driver interface
This commit is contained in:
@@ -6,27 +6,14 @@ type TemperatureSensor struct {
|
||||
TempC float64
|
||||
}
|
||||
|
||||
type TemperatureDriver interface {
|
||||
ReadTemperatureSensors() ([]TemperatureSensor, error)
|
||||
}
|
||||
|
||||
type PowerSensor struct {
|
||||
path string
|
||||
Name string
|
||||
Watts float64
|
||||
}
|
||||
|
||||
type PowerDriver interface {
|
||||
ReadPowerSensors() ([]PowerSensor, error)
|
||||
}
|
||||
|
||||
type ClockSensor struct {
|
||||
path string
|
||||
number int
|
||||
Name string
|
||||
FrequencyGHz float64
|
||||
}
|
||||
|
||||
type ClockDriver interface {
|
||||
ReadClockSensors() ([]ClockSensor, error)
|
||||
}
|
||||
|
||||
@@ -13,11 +13,11 @@ type HwmonDriver struct {
|
||||
hwmonDriver string
|
||||
}
|
||||
|
||||
func NewHwmonDriver(expectedDrivers []string) *HwmonDriver {
|
||||
func NewHwmonDriver(expectedDrivers []string) (*HwmonDriver, error) {
|
||||
// Locate hwmon path
|
||||
dirs, err := filepath.Glob("/sys/class/hwmon/hwmon*")
|
||||
if err != nil {
|
||||
return nil
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, dir := range dirs {
|
||||
@@ -29,16 +29,35 @@ func NewHwmonDriver(expectedDrivers []string) *HwmonDriver {
|
||||
return &HwmonDriver{
|
||||
hwmonDir: dir,
|
||||
hwmonDriver: driver,
|
||||
}
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil, fmt.Errorf("could not find %#v in /sys/class/hwmon", expectedDrivers)
|
||||
}
|
||||
|
||||
func (r *HwmonDriver) Render(console *strings.Builder) error {
|
||||
t, err := r.Read()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
temps := t.([]TemperatureSensor)
|
||||
|
||||
fmt.Fprint(console, "--- Temperature ---\n")
|
||||
for _, sensor := range temps {
|
||||
tempC := sensor.TempC
|
||||
tempF := (tempC * 9 / 5) + 32
|
||||
// \033[K clears from cursor to end of line (prevents lingering chars)
|
||||
fmt.Fprintf(console, "%-16s | %.2f °C (%.3f °F)\033[K\n", sensor.Name, tempC, tempF)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *HwmonDriver) ReadTemperatureSensors() ([]TemperatureSensor, error) {
|
||||
func (r *HwmonDriver) Read() (any, error) {
|
||||
inputs, err := filepath.Glob(filepath.Join(r.hwmonDir, "temp*_input"))
|
||||
if err != nil || len(inputs) == 0 {
|
||||
return nil, fmt.Errorf("no temperature inputs found in %s", r.hwmonDir)
|
||||
|
||||
@@ -20,14 +20,32 @@ type RaplDriver struct {
|
||||
energyState map[string]EnergyState
|
||||
}
|
||||
|
||||
func NewRaplDriver() *RaplDriver {
|
||||
return &RaplDriver{
|
||||
func NewRaplDriver() (*RaplDriver, error) {
|
||||
r := RaplDriver{
|
||||
energyState: map[string]EnergyState{},
|
||||
}
|
||||
|
||||
_, err := r.Read()
|
||||
return &r, err
|
||||
}
|
||||
|
||||
func (r *RaplDriver) ReadPowerSensors() ([]PowerSensor, error) {
|
||||
func (r *RaplDriver) Render(console *strings.Builder) error {
|
||||
fmt.Fprint(console, "--- Power ---\n")
|
||||
p, err := r.Read()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
power := p.([]PowerSensor)
|
||||
|
||||
for _, sensor := range power {
|
||||
// \033[K clears from cursor to end of line (prevents lingering chars)
|
||||
fmt.Fprintf(console, "%-16s | %.2f W\033[K\n", sensor.Name, sensor.Watts)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *RaplDriver) Read() (any, error) {
|
||||
powerSensors := []PowerSensor{}
|
||||
|
||||
patterns := []string{
|
||||
|
||||
+22
-3
@@ -11,11 +11,30 @@ import (
|
||||
|
||||
type SysDriver struct{}
|
||||
|
||||
func NewSysDriver() *SysDriver {
|
||||
return &SysDriver{}
|
||||
func NewSysDriver() (*SysDriver, error) {
|
||||
r := SysDriver{}
|
||||
_, err := r.Read()
|
||||
return &r, err
|
||||
}
|
||||
|
||||
func (r *SysDriver) ReadClockSensors() ([]ClockSensor, error) {
|
||||
func (r *SysDriver) Render(console *strings.Builder) error {
|
||||
fmt.Fprint(console, "--- Clock Frequency ---\n")
|
||||
c, err := r.Read()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
clock := c.([]ClockSensor)
|
||||
|
||||
for _, sensor := range clock {
|
||||
// \033[K clears from cursor to end of line (prevents lingering chars)
|
||||
fmt.Fprintf(console, "%-16s | %.2f GHz\033[K\n", sensor.Name, sensor.FrequencyGHz)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *SysDriver) Read() (any, error) {
|
||||
// Glob directly targets scaling_cur_freq for all numerical CPU core paths
|
||||
freqFiles, err := filepath.Glob("/sys/devices/system/cpu/cpu[0-9]*/cpufreq/scaling_cur_freq")
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user