Changeset 323 for trunk/xcache.c

Timestamp:

2006-12-10T09:18:09+01:00 (6 years ago)

Author:

moo

Message:

add xc_php_addref_dmz and s/xc_php_remove_dmz/xc_php_release_dmz/

File:

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

trunk/xcache.c

@@ -148 +148 @@
 }
 /* }}} */
-static void xc_php_remove_dmz(xc_entry_data_php_t *php) /* {{{ */
+static void xc_php_addref_dmz(xc_entry_data_php_t *php) /* {{{ */
+{
+    php->refcount ++;
+}
+/* }}} */
+static void xc_php_release_dmz(xc_entry_data_php_t *php) /* {{{ */
 {
     if (-- php->refcount == 0) {
@@ -237 +242 @@
 {
     if (xce->type == XC_TYPE_PHP) {
-        xc_php_remove_dmz(xce->data.php);
+        xc_php_release_dmz(xce->data.php);
     }
     xce->cache->mem->handlers->free(xce->cache->mem, (xc_entry_t *)xce);
@@ -1291 +1296 @@
         if (newlycompiled) {
             stored_php = xc_php_store_dmz(&php TSRMLS_CC);
-            /* error */
             if (!stored_php) {
+                /* error */
                 break;
             }
         }
         /* entry_store */
+        xc_php_addref_dmz(stored_php);
         stored_xce = xc_entry_store_dmz(&xce TSRMLS_CC);
         if (stored_xce) {
             stored_xce->data.php = stored_php;
-            stored_php->refcount ++;
         }
         else {
             /* error */
-            xc_php_remove_dmz(stored_php);
-            stored_php = NULL;
+            xc_php_release_dmz(stored_php);
         }
     } LEAVE_LOCK_EX(cache);