Changeset 366 for trunk/xcache.c

Timestamp:

04/07/2007 05:21:34 AM (6 years ago)

Author:

moo

Message:

fixed #80: avoid negetive GC count down

Files:

• trunk/xcache.c (modified) (2 diffs)

trunk/xcache.c

@@ -456 +456 @@
     xc_mem_t *mem = cache->mem;
     const xc_mem_handlers_t *handlers = mem->handlers;
-    zend_ulong interval = (cachetype == XC_TYPE_PHP) ? xc_php_gc_interval : xc_var_gc_interval;
+    zend_ulong interval;
+    if (cachetype == XC_TYPE_PHP) {
+        interval = xc_php_ttl ? xc_php_gc_interval : 0;
+    }
+    else {
+        interval = xc_var_gc_interval;
+    }
 
     add_assoc_long_ex(return_value, ZEND_STRS("slots"),     cache->hentry->size);
@@ -468 +474 @@
     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));
+        time_t gc = (cache->last_gc_expires + interval) - XG(request_time);
+        add_assoc_long_ex(return_value, ZEND_STRS("gc"),    gc > 0 ? gc : 0);
     }
     else {