wfTime() -> microtime( true ), no need to use the former which is just a wrapper...
authorAlexandre Emsenhuber <ialex@users.mediawiki.org>
Fri, 3 Feb 2012 08:32:34 +0000 (08:32 +0000)
committerAlexandre Emsenhuber <ialex@users.mediawiki.org>
Fri, 3 Feb 2012 08:32:34 +0000 (08:32 +0000)
includes/GlobalFunctions.php
includes/Wiki.php
includes/WikiPage.php
includes/debug/Debug.php

index 29d4644..a2fa48a 100644 (file)
@@ -1056,8 +1056,7 @@ function wfLogProfilingData() {
 
        // Get total page request time and only show pages that longer than
        // $wgProfileLimit time (default is 0)
-       $now = wfTime();
-       $elapsed = $now - $wgRequestTime;
+       $elapsed = microtime( true ) - $wgRequestTime;
        if ( $elapsed <= $wgProfileLimit ) {
                return;
        }
@@ -1560,8 +1559,7 @@ function wfHostname() {
 function wfReportTime() {
        global $wgRequestTime, $wgShowHostnames;
 
-       $now = wfTime();
-       $elapsed = $now - $wgRequestTime;
+       $elapsed = microtime( true ) - $wgRequestTime;
 
        return $wgShowHostnames
                ? sprintf( '<!-- Served by %s in %01.3f secs. -->', wfHostname(), $elapsed )
index 9154155..86883d9 100644 (file)
@@ -431,9 +431,9 @@ class MediaWiki {
 
                while ( $n-- && false != ( $job = Job::pop() ) ) {
                        $output = $job->toString() . "\n";
-                       $t = -wfTime();
+                       $t = - microtime( true );
                        $success = $job->run();
-                       $t += wfTime();
+                       $t += microtime( true );
                        $t = round( $t * 1000 );
                        if ( !$success ) {
                                $output .= "Error: " . $job->getLastError() . ", Time: $t ms\n";
index 68fd05c..5966299 100644 (file)
@@ -2861,10 +2861,10 @@ class PoolWorkArticleView extends PoolCounterWork {
                        $text = $rev->getText();
                }
 
-               $time = - wfTime();
+               $time = - microtime( true );
                $this->parserOutput = $wgParser->parse( $text, $this->page->getTitle(),
                        $this->parserOptions, true, true, $this->revid );
-               $time += wfTime();
+               $time += microtime( true );
 
                # Timing hack
                if ( $time > 3 ) {
index 616eb56..2f03fee 100644 (file)
@@ -200,7 +200,7 @@ class MWDebug {
                        'function' => $function,
                        'master' => (bool) $isMaster,
                        'time' > 0.0,
-                       '_start' => wfTime(),
+                       '_start' => microtime( true ),
                );
 
                return count( self::$query ) - 1;
@@ -216,7 +216,7 @@ class MWDebug {
                        return;
                }
 
-               self::$query[$id]['time'] = wfTime() - self::$query[$id]['_start'];
+               self::$query[$id]['time'] = microtime( true ) - self::$query[$id]['_start'];
                unset( self::$query[$id]['_start'] );
        }
 
@@ -257,7 +257,7 @@ class MWDebug {
                $debugInfo = array(
                        'mwVersion' => $wgVersion,
                        'phpVersion' => PHP_VERSION,
-                       'time' => wfTime() - $wgRequestTime,
+                       'time' => microtime( true ) - $wgRequestTime,
                        'log' => self::$log,
                        'debugLog' => self::$debug,
                        'queries' => self::$query,