sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't bother with sems. 

git-svn-id: https://develop.svn.wordpress.org/trunk@3131 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2005-11-17 09:30:14 +00:00
parent 80bc0af577
commit bd536befa8
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/cache.php
View File

@ -54,10 +54,7 @@ class WP_Object_Cache {
var $cache_dir; var $cache_dir;
var $cache_enabled = false; var $cache_enabled = false;
var $expiration_time = 86400; var $expiration_time = 86400;
var $use_flock = false;
var $flock_filename = 'wp_object_cache.lock'; var $flock_filename = 'wp_object_cache.lock';
var $sem_id = 5454;
var $mutex;
var $cache = array (); var $cache = array ();
var $dirty_objects = array (); var $dirty_objects = array ();
var $non_existant_objects = array (); var $non_existant_objects = array ();
@ -281,16 +278,9 @@ class WP_Object_Cache {
@ touch($this->cache_dir."index.php"); @ touch($this->cache_dir."index.php");
} }
// Acquire a write lock. Semaphore preferred. Fallback to flock. // Acquire a write lock.
if (function_exists('sem_get')) { $mutex = fopen($this->cache_dir.$this->flock_filename, 'w');
$this->use_flock = false; flock($mutex, LOCK_EX);
$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);
}
// Loop over dirty objects and save them. // Loop over dirty objects and save them.
foreach ($this->dirty_objects as $group => $ids) { foreach ($this->dirty_objects as $group => $ids) {
@ -321,10 +311,8 @@ class WP_Object_Cache {
} }
// Release write lock. // Release write lock.
if ($this->use_flock) flock($mutex, LOCK_UN);
flock($mutex, LOCK_UN); fclose($mutex);
else
sem_release($mutex);
} }
function stats() { function stats() {