Changeset 032a12a in git

Timestamp:

2012-07-14T04:44:18Z (7 years ago)

Author:

Xuefer <xuefer@…>

Branches:

3.0, 3.1, 3.2, master, trunk

Children:

fb9bb38

Parents:

5aa5f6e

Message:

closes #174: updated api for clear all cache

git-svn-id: ​svn://svn.lighttpd.net/xcache/trunk@976 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:

• ChangeLog (modified) (1 diff)
• admin/xcache.php (modified) (4 diffs)
• xcache.c (modified) (4 diffs)

ChangeLog

@@ -1 +1 @@
 2.1.0 2012-??-??
- * fixes #972: warning/error when XCache is loaded incorrectly
- * fixes #73: warn for improper PHP_FCGI_CHILDREN setting fcgi mode
+API Changes
+========
+ * chg: proto array xcache_clear_cache(int type, [ int id = -1 ]). -1 means all cache splits
+ChangeLog
+========
+ * closes #972: warning/error when XCache is loaded incorrectly
+ * closes #73: warn for improper PHP_FCGI_CHILDREN setting fcgi mode
+ * closes #174: updated api for clear all cache
 
 2.0.1 2012-07-14

admin/xcache.php

@@ -239 +239 @@
         if (isset($_POST['clearcache'])) {
             $count = xcache_count($type);
-            if ($cacheid == $count) {
+            if ($cacheid >= 0) {
                 for ($cacheid = 0; $cacheid < $count; $cacheid ++) {
                     xcache_clear_cache($type, $cacheid);
@@ -245 +245 @@
             }
             else {
-                xcache_clear_cache($type, $cacheid);
+                xcache_clear_cache($type);
             }
         }
@@ -272 +272 @@
     $total['type'] = XC_TYPE_PHP;
     $total['cache_name'] = _T('Total');
-    $total['cacheid'] = $pcnt;
+    $total['cacheid'] = -1;
     $total['gc'] = null;
     $total['istotal'] = true;
@@ -296 +296 @@
     $total['type'] = XC_TYPE_VAR;
     $total['cache_name'] = _T('Total');
-    $total['cacheid'] = $vcnt;
+    $total['cacheid'] = -1;
     $total['gc'] = null;
     $total['istotal'] = true;

xcache.c

@@ -2683 +2683 @@
 }
 /* }}} */
+static void xc_clear(long type, xc_cache_t *cache TSRMLS_DC) /* {{{ */
+{
+    xc_entry_t *e, *next;
+    int entryslotid, c;
+
+    ENTER_LOCK(cache) {
+        for (entryslotid = 0, c = cache->hentry->size; entryslotid < c; entryslotid ++) {
+            for (e = cache->entries[entryslotid]; e; e = next) {
+                next = e->next;
+                xc_entry_remove_unlocked(type, cache, entryslotid, e TSRMLS_CC);
+            }
+            cache->entries[entryslotid] = NULL;
+        }
+    } LEAVE_LOCK(cache);
+} /* }}} */
 /* {{{ xcache_admin_operate */
 typedef enum { XC_OP_COUNT, XC_OP_INFO, XC_OP_LIST, XC_OP_CLEAR } xcache_op_type;
@@ -2698 +2713 @@
     }
 
-    if (optype == XC_OP_COUNT) {
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type) == FAILURE) {
-            return;
-        }
-    }
-    else if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &type, &id) == FAILURE) {
-        return;
+    switch (optype) {
+        case XC_OP_COUNT:
+            if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type) == FAILURE) {
+                return;
+            }
+            break;
+        case XC_OP_CLEAR:
+            id = -1;
+            if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &type, &id) == FAILURE) {
+                return;
+            }
+            break;
+        default:
+            if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &type, &id) == FAILURE) {
+                return;
+            }
     }
 
@@ -2747 +2771 @@
             } LEAVE_LOCK(cache);
             break;
+
         case XC_OP_CLEAR:
-            {
-                xc_entry_t *e, *next;
-                int entryslotid, c;
-
-                if (!caches || id < 0 || id >= size) {
-                    php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cache not exists");
-                    RETURN_FALSE;
+            if (!caches || id < -1 || id >= size) {
+                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cache not exists");
+                RETURN_FALSE;
+            }
+
+            if (id == -1) {
+                for (id = 0; id < size; ++id) {
+                    xc_clear(type, caches[id] TSRMLS_CC);
                 }
-
-                cache = caches[id];
-                ENTER_LOCK(cache) {
-                    for (entryslotid = 0, c = cache->hentry->size; entryslotid < c; entryslotid ++) {
-                        for (e = cache->entries[entryslotid]; e; e = next) {
-                            next = e->next;
-                            xc_entry_remove_unlocked(type, cache, entryslotid, e TSRMLS_CC);
-                        }
-                        cache->entries[entryslotid] = NULL;
-                    }
-                } LEAVE_LOCK(cache);
-                xc_gc_deletes(TSRMLS_C);
-            }
+            }
+            else {
+                xc_clear(type, caches[id] TSRMLS_CC);
+            }
+
+            xc_gc_deletes(TSRMLS_C);
             break;
 
@@ -2797 +2816 @@
 }
 /* }}} */
-/* {{{ proto array xcache_clear_cache(int type, int id)
+/* {{{ proto array xcache_clear_cache(int type, [ int id = -1 ])
    Clear cache by id on specified cache type */
 PHP_FUNCTION(xcache_clear_cache)