Merge pull request #707 from Lomanic/issue599

[cpu] WIP #599 cap percent values returned by Percent() between 0 and 100
6 years ago · 0e6ea68690
parent 14ba67b0ab 946c9ce6ea
commit 0e6ea68690
1 changed files with 2 additions and 1 deletions
--- a/cpu/cpu.go
+++ b/cpu/cpu.go
@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"math"
 	"strconv"
 	"strings"
 	"sync"
@ -112,7 +113,7 @@ func calculateBusy(t1, t2 TimesStat) float64 {
 	if t2All <= t1All {
 		return 1
 	}
-	return (t2Busy - t1Busy) / (t2All - t1All) * 100
+	return math.Min(100, math.Max(0, (t2Busy-t1Busy)/(t2All-t1All)*100))
 }

 func calculateAllBusy(t1, t2 []TimesStat) ([]float64, error) {