X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FUtil%2FLock.php;h=66a568811d62c80ee093ff6e3a889915dd95f015;hb=1bce1b57eb296ffbf199d6cfa5a963098e953381;hp=a50faf2d90d8c637cd5252d4974758b80b54f2ec;hpb=2b161108fe6552ef2effb7b300553f0242b2e49e;p=friendica.git

diff --git a/src/Util/Lock.php b/src/Util/Lock.php
index a50faf2d90..66a568811d 100644
--- a/src/Util/Lock.php
+++ b/src/Util/Lock.php
@@ -1,30 +1,35 @@
 <?php
-
+/**
+ * @file src/Util/Lock.php
+ */
 namespace Friendica\Util;
 
 /**
  * @file src/Util/Lock.php
  * @brief Functions for preventing parallel execution of functions
- *
  */
 
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 use Memcache;
 use dba;
-use dbm;
+
+require_once 'include/dba.php';
 
 /**
  * @brief This class contain Functions for preventing parallel execution of functions
  */
-class Lock {
+class Lock
+{
 	private static $semaphore = array();
 
-       /**
+	/**
 	 * @brief Check for memcache and open a connection if configured
 	 *
 	 * @return object|boolean The memcache object - or "false" if not successful
 	 */
-	private static function connectMemcache() {
+	private static function connectMemcache()
+	{
 		if (!function_exists('memcache_connect')) {
 			return false;
 		}
@@ -52,13 +57,14 @@ class Lock {
 	 *
 	 * @return ressource the semaphore key
 	 */
-	private static function semaphore_key($fn_name) {
+	private static function semaphoreKey($fn_name)
+	{
 		$temp = get_temppath();
 
 		$file = $temp.'/'.$fn_name.'.sem';
 
 		if (!file_exists($file)) {
-			file_put_contents($file, $function);
+			file_put_contents($file, $fn_name);
 		}
 
 		return ftok($file, 'f');
@@ -67,17 +73,19 @@ class Lock {
 	/**
 	 * @brief Sets a lock for a given name
 	 *
-	 * @param string $fn_name Name of the lock
+	 * @param string  $fn_name Name of the lock
 	 * @param integer $timeout Seconds until we give up
 	 *
 	 * @return boolean Was the lock successful?
 	 */
-	public static function set($fn_name, $timeout = 120) {
+	public static function set($fn_name, $timeout = 120)
+	{
 		$got_lock = false;
 		$start = time();
 
-		if (function_exists('sem_get')) {
-			self::$semaphore[$fn_name] = sem_get(self::semaphore_key($fn_name));
+		// The second parameter for "sem_acquire" doesn't exist before 5.6.1
+		if (function_exists('sem_get') && version_compare(PHP_VERSION, '5.6.1', '>=')) {
+			self::$semaphore[$fn_name] = sem_get(self::semaphoreKey($fn_name));
 			if (self::$semaphore[$fn_name]) {
 				return sem_acquire(self::$semaphore[$fn_name], ($timeout == 0));
 			}
@@ -118,9 +126,9 @@ class Lock {
 
 		do {
 			dba::lock('locks');
-			$lock = dba::select('locks', array('locked', 'pid'), array('name' => $fn_name), array('limit' => 1));
+			$lock = dba::selectFirst('locks', ['locked', 'pid'], ['name' => $fn_name]);
 
-			if (dbm::is_result($lock)) {
+			if (DBM::is_result($lock)) {
 				if ($lock['locked']) {
 					// When the process id isn't used anymore, we can safely claim the lock for us.
 					if (!posix_kill($lock['pid'], 0)) {
@@ -135,7 +143,7 @@ class Lock {
 					dba::update('locks', array('locked' => true, 'pid' => getmypid()), array('name' => $fn_name));
 					$got_lock = true;
 				}
-			} elseif (!dbm::is_result($lock)) {
+			} elseif (!DBM::is_result($lock)) {
 				dba::insert('locks', array('name' => $fn_name, 'locked' => true, 'pid' => getmypid()));
 				$got_lock = true;
 			}
@@ -154,11 +162,18 @@ class Lock {
 	 * @brief Removes a lock if it was set by us
 	 *
 	 * @param string $fn_name Name of the lock
+	 * @return mixed
 	 */
-	public static function remove($fn_name) {
-		if (function_exists('sem_get') && self::$semaphore[$fn_name]) {
-			sem_release(self::$semaphore[$fn_name]);
-			return;
+	public static function remove($fn_name)
+	{
+		if (function_exists('sem_get') && version_compare(PHP_VERSION, '5.6.1', '>=')) {
+			if (empty(self::$semaphore[$fn_name])) {
+				return false;
+			} else {
+				$success = @sem_release(self::$semaphore[$fn_name]);
+				unset(self::$semaphore[$fn_name]);
+				return $success;
+			}
 		}
 
 		$memcache = self::connectMemcache();
@@ -180,8 +195,10 @@ class Lock {
 
 	/**
 	 * @brief Removes all lock that were set by us
+	 * @return void
 	 */
-	public static function removeAll() {
+	public static function removeAll()
+	{
 		$memcache = self::connectMemcache();
 		if (is_object($memcache)) {
 			// We cannot delete all cache entries, but this doesn't matter with memcache