瀏覽代碼

Update user_dashboard.php

Fix the CPU usage on the dashboard.
FusionPBX 9 年之前
父節點
當前提交
d071b1e386
共有 1 個文件被更改,包括 9 次插入4 次删除
  1. 9 4
      core/user_settings/user_dashboard.php

+ 9 - 4
core/user_settings/user_dashboard.php

@@ -1049,10 +1049,15 @@
 
 			//cpu usage
 				if (stristr(PHP_OS, 'Linux')) {
-					$ps = shell_exec("/usr/bin/which top");
-					$sed = shell_exec("/usr/bin/which sed");
-					$awk = shell_exec("/usr/bin/which awk");
-					$percent_cpu = shell_exec($top." -bn1 | grep 'Cpu(s)' | ".$sed." 's/.*, *\([0-9.]*\)%* id.*/\1/' | ".$awk." '{print 100 - $1}' ");
+					$result = shell_exec('ps -A -o pcpu');
+					$percent_cpu = 0;
+					foreach (explode("\n", $result) as $value) {
+						if (is_numeric($value)) { $percent_cpu = $percent_cpu + $value; }
+					}
+					$result = trim(shell_exec("grep -P '^processor' /proc/cpuinfo"));
+					$cores = count(explode("\n", $result));
+					if ($percent_cpu > 1) { $percent_cpu = $percent_cpu / $cores; }
+					$percent_cpu = round($percent_cpu, 2);
 					if ($percent_cpu != '') {
 						$hud[$n]['html'] .= "<tr class='tr_link_void'>\n";
 						$hud[$n]['html'] .= "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-processor_usage']."</td>\n";