[MediaWiki-commits] [Gerrit] mediawiki/core[master]: benchmarks: Minor clean up
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349121 )
Change subject: benchmarks: Minor clean up
..
benchmarks: Minor clean up
Change-Id: I446ae1a9d9cdb6b26a6bb62367a432cea082f343
---
M maintenance/benchmarks/Benchmarker.php
M maintenance/benchmarks/bench_HTTP_HTTPS.php
M maintenance/benchmarks/bench_Wikimedia_base_convert.php
M maintenance/benchmarks/bench_delete_truncate.php
M maintenance/benchmarks/bench_if_switch.php
M maintenance/benchmarks/bench_strtr_str_replace.php
M maintenance/benchmarks/bench_utf8_title_check.php
M maintenance/benchmarks/bench_wfIsWindows.php
8 files changed, 30 insertions(+), 30 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/benchmarks/Benchmarker.php
b/maintenance/benchmarks/Benchmarker.php
index 5fab082..70dc1f4 100644
--- a/maintenance/benchmarks/Benchmarker.php
+++ b/maintenance/benchmarks/Benchmarker.php
@@ -38,7 +38,7 @@
public function __construct() {
parent::__construct();
- $this->addOption( 'count', "How many times to run a benchmark",
false, true );
+ $this->addOption( 'count', 'How many times to run a benchmark',
false, true );
}
public function bench( array $benchs ) {
@@ -68,7 +68,7 @@
'function' => $bench['function'],
'arguments' => $bench['args'],
'count' => $count,
- 'delta' => $delta,
+ 'total' => $delta,
'average' => $delta / $count,
];
}
@@ -89,9 +89,9 @@
$res['function'],
implode( ', ', $res['arguments'] )
);
- $ret .= sprintf( " %6.2fms (%6.2fms each)\n",
- $res['delta'] * 1000,
- $res['average'] * 1000
+ $ret .= sprintf( " %6.2fms (%6.4fms each)\n",
+ $res['total'] * 1e3,
+ $res['average'] * 1e3
);
}
diff --git a/maintenance/benchmarks/bench_HTTP_HTTPS.php
b/maintenance/benchmarks/bench_HTTP_HTTPS.php
index 5b64bee..1be50bd 100644
--- a/maintenance/benchmarks/bench_HTTP_HTTPS.php
+++ b/maintenance/benchmarks/bench_HTTP_HTTPS.php
@@ -42,20 +42,20 @@
[ 'function' => [ $this, 'getHTTP' ] ],
[ 'function' => [ $this, 'getHTTPS' ] ],
] );
- print $this->getFormattedResults();
+ $this->output( $this->getFormattedResults() );
}
- static function doRequest( $proto ) {
+ private function doRequest( $proto ) {
Http::get( "$proto://localhost/", [], __METHOD__ );
}
// bench function 1
- function getHTTP() {
+ protected function getHTTP() {
$this->doRequest( 'http' );
}
// bench function 2
- function getHTTPS() {
+ protected function getHTTPS() {
$this->doRequest( 'https' );
}
}
diff --git a/maintenance/benchmarks/bench_Wikimedia_base_convert.php
b/maintenance/benchmarks/bench_Wikimedia_base_convert.php
index c8a9055..bc83a24 100644
--- a/maintenance/benchmarks/bench_Wikimedia_base_convert.php
+++ b/maintenance/benchmarks/bench_Wikimedia_base_convert.php
@@ -65,8 +65,8 @@
}
protected static function makeRandomNumber( $base, $length ) {
- $baseChars = "0123456789abcdefghijklmnopqrstuvwxyz";
- $res = "";
+ $baseChars = '0123456789abcdefghijklmnopqrstuvwxyz';
+ $res = '';
for ( $i = 0; $i < $length; $i++ ) {
$res .= $baseChars[mt_rand( 0, $base - 1 )];
}
diff --git a/maintenance/benchmarks/bench_delete_truncate.php
b/maintenance/benchmarks/bench_delete_truncate.php
index 2369d99..042f8bd 100644
--- a/maintenance/benchmarks/bench_delete_truncate.php
+++ b/maintenance/benchmarks/bench_delete_truncate.php
@@ -102,5 +102,5 @@
}
}
-$maintClass = "BenchmarkDeleteTruncate";
+$maintClass = 'BenchmarkDeleteTruncate';
require_once RUN_MAINTENANCE_IF_MAIN;
diff --git a/maintenance/benchmarks/bench_if_switch.php
b/maintenance/benchmarks/bench_if_switch.php
index 46c9d39..32c3932 100644
--- a/maintenance/benchmarks/bench_if_switch.php
+++ b/maintenance/benchmarks/bench_if_switch.php
@@ -42,11 +42,11 @@
[ 'function' => [ $this, 'doElseIf' ] ],
[ 'function' => [ $this, 'doSwitch' ] ],
] );
- print $this->getFormattedResults();
+ $this->output(
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: benchmarks: Minor clean up
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/349121 )
Change subject: benchmarks: Minor clean up
..
benchmarks: Minor clean up
Change-Id: I446ae1a9d9cdb6b26a6bb62367a432cea082f343
---
M maintenance/benchmarks/Benchmarker.php
M maintenance/benchmarks/bench_HTTP_HTTPS.php
M maintenance/benchmarks/bench_Wikimedia_base_convert.php
M maintenance/benchmarks/bench_delete_truncate.php
M maintenance/benchmarks/bench_if_switch.php
M maintenance/benchmarks/bench_strtr_str_replace.php
M maintenance/benchmarks/bench_utf8_title_check.php
M maintenance/benchmarks/bench_wfIsWindows.php
8 files changed, 30 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/21/349121/1
diff --git a/maintenance/benchmarks/Benchmarker.php
b/maintenance/benchmarks/Benchmarker.php
index 5fab082..70dc1f4 100644
--- a/maintenance/benchmarks/Benchmarker.php
+++ b/maintenance/benchmarks/Benchmarker.php
@@ -38,7 +38,7 @@
public function __construct() {
parent::__construct();
- $this->addOption( 'count', "How many times to run a benchmark",
false, true );
+ $this->addOption( 'count', 'How many times to run a benchmark',
false, true );
}
public function bench( array $benchs ) {
@@ -68,7 +68,7 @@
'function' => $bench['function'],
'arguments' => $bench['args'],
'count' => $count,
- 'delta' => $delta,
+ 'total' => $delta,
'average' => $delta / $count,
];
}
@@ -89,9 +89,9 @@
$res['function'],
implode( ', ', $res['arguments'] )
);
- $ret .= sprintf( " %6.2fms (%6.2fms each)\n",
- $res['delta'] * 1000,
- $res['average'] * 1000
+ $ret .= sprintf( " %6.2fms (%6.4fms each)\n",
+ $res['total'] * 1e3,
+ $res['average'] * 1e3
);
}
diff --git a/maintenance/benchmarks/bench_HTTP_HTTPS.php
b/maintenance/benchmarks/bench_HTTP_HTTPS.php
index 5b64bee..1be50bd 100644
--- a/maintenance/benchmarks/bench_HTTP_HTTPS.php
+++ b/maintenance/benchmarks/bench_HTTP_HTTPS.php
@@ -42,20 +42,20 @@
[ 'function' => [ $this, 'getHTTP' ] ],
[ 'function' => [ $this, 'getHTTPS' ] ],
] );
- print $this->getFormattedResults();
+ $this->output( $this->getFormattedResults() );
}
- static function doRequest( $proto ) {
+ private function doRequest( $proto ) {
Http::get( "$proto://localhost/", [], __METHOD__ );
}
// bench function 1
- function getHTTP() {
+ protected function getHTTP() {
$this->doRequest( 'http' );
}
// bench function 2
- function getHTTPS() {
+ protected function getHTTPS() {
$this->doRequest( 'https' );
}
}
diff --git a/maintenance/benchmarks/bench_Wikimedia_base_convert.php
b/maintenance/benchmarks/bench_Wikimedia_base_convert.php
index c8a9055..bc83a24 100644
--- a/maintenance/benchmarks/bench_Wikimedia_base_convert.php
+++ b/maintenance/benchmarks/bench_Wikimedia_base_convert.php
@@ -65,8 +65,8 @@
}
protected static function makeRandomNumber( $base, $length ) {
- $baseChars = "0123456789abcdefghijklmnopqrstuvwxyz";
- $res = "";
+ $baseChars = '0123456789abcdefghijklmnopqrstuvwxyz';
+ $res = '';
for ( $i = 0; $i < $length; $i++ ) {
$res .= $baseChars[mt_rand( 0, $base - 1 )];
}
diff --git a/maintenance/benchmarks/bench_delete_truncate.php
b/maintenance/benchmarks/bench_delete_truncate.php
index 2369d99..042f8bd 100644
--- a/maintenance/benchmarks/bench_delete_truncate.php
+++ b/maintenance/benchmarks/bench_delete_truncate.php
@@ -102,5 +102,5 @@
}
}
-$maintClass = "BenchmarkDeleteTruncate";
+$maintClass = 'BenchmarkDeleteTruncate';
require_once RUN_MAINTENANCE_IF_MAIN;
diff --git a/maintenance/benchmarks/bench_if_switch.php
b/maintenance/benchmarks/bench_if_switch.php
index 46c9d39..32c3932 100644
--- a/maintenance/benchmarks/bench_if_switch.php
+++ b/maintenance/benchmarks/bench_if_switch.php
@@ -42,11 +42,11 @@
[ 'function' => [ $this, 'doElseIf' ] ],
[ 'function' => [ $this, 'doSwitch' ] ],
] );
- print $this->getFormattedResults();
+ $this->output(
