diff --git a/Library/Data/Analysis.php b/Library/Data/Analysis.php index 68064d2..1c3e950 100644 --- a/Library/Data/Analysis.php +++ b/Library/Data/Analysis.php @@ -220,6 +220,7 @@ public static function slabs($slabs) $slabs['used_slabs'] ++; } $slabs[$id]['request_rate'] = sprintf('%.1f', ($slab['get_hits'] + $slab['cmd_set'] + $slab['delete_hits'] + $slab['cas_hits'] + $slab['cas_badval'] + $slab['incr_hits'] + $slab['decr_hits']) / $slabs['uptime'], 1); + $slabs[$id]['request_count'] = sprintf('%.1f', ($slab['get_hits'] + $slab['cmd_set'] + $slab['delete_hits'] + $slab['cas_hits'] + $slab['cas_badval'] + $slab['incr_hits'] + $slab['decr_hits']), 1); $slabs[$id]['mem_wasted'] = (($slab['total_chunks'] * $slab['chunk_size']) < $slab['mem_requested']) ? (($slab['total_chunks'] - $slab['used_chunks']) * $slab['chunk_size']) : (($slab['total_chunks'] * $slab['chunk_size']) - $slab['mem_requested']); $slabs['total_wasted'] += $slabs[$id]['mem_wasted']; } @@ -324,4 +325,4 @@ public static function hitResize($value) } return sprintf('%.0f%s', $value, $unit); } -} +} \ No newline at end of file diff --git a/View/LiveStats/Frame.phtml b/View/LiveStats/Frame.phtml index 48d3b5b..a0df100 100644 --- a/View/LiveStats/Frame.phtml +++ b/View/LiveStats/Frame.phtml @@ -56,6 +56,10 @@
EVI/s + Number of times an item which had an explicit expire time set had to be evicted before it expired per second +
+
+ EVIs Number of times an item which had an explicit expire time set had to be evicted before it expired
diff --git a/View/LiveStats/Stats.phtml b/View/LiveStats/Stats.phtml index f4193c3..324f9a3 100644 --- a/View/LiveStats/Stats.phtml +++ b/View/LiveStats/Stats.phtml @@ -6,15 +6,15 @@ define('EOL', "\r\n"); echo 'Last update : ' . date('r', time()) . ' (refresh rate : ' . $_ini->get('refresh_rate') . ' sec)' . EOL . EOL; # Table header -echo '' . sprintf('%-36s', 'NAME') . sprintf('%10s', 'SIZE') . sprintf('%7s', '%MEM') . sprintf('%8s', 'TIME') . +echo '' . sprintf('%-30s', 'NAME') . sprintf('%10s', 'SIZE') . sprintf('%7s', '%MEM') . sprintf('%8s', 'TIME') . sprintf('%6s', 'CONN') . sprintf('%7s', '%HIT') . sprintf('%8s', 'REQ/s') . sprintf('%8s', 'GET/s') . sprintf('%8s', 'SET/s') . -sprintf('%8s', 'DEL/s') . sprintf('%8s', 'EVI/s') . sprintf('%11s', 'READ/s') . sprintf('%10s', 'WRITE/s') . '' . EOL . '
'; +sprintf('%8s', 'DEL/s') . sprintf('%8s', 'EVI/s') . sprintf('%6s', 'EVIs') . sprintf('%11s', 'READ/s') . sprintf('%10s', 'WRITE/s') . '
' . EOL . '
'; # Showing stats for every server foreach($stats as $server => $data) { # Server name - echo sprintf('%-36.36s', $server); + echo sprintf('%-30.36s', $server); # Checking for stats validity if((isset($data['time'], $data['bytes_percent'], $data['get_hits_percent'], $data['query_time'], $data['request_rate'], $data['curr_connections'], @@ -70,6 +70,7 @@ foreach($stats as $server => $data) { echo sprintf('%8s', Library_Data_Analysis::valueResize($data['eviction_rate'])); } + echo sprintf('%6.0f', Library_Data_Analysis::valueResize($data['evictions'])); # Bytes read echo sprintf('%11s', Library_Data_Analysis::byteResize($data['bytes_read'] / $data['time']) . 'b'); diff --git a/View/Stats/Slabs.phtml b/View/Stats/Slabs.phtml index 45d4520..8275059 100644 --- a/View/Stats/Slabs.phtml +++ b/View/Stats/Slabs.phtml @@ -81,6 +81,10 @@ foreach($slabs as $id => $slab) Hits 999) ? Library_Data_Analysis::hitResize($slab['request_rate']) : $slab['request_rate']; ?> Request/sec
+
+ Total Reqs + +
0) { ?>