Update formatting in maintenance/ (1/4)

[lhc/web/wiklou.git] / maintenance / benchmarks / Benchmarker.php

diff --git a/maintenance/benchmarks/Benchmarker.php b/maintenance/benchmarks/Benchmarker.php
index 9901b37..3f8a899 100644 (file)
--- a/maintenance/benchmarks/Benchmarker.php
+++ b/maintenance/benchmarks/Benchmarker.php
@@ -27,7 +27,7 @@
  * @ingroup Benchmark
  */
 
-require_once( __DIR__ . '/../Maintenance.php' );
+require_once __DIR__ . '/../Maintenance.php';
 
 /**
  * Base class for benchmark scripts.
@@ -46,38 +46,38 @@ abstract class Benchmarker extends Maintenance {
                $bench_number = 0;
                $count = $this->getOption( 'count', 100 );
 
-               foreach( $benchs as $bench ) {
+               foreach ( $benchs as $bench ) {
                        // handle empty args
-                       if(!array_key_exists( 'args', $bench )) {
+                       if ( !array_key_exists( 'args', $bench ) ) {
                                $bench['args'] = array();
                        }
 
                        $bench_number++;
-                       $start = wfTime();
-                       for( $i=0; $i<$count; $i++ ) {
+                       $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'] ) ) {
-                               $ret = get_class( $bench['function'][0] ). '->' . $bench['function'][1];
+                       if ( is_array( $bench['function'] ) ) {
+                               $ret = get_class( $bench['function'][0] ) . '->' . $bench['function'][1];
                                $bench['function'] = $ret;
                        }
 
                        $this->results[$bench_number] = array(
-                               'function'  => $bench['function'],
+                               'function' => $bench['function'],
                                'arguments' => $bench['args'],
-                               'count'     => $count,
-                               'delta'     => $delta,
-                               'average'   => $delta / $count,
-                               );
+                               'count' => $count,
+                               'delta' => $delta,
+                               'average' => $delta / $count,
+                       );
                }
        }
 
-       public function getFormattedResults( ) {
+       public function getFormattedResults() {
                $ret = '';
-               foreach( $this->results as $res ) {
+               foreach ( $this->results as $res ) {
                        // show function with args
                        $ret .= sprintf( "%s times: function %s(%s) :\n",
                                $res['count'],
@@ -85,10 +85,11 @@ abstract class Benchmarker extends Maintenance {
                                join( ', ', $res['arguments'] )
                        );
                        $ret .= sprintf( "   %6.2fms (%6.2fms each)\n",
-                               $res['delta']   * 1000,
+                               $res['delta'] * 1000,
                                $res['average'] * 1000
                        );
                }
+
                return $ret;
        }
 }