From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 18 Jan 2013 16:46:04 +0100 Subject: Update to MediaWiki 1.20.2 this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024 --- maintenance/benchmarks/Benchmarker.php | 16 ++- maintenance/benchmarks/bench_HTTP_HTTPS.php | 12 +- maintenance/benchmarks/bench_delete_truncate.php | 36 ++++-- maintenance/benchmarks/bench_if_switch.php | 10 +- maintenance/benchmarks/bench_strtr_str_replace.php | 26 ++++- maintenance/benchmarks/bench_utf8_title_check.php | 126 +++++++++++++++++++++ maintenance/benchmarks/bench_wfIsWindows.php | 12 +- maintenance/benchmarks/benchmarkHooks.php | 17 ++- maintenance/benchmarks/benchmarkPurge.php | 13 ++- 9 files changed, 241 insertions(+), 27 deletions(-) create mode 100644 maintenance/benchmarks/bench_utf8_title_check.php (limited to 'maintenance/benchmarks') diff --git a/maintenance/benchmarks/Benchmarker.php b/maintenance/benchmarks/Benchmarker.php index 0056c3c7..c198e0ff 100644 --- a/maintenance/benchmarks/Benchmarker.php +++ b/maintenance/benchmarks/Benchmarker.php @@ -5,7 +5,7 @@ */ /** - * Create a doxygen subgroup of Maintenance for benchmarks + * Base code for benchmark scripts. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +27,13 @@ * @ingroup Benchmark */ -require_once( dirname( __FILE__ ) . '/../Maintenance.php' ); +require_once( __DIR__ . '/../Maintenance.php' ); + +/** + * Base class for benchmark scripts. + * + * @ingroup Benchmark + */ abstract class Benchmarker extends Maintenance { private $results; @@ -47,11 +53,11 @@ abstract class Benchmarker extends Maintenance { } $bench_number++; - $start = wfTime(); + $start = microtime( true ); for( $i=0; $i<$count; $i++ ) { call_user_func_array( $bench['function'], $bench['args'] ); } - $delta = wfTime() - $start; + $delta = microtime( true ) - $start; // function passed as a callback if( is_array( $bench['function'] ) ) { @@ -61,7 +67,7 @@ abstract class Benchmarker extends Maintenance { $this->results[$bench_number] = array( 'function' => $bench['function'], - 'arguments' => $bench['args'], + 'arguments' => $bench['args'], 'count' => $count, 'delta' => $delta, 'average' => $delta / $count, diff --git a/maintenance/benchmarks/bench_HTTP_HTTPS.php b/maintenance/benchmarks/bench_HTTP_HTTPS.php index cf62aadb..fa76ae22 100644 --- a/maintenance/benchmarks/bench_HTTP_HTTPS.php +++ b/maintenance/benchmarks/bench_HTTP_HTTPS.php @@ -1,6 +1,8 @@ insertData( $dbw ); - $start = wfTime(); + $start = microtime( true ); $this->delete( $dbw ); - $end = wfTime(); + $end = microtime( true ); - echo "Delete: " . $end - $start; + echo "Delete: " . sprintf( "%6.3fms", ( $end - $start ) * 1000 ); echo "\r\n"; $this->insertData( $dbw ); - $start = wfTime(); + $start = microtime( true ); $this->truncate( $dbw ); - $end = wfTime(); + $end = microtime( true ); - echo "Truncate: " . $end - $start; + echo "Truncate: " . sprintf( "%6.3fms", ( $end - $start ) * 1000 ); echo "\r\n"; $dbw->dropTable( 'test' ); diff --git a/maintenance/benchmarks/bench_if_switch.php b/maintenance/benchmarks/bench_if_switch.php index dafce050..1f590d4d 100644 --- a/maintenance/benchmarks/bench_if_switch.php +++ b/maintenance/benchmarks/bench_if_switch.php @@ -1,5 +1,7 @@ checkTitleEncoding() + * and compares its execution time against that of mb_check_encoding, if available. + * + * @ingroup Benchmark + */ +class bench_utf8_title_check extends Benchmarker { + + private $canRun; + + private $data; + + public function __construct() { + parent::__construct(); + + $this->data = array ( + "", + "United States of America", // 7bit ASCII + "S%C3%A9rie%20t%C3%A9l%C3%A9vis%C3%A9e", + "Acteur%7CAlbert%20Robbins%7CAnglais%7CAnn%20Donahue%7CAnthony%20E.%20Zuiker%7CCarol%20Mendelsohn", + // This comes from bug 36839 + "Acteur%7CAlbert%20Robbins%7CAnglais%7CAnn%20Donahue%7CAnthony%20E.%20Zuiker%7CCarol%20Mendelsohn%7C" + . "Catherine%20Willows%7CDavid%20Hodges%7CDavid%20Phillips%7CGil%20Grissom%7CGreg%20Sanders%7CHodges%7C" + . "Internet%20Movie%20Database%7CJim%20Brass%7CLady%20Heather%7C" + . "Les%20Experts%20(s%C3%A9rie%20t%C3%A9l%C3%A9vis%C3%A9e)%7CLes%20Experts%20:%20Manhattan%7C" + . "Les%20Experts%20:%20Miami%7CListe%20des%20personnages%20des%20Experts%7C" + . "Liste%20des%20%C3%A9pisodes%20des%20Experts%7CMod%C3%A8le%20discussion:Palette%20Les%20Experts%7C" + . "Nick%20Stokes%7CPersonnage%20de%20fiction%7CPersonnage%20fictif%7CPersonnage%20de%20fiction%7C" + . "Personnages%20r%C3%A9currents%20dans%20Les%20Experts%7CRaymond%20Langston%7CRiley%20Adams%7C" + . "Saison%201%20des%20Experts%7CSaison%2010%20des%20Experts%7CSaison%2011%20des%20Experts%7C" + . "Saison%2012%20des%20Experts%7CSaison%202%20des%20Experts%7CSaison%203%20des%20Experts%7C" + . "Saison%204%20des%20Experts%7CSaison%205%20des%20Experts%7CSaison%206%20des%20Experts%7C" + . "Saison%207%20des%20Experts%7CSaison%208%20des%20Experts%7CSaison%209%20des%20Experts%7C" + . "Sara%20Sidle%7CSofia%20Curtis%7CS%C3%A9rie%20t%C3%A9l%C3%A9vis%C3%A9e%7CWallace%20Langham%7C" + . "Warrick%20Brown%7CWendy%20Simms%7C%C3%89tats-Unis" + ); + + $this->canRun = function_exists ( 'mb_check_encoding' ); + + if ( $this->canRun ) { + $this->mDescription = "Benchmark for using a regexp vs. mb_check_encoding to check for UTF-8 encoding."; + mb_internal_encoding( 'UTF-8' ); + } else { + $this->mDescription = "CANNOT RUN benchmark using mb_check_encoding: function not available."; + } + } + + public function execute() { + if ( !$this->canRun ) { + return; + } + $benchmarks = array(); + foreach ($this->data as $val) { + $benchmarks[] = array( + 'function' => array( $this, 'use_regexp' ), + 'args' => array( rawurldecode ( $val ) ) + ); + $benchmarks[] = array( + 'function' => array( $this, 'use_regexp_non_capturing' ), + 'args' => array( rawurldecode ( $val ) ) + ); + $benchmarks[] = array( + 'function' => array( $this, 'use_regexp_once_only' ), + 'args' => array( rawurldecode ( $val ) ) + ); + $benchmarks[] = array( + 'function' => array( $this, 'use_mb_check_encoding' ), + 'args' => array( rawurldecode ( $val ) ) + ); + } + $this->bench( $benchmarks ); + print $this->getFormattedResults(); + } + + private $isutf8; + + function use_regexp( $s ) { + $this->isutf8 = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' . + '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s ); + } + + function use_regexp_non_capturing( $s ) { + // Same as above with a non-capturing subgroup. + $this->isutf8 = preg_match( '/^(?:[\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' . + '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s ); + } + + function use_regexp_once_only( $s ) { + // Same as above with a once-only subgroup. + $this->isutf8 = preg_match( '/^(?>[\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' . + '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s ); + } + + function use_mb_check_encoding( $s ) { + $this->isutf8 = mb_check_encoding( $s, 'UTF-8' ); + } + +} + +$maintClass = 'bench_utf8_title_check'; +require_once( RUN_MAINTENANCE_IF_MAIN ); diff --git a/maintenance/benchmarks/bench_wfIsWindows.php b/maintenance/benchmarks/bench_wfIsWindows.php index 4caebc5e..85439827 100644 --- a/maintenance/benchmarks/bench_wfIsWindows.php +++ b/maintenance/benchmarks/bench_wfIsWindows.php @@ -1,6 +1,8 @@