Changeset 1063 for trunk/mod_cacher/xc_cacher.c

Timestamp:

07/27/2012 06:03:21 PM (10 months ago)

Author:

moo

Message:

htdocs/cacher: clogs->skips, compiling ad part of status

Files:

• trunk/mod_cacher/xc_cacher.c (modified) (5 diffs)

trunk/mod_cacher/xc_cacher.c

@@ -71 +71 @@
     zend_ulong updates;
     zend_ulong hits;
-    zend_ulong clogs;
+    zend_ulong skips;
     zend_ulong ooms;
     zend_ulong errors;
@@ -617 +617 @@
     add_assoc_long_ex(return_value, ZEND_STRS("misses"),    cached->updates); /* deprecated */
     add_assoc_long_ex(return_value, ZEND_STRS("hits"),      cached->hits);
-    add_assoc_long_ex(return_value, ZEND_STRS("clogs"),     cached->clogs);
+    add_assoc_long_ex(return_value, ZEND_STRS("skips"),     cached->skips);
+    add_assoc_long_ex(return_value, ZEND_STRS("clogs"),     cached->skips); /* deprecated */
     add_assoc_long_ex(return_value, ZEND_STRS("ooms"),      cached->ooms);
     add_assoc_long_ex(return_value, ZEND_STRS("errors"),    cached->errors);
@@ -2048 +2049 @@
     xc_sandboxed_compiler_t sandboxed_compiler;
 
-    /* stale clogs precheck */
+    /* stale skips precheck */
     if (XG(request_time) - cache->cached->compiling < 30) {
-        cache->cached->clogs ++;
+        cache->cached->skips ++;
         return old_compile_file(h, type TSRMLS_CC);
     }
@@ -2110 +2111 @@
         if (XG(request_time) - cache->cached->compiling < 30) {
             TRACE("%s", "miss php, but compiling");
-            cache->cached->clogs ++;
+            cache->cached->skips ++;
             gaveup = 1;
             break;
@@ -2297 +2298 @@
                 xc_lock_destroy(cache->lck);
             }
-            /* do NOT free
-            if (cache->entries) {
-                cache->mem->handlers->free(cache->mem, cache->entries);
-            }
-            cache->mem->handlers->free(cache->mem, cache);
-            */
+            /* do NOT touch cached data */
             shm = cache->shm;
             cache->shm->handlers->memdestroy(cache->mem);