Changeset 32482 in spip-zone

Timestamp:

Oct 29, 2009, 9:36:13 PM (11 years ago)

Author:

fil@…

Message:

reglage des lock

Location:

_plugins_/memoization/memo

Files:

• eaccelerator.inc (modified) (2 diffs)
• filecache.inc (modified) (3 diffs)
• xcache.inc (modified) (2 diffs)

_plugins_/memoization/memo/eaccelerator.inc

@@ -8 +8 @@
 int   cache_inc(string key[, int value[, int ttl] ])
 int   cache_dec(string key[, int value[, int ttl] ])
-bool  cache_lock(string key)
-bool  cache_unlock(string key)
+null  cache_lock(string key)
+null  cache_unlock(string key)
 */
 
@@ -53 +53 @@
 function cache_lock($key) {
         eaccelerator_lock(_CACHE_NAMESPACE.$key);
-        return true;
 }
 
 function cache_unlock($key) {
         eaccelerator_unlock(_CACHE_NAMESPACE.$key);
-        return true;
 }
 

_plugins_/memoization/memo/filecache.inc

@@ -8 +8 @@
 int   cache_inc(string key[, int value[, int ttl] ])
 int   cache_dec(string key[, int value[, int ttl] ])
-bool  cache_lock(string key)
-bool  cache_unlock(string key)
+null  cache_lock(string key)
+null  cache_unlock(string key)
 */
 
@@ -66 +66 @@
 
 function cache_inc($key, $value=null, $ttl=null) {
-        while (!cache_lock($key)){ sleep(1); }
+        cache_lock($key);
         $value = (isset($value) ? intval($value) : 1) + intval(cache_get($key));
         cache_set($key, $value);
@@ -82 +82 @@
         $f = cache_filename($key);
 
+        /* unlock */
         if ($unlock) {
-                return isset($locks[$f])
-                        AND is_resource($locks[$f])
-                        AND @flock($locks[$f], LOCK_UN)
-                        AND @fclose($locks[$f]);
-        } else {
-                return ($locks[$f] = @fopen($f, 'a'))
-                        AND @flock($locks[$f], LOCK_EX);
+                if (isset($locks[$f])
+                AND is_resource($locks[$f])) {
+                        @flock($locks[$f], LOCK_UN);
+                        @fclose($locks[$f]);
+                        unset($locks[$f]);
+                }
+        }
+        /* lock */
+        else {
+                if (!isset($locks[$f])) {
+                        $locks[$f] = @fopen($f, 'a');
+                        @flock($locks[$f], LOCK_EX);
+                }
         }
 }
 
 function cache_unlock($key) {
-        return cache_lock($key, true);
+        cache_lock($key, true);
 }
 

_plugins_/memoization/memo/xcache.inc

@@ -15 +15 @@
 
 @define('_CACHE_NAMESPACE', $_SERVER['HTTP_HOST'].':');
+@define('_LOCK_MAX', 30); # max lock time (seconds)
 
 function cache_get($key) {
@@ -35 +36 @@
 
 function cache_inc($key, $value=null, $ttl=null) {
-        return xcache_inc(_CACHE_NAMESPACE.$key, $value, $ttl);
+        $a = func_get_args();
+        $a[0] = _CACHE_NAMESPACE.$key;
+        return call_user_func_array('xcache_inc', $a);
 }
 
 function cache_dec($key, $value=null, $ttl=null) {
-        return xcache_dec(_CACHE_NAMESPACE.$key, $value, $ttl);
+        $a = func_get_args();
+        $a[0] = _CACHE_NAMESPACE.$key;
+        return call_user_func_array('xcache_dec', $a);
 }
 
-function cache_lock($key) {
-        return cache_inc('lock::'.$key)===1;
+function cache_lock($key, /* private */ $unlock = false) {
+        static $locks = array();
+
+        /* unlock */
+        if ($unlock) {
+                unset($locks[$key]);
+                cache_unset('lock::'.$key);
+        }
+        /* lock */
+        else {
+                if (!isset($locks[$key])) {
+                        while (cache_isset('lock::'.$key)
+                        OR cache_inc('lock::'.$key, 1, _LOCK_MAX) !== 1)
+                                sleep (1);
+                        register_shutdown_function('cache_lock', $key, true);
+                }
+        }
 }
 
 function cache_unlock($key) {
-        return cache_unset('lock::'.$key);
+        cache_lock($key, true);
 }