prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for parsing CPU speed from /proc/cpuinfo on Power (ppc64) systems.

Browse Source 
/proc/cpuinfo format varies between architectures. For example

On Intel the cpu speed is shown like the following
cpu MHz		: 3000

whereas on Power systems its shown like the following
clock		: 3000MHz

This patch enables support for /proc/cpuinfo parsing on Power systems

Signed-off-by: Pradipta Kr. Banerjee <bpradip@in.ibm.com>
This commit is contained in:
Pradipta Kumar 2015-05-20 18:13:07 +00:00 committed by Pradipta Kr. Banerjee
parent 690901ddd9
commit e6de0dd8aa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manager/machine.go
View File

@ -62,7 +62,12 @@ func getClockSpeed(procInfo []byte) (uint64, error) {
// Fall back to /proc/cpuinfo // Fall back to /proc/cpuinfo
matches := CpuClockSpeedMHz.FindSubmatch(procInfo) matches := CpuClockSpeedMHz.FindSubmatch(procInfo)
if len(matches) != 2 { if len(matches) != 2 {
return 0, fmt.Errorf("could not detect clock speed from output: %q", string(procInfo)) //Check if we are running on Power systems which have a different format
CpuClockSpeedMHz, _ = regexp.Compile("clock\\t*: +([0-9]+.[0-9]+)MHz")
matches = CpuClockSpeedMHz.FindSubmatch(procInfo)
if len(matches) != 2 {
return 0, fmt.Errorf("could not detect clock speed from output: %q", string(procInfo))
}
} }
speed, err := strconv.ParseFloat(string(matches[1]), 64) speed, err := strconv.ParseFloat(string(matches[1]), 64)
if err != nil { if err != nil {