+++ /dev/null
-<?php
-/**
- * @file src/Core/Lock.php
- */
-namespace Friendica\Util;
-
-/**
- * @file src/Core/Lock.php
- * @brief Functions for preventing parallel execution of functions
- */
-
-use Friendica\Core\Config;
-use Friendica\Core\Lock;
-
-require_once 'include/dba.php';
-
-/**
- * @brief This class contain Functions for preventing parallel execution of functions
- */
-class Lock
-{
- /**
- * @var Lock\ILockDriver;
- */
- static $driver = null;
-
- public static function init()
- {
- switch(Config::get('system', 'lock_driver', 'default')) {
- case 'memcache':
- self::$driver = new Lock\MemcacheLockDriver();
- break;
- case 'database':
- self::$driver = new Lock\DatabaseLockDriver();
- break;
- case 'semaphore':
- self::$driver = new Lock\SemaphoreLockDriver();
- break;
- default:
- // Determine what's the best/fastest locking driver (default behavior in Friendica)
- if (function_exists('sem_get') && version_compare(PHP_VERSION, '5.6.1', '>=')) {
- self::$driver = new Lock\SemaphoreLockDriver();
- } elseif (Config::get('system', 'cache_driver', 'database') == 'memcache') {
- self::$driver = new Lock\MemcacheLockDriver();
- } else {
- self::$driver = new Lock\DatabaseLockDriver();
- }
- }
- }
-
- /**
- * Returns the current cache driver
- *
- * @return Lock\ILockDriver;
- */
- private static function getDriver()
- {
- if (self::$driver === null) {
- self::init();
- }
-
- return self::$driver;
- }
-
- /**
- * @brief Acquires a lock for a given name
- *
- * @param string $key Name of the lock
- * @param integer $timeout Seconds until we give up
- *
- * @return boolean Was the lock successful?
- */
- public static function acquireLock($key, $timeout = 120)
- {
- return self::getDriver()->acquireLock($key, $timeout);
- }
-
- /**
- * @brief Releases a lock if it was set by us
- *
- * @param string $key Name of the lock
- * @return mixed
- */
- public static function releaseLock($key)
- {
- return self::getDriver()->releaseLock($key);
- }
-
- /**
- * @brief Releases all lock that were set by us
- * @return void
- */
- public static function releaseAll()
- {
- self::getDriver()->releaseAll();
- }
-}
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Lock;
-
-use dba;
-use Friendica\Database\DBM;
-
-/**
- * Locking driver that stores the locks in the database
- */
-class DatabaseLockDriver implements ILockDriver
-{
- /**
- * @brief Sets a lock for a given name
- *
- * @param string $key The Name of the lock
- * @param integer $timeout Seconds until we give up
- *
- * @return boolean Was the lock successful?
- */
- public function acquireLock($key, $timeout = 120)
- {
- $got_lock = false;
- $start = time();
-
- do {
- dba::lock('locks');
- $lock = dba::selectFirst('locks', ['locked', 'pid'], ['name' => $key]);
-
- 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)) {
- $lock['locked'] = false;
- }
- // We want to lock something that was already locked by us? So we got the lock.
- if ($lock['pid'] == getmypid()) {
- $got_lock = true;
- }
- }
- if (!$lock['locked']) {
- dba::update('locks', ['locked' => true, 'pid' => getmypid()], ['name' => $key]);
- $got_lock = true;
- }
- } elseif (!DBM::is_result($lock)) {
- dba::insert('locks', ['name' => $key, 'locked' => true, 'pid' => getmypid()]);
- $got_lock = true;
- }
-
- dba::unlock();
-
- if (!$got_lock && ($timeout > 0)) {
- usleep(rand(100000, 2000000));
- }
- } while (!$got_lock && ((time() - $start) < $timeout));
-
- return $got_lock;
- }
-
- /**
- * @brief Removes a lock if it was set by us
- *
- * @param string $key Name of the lock
- *
- * @return mixed
- */
- public function releaseLock($key)
- {
- dba::update('locks', ['locked' => false, 'pid' => 0], ['name' => $key, 'pid' => getmypid()]);
-
- return;
- }
-
- /**
- * @brief Removes all lock that were set by us
- *
- * @return void
- */
- public function releaseAll()
- {
- dba::update('locks', ['locked' => false, 'pid' => 0], ['pid' => getmypid()]);
- }
-}
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Lock;
-
-/**
- * Lock Driver Interface
- *
- * @author Philipp Holzer <admin@philipp.info>
- */
-interface ILockDriver
-{
- /**
- *
- * @brief Acquires a lock for a given name
- *
- * @param string $key The Name of the lock
- * @param integer $timeout Seconds until we give up
- *
- * @return boolean Was the lock successful?
- */
- public function acquireLock($key, $timeout = 120);
-
- /**
- * @brief Releases a lock if it was set by us
- *
- * @param string $key Name of the lock
- *
- * @return mixed
- */
- public function releaseLock($key);
-
- /**
- * @brief Releases all lock that were set by us
- *
- * @return void
- */
- public function releaseAll();
-}
\ No newline at end of file
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Lock;
-
-use Friendica\Core\Cache;
-use dba;
-
-class MemcacheLockDriver implements ILockDriver
-{
- /**
- *
- * @brief Sets a lock for a given name
- *
- * @param string $key The Name of the lock
- * @param integer $timeout Seconds until we give up
- *
- * @return boolean Was the lock successful?
- */
- public function acquireLock($key, $timeout = 120)
- {
- $got_lock = false;
- $start = time();
-
- $cachekey = get_app()->get_hostname() . ";lock:" . $key;
-
- do {
- // We only lock to be sure that nothing happens at exactly the same time
- dba::lock('locks');
- $lock = Cache::get($cachekey);
-
- if (!is_bool($lock)) {
- $pid = (int)$lock;
-
- // When the process id isn't used anymore, we can safely claim the lock for us.
- // Or we do want to lock something that was already locked by us.
- if (!posix_kill($pid, 0) || ($pid == getmypid())) {
- $lock = false;
- }
- }
- if (is_bool($lock)) {
- Cache::set($cachekey, getmypid(), 300);
- $got_lock = true;
- }
-
- dba::unlock();
-
- if (!$got_lock && ($timeout > 0)) {
- usleep(rand(10000, 200000));
- }
- } while (!$got_lock && ((time() - $start) < $timeout));
-
- return $got_lock;
- }
-
- /**
- * @brief Removes a lock if it was set by us
- *
- * @param string $key Name of the lock
- *
- * @return mixed
- */
- public function releaseLock($key)
- {
- $cachekey = get_app()->get_hostname() . ";lock:" . $key;
- $lock = Cache::get($cachekey);
-
- if (!is_bool($lock)) {
- if ((int)$lock == getmypid()) {
- Cache::delete($cachekey);
- }
- }
-
- return;
- }
-
- /**
- * @brief Removes all lock that were set by us
- *
- * @return void
- */
- public function releaseAll()
- {
- // We cannot delete all cache entries, but this doesn't matter with memcache
- return;
- }
-}
\ No newline at end of file
+++ /dev/null
-<?php
-
-namespace Friendica\Core\Lock;
-
-class SemaphoreLockDriver implements ILockDriver
-{
- /**
- * @var array stored semaphores
- */
- private static $semaphore = [];
-
- /**
- * @brief Creates a semaphore key
- *
- * @param string $key Name of the lock
- *
- * @return integer the semaphore key
- */
- private static function semaphoreKey($key)
- {
- $temp = get_temppath();
-
- $file = $temp.'/'.$key.'.sem';
-
- if (!file_exists($file)) {
- file_put_contents($file, $key);
- }
-
- return ftok($file, 'f');
- }
-
- /**
- *
- * @brief Sets a lock for a given name
- *
- * @param string $key The Name of the lock
- * @param integer $timeout Seconds until we give up
- *
- * @return boolean Was the lock successful?
- */
- public function acquireLock($key, $timeout = 120)
- {
- // 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[$key] = sem_get(self::semaphoreKey($key));
- if (self::$semaphore[$key]) {
- return sem_acquire(self::$semaphore[$key], ($timeout == 0));
- }
- }
- }
-
- /**
- * @brief Removes a lock if it was set by us
- *
- * @param string $key Name of the lock
- *
- * @return mixed
- */
- public function releaseLock($key)
- {
- if (function_exists('sem_get') && version_compare(PHP_VERSION, '5.6.1', '>=')) {
- if (empty(self::$semaphore[$key])) {
- return false;
- } else {
- $success = @sem_release(self::$semaphore[$key]);
- unset(self::$semaphore[$key]);
- return $success;
- }
- }
- }
-
- /**
- * @brief Removes all lock that were set by us
- *
- * @return void
- */
- public function releaseAll()
- {
- // not needed/supported
- return;
- }
-}
\ No newline at end of file
use Friendica\Model\Process;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
+use Friendica\Util\Lock;
use dba;
require_once 'include/dba.php';
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Lock;
use Friendica\Util\Network;
use Friendica\Util\XML;
use dba;
--- /dev/null
+<?php
+/**
+ * @file src/Core/Lock.php
+ */
+namespace Friendica\Util;
+
+/**
+ * @file src/Core/Lock.php
+ * @brief Functions for preventing parallel execution of functions
+ */
+
+use Friendica\Core\Config;
+use Friendica\Util\Lock;
+
+require_once 'include/dba.php';
+
+/**
+ * @brief This class contain Functions for preventing parallel execution of functions
+ */
+class Lock
+{
+ /**
+ * @var Lock\ILockDriver;
+ */
+ static $driver = null;
+
+ public static function init()
+ {
+ switch(Config::get('system', 'lock_driver', 'default')) {
+ case 'memcache':
+ self::$driver = new Lock\MemcacheLockDriver();
+ break;
+ case 'database':
+ self::$driver = new Lock\DatabaseLockDriver();
+ break;
+ case 'semaphore':
+ self::$driver = new Lock\SemaphoreLockDriver();
+ break;
+ default:
+ // Determine what's the best/fastest locking driver (default behavior in Friendica)
+ if (function_exists('sem_get') && version_compare(PHP_VERSION, '5.6.1', '>=')) {
+ self::$driver = new Lock\SemaphoreLockDriver();
+ } elseif (Config::get('system', 'cache_driver', 'database') == 'memcache') {
+ self::$driver = new Lock\MemcacheLockDriver();
+ } else {
+ self::$driver = new Lock\DatabaseLockDriver();
+ }
+ }
+ }
+
+ /**
+ * Returns the current cache driver
+ *
+ * @return Lock\ILockDriver;
+ */
+ private static function getDriver()
+ {
+ if (self::$driver === null) {
+ self::init();
+ }
+
+ return self::$driver;
+ }
+
+ /**
+ * @brief Acquires a lock for a given name
+ *
+ * @param string $key Name of the lock
+ * @param integer $timeout Seconds until we give up
+ *
+ * @return boolean Was the lock successful?
+ */
+ public static function acquireLock($key, $timeout = 120)
+ {
+ return self::getDriver()->acquireLock($key, $timeout);
+ }
+
+ /**
+ * @brief Releases a lock if it was set by us
+ *
+ * @param string $key Name of the lock
+ * @return mixed
+ */
+ public static function releaseLock($key)
+ {
+ return self::getDriver()->releaseLock($key);
+ }
+
+ /**
+ * @brief Releases all lock that were set by us
+ * @return void
+ */
+ public static function releaseAll()
+ {
+ self::getDriver()->releaseAll();
+ }
+
+ public static function isLocked($key)
+ {
+
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Util\Lock;
+
+use dba;
+use Friendica\Database\DBM;
+
+/**
+ * Locking driver that stores the locks in the database
+ */
+class DatabaseLockDriver implements ILockDriver
+{
+ /**
+ * @brief Sets a lock for a given name
+ *
+ * @param string $key The Name of the lock
+ * @param integer $timeout Seconds until we give up
+ *
+ * @return boolean Was the lock successful?
+ */
+ public function acquireLock($key, $timeout = 120)
+ {
+ $got_lock = false;
+ $start = time();
+
+ do {
+ dba::lock('locks');
+ $lock = dba::selectFirst('locks', ['locked', 'pid'], ['name' => $key]);
+
+ 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)) {
+ $lock['locked'] = false;
+ }
+ // We want to lock something that was already locked by us? So we got the lock.
+ if ($lock['pid'] == getmypid()) {
+ $got_lock = true;
+ }
+ }
+ if (!$lock['locked']) {
+ dba::update('locks', ['locked' => true, 'pid' => getmypid()], ['name' => $key]);
+ $got_lock = true;
+ }
+ } elseif (!DBM::is_result($lock)) {
+ dba::insert('locks', ['name' => $key, 'locked' => true, 'pid' => getmypid()]);
+ $got_lock = true;
+ }
+
+ dba::unlock();
+
+ if (!$got_lock && ($timeout > 0)) {
+ usleep(rand(100000, 2000000));
+ }
+ } while (!$got_lock && ((time() - $start) < $timeout));
+
+ return $got_lock;
+ }
+
+ /**
+ * @brief Removes a lock if it was set by us
+ *
+ * @param string $key Name of the lock
+ *
+ * @return mixed
+ */
+ public function releaseLock($key)
+ {
+ dba::update('locks', ['locked' => false, 'pid' => 0], ['name' => $key, 'pid' => getmypid()]);
+
+ return;
+ }
+
+ /**
+ * @brief Removes all lock that were set by us
+ *
+ * @return void
+ */
+ public function releaseAll()
+ {
+ dba::update('locks', ['locked' => false, 'pid' => 0], ['pid' => getmypid()]);
+ }
+}
--- /dev/null
+<?php
+
+namespace Friendica\Util\Lock;
+
+/**
+ * Lock Driver Interface
+ *
+ * @author Philipp Holzer <admin@philipp.info>
+ */
+interface ILockDriver
+{
+ /**
+ *
+ * @brief Acquires a lock for a given name
+ *
+ * @param string $key The Name of the lock
+ * @param integer $timeout Seconds until we give up
+ *
+ * @return boolean Was the lock successful?
+ */
+ public function acquireLock($key, $timeout = 120);
+
+ /**
+ * @brief Releases a lock if it was set by us
+ *
+ * @param string $key Name of the lock
+ *
+ * @return mixed
+ */
+ public function releaseLock($key);
+
+ /**
+ * @brief Releases all lock that were set by us
+ *
+ * @return void
+ */
+ public function releaseAll();
+
+
+ public function isLocked();
+}
\ No newline at end of file
--- /dev/null
+<?php
+
+namespace Friendica\Util\Lock;
+
+use Friendica\Core\Cache;
+use dba;
+
+class MemcacheLockDriver implements ILockDriver
+{
+ /**
+ *
+ * @brief Sets a lock for a given name
+ *
+ * @param string $key The Name of the lock
+ * @param integer $timeout Seconds until we give up
+ *
+ * @return boolean Was the lock successful?
+ */
+ public function acquireLock($key, $timeout = 120)
+ {
+ $got_lock = false;
+ $start = time();
+
+ $cachekey = get_app()->get_hostname() . ";lock:" . $key;
+
+ do {
+ // We only lock to be sure that nothing happens at exactly the same time
+ dba::lock('locks');
+ $lock = Cache::get($cachekey);
+
+ if (!is_bool($lock)) {
+ $pid = (int)$lock;
+
+ // When the process id isn't used anymore, we can safely claim the lock for us.
+ // Or we do want to lock something that was already locked by us.
+ if (!posix_kill($pid, 0) || ($pid == getmypid())) {
+ $lock = false;
+ }
+ }
+ if (is_bool($lock)) {
+ Cache::set($cachekey, getmypid(), 300);
+ $got_lock = true;
+ }
+
+ dba::unlock();
+
+ if (!$got_lock && ($timeout > 0)) {
+ usleep(rand(10000, 200000));
+ }
+ } while (!$got_lock && ((time() - $start) < $timeout));
+
+ return $got_lock;
+ }
+
+ /**
+ * @brief Removes a lock if it was set by us
+ *
+ * @param string $key Name of the lock
+ *
+ * @return mixed
+ */
+ public function releaseLock($key)
+ {
+ $cachekey = get_app()->get_hostname() . ";lock:" . $key;
+ $lock = Cache::get($cachekey);
+
+ if (!is_bool($lock)) {
+ if ((int)$lock == getmypid()) {
+ Cache::delete($cachekey);
+ }
+ }
+
+ return;
+ }
+
+ /**
+ * @brief Removes all lock that were set by us
+ *
+ * @return void
+ */
+ public function releaseAll()
+ {
+ // We cannot delete all cache entries, but this doesn't matter with memcache
+ return;
+ }
+}
\ No newline at end of file
--- /dev/null
+<?php
+
+namespace Friendica\Util\Lock;
+
+class SemaphoreLockDriver implements ILockDriver
+{
+ /**
+ * @var array stored semaphores
+ */
+ private static $semaphore = [];
+
+ /**
+ * @brief Creates a semaphore key
+ *
+ * @param string $key Name of the lock
+ *
+ * @return integer the semaphore key
+ */
+ private static function semaphoreKey($key)
+ {
+ $temp = get_temppath();
+
+ $file = $temp.'/'.$key.'.sem';
+
+ if (!file_exists($file)) {
+ file_put_contents($file, $key);
+ }
+
+ return ftok($file, 'f');
+ }
+
+ /**
+ *
+ * @brief Sets a lock for a given name
+ *
+ * @param string $key The Name of the lock
+ * @param integer $timeout Seconds until we give up
+ *
+ * @return boolean Was the lock successful?
+ */
+ public function acquireLock($key, $timeout = 120)
+ {
+ // 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[$key] = sem_get(self::semaphoreKey($key));
+ if (self::$semaphore[$key]) {
+ return sem_acquire(self::$semaphore[$key], ($timeout == 0));
+ }
+ }
+ }
+
+ /**
+ * @brief Removes a lock if it was set by us
+ *
+ * @param string $key Name of the lock
+ *
+ * @return mixed
+ */
+ public function releaseLock($key)
+ {
+ if (function_exists('sem_get') && version_compare(PHP_VERSION, '5.6.1', '>=')) {
+ if (empty(self::$semaphore[$key])) {
+ return false;
+ } else {
+ $success = @sem_release(self::$semaphore[$key]);
+ unset(self::$semaphore[$key]);
+ return $success;
+ }
+ }
+ }
+
+ /**
+ * @brief Removes all lock that were set by us
+ *
+ * @return void
+ */
+ public function releaseAll()
+ {
+ // not needed/supported
+ return;
+ }
+}
\ No newline at end of file