dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "SpecialMovepage: Convert form to use OOUI controls"
[lhc/web/wiklou.git]
/
includes
/
poolcounter
/
PoolCounterRedis.php
diff --git
a/includes/poolcounter/PoolCounterRedis.php
b/includes/poolcounter/PoolCounterRedis.php
index
98797a3
..
d7357cf
100644
(file)
--- a/
includes/poolcounter/PoolCounterRedis.php
+++ b/
includes/poolcounter/PoolCounterRedis.php
@@
-76,7
+76,7
@@
class PoolCounterRedis extends PoolCounter {
const AWAKE_ONE = 1; // wake-up if when a slot can be taken from an existing process
const AWAKE_ALL = 2; // wake-up if an existing process finishes and wake up such others
const AWAKE_ONE = 1; // wake-up if when a slot can be taken from an existing process
const AWAKE_ALL = 2; // wake-up if an existing process finishes and wake up such others
- /** @var
array
List of active PoolCounterRedis objects in this script */
+ /** @var
PoolCounterRedis[]
List of active PoolCounterRedis objects in this script */
protected static $active = null;
function __construct( $conf, $type, $key ) {
protected static $active = null;
function __construct( $conf, $type, $key ) {
@@
-121,7
+121,6
@@
class PoolCounterRedis extends PoolCounter {
}
function acquireForMe() {
}
function acquireForMe() {
-
$status = $this->precheckAcquire();
if ( !$status->isGood() ) {
return $status;
$status = $this->precheckAcquire();
if ( !$status->isGood() ) {
return $status;
@@
-131,7
+130,6
@@
class PoolCounterRedis extends PoolCounter {
}
function acquireForAnyone() {
}
function acquireForAnyone() {
-
$status = $this->precheckAcquire();
if ( !$status->isGood() ) {
return $status;
$status = $this->precheckAcquire();
if ( !$status->isGood() ) {
return $status;
@@
-141,7
+139,6
@@
class PoolCounterRedis extends PoolCounter {
}
function release() {
}
function release() {
-
if ( $this->slot === null ) {
return Status::newGood( PoolCounter::NOT_LOCKED ); // not locked
}
if ( $this->slot === null ) {
return Status::newGood( PoolCounter::NOT_LOCKED ); // not locked
}
@@
-190,7
+187,7
@@
class PoolCounterRedis extends PoolCounter {
return 1
LUA;
try {
return 1
LUA;
try {
- $
res = $
conn->luaEval( $script,
+ $conn->luaEval( $script,
array(
$this->getSlotListKey(),
$this->getSlotRTimeSetKey(),
array(
$this->getSlotListKey(),
$this->getSlotRTimeSetKey(),