- Add comments and fix indention

- Update changelog Signed-off-by: Volker Theile <votdev@gmx.de>
openmediavault · Dec 9, 2017 · 2799e50 · 2799e50
1 parent 538caf7
commit 2799e50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/deb/openmediavault/debian/changelog b/deb/openmediavault/debian/changelog
@@ -133,6 +133,7 @@ openmediavault (4.0) stable; urgency=low
 openmediavault (3.0.95) stable; urgency=low
 
   * Increase 'Unit' column size in file system quota dialog.
+  * Fix calculation of CPU utilization.
 
  -- Volker Theile <volker.theile@openmediavault.org>  Sat, 02 Dec 2017 13:55:14 +0100
 

diff --git a/deb/openmediavault/usr/share/php/openmediavault/system/system.inc b/deb/openmediavault/usr/share/php/openmediavault/system/system.inc
@@ -320,6 +320,10 @@ class System {
 		// * iowait: waiting for I/O to complete
 		// * irq: servicing interrupts
 		// * softirq: servicing softirqs
+		//
+		// See also
+		// - https://serverfault.com/a/667250.
+		// - https://en.wikipedia.org/wiki/Load_(computing)
 		$tprev = file("/proc/stat");
 		sleep(1);
 		$tnow = file("/proc/stat");
@@ -353,9 +357,9 @@ class System {
 		return [
 			"modelname" => $modelName,
 			"cpumhz" => $cpuInfo->exists("cpumhz") ?
-			  $cpuInfo->get("cpumhz") : gettext("n/a"),
-			"usage" => (0 == $diffTotal) ? 0 : (($diffTotal - $diffIowait - $diffIdle) /
-			  $diffTotal) * 100
+				$cpuInfo->get("cpumhz") : gettext("n/a"),
+			"usage" => (0 == $diffTotal) ? 0 :
+				(($diffTotal - $diffIowait - $diffIdle) / $diffTotal) * 100
 		];
 	}
 }