X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/mediawiki.git/blobdiff_plain/19e297c21b10b1b8a3acad5e73fc71dcb35db44a:/maintenance/benchmarkPurge.php..6932310fd58ebef145fa01eb76edf7150284d8ea:/maintenance/benchmarks/benchmarkPurge.php diff --git a/maintenance/benchmarkPurge.php b/maintenance/benchmarks/benchmarkPurge.php similarity index 76% rename from maintenance/benchmarkPurge.php rename to maintenance/benchmarks/benchmarkPurge.php index 8360ef85..e006cf53 100644 --- a/maintenance/benchmarkPurge.php +++ b/maintenance/benchmarks/benchmarkPurge.php @@ -1,6 +1,6 @@ addOption( "count", "How many URLs to feed to Squid for purging", false, true ); - $this->mDescription = "Benchmark the Squid purge functions."; + $this->addDescription( 'Benchmark the Squid purge functions.' ); } public function execute() { @@ -38,9 +41,9 @@ class BenchmarkPurge extends Maintenance { } else { $this->output( "There are " . count( $wgSquidServers ) . " defined squid servers:\n" ); if ( $this->hasOption( 'count' ) ) { - $lengths = array( intval( $this->getOption( 'count' ) ) ); + $lengths = [ intval( $this->getOption( 'count' ) ) ]; } else { - $lengths = array( 1, 10, 100 ); + $lengths = [ 1, 10, 100 ]; } foreach ( $lengths as $length ) { $urls = $this->randomUrlList( $length ); @@ -53,45 +56,52 @@ class BenchmarkPurge extends Maintenance { /** * Run a bunch of URLs through SquidUpdate::purge() * to benchmark Squid response times. - * @param $urls array A bunch of URLs to purge - * @param $trials int How many times to run the test? + * @param array $urls A bunch of URLs to purge + * @param int $trials How many times to run the test? + * @return string */ private function benchSquid( $urls, $trials = 1 ) { - $start = wfTime(); + $start = microtime( true ); for ( $i = 0; $i < $trials; $i++ ) { - SquidUpdate::purge( $urls ); + CdnCacheUpdate::purge( $urls ); } - $delta = wfTime() - $start; + $delta = microtime( true ) - $start; $pertrial = $delta / $trials; $pertitle = $pertrial / count( $urls ); + return sprintf( "%4d titles in %6.2fms (%6.2fms each)", count( $urls ), $pertrial * 1000.0, $pertitle * 1000.0 ); } /** * Get an array of randomUrl()'s. - * @param $length int How many urls to add to the array + * @param int $length How many urls to add to the array + * @return array */ private function randomUrlList( $length ) { - $list = array(); + $list = []; for ( $i = 0; $i < $length; $i++ ) { $list[] = $this->randomUrl(); } + return $list; } /** * Return a random URL of the wiki. Not necessarily an actual title in the * database, but at least a URL that looks like one. + * @return string */ private function randomUrl() { global $wgServer, $wgArticlePath; + return $wgServer . str_replace( '$1', $this->randomTitle(), $wgArticlePath ); } /** * Create a random title string (not necessarily a Title object). * For use with randomUrl(). + * @return string */ private function randomTitle() { $str = ''; @@ -99,9 +109,10 @@ class BenchmarkPurge extends Maintenance { for ( $i = 0; $i < $length; $i++ ) { $str .= chr( mt_rand( ord( 'a' ), ord( 'z' ) ) ); } + return ucfirst( $str ); } } $maintClass = "BenchmarkPurge"; -require_once( DO_MAINTENANCE ); +require_once RUN_MAINTENANCE_IF_MAIN;