Merge pull request #382 from acd/master

Only read /proc/stat once when cpu.Times(true) is called on Linux
tags/v2.17.06 v2.17.06
shirou 8 years ago committed by GitHub
commit aa0a3bce9d

@ -33,18 +33,15 @@ func Times(percpu bool) ([]TimesStat, error) {
filename := common.HostProc("stat")
var lines = []string{}
if percpu {
var startIdx uint = 1
for {
linen, _ := common.ReadLinesOffsetN(filename, startIdx, 1)
if len(linen) == 0 {
break
}
line := linen[0]
statlines, err := common.ReadLines(filename)
if err != nil || len(statlines) < 2 {
return []TimesStat{}, nil
}
for _, line := range statlines[1:] {
if !strings.HasPrefix(line, "cpu") {
break
}
lines = append(lines, line)
startIdx++
}
} else {
lines, _ = common.ReadLinesOffsetN(filename, 0, 1)

Loading…
Cancel
Save