benchmarks: Minor cleanup for strtr benchmark

Only bench with variable input ("indirect"). The static string is
too unrealistic and not worth testing for imho, if it even makes
a difference at all.

Also bump the default count from 100 to 10,000 given it's so tiny.

Change-Id: Iccc35af4bd3c5b0967983ddfacd1d4ead235e4a4

diff --git a/autoload.php b/autoload.php
index 999d82d..1d61381 100644 (file)
--- a/autoload.php
+++ b/autoload.php
@@ -187,7 +187,6 @@ $wgAutoloadLocalClasses = [
        'BcryptPassword' => __DIR__ . '/includes/password/BcryptPassword.php',
        'BenchHttpHttps' => __DIR__ . '/maintenance/benchmarks/bench_HTTP_HTTPS.php',
        'BenchIfSwitch' => __DIR__ . '/maintenance/benchmarks/bench_if_switch.php',
-       'BenchStrtrStrReplace' => __DIR__ . '/maintenance/benchmarks/bench_strtr_str_replace.php',
        'BenchUtf8TitleCheck' => __DIR__ . '/maintenance/benchmarks/bench_utf8_title_check.php',
        'BenchWfIsWindows' => __DIR__ . '/maintenance/benchmarks/bench_wfIsWindows.php',
        'BenchWikimediaBaseConvert' => __DIR__ . '/maintenance/benchmarks/bench_Wikimedia_base_convert.php',
@@ -200,6 +199,7 @@ $wgAutoloadLocalClasses = [
        'BenchmarkParse' => __DIR__ . '/maintenance/benchmarks/benchmarkParse.php',
        'BenchmarkPurge' => __DIR__ . '/maintenance/benchmarks/benchmarkPurge.php',
        'BenchmarkSanitizer' => __DIR__ . '/maintenance/benchmarks/benchmarkSanitizer.php',
+       'BenchmarkStringReplacement' => __DIR__ . '/maintenance/benchmarks/benchmarkStringReplacement.php',
        'BenchmarkTidy' => __DIR__ . '/maintenance/benchmarks/benchmarkTidy.php',
        'BenchmarkTitleValue' => __DIR__ . '/maintenance/benchmarks/benchmarkTitleValue.php',
        'Benchmarker' => __DIR__ . '/maintenance/benchmarks/Benchmarker.php',

diff --git a/maintenance/benchmarks/bench_strtr_str_replace.php b/maintenance/benchmarks/bench_strtr_str_replace.php
deleted file mode 100644 (file)
index 2c065f6..0000000
--- a/maintenance/benchmarks/bench_strtr_str_replace.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Benchmark for strtr() vs str_replace().
- *
- * This come from r75429 message.
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Benchmark
- */
-
-require_once __DIR__ . '/Benchmarker.php';
-
-function bfNormalizeTitleStrTr( $str ) {
-       return strtr( $str, '_', ' ' );
-}
-
-function bfNormalizeTitleStrReplace( $str ) {
-       return str_replace( '_', ' ', $str );
-}
-
-/**
- * Maintenance script that benchmarks for strtr() vs str_replace().
- *
- * @ingroup Benchmark
- */
-class BenchStrtrStrReplace extends Benchmarker {
-       public function __construct() {
-               parent::__construct();
-               $this->addDescription( 'Benchmark for strtr() vs str_replace().' );
-       }
-
-       public function execute() {
-               $this->bench( [
-                       [ 'function' => [ $this, 'benchstrtr' ] ],
-                       [ 'function' => [ $this, 'benchstr_replace' ] ],
-                       [ 'function' => [ $this, 'benchstrtr_indirect' ] ],
-                       [ 'function' => [ $this, 'benchstr_replace_indirect' ] ],
-               ] );
-       }
-
-       protected function benchstrtr() {
-               strtr( "[[MediaWiki:Some_random_test_page]]", "_", " " );
-       }
-
-       protected function benchstr_replace() {
-               str_replace( "_", " ", "[[MediaWiki:Some_random_test_page]]" );
-       }
-
-       protected function benchstrtr_indirect() {
-               bfNormalizeTitleStrTr( "[[MediaWiki:Some_random_test_page]]" );
-       }
-
-       protected function benchstr_replace_indirect() {
-               bfNormalizeTitleStrReplace( "[[MediaWiki:Some_random_test_page]]" );
-       }
-}
-
-$maintClass = BenchStrtrStrReplace::class;
-require_once RUN_MAINTENANCE_IF_MAIN;

diff --git a/maintenance/benchmarks/benchmarkStringReplacement.php b/maintenance/benchmarks/benchmarkStringReplacement.php
new file mode 100644 (file)
index 0000000..6db024c
--- /dev/null
+++ b/maintenance/benchmarks/benchmarkStringReplacement.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Benchmark
+ */
+
+require_once __DIR__ . '/Benchmarker.php';
+
+/**
+ * Maintenance script that benchmarks string replacement methods.
+ *
+ * @ingroup Benchmark
+ */
+class BenchmarkStringReplacement extends Benchmarker {
+       protected $defaultCount = 10000;
+       private $input = 'MediaWiki:Some_random_test_page';
+
+       public function __construct() {
+               parent::__construct();
+               $this->addDescription( 'Benchmark for string replacement methods.' );
+       }
+
+       public function execute() {
+               $this->bench( [
+                       'strtr' => [ $this, 'bench_strtr' ],
+                       'str_replace' => [ $this, 'bench_str_replace' ],
+               ] );
+       }
+
+       protected function bench_strtr() {
+               strtr( $this->input, "_", " " );
+       }
+
+       protected function bench_str_replace() {
+               str_replace( "_", " ", $this->input );
+       }
+}
+
+$maintClass = BenchmarkStringReplacement::class;
+require_once RUN_MAINTENANCE_IF_MAIN;