X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Ffilebackend%2Flockmanager%2FLockManager.php;h=8115fd42a9618190c9695c9c89172e51e5032b2e;hb=b2c0705b819f5da7a7c07919a76b05fc31b01c34;hp=762bc66086e37a122d78f752e55ad501de83c4b9;hpb=08e21a46f775f038abca424b7c15f9cad3510984;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/filebackend/lockmanager/LockManager.php b/includes/filebackend/lockmanager/LockManager.php index 762bc66086..8115fd42a9 100644 --- a/includes/filebackend/lockmanager/LockManager.php +++ b/includes/filebackend/lockmanager/LockManager.php @@ -64,7 +64,7 @@ abstract class LockManager { /** * Construct a new instance from configuration * - * @param array $config Paramaters include: + * @param array $config Parameters include: * - domain : Domain (usually wiki ID) that all resources are relative to [optional] * - lockTTL : Age (in seconds) at which resource locks should expire. * This only applies if locks are not tied to a connection/process. @@ -102,8 +102,6 @@ abstract class LockManager { * @since 1.22 */ final public function lockByType( array $pathsByType, $timeout = 0 ) { - wfProfileIn( __METHOD__ ); - $status = Status::newGood(); $pathsByType = $this->normalizePathsByType( $pathsByType ); $msleep = array( 0, 50, 100, 300, 500 ); // retry backoff times $start = microtime( true ); @@ -116,7 +114,6 @@ abstract class LockManager { usleep( 1e3 * ( next( $msleep ) ?: 1000 ) ); // use 1 sec after enough times $elapsed = microtime( true ) - $start; } while ( $elapsed < $timeout && $elapsed >= 0 ); - wfProfileOut( __METHOD__ ); return $status; } @@ -140,10 +137,8 @@ abstract class LockManager { * @since 1.22 */ final public function unlockByType( array $pathsByType ) { - wfProfileIn( __METHOD__ ); $pathsByType = $this->normalizePathsByType( $pathsByType ); $status = $this->doUnlockByType( $pathsByType ); - wfProfileOut( __METHOD__ ); return $status; }