From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Aug 2013 09:28:15 +0200 Subject: Update to MediaWiki 1.21.1 --- maintenance/fileOpPerfTest.php | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'maintenance/fileOpPerfTest.php') diff --git a/maintenance/fileOpPerfTest.php b/maintenance/fileOpPerfTest.php index 501bcfc3..008d7686 100644 --- a/maintenance/fileOpPerfTest.php +++ b/maintenance/fileOpPerfTest.php @@ -21,7 +21,6 @@ * @ingroup Maintenance */ -$initialTime = microtime( true ); $wgProfiler = array( 'class' => 'ProfilerSimpleText' ); error_reporting( E_ALL ); @@ -40,7 +39,8 @@ 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() { @@ -54,7 +54,8 @@ class TestFileOpPerformance extends Maintenance { $profiler = Profiler::instance(); $profiler->setTemplated( true ); - $profiler->logData(); // prints + + //NOTE: as of MW1.21, $profiler->logData() is called implicitly by doMaintenance.php. } protected function doPerfTest( FileBackend $backend ) { @@ -95,8 +96,13 @@ 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() ); @@ -105,7 +111,7 @@ class TestFileOpPerformance extends Maintenance { $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() ); @@ -114,7 +120,7 @@ class TestFileOpPerformance extends Maintenance { $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() ); @@ -123,7 +129,7 @@ class TestFileOpPerformance extends Maintenance { $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() ); @@ -132,7 +138,7 @@ class TestFileOpPerformance extends Maintenance { $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() ); -- cgit v1.2.3-54-g00ecf