| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -4455,7 +4455,6 @@ |
| 4456 | 4456 | * |
| 4457 | 4457 | * @param $parserOutput mixed ParserOptions object, or boolean false |
| 4458 | 4458 | **/ |
| 4459 | | - |
| 4460 | 4459 | protected function doCascadeProtectionUpdates( $parserOutput ) { |
| 4461 | 4460 | if ( !$this->isCurrent() || wfReadOnly() || !$this->mTitle->areRestrictionsCascading() ) { |
| 4462 | 4461 | return; |
| — | — | @@ -4623,7 +4622,7 @@ |
| 4624 | 4623 | private $mArticle; |
| 4625 | 4624 | |
| 4626 | 4625 | function __construct( $article, $key, $useParserCache, $parserOptions ) { |
| 4627 | | - parent::__construct( __CLASS__, $key ); |
| | 4626 | + parent::__construct( 'ArticleView', $key ); |
| 4628 | 4627 | $this->mArticle = $article; |
| 4629 | 4628 | $this->cacheable = $useParserCache; |
| 4630 | 4629 | $this->parserOptions = $parserOptions; |
| Index: trunk/phase3/includes/PoolCounter.php |
| — | — | @@ -9,8 +9,10 @@ |
| 10 | 10 | * of the cpu of the pool. This is also known as 'Michael Jackson effect'. |
| 11 | 11 | * The PoolCounter provides semaphore semantics for restricting the number |
| 12 | 12 | * of workers that may be concurrently performing such single task. |
| | 13 | + * |
| | 14 | + * By default PoolCounter_Stub is used, which provides no locking. You |
| | 15 | + * can get a useful one in the PoolCounter extension. |
| 13 | 16 | */ |
| 14 | | - |
| 15 | 17 | abstract class PoolCounter { |
| 16 | 18 | |
| 17 | 19 | /* Return codes */ |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -5070,8 +5070,11 @@ |
| 5071 | 5071 | * The remaining elements are passed through to the class as constructor |
| 5072 | 5072 | * parameters. Example: |
| 5073 | 5073 | * |
| 5074 | | - * $wgPoolCounterConf = array( 'Article::view' => array( |
| | 5074 | + * $wgPoolCounterConf = array( 'ArticleView' => array( |
| 5075 | 5075 | * 'class' => 'PoolCounter_Client', |
| | 5076 | + * 'timeout' => 15, // wait timeout in seconds |
| | 5077 | + * 'workers' => 5, // maximum number of active threads in each pool |
| | 5078 | + * 'maxqueue' => 50, // maximum number of total threads in each pool |
| 5076 | 5079 | * ... any extension-specific options... |
| 5077 | 5080 | * ); |
| 5078 | 5081 | */ |
| Index: trunk/extensions/PoolCounter/PoolCounterClient.php |
| — | — | @@ -31,7 +31,7 @@ |
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * Sample pool configuration: |
| 35 | | - * $wgPoolCounterConf = array( 'PoolWorkArticleView' => array( |
| | 35 | + * $wgPoolCounterConf = array( 'ArticleView' => array( |
| 36 | 36 | * 'class' => 'PoolCounter_Client', |
| 37 | 37 | * 'timeout' => 15, // wait timeout in seconds |
| 38 | 38 | * 'workers' => 5, // maximum number of active threads in each pool |