Changeset 517

Timestamp:

2008-02-17T11:52:38+01:00 (5 years ago)

Author:

moo

Message:

show free blocks as graph

Location:

trunk/admin

Files:

• common.php (modified) (1 diff)
• config.php.example (modified) (1 diff)
• xcache.css (modified) (1 diff)
• xcache.php (modified) (1 diff)
• xcache.tpl.php (modified) (3 diffs)

trunk/admin/common.php

@@ -109 +109 @@
     $lang = 'en-us';
 }
+if (!isset($free_graph_width)) {
+    $free_graph_width = 120;
+}
 
 ?>

trunk/admin/config.php.example

@@ -11 +11 @@
 // developers only
 $show_todo_strings = false;
+
+// width of graph for free blocks
+$free_graph_width = 120;
 
 // this function is detected by xcache.tpl.php, and enabled if function_exists

trunk/admin/xcache.css

@@ -20 +20 @@
 .freeblocks td { text-align: right; }
 form {margin: 0; padding: 0}
-.percent { border: 1px solid black; width: 80%; height: 20px; }
-.percent div { font-size: 1px; line-height: 1px; width: 100%;}
-.percent .pavail { background: blue; }
+
+.percent { height: 3px; margin-bottom: 1px; background: gray; border: 1px solid gray; border-top: 0px; border-bottom: 0px; }
+.percent div { float: left; height: 100%; }
+.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; }
+
 .switcher, h1, h2 { text-align: center; display: block; }
 .switcher * { color: blue; }

trunk/admin/xcache.php

@@ -73 +73 @@
 
     return '0 s';
+}
+
+function freeblock_to_graph($freeblocks, $size)
+{
+    global $free_graph_width;
+
+    // cached in static variable
+    static $graph_initial;
+    if (!isset($graph_initial)) {
+        for ($i = 0; $i < $free_graph_width; $i ++) {
+            $graph_initial[$i] = 0;
+        }
+    }
+    $graph = $graph_initial;
+    foreach ($freeblocks as $b) {
+        $begin = $b['offset'] / $size * $free_graph_width;
+        $end = ($b['offset'] + $b['size']) / $size * $free_graph_width;
+
+        $graph[(int) $begin] += 1 - ($begin - (int) $begin);
+        $graph[(int) $end] += ($end - (int) $end);
+        for ($i = (int) $begin + 1, $e = (int) $end; $i < $e; $i ++) {
+            $graph[$i] = 1;
+        }
+    }
+    $html = array();
+    $c = 255;
+    foreach ($graph as $k => $v) {
+        $v = (int) ($v * $c);
+        $r = $g = $c - $v;
+        $b = $c;
+        $html[] = '<div style="background: rgb(' . "$r,$g,$b" . ')"></div>';
+    }
+    return implode('', $html);
 }
 

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;
+
         $ci_slots = size($ci['slots']);
         $ci_size  = size($ci['size']);
@@ -62 +66 @@
         <td title="{$ci['size']}">{$ci_size}</td>
         <td title="{$ci['avail']}">{$ci_avail}</td>
-        <td title="{$pavail} %"><div class="percent"><div style="height: {$pused}%" class="pused">&nbsp;</div><div style="height: {$pavail}%" class="pavail">&nbsp;</div></div></td>
+        <td title="{$pavail} %" width="{$tdwidth}"
+            ><div class="percent" style="width: {$w}px"
+                ><div style="width: {$pavail}%" class="pavail"></div
+                ><div style="width: {$pused}%" class="pused"></div
+            ></div
+            ><div class="usagegraph" style="width: {$w}px">{$graph}</div
+        ></td>
         <td>
             <form method="post">
@@ -89 +99 @@
     <?php } ?>
 </table>
-<div>
-    <?php echo _T('Free Blocks'); ?>:
-</div>
-<?php
-foreach ($cacheinfos as $i => $ci) {
-    $b->reset();
-?>
-<table cellspacing="0" cellpadding="4" class="cycles freeblocks">
-    <tr>
-        <th><?php echo $ci['cache_name']; ?> <?php echo _T("size"); ?><br><?php echo _T("offset"); ?></th>
-    <?php
-    foreach ($ci['free_blocks'] as $block) {
-        $size   = size($block['size']);
-        $offset = size($block['offset']);
-
-        $c = $b->next();
-        echo "
-        <td $c><nobr>$size<br>$offset</nobr></td>";
-    }
-    ?>
-
-    </tr>
-</table>
-<?php
-}
-?>
 <div style="clear: both">&nbsp;</div>
 <?php