From 36b408780c21538588509c5685a19741978f34cc Mon Sep 17 00:00:00 2001 From: WAKAYAMA Shirou Date: Tue, 21 Mar 2017 00:55:21 +0900 Subject: [PATCH] cpu[linux]: ignore cpufreq/cpuinfo_max_freq error --- cpu/cpu_linux.go | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/cpu/cpu_linux.go b/cpu/cpu_linux.go index 6bd36cd..f2276a7 100644 --- a/cpu/cpu_linux.go +++ b/cpu/cpu_linux.go @@ -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