It's faster without locks, gnarl ...

[friendica.git] / src / Util / Lock.php

diff --git a/src/Util/Lock.php b/src/Util/Lock.php
index 6d7952ffa914524b0a40f738af91a3ceccf2a3df..36f408cf324b4e1603c82e9c6d963579e0ab85cc 100644 (file)
--- a/src/Util/Lock.php
+++ b/src/Util/Lock.php
@@ -57,7 +57,6 @@ class Lock {
 
                $memcache = self::connectMemcache();
                if (is_object($memcache)) {
-                       $wait_sec = 0.2;
                        $cachekey = get_app()->get_hostname().";lock:".$fn_name;
 
                        do {
@@ -82,15 +81,13 @@ class Lock {
                                dba::unlock();
 
                                if (!$got_lock && ($timeout > 0)) {
-                                       usleep($wait_sec * 1000000);
+                                       usleep(rand(10000, 200000));
                                }
                        } while (!$got_lock && ((time() - $start) < $timeout));
 
                        return $got_lock;
                }
 
-               $wait_sec = 2;
-
                do {
                        dba::lock('locks');
                        $lock = dba::select('locks', array('locked', 'pid'), array('name' => $fn_name), array('limit' => 1));
@@ -118,7 +115,7 @@ class Lock {
                        dba::unlock();
 
                        if (!$got_lock && ($timeout > 0)) {
-                               sleep($wait_sec);
+                               usleep(rand(100000, 2000000));
                        }
                } while (!$got_lock && ((time() - $start) < $timeout));