X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FForkController.php;h=05822302efaa58aaebd4fd13d215f6a811266132;hb=aea3a5dce215b9f3929d65365fe9bd101ecdf07d;hp=448bc03be717d6d6e12fb788955b8a37ceefaee3;hpb=4fa67221df791c05f57163cc8e9b8fd08cc7d19e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ForkController.php b/includes/ForkController.php
index 448bc03be7..05822302ef 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -30,11 +30,11 @@
  * @ingroup Maintenance
  */
 class ForkController {
-	var $children = array();
-	var $termReceived = false;
-	var $flags = 0, $procsToStart = 0;
+	protected $children = array(), $childNumber = 0;
+	protected $termReceived = false;
+	protected $flags = 0, $procsToStart = 0;
 
-	static $restartableSignals = array(
+	protected static $restartableSignals = array(
 		SIGFPE,
 		SIGILL,
 		SIGSEGV,
@@ -53,7 +53,7 @@ class ForkController {
 	const RESTART_ON_ERROR = 1;
 
 	public function __construct( $numProcs, $flags = 0 ) {
-		if ( php_sapi_name() != 'cli' ) {
+		if ( PHP_SAPI != 'cli' ) {
 			throw new MWException( "ForkController cannot be used from the web." );
 		}
 		$this->procsToStart = $numProcs;
@@ -121,7 +121,9 @@ class ForkController {
 			if ( function_exists( 'pcntl_signal_dispatch' ) ) {
 				pcntl_signal_dispatch();
 			} else {
-				declare (ticks=1) { $status = $status; }
+				declare( ticks = 1 ) {
+					$status = $status;
+				}
 			}
 			// Respond to TERM signal
 			if ( $this->termReceived ) {
@@ -135,12 +137,22 @@ class ForkController {
 		return 'done';
 	}
 
+	/**
+	 * Get the number of the child currently running. Note, this
+	 * is not the pid, but rather which of the total number of children
+	 * we are
+	 * @return int
+	 */
+	public function getChildNumber() {
+		return $this->childNumber;
+	}
+
 	protected function prepareEnvironment() {
 		global $wgMemc;
 		// Don't share DB, storage, or memcached connections
 		wfGetLBFactory()->destroyInstance();
 		FileBackendGroup::destroySingleton();
-		LockManagerGroup::destroySingleton();
+		LockManagerGroup::destroySingletons();
 		ObjectCache::clear();
 		$wgMemc = null;
 	}
@@ -164,6 +176,7 @@ class ForkController {
 
 			if ( !$pid ) {
 				$this->initChild();
+				$this->childNumber = $i;
 				return 'child';
 			} else {
 				// This is the parent process