Changeset 3131 for trunk/wp-includes/cache.php

Timestamp:

11/17/2005 09:30:14 AM (21 years ago)

Author:

ryan

Message:

Don't bother with sems.

File:

• trunk/wp-includes/cache.php (modified) (3 diffs)

trunk/wp-includes/cache.php

@@ -55 +55 @@
         var $cache_enabled = false;
         var $expiration_time = 86400;
-        var $use_flock = false;
         var $flock_filename = 'wp_object_cache.lock';
-        var $sem_id = 5454;
-        var $mutex;
         var $cache = array ();
         var $dirty_objects = array ();
@@ -282 +279 @@
                 }
 
-                // Acquire a write lock.  Semaphore preferred.  Fallback to flock.
-                if (function_exists('sem_get')) {
-                        $this->use_flock = false;
-                        $mutex = sem_get($this->sem_id, 1, 0644 | IPC_CREAT, 1);
-                        sem_acquire($mutex);
-                } else {
-                        $this->use_flock = true;
-                        $mutex = fopen($this->cache_dir.$this->flock_filename, 'w');
-                        flock($mutex, LOCK_EX);
-                }
+                // Acquire a write lock. 
+                $mutex = fopen($this->cache_dir.$this->flock_filename, 'w');
+                flock($mutex, LOCK_EX);
 
                 // Loop over dirty objects and save them.
@@ -322 +312 @@
 
                 // Release write lock.
-                if ($this->use_flock)
-                        flock($mutex, LOCK_UN);
-                else
-                        sem_release($mutex);
+                flock($mutex, LOCK_UN);
+                fclose($mutex);
         }