Implement Mhz to current, min and max.

cpu/cpu.go

@@ -40,12 +40,18 @@ type InfoStat struct {
 	CoreID     string   `json:"coreId"`
 	Cores      int32    `json:"cores"`
 	ModelName  string   `json:"modelName"`
-	Mhz        float64  `json:"mhz"`
+	Mhz        Mhz      `json:"mhz"`
 	CacheSize  int32    `json:"cacheSize"`
 	Flags      []string `json:"flags"`
 	Microcode  string   `json:"microcode"`
 }
 
+type Mhz struct {
+	Current float64 `json:"current"` //from cpuinfo or cpufreq/cpuinfo_cur_freq
+	Max     float64 `json:"max"`     //from cpufreq/cpuinfo_max_freq
+	Min     float64 `json:"min"`     //from cpufreq/cpuinfo_min_freq
+}
+
 type lastPercent struct {
 	sync.Mutex
 	lastCPUTimes    []TimesStat

cpu/cpu_aix_cgo.go

@@ -49,8 +49,12 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
 		return nil, err
 	}
 	info := InfoStat{
-		CPU:   0,
-		Mhz:   float64(c.ProcessorHz / 1000000),
+		CPU: 0,
+		Mhz: Mhz{
+			current: float64(c.ProcessorHz / 1000000),
+			max:     0,
+			min:     0,
+		},
 		Cores: int32(c.NCpusCfg),
 	}
 	result := []InfoStat{info}

cpu/cpu_aix_nocgo.go

@@ -70,14 +70,16 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
 				if t, err := strconv.ParseFloat(p[3], 64); err == nil {
 					switch strings.ToUpper(p[4]) {
 					case "MHZ":
-						ret.Mhz = t
+						ret.Mhz.Current = t
 					case "GHZ":
-						ret.Mhz = t * 1000.0
+						ret.Mhz.Current = t * 1000.0
 					case "KHZ":
-						ret.Mhz = t / 1000.0
+						ret.Mhz.Current = t / 1000.0
 					default:
-						ret.Mhz = t
+						ret.Mhz.Current = t
 					}
+					ret.Mhz.Min = 0
+					ret.Mhz.Max = 0
 				}
 			}
 			break

cpu/cpu_darwin.go

@@ -87,13 +87,17 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
 	c.VendorID, _ = unix.Sysctl("machdep.cpu.vendor")
 
 	if m1cpu.IsAppleSilicon() {
-		c.Mhz = float64(m1cpu.PCoreHz() / 1_000_000)
+		c.Mhz.Current = float64(m1cpu.PCoreHz() / 1_000_000)
+		c.Mhz.Max = 0
+		c.Mhz.Min = 0
 	} else {
 		// Use the rated frequency of the CPU. This is a static value and does not
 		// account for low power or Turbo Boost modes.
 		cpuFrequency, err := unix.SysctlUint64("hw.cpufrequency")
 		if err == nil {
-			c.Mhz = float64(cpuFrequency) / 1000000.0
+			c.Mhz.Current = float64(cpuFrequency) / 1000000.0
+			c.Mhz.Max = 0
+			c.Mhz.Min = 0
 		}
 	}
 

cpu/cpu_darwin_test.go

@@ -23,7 +23,7 @@ func Test_CpuInfo_AppleSilicon(t *testing.T) {
 		if vv.ModelName == "" {
 			t.Errorf("could not get CPU info: %v", vv)
 		}
-		if vv.Mhz <= 0 {
+		if vv.Mhz.Current <= 0 {
 			t.Errorf("could not get frequency of: %s", vv.ModelName)
 		}
 		if vv.Mhz > 6000 {

cpu/cpu_dragonfly.go

@@ -102,8 +102,9 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
 	if u32, err = unix.SysctlUint32("hw.clockrate"); err != nil {
 		return nil, err
 	}
-	c.Mhz = float64(u32)
-
+	c.Mhz.Current = float64(u32)
+	c.Mhz.Min = 0
+	c.Mhz.Max = 0
 	var num int
 	var buf string
 	if buf, err = unix.Sysctl("hw.cpu_topology.tree"); err != nil {

cpu/cpu_freebsd.go

@@ -103,7 +103,9 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
 	if u32, err = unix.SysctlUint32("hw.clockrate"); err != nil {
 		return nil, err
 	}
-	c.Mhz = float64(u32)
+	c.Mhz.Current = float64(u32)
+	c.Mhz.Min = 0
+	c.Mhz.Max = 0
 
 	if u32, err = unix.SysctlUint32("hw.ncpu"); err != nil {
 		return nil, err

cpu/cpu_linux.go

@@ -133,7 +133,6 @@ func sysCPUPath(ctx context.Context, cpu int32, relPath string) string {
 func finishCPUInfo(ctx context.Context, c *InfoStat) {
 	var lines []string
 	var err error
-	var value float64
 
 	if len(c.CoreID) == 0 {
 		lines, err = common.ReadLines(sysCPUPath(ctx, c.CPU, "topology/core_id"))
@@ -142,23 +141,35 @@ func finishCPUInfo(ctx context.Context, c *InfoStat) {
 		}
 	}
 
-	// override the value of c.Mhz with cpufreq/cpuinfo_max_freq regardless
-	// of the value from /proc/cpuinfo because we want to report the maximum
-	// clock-speed of the CPU for c.Mhz, matching the behaviour of Windows
-	lines, err = common.ReadLines(sysCPUPath(ctx, c.CPU, "cpufreq/cpuinfo_max_freq"))
-	// if we encounter errors below such as there are no cpuinfo_max_freq file,
-	// we just ignore. so let Mhz is 0.
-	if err != nil || len(lines) == 0 {
-		return
-	}
-	value, err = strconv.ParseFloat(lines[0], 64)
-	if err != nil {
-		return
-	}
-	c.Mhz = value / 1000.0 // value is in kHz
-	if c.Mhz > 9999 {
-		c.Mhz = c.Mhz / 1000.0 // value in Hz
+	c.Mhz.Current = fillMhz(ctx, "cur", c)
+	c.Mhz.Min = fillMhz(ctx, "min", c)
+	c.Mhz.Max = fillMhz(ctx, "max", c)
+
+}
+
+func fillMhz(ctx context.Context, value string, c *InfoStat) float64 {
+	var lines []string
+	var err error
+	var line float64
+	var mhz float64 = 0
+
+	if value == "min" || value == "max" || value == "cur" {
+		lines, err = common.ReadLines(sysCPUPath(ctx, c.CPU, fmt.Sprintf("cpufreq/cpuinfo_%s_freq", value)))
+		// if we encounter errors below such as there are no cpuinfo_max_freq file,
+		// we just ignore. so let Mhz is 0.
+		if err != nil || len(lines) == 0 {
+			return mhz
+		}
+		line, err = strconv.ParseFloat(lines[0], 64)
+		if err != nil {
+			return mhz
+		}
+		mhz = line / 1000.0 // value is in kHz
+		if mhz > 9999 {
+			mhz = mhz / 1000.0 // value in Hz
+		}
 	}
+	return mhz
 }
 
 // CPUInfo on linux will return 1 item per physical thread.
@@ -279,7 +290,7 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
 		case "cpu MHz", "clock", "cpu MHz dynamic":
 			// treat this as the fallback value, thus we ignore error
 			if t, err := strconv.ParseFloat(strings.Replace(value, "MHz", "", 1), 64); err == nil {
-				c.Mhz = t
+				c.Mhz.Current = t
 			}
 		case "cache size":
 			t, err := strconv.ParseInt(strings.Replace(value, " KB", "", 1), 10, 64)

cpu/cpu_openbsd.go

@@ -117,7 +117,9 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
 	if err != nil {
 		return nil, err
 	}
-	c.Mhz = float64(mhz)
+	c.Mhz.Current = float64(mhz)
+	c.Mhz.Min = 0
+	c.Mhz.Max = 0
 
 	ncpu, err := unix.SysctlUint32("hw.ncpuonline")
 	if err != nil {

cpu/cpu_solaris.go

@@ -226,7 +226,11 @@ func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) {
 					Family:     physicalCPU[psrFamilyOffset],
 					Model:      physicalCPU[psrModelOffset],
 					Stepping:   step,
-					Mhz:        clock,
+					Mhz: Mhz{
+						current: clock,
+						max:     0,
+						min:     0,
+					},
 				})
 				infoStatCount++
 			}
@@ -252,7 +256,11 @@ func parseProcessorInfo(cmdOutput string) ([]InfoStat, error) {
 					Family:     physicalCPU[psrFamilyOffset],
 					Model:      physicalCPU[psrModelOffset],
 					Stepping:   step,
-					Mhz:        clock,
+					Mhz: Mhz{
+						current: clock,
+						max:     0,
+						min:     0,
+					},
 				})
 				infoStatCount++
 			}