Use percent() function to calc CPU usage

firesh · Nov 13, 2020 · 3a29c94 · 3a29c94
1 parent a22d99f
commit 3a29c94
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/connector/collector/docker.go b/connector/collector/docker.go
@@ -86,9 +86,9 @@ func (c *Docker) ReadCPU(stats *api.Stats) {
 	syscpudiff := system - c.lastSysCpu
 
 	if c.scaleCpu {
-		c.CPUUtil = round((cpudiff / syscpudiff * 100))
+		c.CPUUtil = percent(cpudiff, syscpudiff)
 	} else {
-		c.CPUUtil = round((cpudiff / syscpudiff * 100) * ncpus)
+		c.CPUUtil = percent(ncpus*cpudiff, syscpudiff)
 	}
 	c.lastCpu = total
 	c.lastSysCpu = system

diff --git a/connector/collector/runc.go b/connector/collector/runc.go
@@ -96,9 +96,9 @@ func (c *Runc) ReadCPU(stats *cgroups.Stats) {
 	syscpudiff := system - c.lastSysCpu
 
 	if c.scaleCpu {
-		c.CPUUtil = round((cpudiff / syscpudiff * 100))
+		c.CPUUtil = percent(cpudiff, syscpudiff)
 	} else {
-		c.CPUUtil = round((cpudiff / syscpudiff * 100) * ncpus)
+		c.CPUUtil = percent(ncpus*cpudiff, syscpudiff)
 	}
 	c.lastCpu = total
 	c.lastSysCpu = system