[eStudy-svn] -- pcvolkmer -- in /trunk/web/admin: cacheinfo.php classes/class.cacheinfo.inc.php templates/memcache.html

[<es...@fh...>]

Author: pcvolkmer
Date: Mon Jul 26 14:10:18 2010
New Revision: 5292

Log:
Added memory usage indicator for memcache cacheinfo.

Modified:
    trunk/web/admin/cacheinfo.php
    trunk/web/admin/classes/class.cacheinfo.inc.php
    trunk/web/admin/templates/memcache.html

Modified: trunk/web/admin/cacheinfo.php
==============================================================================
--- trunk/web/admin/cacheinfo.php (original)
+++ trunk/web/admin/cacheinfo.php Mon Jul 26 14:10:18 2010
@@ -30,10 +30,11 @@
 /** Ausgabe des HTML-Kopfes und der Menues */
 require_once (PATH_TO_ROOT."common/header.inc.php");
 
-echo "<h1>Cacheinformation</h1><div><h2>Alternate PHP Cache</h2>";
-CacheInfo::printCacheInfo(CacheInfo::APC);
+echo "<h1>Cacheinformation</h1><div>";
 echo "<h2>Memcache</h2>";
 CacheInfo::printCacheInfo(CacheInfo::MEMCACHE);
+echo "<h2>Alternate PHP Cache</h2>";
+CacheInfo::printCacheInfo(CacheInfo::APC);
 echo "</div>";
 
 /** HTML-Fuss und unteres Menue */

Modified: trunk/web/admin/classes/class.cacheinfo.inc.php
==============================================================================
--- trunk/web/admin/classes/class.cacheinfo.inc.php (original)
+++ trunk/web/admin/classes/class.cacheinfo.inc.php Mon Jul 26 14:10:18 2010
@@ -93,15 +93,15 @@
 	}
 	
 	private function memcacheHtmlCacheInfo() {
-		if (! $this->enabled())
-			return "Memcache ist nicht aktiviert";
+		global $memcache;
+		
+		if (! $this->enabled() || $memcache === null)
+			return "Memcache ist nicht aktiviert!";
 
-		global $memcache;
-		$memcacheInfo = $memcache->getStats('sizes');
+		$memcacheInfo = $memcache->getStats();
 		if ($memcacheInfo === false)
-			return "Fehler bei Statistikerstellung";
+			return "Fehler bei Statistikerfassung!";
 		
-		var_dump($memcacheInfo);
 		$memcacheTemplate    = new Template2(PATH_TO_ROOT."admin/templates/memcache.html");
 		
 		$relativeCacheHits = $relativeCacheMisses = '0%';
@@ -114,7 +114,7 @@
 				. "%";
 			
 			$relativeCacheMisses = round(
-					($memcacheInfo['get_misses'] / ($memcacheInfo['get_hits']+$memacheInfo['get_misses'])) * 100,
+					($memcacheInfo['get_misses'] / ($memcacheInfo['get_hits']+$memcacheInfo['get_misses'])) * 100,
 					2
 				) 
 				. "%";
@@ -135,6 +135,17 @@
 				) 
 				. "%";
 		}
+		
+		$relativeUsedBytes = '0%';
+		
+		if ($memcacheInfo['limit_maxbytes'] > 0) {
+			$retrievalRequests  = round(
+					($memcacheInfo['bytes'] / ($memcacheInfo['limit_maxbytes'])) * 100,
+					2
+				) 
+				. "%";
+		}
+		
 		eval ($memcacheTemplate->getTemplate());
 	}
 	

Modified: trunk/web/admin/templates/memcache.html
==============================================================================
--- trunk/web/admin/templates/memcache.html (original)
+++ trunk/web/admin/templates/memcache.html Mon Jul 26 14:10:18 2010
@@ -14,17 +14,24 @@
 		<div style="width: $relativeCacheMisses;"></div>
 	</div>
 	<div>
-		<span>Anfragen:&nbsp;</span>
+		<span>Anfragen lesend:&nbsp;</span>
 		<pre style="display: inline;">$memcacheInfo[cmd_get] ($retrievalRequests)</pre>
 	</div>
 	<div class="diagram_bar">
 		<div style="width: $relativeCacheHits;"></div>
 	</div>
 	<div>
-		<span>Speichern:&nbsp;</span>
+		<span>Anfragen schreibend:&nbsp;</span>
 		<pre style="display: inline;">$memcacheInfo[cmd_set] ($storageRequests)</pre>
 	</div>
 	<div class="diagram_bar">
 		<div style="width: $relativeCacheMisses;"></div>
 	</div>
+	<div>
+		<span>Speichernutzung:&nbsp;</span>
+		<pre style="display: inline;">$memcacheInfo[bytes] Bytes ($relativeUsedBytes)</pre>
+	</div>
+	<div class="diagram_bar">
+		<div style="width: $relativeUsedBytes;"></div>
+	</div>
 </div>