From 249e3443a9ca10f70aef42fd0bd0a97c03d20fdd Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 9 Nov 2016 17:07:05 +0100 Subject: [PATCH 1/6] Display CPU and I/O utilization of the last one, five, and 15 minute periods (load). --- header.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/header.php b/header.php index bc31aa9e..d9e809a6 100644 --- a/header.php +++ b/header.php @@ -11,6 +11,9 @@ $cmd = "echo $((`cat /sys/class/thermal/thermal_zone0/temp | cut -c1-2`))"; $output = shell_exec($cmd); $output = str_replace(array("\r\n","\r","\n"),"", $output); + + // Get load + $loaddata = sys_getloadavg(); ?> @@ -154,6 +157,18 @@ echo ' Temp: ' . $output . ''; } ?> +
+ Load:  ' . $loaddata[0] . '  ' . $loaddata[1] . '  '. $loaddata[2] . ''; + ?> From 6460eb46b85024574257f185c2517a4d54977997 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 9 Nov 2016 17:14:02 +0100 Subject: [PATCH 2/6] Corrected color. --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index d9e809a6..f45f99da 100644 --- a/header.php +++ b/header.php @@ -165,7 +165,7 @@ } else { - echo '#3366FF'; + echo '#7FFF00'; } echo '""> Load:  ' . $loaddata[0] . '  ' . $loaddata[1] . '  '. $loaddata[2] . ''; ?> From e0b569a59b7b068befe6da818fed22c74cc69e00 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 9 Nov 2016 17:39:42 +0100 Subject: [PATCH 3/6] Add RAM usage display --- header.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/header.php b/header.php index f45f99da..c035a483 100644 --- a/header.php +++ b/header.php @@ -14,6 +14,15 @@ // Get load $loaddata = sys_getloadavg(); + + // Get memory usage + $free = shell_exec('free'); + $free = (string)trim($free); + $free_arr = explode("\n", $free); + $mem = explode(" ", $free_arr[1]); + $mem = array_filter($mem); + $mem = array_merge($mem); + $memory_usage = $mem[2]/$mem[1]*100; ?> @@ -169,6 +178,18 @@ } echo '""> Load:  ' . $loaddata[0] . '  ' . $loaddata[1] . '  '. $loaddata[2] . ''; ?> +
+ Memory usage:  ' . sprintf("%.1f",$memory_usage) . '%'; + ?> From 74029ea0f0ee7c949505a981247756bb871117c9 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 9 Nov 2016 19:41:56 +0100 Subject: [PATCH 4/6] Changed to formula used to compute the memory usage to show the same percentage as system monitor, etc. --- header.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/header.php b/header.php index c035a483..d719ea3b 100644 --- a/header.php +++ b/header.php @@ -22,7 +22,9 @@ $mem = explode(" ", $free_arr[1]); $mem = array_filter($mem); $mem = array_merge($mem); - $memory_usage = $mem[2]/$mem[1]*100; + $used = $mem[2] - $mem[5] - $mem[6]; + $total = $mem[1]; + $memory_usage = $used/$total*100; ?> From ed8a0a6f1673b38bc3a3a3873a59ff13e38ea668 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 10 Nov 2016 11:17:15 +0100 Subject: [PATCH 5/6] Compare load to actual number of processors available. If load > CPUs, then apply red color. --- header.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/header.php b/header.php index d719ea3b..a82b67bb 100644 --- a/header.php +++ b/header.php @@ -14,6 +14,9 @@ // Get load $loaddata = sys_getloadavg(); + // Get number of processing units available to PHP + // (may be less than the number of online processors) + $nproc = shell_exec('nproc'); // Get memory usage $free = shell_exec('free'); @@ -171,7 +174,7 @@