Changeset 118

Timestamp:

08/31/2006 12:23:20 AM (2 years ago)

Author:

moo

Message:

show gc countdown in admin page

Location:

trunk

Files:

• admin/xcache.tpl.php (modified) (2 diffs)
• xcache.c (modified) (4 diffs)

trunk/admin/xcache.tpl.php

@@ -54 +54 @@
         <th>Cached</th>
         <th>Deleted</th>
+        <th>GC</th>
     </tr>
     <?php
@@ -92 +93 @@
         <td>{$ci['cached']}</td>
         <td>{$ci['deleted']}</td>
+        <td>{$ci['gc']}</td>
 EOS;
 

trunk/xcache.c

@@ -368 +368 @@
 
 /* helper functions for user functions */
-static void xc_fillinfo_dmz(xc_cache_t *cache, zval *return_value TSRMLS_DC) /* {{{ */
+static void xc_fillinfo_dmz(int cachetype, xc_cache_t *cache, zval *return_value TSRMLS_DC) /* {{{ */
 {
     zval *blocks;
@@ -376 +376 @@
 #endif
     xc_mem_t *mem = cache->mem;
+    zend_ulong interval = cachetype = XC_TYPE_PHP ? xc_php_gc_interval : xc_var_gc_interval;
 
     add_assoc_long_ex(return_value, ZEND_STRS("slots"),     cache->hentry->size);
@@ -386 +387 @@
     add_assoc_long_ex(return_value, ZEND_STRS("cached"),    cache->entries_count);
     add_assoc_long_ex(return_value, ZEND_STRS("deleted"),   cache->deletes_count);
+    if (interval) {
+        add_assoc_long_ex(return_value, ZEND_STRS("gc"),    (cache->last_gc_expires + interval) - XG(request_time));
+    }
+    else {
+        add_assoc_null_ex(return_value, ZEND_STRS("gc"));
+    }
 
     MAKE_STD_ZVAL(blocks);
@@ -1435 +1442 @@
             ENTER_LOCK(cache) {
                 if (optype == XC_OP_INFO) {
-                    xc_fillinfo_dmz(cache, return_value TSRMLS_CC);
+                    xc_fillinfo_dmz(type, cache, return_value TSRMLS_CC);
                 }
                 else {