Merge pull request #33 from codeskyblue/master

change cpu_linux.go: on some android, runtime.NumCPU() will not return r...
pull/34/head
shirou 10 years ago
commit 4a0ce1d13e

@ -12,10 +12,18 @@ import (
func CPUTimes(percpu bool) ([]CPUTimesStat, error) { func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
filename := "/proc/stat" filename := "/proc/stat"
var lines []string var lines = []string{}
if percpu { if percpu {
ncpu, _ := CPUCounts(true) var startIdx uint = 1
lines, _ = common.ReadLinesOffsetN(filename, 1, ncpu) for {
linen, _ := common.ReadLinesOffsetN(filename, startIdx, 1)
line := linen[0]
if !strings.HasPrefix(line, "cpu") {
break
}
lines = append(lines, line)
startIdx += 1
}
} else { } else {
lines, _ = common.ReadLinesOffsetN(filename, 0, 1) lines, _ = common.ReadLinesOffsetN(filename, 0, 1)
} }

Loading…
Cancel
Save