add system cpu usage

SonicCloudOrg · Jan 12, 2023 · 1e1e85c · 1e1e85c
1 parent 2a753f3
commit 1e1e85c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/entity/system.go b/src/entity/system.go
@@ -58,6 +58,7 @@ type SystemCPUInfo struct {
 	SoftIrq float32 `json:"softIrq"`
 	Steal   float32 `json:"steal"`
 	Guest   float32 `json:"guest"`
+	Usage   float32 `json:"cpuUsage"`
 }
 
 type SystemMemInfo struct {

diff --git a/src/perfmonUtil/system.go b/src/perfmonUtil/system.go
@@ -255,6 +255,10 @@ func getCPU(client *adb.Device, stats *entity.SystemInfo) (err error) {
 			cpu.Irq = float32(nowCPU.Irq-preCPU.Irq) / total * 100
 			cpu.SoftIrq = float32(nowCPU.SoftIrq-preCPU.SoftIrq) / total * 100
 			cpu.Guest = float32(nowCPU.Guest-preCPU.Guest) / total * 100
+			var cpuNowTime = float32(nowCPU.User + nowCPU.Nice + nowCPU.System + nowCPU.Iowait + nowCPU.Irq + nowCPU.SoftIrq)
+			var cpuPreTime = float32(preCPU.User + preCPU.Nice + preCPU.System + preCPU.Iowait + preCPU.Irq + preCPU.SoftIrq)
+
+			cpu.Usage = (cpuNowTime - cpuPreTime) / ((cpuNowTime + float32(nowCPU.Idle)) - (cpuPreTime + float32(preCPU.Idle)))
 			stats.CPU[fields[0]] = cpu
 		}
 	}