Added more hit/miss tracking to CompositeCache, and made those counts available

via the admin servlet (perhaps JMX someday).

Also, removed DCL from dispose, and tried to comment what is going on there
(still not entirely sure =)

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/jakarta/jcs/trunk@223999 13f79535-47bb-0310-9956-ffa450edef68

Author: James Taylor

src/java/org/apache/jcs/admin/servlet/JCSAdminServlet.java

@@ -176,10 +176,8 @@ private LinkedList buildCacheInfo() throws Exception
 
             regionInfo = new CacheRegionInfo();
 
-            regionInfo.name = cache.getCacheName();
-            regionInfo.itemCount = cache.getSize();
+            regionInfo.cache = cache;
             regionInfo.byteCount = getByteCount( cache );
-            regionInfo.status = statusAsString( cache );
 
             cacheInfo.add( regionInfo );
         }
@@ -210,16 +208,6 @@ public int getByteCount( CompositeCache cache )
         return counter.getCount() - 4;
     }
 
-    private String statusAsString( ICache cache )
-    {
-        int status = cache.getStatus();
-
-        return ( status == CacheConstants.STATUS_ALIVE ? "ALIVE"
-            : status == CacheConstants.STATUS_DISPOSED ? "DISPOSED"
-            : status == CacheConstants.STATUS_ERROR ? "ERROR"
-            : "UNKNOWN" );
-    }
-
     private void clearAllRegions() throws IOException
     {
         String[] names = cacheHub.getCacheNames();
@@ -243,19 +231,12 @@ private void removeItem( String cacheName, String key ) throws IOException
     /** Stores info on a cache region for the template */
     public class CacheRegionInfo
     {
-        String name = null;
-        long itemCount = 0;
+        CompositeCache cache = null;
         long byteCount = 0;
-        String status = null;
 
-        public String getName()
+        public CompositeCache getCache()
         {
-            return name;
-        }
-
-        public long getItemCount()
-        {
-            return itemCount;
+            return cache;
         }
 
         public long getByteCount()
@@ -265,7 +246,12 @@ public long getByteCount()
 
         public String getStatus()
         {
-            return status;
+            int status = cache.getStatus();
+
+            return ( status == CacheConstants.STATUS_ALIVE ? "ALIVE"
+                : status == CacheConstants.STATUS_DISPOSED ? "DISPOSED"
+                : status == CacheConstants.STATUS_ERROR ? "ERROR"
+                : "UNKNOWN" );
         }
     }
 

src/java/org/apache/jcs/admin/servlet/JCSAdminServletDefault.vm

@@ -18,14 +18,22 @@ which empties the entire cache.</p>
         <th> Items </th>
         <th> Bytes </th>
         <th> Status </th>
+        <th> Memory Hits </th>
+        <th> Aux Hits </th>
+        <th> Not Found Misses </th>
+        <th> Expired Misses </th>
     </tr>
 
     #foreach ( $record in $cacheInfoRecords )
         <tr>
-            <td> $record.Name </td>
-            <td> $record.ItemCount </td>
-            <td> $record.ByteCount </td>
-            <td> $record.Status </td>
+            <td> $record.cache.cacheName </td>
+            <td> $record.cache.size </td>
+            <td> $record.byteCount </td>
+            <td> $record.status </td>
+            <td> $record.cache.hitCountRam </td>
+            <td> $record.cache.hitCountAux </td>
+            <td> $record.cache.missCountNotFound </td>
+            <td> $record.cache.missCountExpired </td>
             <td>
                 <a href="?action=detail&cacheName=${record.Name}"> Detail </a>
                 | <a href="?action=clearRegion&cacheName=${record.Name}"> Remove all </a>