Changeset 598 for branches/1.3/xcache.c


Ignore:
Timestamp:
2009-07-05T07:25:36+02:00 (5 years ago)
Author:
moo
Message:

unmerge r321 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/xcache.c

    r596 r598  
    446446    array_init(ei); 
    447447 
     448    add_assoc_long_ex(ei, ZEND_STRS("size"),     entry->size); 
    448449    add_assoc_long_ex(ei, ZEND_STRS("refcount"), entry->refcount); 
    449450    add_assoc_long_ex(ei, ZEND_STRS("hits"),     entry->hits); 
     
    476477        case XC_TYPE_PHP: 
    477478            php = entry->data.php; 
    478             add_assoc_long_ex(ei, ZEND_STRS("size"),          entry->size + php->size); 
    479             add_assoc_long_ex(ei, ZEND_STRS("phprefcount"),   php->refcount); 
    480479            add_assoc_long_ex(ei, ZEND_STRS("sourcesize"),    php->sourcesize); 
    481480#ifdef HAVE_INODE 
     
    494493#endif 
    495494            break; 
    496  
    497495        case XC_TYPE_VAR: 
    498496            var = entry->data.var; 
    499             add_assoc_long_ex(ei, ZEND_STRS("size"),          entry->size); 
    500497            break; 
    501498 
     
    14441441 
    14451442err: 
     1443    xc_destroy(); 
    14461444    if (xc_php_caches || xc_var_caches) { 
    1447         xc_destroy(); 
    14481445        /* shm destroied in xc_destroy() */ 
    14491446    } 
    14501447    else if (shm) { 
    1451         xc_destroy(); 
    14521448        xc_shm_destroy(shm); 
    14531449    } 
Note: See TracChangeset for help on using the changeset viewer.