Changeset 596 for branches/1.3/xcache.c

Timestamp:

2009-07-05T06:57:59+02:00 (4 years ago)

Author:

moo

Message:

merged r318,r321 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xcache.c (modified) (3 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);
@@ -477 +476 @@
         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
@@ -493 +494 @@
 #endif
             break;
+
         case XC_TYPE_VAR:
             var = entry->data.var;
+            add_assoc_long_ex(ei, ZEND_STRS("size"),          entry->size);
             break;