OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "[process] Fix #599 cap percent values returned by *Percent() between 0 and 100" 

This reverts commit f4e23559a2.
Fixes #755
This commit is contained in:
Laurent Sesques 2019-10-15 14:25:43 +02:00
parent 1c09419d4b
commit b3cfb9abc3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
process/process.go
View File

@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"errors"
"math"
"runtime"
"sort"
"time"
@ -265,7 +264,7 @@ func calculatePercent(t1, t2 *cpu.TimesStat, delta float64, numcpu int) float64
}
delta_proc := t2.Total() - t1.Total()
overall_percent := ((delta_proc / delta) * 100) * float64(numcpu)
return math.Min(100, math.Max(0, overall_percent))
return overall_percent
}
// MemoryPercent returns how many percent of the total RAM this process uses
@ -286,7 +285,7 @@ func (p *Process) MemoryPercentWithContext(ctx context.Context) (float32, error)
}
used := processMemory.RSS
return float32(math.Min(100, math.Max(0, (100*float64(used)/float64(total))))), nil
return (100 * float32(used) / float32(total)), nil
}
// CPU_Percent returns how many percent of the CPU time this process uses
@ -311,5 +310,5 @@ func (p *Process) CPUPercentWithContext(ctx context.Context) (float64, error) {
return 0, nil
}
return math.Min(100, math.Max(0, 100*cput.Total()/totalTime)), nil
return 100 * cput.Total() / totalTime, nil
}