Changeset 11171

Timestamp:

05/05/08 19:01:53 (5 years ago)

Author:

bto

Message:

invalidなロックをアンロックするときに、ちゃんとクリティカルセクションに閉じ込めた

Files:

• lang/php/misc/single_execution.php (modified) (2 diffs)

lang/php/misc/single_execution.php

@@ -63 +63 @@
         }
 
+        $this->unlockIfInvalid($key);
+
         $lock_directory = $this->lockDirectory($key);
-
-        if (!$this->isInvalidLock($lock_directory)) {
-            $this->unlock($key);
-        }
 
         if (!$this->mkdir($lock_directory)) {
@@ -154 +152 @@
         $this->unlock($this->key);
         exit;
+    }
+
+    function unlockIfInvalid($key)
+    {
+        $common_key = 'common';
+
+        // spin lock
+        $common_lock = $this->lockDirectory($common_key);
+        while (!$this->mkdir($common_lock)) {
+            usleep(10000);
+        }
+
+        // critical section
+        if (!$this->isInvalidLock($this->lockDirectory($key))) {
+            $this->unlock($key);
+        }
+
+        // unlock
+        $this->unlock($common_key);
     }