From 0fc544635d8b98dae2a0055a728a87dd657cd40d Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 24 Jan 2012 02:46:21 +0000 Subject: [PATCH] * Moved FSFile classes from file/ to backend/ * Improved $this->lockCount check in LockServerDaemon --- includes/AutoLoader.php | 4 ++-- includes/filerepo/{file => backend}/FSFile.php | 0 includes/filerepo/{file => backend}/TempFSFile.php | 0 maintenance/locking/LockServerDaemon.php | 4 +++- 4 files changed, 5 insertions(+), 3 deletions(-) rename includes/filerepo/{file => backend}/FSFile.php (100%) rename includes/filerepo/{file => backend}/TempFSFile.php (100%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index c4153d36d5..6c3b233afc 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -489,8 +489,8 @@ $wgAutoloadLocalClasses = array( 'LocalFileRestoreBatch' => 'includes/filerepo/file/LocalFile.php', 'OldLocalFile' => 'includes/filerepo/file/OldLocalFile.php', 'UnregisteredLocalFile' => 'includes/filerepo/file/UnregisteredLocalFile.php', - 'FSFile' => 'includes/filerepo/file/FSFile.php', - 'TempFSFile' => 'includes/filerepo/file/TempFSFile.php', + 'FSFile' => 'includes/filerepo/backend/FSFile.php', + 'TempFSFile' => 'includes/filerepo/backend/TempFSFile.php', # includes/filerepo/backend 'FileBackendGroup' => 'includes/filerepo/backend/FileBackendGroup.php', diff --git a/includes/filerepo/file/FSFile.php b/includes/filerepo/backend/FSFile.php similarity index 100% rename from includes/filerepo/file/FSFile.php rename to includes/filerepo/backend/FSFile.php diff --git a/includes/filerepo/file/TempFSFile.php b/includes/filerepo/backend/TempFSFile.php similarity index 100% rename from includes/filerepo/file/TempFSFile.php rename to includes/filerepo/backend/TempFSFile.php diff --git a/maintenance/locking/LockServerDaemon.php b/maintenance/locking/LockServerDaemon.php index 986ce99859..cba0454659 100644 --- a/maintenance/locking/LockServerDaemon.php +++ b/maintenance/locking/LockServerDaemon.php @@ -278,6 +278,8 @@ class LockServerDaemon { } /** + * Get the current timestamp and memory usage + * * @return string */ protected function stat() { @@ -317,7 +319,7 @@ class LockHolder { * @return string */ public function lock( $session, $type, array $keys ) { - if ( $this->lockCount >= $this->maxLocks ) { + if ( ( $this->lockCount + count( $keys ) ) > $this->maxLocks ) { return 'TOO_MANY_LOCKS'; } if ( $type === 'SH' ) { -- 2.20.1