From b3cfb9abc39a3b28c1bfb985871ec9c994731b5d Mon Sep 17 00:00:00 2001 From: Laurent Sesques Date: Tue, 15 Oct 2019 14:25:43 +0200 Subject: [PATCH] Revert "[process] Fix #599 cap percent values returned by *Percent() between 0 and 100" This reverts commit f4e23559a2bad85fca1eeea695331ce38ff3f494. Fixes #755 --- process/process.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/process/process.go b/process/process.go index 87b647b..3782ef2 100644 --- a/process/process.go +++ b/process/process.go @@ -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 }