Changeset 39 for trunk/measure_scripts/system.php

Timestamp:

Mar 21, 2009, 9:38:58 AM (16 years ago)

Author:

george

Message:

• Upraveno: Funkce pro zjištění zátěže CPU nyní uchovává poslední stav v jedné proměnné. * Upraveno: Skript monitor.php se nyní spouští periodicky pomocí cronu namísto vnitřní nekonečné smyčky. Stavové informace pro některé funce se nyní ukládáají do temp souborů.

File:

• trunk/measure_scripts/system.php (modified) (5 diffs)

trunk/measure_scripts/system.php

@@ -23 +23 @@
 }
 
-function Ping()
+function Ping($Host = 'nix.cz')
 {  
-  exec('ping nix.cz -c 1 -W 1|grep time=', $Row);
+  exec('ping '.$Host.' -c 1 -W 1|grep time=', $Row);
   // W - timeout in seconds
   // c - ping count
@@ -47 +47 @@
   while(strpos($Row, '  ') !== false) $Row = str_replace('  ', ' ', $Row);
   $RowParts2 = explode(' ', $Row);
-  return($RowParts[2] + $RowParts2[2]);  
+  return($RowParts[2] + $RowParts2[2]);
 }
 
 function CpuUsage()
-{  
-  global $cpuIDLEprev, $cpuSYSTprev, $cpuUSERprev;
+{
+  global $LastCpuUsage;
+  //$cpuIDLEprev, $cpuSYSTprev, $cpuUSERprev;
+
   // get processor usage seconds for pct stats ###
   $File = fopen('/proc/stat', 'r');
@@ -58 +60 @@
   fclose($File);
   $Parts = explode(' ', $Row);
-  $cpuUSER = $Parts[2] + $Parts[3];
-  $cpuSYST = $Parts[4];
-  $cpuIDLE = $Parts[5];
-  $cpuUSERdiff = ($cpuUSER - $cpuUSERprev);
-  $cpuSYSTdiff = ($cpuSYST - $cpuSYSTprev);
-  $cpuIDLEdiff = ($cpuIDLE - $cpuIDLEprev);
-  $cpuIDLEdiffTOTAL = (($cpuUSERdiff + $cpuSYSTdiff) + $cpuIDLEdiff);
-  if ($cpuIDLEdiffTOTAL > 0)
+  $CpuUsage['User'] = $Parts[2] + $Parts[3];
+  $CpuUsage['System'] = $Parts[4];
+  $CpuUsage['Idle'] = $Parts[5];
+  $CpuUsageDiff['User'] = ($CpuUsage['User'] - $LastCpuUsage['User']);
+  $CpuUsageDiff['System'] = ($CpuUsage['System'] - $LastCpuUsage['System']);
+  $CpuUsageDiff['Idle'] = ($CpuUsage['Idle'] - $LastCpuUsage['Idle']);
+  $CpuUsageDiffTotal = (($CpuUsageDiff['User'] + $CpuUsageDiff['System']) + $CpuUsageDiff['Idle']);
+  if ($CpuUsageDiffTotal > 0)
   {
-    $cpuUSERcent = ($cpuUSERdiff / $cpuIDLEdiffTOTAL) * 100;
-    $cpuSYSTcent = ($cpuSYSTdiff / $cpuIDLEdiffTOTAL) * 100;
-    $cpuIDLEcent = ($cpuIDLEdiff / $cpuIDLEdiffTOTAL * 100);
+    $CpuUsagePercent['User'] = ($CpuUsageDiff['User'] / $CpuUsageDiffTotal) * 100;
+    $CpuUsagePercent['System'] = ($CpuUsageDiff['System'] / $CpuUsageDiffTotal) * 100;
+    $CpuUsagePercent['Idle'] = ($CpuUsageDiff['Idle'] / $CpuUsageDiffTotal * 100);
   } else
   {
-    $cpuUSERcent  =0;
-    $cpuSYSTcent = 0;
-    $cpuIDLEcent = 0;
+    $CpuUsagePercent['User'] = 0;
+    $CpuUsagePercent['System'] = 0;
+    $CpuUsagePercent['Idle'] = 0;
   }
-  $cpuUSERprev = $cpuUSER;
-  $cpuSYSTprev = $cpuSYST;
-  $cpuIDLEprev = $cpuIDLE;
-  return(100 - round($cpuIDLEcent * 100) / 100);
+  $LastCpuUsage = $CpuUsage;
+  return(100 - round($CpuUsagePercent['Idle'], 2));
 }
 
 function GetNetworkState()
-{  
+{
   global $LastNetworkState;
   
@@ -124 +124 @@
 }
 
-function DiskUtilization()
+function DiskUtilization($Device)
 {
   $Output = array();
-  exec('iostat -d sda -x -m 2 2', $Output);   // 2 second measure delay
+  exec('iostat -d '.$Device.' -x -m 2 2', $Output);   // 2 second measure delay
   $Row = $Output[6];
   while(strpos($Row, '  ') !== false) $Row = str_replace('  ', ' ', $Row);
@@ -135 +135 @@
 }
 
-function DiskFree()
+function DiskFree($Path)
 {
-  return(disk_free_space('/'));
+  return(disk_free_space($Path));
 }