MediaWiki 1.17.0

[autoinstalls/mediawiki.git] / includes / ProfilerSimpleTrace.php

diff --git a/includes/ProfilerSimpleTrace.php b/includes/ProfilerSimpleTrace.php
index 631192288ccfe8a76c01e88d6dd9d870d16769a4..8f6a2a1ca6ee411d01235beed1fd771a46c5d4b6 100644 (file)
--- a/includes/ProfilerSimpleTrace.php
+++ b/includes/ProfilerSimpleTrace.php
@@ -21,50 +21,48 @@ class ProfilerSimpleTrace extends ProfilerSimple {
 
        function __construct() {
                global $wgRequestTime, $wgRUstart;
-               if (!empty($wgRequestTime) && !empty($wgRUstart)) {
-                       $this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
-                       $elapsedcpu = $this->getCpuTime() - $this->getCpuTime($wgRUstart);
-                       $elapsedreal = microtime(true) - $wgRequestTime;
+               if ( !empty( $wgRequestTime ) && !empty( $wgRUstart ) ) {
+                       $this->mWorkStack[] = array( '-total', 0, $wgRequestTime, $this->getCpuTime( $wgRUstart ) );
                }
                $this->trace .= "Beginning trace: \n";
        }
 
        function profileIn($functionname) {
-               global $wgDebugFunctionEntry;
                $this->mWorkStack[] = array($functionname, count( $this->mWorkStack ), microtime(true), $this->getCpuTime());
-               $this->trace .= "         " . sprintf("%6.1f",$this->memoryDiff()) . str_repeat( " ", count($this->mWorkStack)) . " > " . $functionname . "\n";
+               $this->trace .= "         " . sprintf("%6.1f",$this->memoryDiff()) .
+                               str_repeat( " ", count($this->mWorkStack)) . " > " . $functionname . "\n";
        }
 
        function profileOut($functionname) {
                global $wgDebugFunctionEntry;
 
-               if ($wgDebugFunctionEntry) {
+               if ( $wgDebugFunctionEntry ) {
                        $this->debug(str_repeat(' ', count($this->mWorkStack) - 1).'Exiting '.$functionname."\n");
                }
 
-               list($ofname, /* $ocount */ ,$ortime,$octime) = array_pop($this->mWorkStack);
+               list( $ofname, /* $ocount */ , $ortime, $octime ) = array_pop( $this->mWorkStack );
 
-               if (!$ofname) {
+               if ( !$ofname ) {
                        $this->trace .= "Profiling error: $functionname\n";
                } else {
-                       if ($functionname == 'close') {
+                       if ( $functionname == 'close' ) {
                                $message = "Profile section ended by close(): {$ofname}";
                                $functionname = $ofname;
                                $this->trace .= $message . "\n";
                        }
-                       elseif ($ofname != $functionname) {
-                               $self->trace .= "Profiling error: in({$ofname}), out($functionname)";
+                       elseif ( $ofname != $functionname ) {
+                               $this->trace .= "Profiling error: in({$ofname}), out($functionname)";
                        }
-                       $elapsedcpu = $this->getCpuTime() - $octime;
-                       $elapsedreal = microtime(true) - $ortime;
-                       $this->trace .= sprintf("%03.6f %6.1f",$elapsedreal,$this->memoryDiff()) .  str_repeat(" ",count($this->mWorkStack)+1) . " < " . $functionname . "\n";
+                       $elapsedreal = microtime( true ) - $ortime;
+                       $this->trace .= sprintf( "%03.6f %6.1f", $elapsedreal, $this->memoryDiff() ) .
+                                       str_repeat(" ", count( $this->mWorkStack ) + 1 ) . " < " . $functionname . "\n";
                }
        }
        
        function memoryDiff() {
                $diff = memory_get_usage() - $this->memory;
                $this->memory = memory_get_usage();
-               return $diff/1024;
+               return $diff / 1024;
        }
 
        function getOutput() {