Changeset 129 for trunk/xcache.c

Timestamp:

2006-09-03T08:16:02+02:00 (7 years ago)

Author:

moo

Message:

minor ttl fix

File:

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

trunk/xcache.c

@@ -284 +284 @@
     fprintf(stderr, "interval %d, %d %d\n", XG(request_time), cache->last_gc_expires, gc_interval);
 #endif
-    if (XG(request_time) - cache->last_gc_expires > gc_interval) {
+    if (XG(request_time) - cache->last_gc_expires >= gc_interval) {
         ENTER_LOCK(cache) {
-            if (XG(request_time) - cache->last_gc_expires > gc_interval) {
+            if (XG(request_time) - cache->last_gc_expires >= gc_interval) {
                 cache->last_gc_expires = XG(request_time);
                 xc_entry_apply_dmz(cache, apply_func TSRMLS_CC);
@@ -376 +376 @@
 #endif
     xc_mem_t *mem = cache->mem;
-    zend_ulong interval = cachetype = XC_TYPE_PHP ? xc_php_gc_interval : xc_var_gc_interval;
+    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);