Changeset 129

Show
Ignore:
Timestamp:
09/03/2006 08:16:02 AM (7 years ago)
Author:
moo
Message:

minor ttl fix

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/xcache.c

    r126 r129  
    284284    fprintf(stderr, "interval %d, %d %d\n", XG(request_time), cache->last_gc_expires, gc_interval); 
    285285#endif 
    286     if (XG(request_time) - cache->last_gc_expires > gc_interval) { 
     286    if (XG(request_time) - cache->last_gc_expires >= gc_interval) { 
    287287        ENTER_LOCK(cache) { 
    288             if (XG(request_time) - cache->last_gc_expires > gc_interval) { 
     288            if (XG(request_time) - cache->last_gc_expires >= gc_interval) { 
    289289                cache->last_gc_expires = XG(request_time); 
    290290                xc_entry_apply_dmz(cache, apply_func TSRMLS_CC); 
    … …  
    376376#endif 
    377377    xc_mem_t *mem = cache->mem; 
    378     zend_ulong interval = cachetype = XC_TYPE_PHP ? xc_php_gc_interval : xc_var_gc_interval; 
     378    zend_ulong interval = (cachetype == XC_TYPE_PHP) ? xc_php_gc_interval : xc_var_gc_interval; 
    379379 
    380380    add_assoc_long_ex(return_value, ZEND_STRS("slots"),     cache->hentry->size);