Merge pull request #707 from Lomanic/issue599

[cpu] WIP #599 cap percent values returned by Percent() between 0 and 100
pull/710/head
shirou 6 years ago committed by GitHub
commit 0e6ea68690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -4,6 +4,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"math"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
@ -112,7 +113,7 @@ func calculateBusy(t1, t2 TimesStat) float64 {
if t2All <= t1All { if t2All <= t1All {
return 1 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) { func calculateAllBusy(t1, t2 []TimesStat) ([]float64, error) {

Loading…
Cancel
Save