1 files changed, 24 insertions, 20 deletions

diff --git a/maintenance/fileOpPerfTest.php b/maintenance/fileOpPerfTest.php
index 501bcfc3..9dba8183 100644
--- a/maintenance/fileOpPerfTest.php
+++ b/maintenance/fileOpPerfTest.php
@@ -21,11 +21,8 @@
  * @ingroup Maintenance
  */
 
-$initialTime = microtime( true );
-$wgProfiler = array( 'class' => 'ProfilerSimpleText' );
 error_reporting( E_ALL );
-
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script to test fileop performance.
@@ -40,10 +37,13 @@ class TestFileOpPerformance extends Maintenance {
 		$this->addOption( 'b2', 'Backend 2', false, true );
 		$this->addOption( 'srcdir', 'File source directory', true, true );
 		$this->addOption( 'maxfiles', 'Max files', false, true );
-		$this->addOption( 'quick', 'Avoid operation pre-checks' );
+		$this->addOption( 'quick', 'Avoid operation pre-checks (use doQuickOperations())' );
+		$this->addOption( 'parallelize', '"parallelize" flag for doOperations()', false, true );
 	}
 
 	public function execute() {
+		Profiler::setInstance( new ProfilerSimpleText( array() ) ); // clear
+
 		$backend = FileBackendGroup::singleton()->get( $this->getOption( 'b1' ) );
 		$this->doPerfTest( $backend );
 
@@ -52,9 +52,8 @@ class TestFileOpPerformance extends Maintenance {
 			$this->doPerfTest( $backend );
 		}
 
-		$profiler = Profiler::instance();
-		$profiler->setTemplated( true );
-		$profiler->logData(); // prints
+		Profiler::instance()->setTemplated( true );
+		// NOTE: as of MW1.21, $profiler->logData() is called implicitly by doMaintenance.php.
 	}
 
 	protected function doPerfTest( FileBackend $backend ) {
@@ -78,7 +77,7 @@ class TestFileOpPerformance extends Maintenance {
 				$this->output( "Using '$dirname/$file' in operations.\n" );
 				$dst = $baseDir . '/' . wfBaseName( $file );
 				$ops1[] = array( 'op' => 'store',
-					'src' => "$dirname/$file", 'dst' => $dst, 'overwrite' => 1);
+					'src' => "$dirname/$file", 'dst' => $dst, 'overwrite' => 1 );
 				$ops2[] = array( 'op' => 'copy',
 					'src' => "$dst", 'dst' => "$dst-1", 'overwrite' => 1 );
 				$ops3[] = array( 'op' => 'move',
@@ -95,52 +94,57 @@ class TestFileOpPerformance extends Maintenance {
 
 		$method = $this->hasOption( 'quick' ) ? 'doQuickOperations' : 'doOperations';
 
+		$opts = array( 'force' => 1 );
+		if ( $this->hasOption( 'parallelize' ) ) {
+			$opts['parallelize'] = ( $this->getOption( 'parallelize' ) === 'true' );
+		}
+
 		$start = microtime( true );
-		$status = $backend->$method( $ops1, array( 'force' => 1 ) );
+		$status = $backend->$method( $ops1, $opts );
 		$e = ( microtime( true ) - $start ) * 1000;
 		if ( $status->getErrorsArray() ) {
 			print_r( $status->getErrorsArray() );
-			exit(0);
+			exit( 0 );
 		}
 		$this->output( $backend->getName() . ": Stored " . count( $ops1 ) . " files in $e ms.\n" );
 
 		$start = microtime( true );
-		$backend->$method( $ops2, array( 'force' => 1 ) );
+		$backend->$method( $ops2, $opts );
 		$e = ( microtime( true ) - $start ) * 1000;
 		if ( $status->getErrorsArray() ) {
 			print_r( $status->getErrorsArray() );
-			exit(0);
+			exit( 0 );
 		}
 		$this->output( $backend->getName() . ": Copied " . count( $ops2 ) . " files in $e ms.\n" );
 
 		$start = microtime( true );
-		$backend->$method( $ops3, array( 'force' => 1 ) );
+		$backend->$method( $ops3, $opts );
 		$e = ( microtime( true ) - $start ) * 1000;
 		if ( $status->getErrorsArray() ) {
 			print_r( $status->getErrorsArray() );
-			exit(0);
+			exit( 0 );
 		}
 		$this->output( $backend->getName() . ": Moved " . count( $ops3 ) . " files in $e ms.\n" );
 
 		$start = microtime( true );
-		$backend->$method( $ops4, array( 'force' => 1 ) );
+		$backend->$method( $ops4, $opts );
 		$e = ( microtime( true ) - $start ) * 1000;
 		if ( $status->getErrorsArray() ) {
 			print_r( $status->getErrorsArray() );
-			exit(0);
+			exit( 0 );
 		}
 		$this->output( $backend->getName() . ": Deleted " . count( $ops4 ) . " files in $e ms.\n" );
 
 		$start = microtime( true );
-		$backend->$method( $ops5, array( 'force' => 1 ) );
+		$backend->$method( $ops5, $opts );
 		$e = ( microtime( true ) - $start ) * 1000;
 		if ( $status->getErrorsArray() ) {
 			print_r( $status->getErrorsArray() );
-			exit(0);
+			exit( 0 );
 		}
 		$this->output( $backend->getName() . ": Deleted " . count( $ops5 ) . " files in $e ms.\n" );
 	}
 }
 
 $maintClass = "TestFileOpPerformance";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;