Changeset 598 for branches/1.3/xcache.c

Timestamp:

2009-07-05T07:25:36+02:00 (4 years ago)

Author:

moo

Message:

unmerge r321 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xcache.c (modified) (4 diffs)

branches/1.3/xcache.c

@@ -446 +446 @@
     array_init(ei);
 
+    add_assoc_long_ex(ei, ZEND_STRS("size"),     entry->size);
     add_assoc_long_ex(ei, ZEND_STRS("refcount"), entry->refcount);
     add_assoc_long_ex(ei, ZEND_STRS("hits"),     entry->hits);
@@ -476 +477 @@
         case XC_TYPE_PHP:
             php = entry->data.php;
-            add_assoc_long_ex(ei, ZEND_STRS("size"),          entry->size + php->size);
-            add_assoc_long_ex(ei, ZEND_STRS("phprefcount"),   php->refcount);
             add_assoc_long_ex(ei, ZEND_STRS("sourcesize"),    php->sourcesize);
 #ifdef HAVE_INODE
@@ -494 +493 @@
 #endif
             break;
-
         case XC_TYPE_VAR:
             var = entry->data.var;
-            add_assoc_long_ex(ei, ZEND_STRS("size"),          entry->size);
             break;
 
@@ -1444 +1441 @@
 
 err:
+    xc_destroy();
     if (xc_php_caches || xc_var_caches) {
-        xc_destroy();
         /* shm destroied in xc_destroy() */
     }
     else if (shm) {
-        xc_destroy();
         xc_shm_destroy(shm);
     }