Merge pull request #47 from ThomasKaiser/patch-1

Do not consider %iowait when calculating CPU utilization
openmediavault · Dec 9, 2017 · 538caf7 · 538caf7
2 parents 5813c8d + c47832e
commit 538caf7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/deb/openmediavault/usr/share/php/openmediavault/system/system.inc b/deb/openmediavault/usr/share/php/openmediavault/system/system.inc
@@ -332,6 +332,7 @@ class System {
 		$tnowTotal = array_sum($tnow);
 		// Calculate the CPU usage since we last checked.
 		$diffIdle = $tnow[3] - $tprev[3];
+		$diffIowait = $tnow[4] - $tprev[4];
 		$diffTotal = $tnowTotal - $tprevTotal;
 		// Get the processor name.
 		// Parse output:
@@ -353,7 +354,7 @@ class System {
 			"modelname" => $modelName,
 			"cpumhz" => $cpuInfo->exists("cpumhz") ?
 			  $cpuInfo->get("cpumhz") : gettext("n/a"),
-			"usage" => (0 == $diffTotal) ? 0 : (($diffTotal - $diffIdle) /
+			"usage" => (0 == $diffTotal) ? 0 : (($diffTotal - $diffIowait - $diffIdle) /
 			  $diffTotal) * 100
 		];
 	}