Implemented the PoolCounter feature and did some general refactoring in the areas that it touched.
* Renamed Article::outputFromWikitext() to Article::getOutputFromWikitext()
* Factored out cascade protection updates
* Removed recently-added Article::tryParserCache(): misnamed, can be done in one line of code in the caller. Deprecated OutputPage::tryParserCache().
* Made some functions public instead of protected when they could be useful from hooks.
* In ParserCache, removed PHP 4-style ampersands
In Article::view():
* Factored out robot policy logic, "redirected from" header, patrol footer, diff page, revdelete header, CSS/JS formatting, footer, namespace header, missing article error
* Removed some variables, renamed some others, fixed incorrect use of empty()
* Used the refactored footer section to do a couple of early returns and unindent a massive if(!$outputDone) block
* Removed fantasy interpretation of $this->getContent()===false in comment
* Don't try the parser cache when ArticleViewHeader specified $outputDone=true
* Move timing hack to getOutputFromWikitext()
* Stop using $wgOut->parserOptions() with save/restore nonsense every time you want to change something in it. This is meant to be OOP.
* Don't overwrite the article text with an error message and then pretend to write it to the cache, that's confusing
2009-07-08 08:12:35 +00:00
|
|
|
<?php
|
2012-05-11 08:34:29 +00:00
|
|
|
/**
|
|
|
|
|
* Provides of semaphore semantics for restricting the number
|
|
|
|
|
* of workers that may be concurrently performing the same task.
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
|
|
|
*
|
|
|
|
|
* @file
|
|
|
|
|
*/
|
Implemented the PoolCounter feature and did some general refactoring in the areas that it touched.
* Renamed Article::outputFromWikitext() to Article::getOutputFromWikitext()
* Factored out cascade protection updates
* Removed recently-added Article::tryParserCache(): misnamed, can be done in one line of code in the caller. Deprecated OutputPage::tryParserCache().
* Made some functions public instead of protected when they could be useful from hooks.
* In ParserCache, removed PHP 4-style ampersands
In Article::view():
* Factored out robot policy logic, "redirected from" header, patrol footer, diff page, revdelete header, CSS/JS formatting, footer, namespace header, missing article error
* Removed some variables, renamed some others, fixed incorrect use of empty()
* Used the refactored footer section to do a couple of early returns and unindent a massive if(!$outputDone) block
* Removed fantasy interpretation of $this->getContent()===false in comment
* Don't try the parser cache when ArticleViewHeader specified $outputDone=true
* Move timing hack to getOutputFromWikitext()
* Stop using $wgOut->parserOptions() with save/restore nonsense every time you want to change something in it. This is meant to be OOP.
* Don't overwrite the article text with an error message and then pretend to write it to the cache, that's confusing
2009-07-08 08:12:35 +00:00
|
|
|
|
2010-08-27 20:57:32 +00:00
|
|
|
/**
|
2013-03-18 23:16:51 +00:00
|
|
|
* Class for dealing with PoolCounters using class members
|
2010-08-27 20:57:32 +00:00
|
|
|
*/
|
|
|
|
|
abstract class PoolCounterWork {
|
2014-04-21 17:37:14 +00:00
|
|
|
/** @var string */
|
|
|
|
|
protected $type = 'generic';
|
|
|
|
|
/** @var bool */
|
|
|
|
|
protected $cacheable = false; // does this override getCachedWork() ?
|
2011-08-17 17:11:49 +00:00
|
|
|
|
2010-08-27 20:57:32 +00:00
|
|
|
/**
|
2013-03-18 22:41:19 +00:00
|
|
|
* @param string $type The type of PoolCounter to use
|
|
|
|
|
* @param string $key Key that identifies the queue this work is placed on
|
2010-08-27 20:57:32 +00:00
|
|
|
*/
|
2013-03-18 22:41:19 +00:00
|
|
|
public function __construct( $type, $key ) {
|
2014-04-21 17:37:14 +00:00
|
|
|
$this->type = $type;
|
2013-03-18 22:41:19 +00:00
|
|
|
$this->poolCounter = PoolCounter::factory( $type, $key );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Actually perform the work, caching it if needed
|
2014-04-19 20:22:20 +00:00
|
|
|
* @return mixed Work result or false
|
2013-03-18 22:41:19 +00:00
|
|
|
*/
|
|
|
|
|
abstract public function doWork();
|
Implemented the PoolCounter feature and did some general refactoring in the areas that it touched.
* Renamed Article::outputFromWikitext() to Article::getOutputFromWikitext()
* Factored out cascade protection updates
* Removed recently-added Article::tryParserCache(): misnamed, can be done in one line of code in the caller. Deprecated OutputPage::tryParserCache().
* Made some functions public instead of protected when they could be useful from hooks.
* In ParserCache, removed PHP 4-style ampersands
In Article::view():
* Factored out robot policy logic, "redirected from" header, patrol footer, diff page, revdelete header, CSS/JS formatting, footer, namespace header, missing article error
* Removed some variables, renamed some others, fixed incorrect use of empty()
* Used the refactored footer section to do a couple of early returns and unindent a massive if(!$outputDone) block
* Removed fantasy interpretation of $this->getContent()===false in comment
* Don't try the parser cache when ArticleViewHeader specified $outputDone=true
* Move timing hack to getOutputFromWikitext()
* Stop using $wgOut->parserOptions() with save/restore nonsense every time you want to change something in it. This is meant to be OOP.
* Don't overwrite the article text with an error message and then pretend to write it to the cache, that's confusing
2009-07-08 08:12:35 +00:00
|
|
|
|
2010-08-27 20:57:32 +00:00
|
|
|
/**
|
|
|
|
|
* Retrieve the work from cache
|
2014-04-19 20:22:20 +00:00
|
|
|
* @return mixed Work result or false
|
2010-08-27 20:57:32 +00:00
|
|
|
*/
|
2013-03-18 22:41:19 +00:00
|
|
|
public function getCachedWork() {
|
2010-08-27 20:57:32 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2011-08-17 17:11:49 +00:00
|
|
|
* A work not so good (eg. expired one) but better than an error
|
2010-08-27 20:57:32 +00:00
|
|
|
* message.
|
2014-04-19 20:22:20 +00:00
|
|
|
* @return mixed Work result or false
|
2010-08-27 20:57:32 +00:00
|
|
|
*/
|
2013-03-18 22:41:19 +00:00
|
|
|
public function fallback() {
|
2010-08-27 20:57:32 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
2011-08-17 17:11:49 +00:00
|
|
|
|
2010-08-27 20:57:32 +00:00
|
|
|
/**
|
|
|
|
|
* Do something with the error, like showing it to the user.
|
2012-02-09 21:35:05 +00:00
|
|
|
* @return bool
|
2010-08-27 20:57:32 +00:00
|
|
|
*/
|
2014-03-06 23:37:42 +00:00
|
|
|
public function error( $status ) {
|
2010-08-27 20:57:32 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
2011-03-19 12:06:04 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Log an error
|
2011-08-17 17:11:49 +00:00
|
|
|
*
|
2014-04-19 20:22:20 +00:00
|
|
|
* @param Status $status
|
2013-03-18 22:41:19 +00:00
|
|
|
* @return void
|
2011-03-19 12:06:04 +00:00
|
|
|
*/
|
2014-03-06 23:37:42 +00:00
|
|
|
public function logError( $status ) {
|
2014-03-06 23:32:47 +00:00
|
|
|
$key = $this->poolCounter->getKey();
|
|
|
|
|
|
2014-04-21 17:37:14 +00:00
|
|
|
wfDebugLog( 'poolcounter', "Pool key '$key' ({$this->type}): "
|
2014-02-07 22:03:59 +00:00
|
|
|
. $status->getMessage()->inLanguage( 'en' )->useDatabase( false )->text() );
|
2011-03-19 12:06:04 +00:00
|
|
|
}
|
2011-08-17 17:11:49 +00:00
|
|
|
|
2010-08-27 20:57:32 +00:00
|
|
|
/**
|
2013-04-24 21:19:23 +00:00
|
|
|
* Get the result of the work (whatever it is), or the result of the error() function.
|
|
|
|
|
* This returns the result of the first applicable method that returns a non-false value,
|
|
|
|
|
* where the methods are checked in the following order:
|
|
|
|
|
* - a) doWork() : Applies if the work is exclusive or no another process
|
|
|
|
|
* is doing it, and on the condition that either this process
|
|
|
|
|
* successfully entered the pool or the pool counter is down.
|
|
|
|
|
* - b) doCachedWork() : Applies if the work is cacheable and this blocked on another
|
|
|
|
|
* process which finished the work.
|
|
|
|
|
* - c) fallback() : Applies for all remaining cases.
|
|
|
|
|
* If these all fall through (by returning false), then the result of error() is returned.
|
|
|
|
|
*
|
2014-04-19 20:22:20 +00:00
|
|
|
* @param bool $skipcache
|
2013-04-24 21:19:23 +00:00
|
|
|
* @return mixed
|
2010-08-27 20:57:32 +00:00
|
|
|
*/
|
2013-03-18 22:41:19 +00:00
|
|
|
public function execute( $skipcache = false ) {
|
2010-08-27 20:57:32 +00:00
|
|
|
if ( $this->cacheable && !$skipcache ) {
|
|
|
|
|
$status = $this->poolCounter->acquireForAnyone();
|
|
|
|
|
} else {
|
|
|
|
|
$status = $this->poolCounter->acquireForMe();
|
|
|
|
|
}
|
2011-03-19 12:55:48 +00:00
|
|
|
|
|
|
|
|
if ( !$status->isOK() ) {
|
|
|
|
|
// Respond gracefully to complete server breakage: just log it and do the work
|
|
|
|
|
$this->logError( $status );
|
|
|
|
|
return $this->doWork();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch ( $status->value ) {
|
|
|
|
|
case PoolCounter::LOCKED:
|
|
|
|
|
$result = $this->doWork();
|
|
|
|
|
$this->poolCounter->release();
|
|
|
|
|
return $result;
|
2011-08-17 17:11:49 +00:00
|
|
|
|
2011-03-19 12:55:48 +00:00
|
|
|
case PoolCounter::DONE:
|
|
|
|
|
$result = $this->getCachedWork();
|
|
|
|
|
if ( $result === false ) {
|
|
|
|
|
/* That someone else work didn't serve us.
|
|
|
|
|
* Acquire the lock for me
|
|
|
|
|
*/
|
|
|
|
|
return $this->execute( true );
|
|
|
|
|
}
|
|
|
|
|
return $result;
|
2011-08-17 17:11:49 +00:00
|
|
|
|
2011-03-19 12:55:48 +00:00
|
|
|
case PoolCounter::QUEUE_FULL:
|
|
|
|
|
case PoolCounter::TIMEOUT:
|
|
|
|
|
$result = $this->fallback();
|
2011-08-17 17:11:49 +00:00
|
|
|
|
2011-03-19 12:55:48 +00:00
|
|
|
if ( $result !== false ) {
|
2010-08-27 20:57:32 +00:00
|
|
|
return $result;
|
2011-03-19 12:55:48 +00:00
|
|
|
}
|
|
|
|
|
/* no break */
|
2011-08-17 17:11:49 +00:00
|
|
|
|
2011-03-19 12:55:48 +00:00
|
|
|
/* These two cases should never be hit... */
|
|
|
|
|
case PoolCounter::ERROR:
|
|
|
|
|
default:
|
2013-03-18 22:41:19 +00:00
|
|
|
$errors = array(
|
|
|
|
|
PoolCounter::QUEUE_FULL => 'pool-queuefull',
|
|
|
|
|
PoolCounter::TIMEOUT => 'pool-timeout' );
|
2011-08-17 17:11:49 +00:00
|
|
|
|
2013-03-18 22:41:19 +00:00
|
|
|
$status = Status::newFatal( isset( $errors[$status->value] )
|
|
|
|
|
? $errors[$status->value]
|
|
|
|
|
: 'pool-errorunknown' );
|
2011-03-19 12:55:48 +00:00
|
|
|
$this->logError( $status );
|
|
|
|
|
return $this->error( $status );
|
2010-08-27 20:57:32 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2013-03-18 23:16:51 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Convenience class for dealing with PoolCounters using callbacks
|
|
|
|
|
* @since 1.22
|
|
|
|
|
*/
|
|
|
|
|
class PoolCounterWorkViaCallback extends PoolCounterWork {
|
|
|
|
|
/** @var callable */
|
|
|
|
|
protected $doWork;
|
|
|
|
|
/** @var callable|null */
|
|
|
|
|
protected $doCachedWork;
|
|
|
|
|
/** @var callable|null */
|
|
|
|
|
protected $fallback;
|
|
|
|
|
/** @var callable|null */
|
|
|
|
|
protected $error;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Build a PoolCounterWork class from a type, key, and callback map.
|
|
|
|
|
*
|
|
|
|
|
* The callback map must at least have a callback for the 'doWork' method.
|
|
|
|
|
* Additionally, callbacks can be provided for the 'doCachedWork', 'fallback',
|
|
|
|
|
* and 'error' methods. Methods without callbacks will be no-ops that return false.
|
|
|
|
|
* If a 'doCachedWork' callback is provided, then execute() may wait for any prior
|
|
|
|
|
* process in the pool to finish and reuse its cached result.
|
|
|
|
|
*
|
|
|
|
|
* @param string $type
|
|
|
|
|
* @param string $key
|
|
|
|
|
* @param array $callbacks Map of callbacks
|
|
|
|
|
* @throws MWException
|
|
|
|
|
*/
|
|
|
|
|
public function __construct( $type, $key, array $callbacks ) {
|
|
|
|
|
parent::__construct( $type, $key );
|
|
|
|
|
foreach ( array( 'doWork', 'doCachedWork', 'fallback', 'error' ) as $name ) {
|
|
|
|
|
if ( isset( $callbacks[$name] ) ) {
|
|
|
|
|
if ( !is_callable( $callbacks[$name] ) ) {
|
|
|
|
|
throw new MWException( "Invalid callback provided for '$name' function." );
|
|
|
|
|
}
|
|
|
|
|
$this->$name = $callbacks[$name];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ( !isset( $this->doWork ) ) {
|
|
|
|
|
throw new MWException( "No callback provided for 'doWork' function." );
|
|
|
|
|
}
|
|
|
|
|
$this->cacheable = isset( $this->doCachedWork );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public function doWork() {
|
|
|
|
|
return call_user_func_array( $this->doWork, array() );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public function getCachedWork() {
|
|
|
|
|
if ( $this->doCachedWork ) {
|
|
|
|
|
return call_user_func_array( $this->doCachedWork, array() );
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-06 23:37:42 +00:00
|
|
|
public function fallback() {
|
2013-03-18 23:16:51 +00:00
|
|
|
if ( $this->fallback ) {
|
|
|
|
|
return call_user_func_array( $this->fallback, array() );
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-06 23:37:42 +00:00
|
|
|
public function error( $status ) {
|
2013-03-18 23:16:51 +00:00
|
|
|
if ( $this->error ) {
|
|
|
|
|
return call_user_func_array( $this->error, array( $status ) );
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|