Changeset 521 for trunk

Timestamp:

02/17/2008 02:27:05 PM (8 months ago)

Author:

moo

Message:

add "total" stat

Location:

trunk/admin

Files:

• common-zh-simplified-utf-8.lang.php (modified) (1 diff)
• common-zh-traditional-utf-8.lang.php (modified) (1 diff)
• xcache.css (modified) (2 diffs)
• xcache.php (modified) (5 diffs)
• xcache.tpl.php (modified) (3 diffs)

trunk/admin/common-zh-simplified-utf-8.lang.php

@@ -71 +71 @@
         'GC'
         => 'GC',
+        'Total'
+        => '总共',
         'Cache'
         => '缓冲区',

trunk/admin/common-zh-traditional-utf-8.lang.php

@@ -71 +71 @@
         'GC'
         => 'GC',
+        'Total'
+        => '总共',
         'Cache'
         => '快取',

trunk/admin/xcache.css

@@ -18 +18 @@
 .button { }
 span.sortarrow { color: white; text-decoration: none; }
-.freeblocks { float: left; margin-right: 4px;}
-.freeblocks td { text-align: right; }
 form {margin: 0; padding: 0}
 
@@ -26 +24 @@
 .percent .pavail { background: green; }
 
-.usagegraph { height: 16px; }
-.usagegraph div { float: left; height: 3px; width: 4px; border: solid gray; border-width: 0 0px 1px 0; }
-.usagegraph { border: 1px solid gray; border-bottom: 0px; }
+.freeblockgraph { height: 16px; }
+.freeblockgraph div { float: left; height: 3px; width: 4px; border: solid gray; border-width: 0 0px 1px 0; }
+.freeblockgraph { border: 1px solid gray; border-bottom: 0px; }
 
 .switcher, h1, h2 { text-align: center; display: block; }

trunk/admin/xcache.php

@@ -169 +169 @@
         $cacheid = (int) (isset($_POST['cacheid']) ? $_POST['cacheid'] : 0);
         if (isset($_POST['clearcache'])) {
-            xcache_clear_cache($type, $cacheid);
+            $count = xcache_count($type);
+            if ($cacheid == $count) {
+                for ($cacheid = 0; $cacheid < $count; $cacheid ++) {
+                    xcache_clear_cache($type, $cacheid);
+                }
+            }
+            else {
+                xcache_clear_cache($type, $cacheid);
+            }
         }
     }
@@ -177 +185 @@
 // {{{ load info/list
 $cacheinfos = array();
+$total = array();
 for ($i = 0; $i < $pcnt; $i ++) {
     $data = xcache_info(XC_TYPE_PHP, $i);
@@ -186 +195 @@
     $data['cacheid'] = $i;
     $cacheinfos[] = $data;
-}
+    if ($pcnt >= 2) {
+        foreach ($data as $k => $v) {
+            switch ($k) {
+            case 'type':
+            case 'cache_name':
+            case 'cacheid':
+            case 'free_blocks':
+                continue 2;
+            }
+            if (!isset($total[$k])) {
+                $total[$k] = $v;
+            }
+            else {
+                $total[$k] += $v;
+            }
+        }
+    }
+}
+
+if ($pcnt >= 2) {
+    $total['type'] = XC_TYPE_PHP;
+    $total['cache_name'] = _T('Total');
+    $total['cacheid'] = $pcnt;
+    $total['gc'] = null;
+    $total['istotal'] = true;
+    $cacheinfos[] = $total;
+}
+
+$total = array();
 for ($i = 0; $i < $vcnt; $i ++) {
     $data = xcache_info(XC_TYPE_VAR, $i);
@@ -196 +233 @@
     $data['cacheid'] = $i;
     $cacheinfos[] = $data;
+    if ($pcnt >= 2) {
+        foreach ($data as $k => $v) {
+            switch ($k) {
+            case 'type':
+            case 'cache_name':
+            case 'cacheid':
+            case 'free_blocks':
+            case 'gc':
+                continue 2;
+            }
+            if (!isset($total[$k])) {
+                $total[$k] = $v;
+            }
+            else {
+                $total[$k] += $v;
+            }
+        }
+    }
+}
+
+if ($vcnt >= 2) {
+    $total['type'] = XC_TYPE_VAR;
+    $total['cache_name'] = _T('Total');
+    $total['cacheid'] = $vcnt;
+    $total['gc'] = null;
+    $total['istotal'] = true;
+    $cacheinfos[] = $total;
 }
 // }}}
@@ -210 +274 @@
     }
     foreach ($cacheinfos as $i => $c) {
+        if (!empty($c['istotal'])) {
+            continue;
+        }
         if ($c['type'] == $type && isset($c['cache_list'])) {
             foreach ($c['cache_list'] as $e) {

trunk/admin/xcache.tpl.php

@@ -51 +51 @@
         $pused = 100 - $pavail;
 
-        $graph = freeblock_to_graph($ci['free_blocks'], $ci['size']);
         $w = $free_graph_width;
         $tdwidth = $w + 2;
+        if (empty($ci['istotal'])) {
+            $graph = freeblock_to_graph($ci['free_blocks'], $ci['size']);
+            $freeblockgraph = "<div class=\"freeblockgraph\" style=\"width: {$w}px\">{$graph}</div>";
+        }
+        else {
+            $freeblockgraph = '';
+        }
 
         $ci_slots = size($ci['slots']);
@@ -59 +65 @@
         $ci_avail = size($ci['avail']);
         $ci = number_formats($ci, $numkeys);
-        $ci['compiling']    = $ci['type'] == $type_php ? ($ci['compiling'] ? 'yes' : 'no') : '-';
-        $ci['can_readonly'] = $ci['can_readonly'] ? 'yes' : 'no';
+        if (!empty($ci['istotal'])) {
+            $ci['compiling']    = '-';
+            $ci['can_readonly'] = '-';
+        }
+        else {
+            $ci['compiling']    = $ci['type'] == $type_php ? ($ci['compiling'] ? 'yes' : 'no') : '-';
+            $ci['can_readonly'] = $ci['can_readonly'] ? 'yes' : 'no';
+        }
         echo <<<EOS
         <th>{$ci['cache_name']}</th>
@@ -71 +83 @@
                 ><div style="width: {$pused}%" class="pused"></div
             ></div
-            ><div class="usagegraph" style="width: {$w}px">{$graph}</div
-        ></td>
+        >{$freeblockgraph}</td>
         <td
             ><form method="post"