Merge pull request #135 from influxdata/process-percent

Optimize per-process percentage calculation

process/process.go

@@ -106,24 +106,15 @@ func PidExists(pid int32) (bool, error) {
 // If interval is 0, return difference from last call(non-blocking).
 // If interval > 0, wait interval sec and return diffrence between start and end.
 func (p *Process) CPUPercent(interval time.Duration) (float64, error) {
-	numcpu := runtime.NumCPU()
-	calculate := func(t1, t2 *cpu.CPUTimesStat, delta float64) float64 {
-		if delta == 0 {
-			return 0
-		}
-		delta_proc := (t2.User - t1.User) + (t2.System - t1.System)
-		overall_percent := ((delta_proc / delta) * 100) * float64(numcpu)
-		return overall_percent
-	}
-
 	cpuTimes, err := p.CPUTimes()
 	if err != nil {
 		return 0, err
 	}
+	now := time.Now()
 
 	if interval > 0 {
 		p.lastCPUTimes = cpuTimes
-		p.lastCPUTime = time.Now()
+		p.lastCPUTime = now
 		time.Sleep(interval)
 		cpuTimes, err = p.CPUTimes()
 		if err != nil {
@@ -132,18 +123,31 @@ func (p *Process) CPUPercent(interval time.Duration) (float64, error) {
 	} else {
 		if p.lastCPUTimes == nil {
 			// invoked first time
-			p.lastCPUTimes, err = p.CPUTimes()
-			if err != nil {
-				return 0, err
-			}
-			p.lastCPUTime = time.Now()
+			p.lastCPUTimes = cpuTimes
+			p.lastCPUTime = now
 			return 0, nil
 		}
 	}
 
-	delta := (time.Now().Sub(p.lastCPUTime).Seconds()) * float64(numcpu)
-	ret := calculate(p.lastCPUTimes, cpuTimes, float64(delta))
+	numcpu := runtime.NumCPU()
+	delta := (now.Sub(p.lastCPUTime).Seconds()) * float64(numcpu)
+	ret := calculatePercent(p.lastCPUTimes, cpuTimes, delta, numcpu)
 	p.lastCPUTimes = cpuTimes
-	p.lastCPUTime = time.Now()
+	p.lastCPUTime = now
 	return ret, nil
 }
+
+func calculatePercent(t1, t2 *cpu.CPUTimesStat, delta float64, numcpu int) float64 {
+	if delta == 0 {
+		return 0
+	}
+	delta_proc := totalCpuTime(t2) - totalCpuTime(t1)
+	overall_percent := ((delta_proc / delta) * 100) * float64(numcpu)
+	return overall_percent
+}
+
+func totalCpuTime(t *cpu.CPUTimesStat) float64 {
+	total := t.User + t.System + t.Nice + t.Iowait + t.Irq + t.Softirq + t.Steal +
+		t.Guest + t.GuestNice + t.Idle
+	return total
+}