From aa1f46364f5c2c2637dfda1ff1453e2929b38bb7 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 14 Mar 2005 03:33:31 +0000
Subject: Write out all javascript updates in one batch instead of updating the
 uptime before the sleep statements.

---
 usr/local/www/index.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 9a19f28..24a3148 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -251,10 +251,6 @@ $counter = 0;
 
 While(!Connection_Aborted()) {
 
-    echo "<script language='javascript'>\n";
-    /* Update uptime */
-    echo "document.forms[0].uptime.value = '" . get_uptime() . "';\n";
-
     /* Update CPU meter */
     sleep(1);
     $cpuTicks = get_cputicks();
@@ -262,10 +258,6 @@ While(!Connection_Aborted()) {
     $cpuTicks2 = get_cputicks();
     $cpuUsage = get_cpuusage($cpuTicks, $cpuTicks2);
 
-    echo "document.cpuwidtha.style.width='" . $cpuUsage . "';\n";
-    echo "document.cpuwidthb.style.width='" . (100 - $cpuUsage) . "';\n";
-    echo "document.forms[0].cpumeter.value = '" . $cpuUsage . "%';\n";
-
     /* Update memory usage */
     exec("/sbin/sysctl -n vm.stats.vm.v_active_count vm.stats.vm.v_inactive_count " .
         "vm.stats.vm.v_wire_count vm.stats.vm.v_cache_count vm.stats.vm.v_free_count", $memory);
@@ -275,6 +267,13 @@ While(!Connection_Aborted()) {
     $usedMem = $totalMem - $freeMem;
     $memUsage = round(($usedMem * 100) / $totalMem, 0);
 
+    echo "<script language='javascript'>\n";
+    echo "document.forms[0].uptime.value = '" . get_uptime() . "';\n";
+    
+    echo "document.cpuwidtha.style.width='" . $cpuUsage . "';\n";
+    echo "document.cpuwidthb.style.width='" . (100 - $cpuUsage) . "';\n";
+    echo "document.forms[0].cpumeter.value = '" . $cpuUsage . "%';\n";
+
     echo "document.memwidtha.style.width='" . $memUsage . "';\n";
     echo "document.memwidthb.style.width='" . (100 - $memUsage) . "';\n";
     echo "document.forms[0].memusagemeter.value = '" . $memUsage . "%';\n";
-- 
cgit v1.1