From c47832e6770166d49606bb651d7b1fab69763d12 Mon Sep 17 00:00:00 2001 From: Thomas Kaiser Date: Fri, 8 Dec 2017 17:50:18 +0100 Subject: [PATCH] Do not consider %iowait when calculating CPU utilization https://forum.openmediavault.org/index.php/Thread/20844 --- .../usr/share/php/openmediavault/system/system.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deb/openmediavault/usr/share/php/openmediavault/system/system.inc b/deb/openmediavault/usr/share/php/openmediavault/system/system.inc index 071f6ffda90..f9f1b4498d4 100644 --- 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 ]; }