cpu[linux]: ignore cpufreq/cpuinfo_max_freq error

This commit is contained in:
WAKAYAMA Shirou 2017-03-21 00:55:21 +09:00
parent 98d5de7ce9
commit 36b408780c
1 changed files with 4 additions and 12 deletions

View File

@ -83,22 +83,14 @@ func finishCPUInfo(c *InfoStat) error {
// 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(c.CPU, "cpufreq/cpuinfo_max_freq"))
// if we encounter errors below but has a value from parsing /proc/cpuinfo
// then we ignore the error
// 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 {
if c.Mhz == 0 {
return err
} else {
return nil
}
return nil
}
value, err = strconv.ParseFloat(lines[0], 64)
if err != nil {
if c.Mhz == 0 {
return err
} else {
return nil
}
return nil
}
c.Mhz = value / 1000.0 // value is in kHz
return nil