X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Flock.php;h=a48b0ad342e1353b1b3b816e50bf0d5fc4c4cffb;hb=8398270ceee6afdb0ec46a28ddf04e2e337b707b;hp=be6130e1d091ec5f74d969935e58c7f5ef2a0dd3;hpb=168ae40dd25ee827e9bcb01e27e52c0e203c21d6;p=friendica.git

diff --git a/include/lock.php b/include/lock.php
index be6130e1d0..a48b0ad342 100644
--- a/include/lock.php
+++ b/include/lock.php
@@ -2,30 +2,32 @@
 
 // Provide some ability to lock a PHP function so that multiple processes
 // can't run the function concurrently
-// The function must have a line inserted into the 'lock' table with the
-// function's name in the 'name' field
 if(! function_exists('lock_function')) {
-function lock_function($fn_name, $block = true, $wait_sec = 2) {
+function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
 	if( $wait_sec == 0 )
 		$wait_sec = 2;	// don't let the user pick a value that's likely to crash the system
 
 	$got_lock = false;
+	$start = time();
 
 	do {
-		q("LOCK TABLE lock WRITE");
-		$r = q("SELECT locked FROM lock WHERE name = '%s' LIMIT 1",
+		q("LOCK TABLE `locks` WRITE");
+		$r = q("SELECT `locked`, `created` FROM `locks` WHERE `name` = '%s' LIMIT 1",
 			dbesc($fn_name)
 		);
 
-		if((count($r)) && (! $r[0]['locked'])) {
-			q("UPDATE lock SET locked = 1 WHERE name = '%s' LIMIT 1",
+		if((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) {
+			q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'",
+				dbesc(datetime_convert()),
 				dbesc($fn_name)
 			);
 			$got_lock = true;
 		}
-		elseif(! $r) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r
-			q("INSERT INTO lock ( name, locked ) VALUES ( '%s', 1 )",
-				dbesc($fn_name)
+		elseif (! dbm::is_result($r)) {
+			/// @TODO the Boolean value for count($r) should be equivalent to the Boolean value of $r
+			q("INSERT INTO `locks` (`name`, `created`, `locked`) VALUES ('%s', '%s', 1)",
+				dbesc($fn_name),
+				dbesc(datetime_convert())
 			);
 			$got_lock = true;
 		}
@@ -35,42 +37,43 @@ function lock_function($fn_name, $block = true, $wait_sec = 2) {
 		if(($block) && (! $got_lock))
 			sleep($wait_sec);
 
-	} while(($block) && (! $got_lock));
+	} while(($block) && (! $got_lock) && ((time() - $start) < $timeout));
+
+	logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock . ' time = ' . (time() - $start), LOGGER_DEBUG);
 
-	logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock, LOGGER_DEBUG);
-	
 	return $got_lock;
 }}
 
 
 if(! function_exists('block_on_function_lock')) {
-function block_on_function_lock($fn_name, $wait_sec = 2) {
+function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
 	if( $wait_sec == 0 )
 		$wait_sec = 2;	// don't let the user pick a value that's likely to crash the system
 
+	$start = time();
+
 	do {
-		$r = q("SELECT locked FROM lock WHERE name = '%s' LIMIT 1",
-				dbesc(fn_name)
+		$r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
+				dbesc($fn_name)
 		     );
 
-		if(count($r) && $r[0]['locked'])
+		if (dbm::is_result($r) && $r[0]['locked'])
 			sleep($wait_sec);
 
-	} while(count($r) && $r[0]['locked']);
+	} while(dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout));
 
 	return;
 }}
 
 
 if(! function_exists('unlock_function')) {
-function unlock_function(fn_name) {
-	//$r = q("LOCK TABLE lock WRITE");
-	$r = q("UPDATE lock SET locked = 0 WHERE name = '%s' LIMIT 1",
-			dbesc(fn_name)
+function unlock_function($fn_name) {
+	$r = q("UPDATE `locks` SET `locked` = 0, `created` = '%s' WHERE `name` = '%s'",
+			dbesc(NULL_DATE),
+			dbesc($fn_name)
 	     );
-	//$r = q("UNLOCK TABLES");
 
-	logger('unlock_function: released lock for function ' . fn_name, LOGGER_DEBUG);
+	logger('unlock_function: released lock for function ' . $fn_name, LOGGER_DEBUG);
 
 	return;
 }}