Changeset 593 for branches/1.3/xcache.c

Timestamp:

07/05/2009 06:06:15 AM (4 years ago)

Author:

moo

Message:

merged r304,r305,r306,r307 from trunk

Location:

branches/1.3

Files:

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

branches/1.3/xcache.c

@@ -30 +30 @@
 #include "xcache_globals.h"
 #include "processor.h"
-#include "utils.h"
 #include "const_string.h"
 #include "opcode_spec.h"
-
-#ifdef DEBUG
-#   undef NDEBUG
-#   undef inline
-#   define inline
-#else
-#   ifndef NDEBUG
-#       define NDEBUG
-#   endif
-#endif
-#include <assert.h>
+#include "utils.h"
 
 #define VAR_ENTRY_EXPIRED(pentry) ((pentry)->ttl && XG(request_time) > pentry->ctime + (pentry)->ttl)
@@ -245 +234 @@
 static void xc_entry_hold_php_dmz(xc_entry_t *xce TSRMLS_DC) /* {{{ */
 {
-#ifdef DEBUG
-    fprintf(stderr, "hold %s\n", xce->name.str.val);
-#endif
+    TRACE("hold %s", xce->name.str.val);
     xce->refcount ++;
     xc_stack_push(&XG(php_holds)[xce->cache->cacheid], (void *)xce);
@@ -292 +279 @@
 static XC_ENTRY_APPLY_FUNC(xc_gc_expires_php_entry_dmz) /* {{{ */
 {
-#ifdef DEBUG
-    fprintf(stderr, "ttl %lu, %lu %lu\n", (zend_ulong) XG(request_time), (zend_ulong) entry->atime, xc_php_ttl);
-#endif
+    TRACE("ttl %lu, %lu %lu", (zend_ulong) XG(request_time), (zend_ulong) entry->atime, xc_php_ttl);
     if (XG(request_time) > entry->atime + xc_php_ttl) {
         return 1;
@@ -311 +296 @@
 static void xc_gc_expires_one(xc_cache_t *cache, zend_ulong gc_interval, cache_apply_dmz_func_t apply_func TSRMLS_DC) /* {{{ */
 {
-#ifdef DEBUG
-    fprintf(stderr, "interval %lu, %lu %lu\n", (zend_ulong) XG(request_time), (zend_ulong) cache->last_gc_expires, gc_interval);
-#endif
+    TRACE("interval %lu, %lu %lu", (zend_ulong) XG(request_time), (zend_ulong) cache->last_gc_expires, gc_interval);
     if (XG(request_time) - cache->last_gc_expires >= gc_interval) {
         ENTER_LOCK(cache) {
@@ -630 +613 @@
     for (i = 0; i < cachecount; i ++) {
         s = &holds[i];
-#ifdef DEBUG
-        fprintf(stderr, "holded %d\n", xc_stack_size(s));
-#endif
-        if (xc_stack_size(s)) {
+        TRACE("holded %d", xc_stack_count(s));
+        if (xc_stack_count(s)) {
             cache = ((xc_entry_t *)xc_stack_top(s))->cache;
             ENTER_LOCK(cache) {
-                while (xc_stack_size(s)) {
+                while (xc_stack_count(s)) {
                     xce = (xc_entry_t*) xc_stack_pop(s);
-#ifdef DEBUG
-                    fprintf(stderr, "unhold %s\n", xce->name.str.val);
-#endif
+                    TRACE("unhold %s", xce->name.str.val);
                     xce->refcount --;
                     assert(xce->refcount >= 0);
@@ -829 +808 @@
         assert(0);
     }
-#ifdef DEBUG
-    fprintf(stderr, "got ZEND_DECLARE_INHERITED_CLASS: %s\n", class_name + 1);
-#endif
+    TRACE("got ZEND_DECLARE_INHERITED_CLASS: %s", class_name + 1);
     /* let's see which class */
     for (i = 0; i < php->classinfo_cnt; i ++) {
@@ -915 +892 @@
         /* found */
         if (stored_xce) {
-#ifdef DEBUG
-            fprintf(stderr, "found %s, catch it\n", stored_xce->name.str.val);
-#endif
+            TRACE("found %s, catch it", stored_xce->name.str.val);
             xc_entry_hold_php_dmz(stored_xce TSRMLS_CC);
             cache->hits ++;
@@ -944 +919 @@
 
     /* {{{ compile */
-#ifdef DEBUG
-    fprintf(stderr, "compiling %s\n", filename);
-#endif
+    TRACE("compiling %s", filename);
 
     /* make compile inside sandbox */
@@ -1125 +1098 @@
     } LEAVE_LOCK_EX(cache);
     /* }}} */
-#ifdef DEBUG
-    fprintf(stderr, "stored\n");
-#endif
+    TRACE("%s", "stored");
 
 #define X_FREE(var) \
@@ -1186 +1157 @@
     CG(compiled_filename) = stored_xce->name.str.val;
     CG(zend_lineno)       = 0;
-#ifdef DEBUG
-    fprintf(stderr, "restoring %s\n", stored_xce->name.str.val);
-#endif
+    TRACE("restoring %s", stored_xce->name.str.val);
     xc_processor_restore_xc_entry_t(&xce, stored_xce, xc_readonly_protection TSRMLS_CC);
 #ifdef SHOW_DPRINT
@@ -1221 +1190 @@
     CG(in_compilation)    = 0;
     CG(compiled_filename) = NULL;
-#ifdef DEBUG
-    fprintf(stderr, "restored  %s\n", stored_xce->name.str.val);
-#endif
+    TRACE("restored  %s", stored_xce->name.str.val);
     return op_array;
 }
@@ -2006 +1973 @@
         stored_xce = xc_entry_find_dmz(&xce TSRMLS_CC);
         if (stored_xce) {
-#ifdef DEBUG
-            fprintf(stderr, "incdec: gotxce %s\n", xce.name.str.val);
-#endif
+            TRACE("incdec: gotxce %s", xce.name.str.val);
             /* timeout */
             if (VAR_ENTRY_EXPIRED(stored_xce)) {
-#ifdef DEBUG
-                fprintf(stderr, "incdec: expired\n");
-#endif
+                TRACE("%s", "incdec: expired");
                 xc_entry_remove_dmz(stored_xce TSRMLS_CC);
                 stored_xce = NULL;
@@ -2024 +1987 @@
                     stored_xce->ctime = XG(request_time);
                     stored_xce->ttl   = xce.ttl;
-#ifdef DEBUG
-                    fprintf(stderr, "incdec: islong\n");
-#endif
+                    TRACE("%s", "incdec: islong");
                     value = Z_LVAL_P(stored_var->value);
                     value += (inc == 1 ? count : - count);
@@ -2036 +1997 @@
                 }
                 else {
-#ifdef DEBUG
-                    fprintf(stderr, "incdec: notlong\n");
-#endif
+                    TRACE("%s", "incdec: notlong");
                     xc_processor_restore_zval(&oldzval, stored_xce->data.var->value, stored_xce->have_references TSRMLS_CC);
                     convert_to_long(&oldzval);
@@ -2046 +2005 @@
             }
         }
-#ifdef DEBUG
         else {
-            fprintf(stderr, "incdec: %s not found\n", xce.name.str.val);
-        }
-#endif
+            TRACE("incdec: %s not found", xce.name.str.val);
+        }
 
         value += (inc == 1 ? count : - count);
@@ -2495 +2452 @@
 
     zend_llist_prepend_element(&zend_extensions, &extension);
-#ifdef DEBUG
-    fprintf(stderr, "registered\n");
-#endif
+    TRACE("%s", "registered");
 }