From fa7e0ab9f86b3ee3b6e4c75ead6e4a752a036ba6 Mon Sep 17 00:00:00 2001
From: Xuefer <xuefer@gmail.com>
Date: Thu, 31 Aug 2006 00:23:20 +0000
Subject: [PATCH] show gc countdown in admin page

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@118 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
---
 admin/xcache.tpl.php |  2 ++
 xcache.c             | 11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/admin/xcache.tpl.php b/admin/xcache.tpl.php
index 7005c42..1cf41a6 100644
--- a/admin/xcache.tpl.php
+++ b/admin/xcache.tpl.php
@@ -53,6 +53,7 @@ Caches:
 		<th>Protected</th>
 		<th>Cached</th>
 		<th>Deleted</th>
+		<th>GC</th>
 	</tr>
 	<?php
 	$numkeys = explode(',', 'hits,misses,clogs,ooms,cached,deleted');
@@ -91,6 +92,7 @@ Caches:
 		<td>{$ci['can_readonly']}</td>
 		<td>{$ci['cached']}</td>
 		<td>{$ci['deleted']}</td>
+		<td>{$ci['gc']}</td>
 EOS;
 
 			$b->reset();
diff --git a/xcache.c b/xcache.c
index 24111f9..8d1fcdf 100644
--- a/xcache.c
+++ b/xcache.c
@@ -367,7 +367,7 @@ static void xc_gc_deletes(TSRMLS_D) /* {{{ */
 /* }}} */
 
 /* 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;
 	const xc_block_t *b;
@@ -375,6 +375,7 @@ static void xc_fillinfo_dmz(xc_cache_t *cache, zval *return_value TSRMLS_DC) /*
 	xc_memsize_t avail = 0;
 #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);
 	add_assoc_long_ex(return_value, ZEND_STRS("compiling"), cache->compiling);
@@ -385,6 +386,12 @@ static void xc_fillinfo_dmz(xc_cache_t *cache, zval *return_value TSRMLS_DC) /*
 
 	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);
 	array_init(blocks);
@@ -1434,7 +1441,7 @@ static void xcache_admin_operate(xcache_op_type optype, INTERNAL_FUNCTION_PARAME
 			cache = caches[id];
 			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 {
 					xc_filllist_dmz(cache, return_value TSRMLS_CC);