Merge "Localisation updates from http://translatewiki.net."

[lhc/web/wiklou.git] / includes / profiler / ProfilerSimpleTrace.php

diff --git a/includes/profiler/ProfilerSimpleTrace.php b/includes/profiler/ProfilerSimpleTrace.php
index b187623..f14139e 100644 (file)
--- a/includes/profiler/ProfilerSimpleTrace.php
+++ b/includes/profiler/ProfilerSimpleTrace.php
@@ -1,34 +1,37 @@
 <?php
 /**
+ * Profiler showing execution trace.
+ *
+ * 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 Profiler
  */
 
-if ( !class_exists( 'ProfilerSimple' ) ) {
-       require_once( dirname( __FILE__ ) . '/ProfilerSimple.php' );
-}
-
 /**
  * Execution trace
  * @todo document methods (?)
  * @ingroup Profiler
  */
 class ProfilerSimpleTrace extends ProfilerSimple {
-       var $mMinimumTime = 0;
-       var $mProfileID = false;
-       var $trace = "";
+       var $trace = "Beginning trace: \n";
        var $memory = 0;
 
-       function __construct() {
-               global $wgRequestTime, $wgRUstart;
-               if ( !empty( $wgRequestTime ) && !empty( $wgRUstart ) ) {
-                       $this->mWorkStack[] = array( '-total', 0, $wgRequestTime, $this->getCpuTime( $wgRUstart ) );
-               }
-               $this->trace .= "Beginning trace: \n";
-       }
-
-       function profileIn($functionname) {
-               $this->mWorkStack[] = array($functionname, count( $this->mWorkStack ), microtime(true), $this->getCpuTime());
+       function profileIn( $functionname ) {
+               parent::profileIn( $functionname );
                $this->trace .= "         " . sprintf("%6.1f",$this->memoryDiff()) .
                                str_repeat( " ", count($this->mWorkStack)) . " > " . $functionname . "\n";
        }
@@ -40,7 +43,7 @@ class ProfilerSimpleTrace extends ProfilerSimple {
                        $this->debug(str_repeat(' ', count($this->mWorkStack) - 1).'Exiting '.$functionname."\n");
                }
 
-               list( $ofname, /* $ocount */ , $ortime, $octime ) = array_pop( $this->mWorkStack );
+               list( $ofname, /* $ocount */ , $ortime ) = array_pop( $this->mWorkStack );
 
                if ( !$ofname ) {
                        $this->trace .= "Profiling error: $functionname\n";
@@ -53,7 +56,7 @@ class ProfilerSimpleTrace extends ProfilerSimple {
                        elseif ( $ofname != $functionname ) {
                                $this->trace .= "Profiling error: in({$ofname}), out($functionname)";
                        }
-                       $elapsedreal = microtime( true ) - $ortime;
+                       $elapsedreal = $this->getTime() - $ortime;
                        $this->trace .= sprintf( "%03.6f %6.1f", $elapsedreal, $this->memoryDiff() ) .
                                        str_repeat(" ", count( $this->mWorkStack ) + 1 ) . " < " . $functionname . "\n";
                }
@@ -65,7 +68,7 @@ class ProfilerSimpleTrace extends ProfilerSimple {
                return $diff / 1024;
        }
 
-       function getOutput() {
+       function logData() {
                print "<!-- \n {$this->trace} \n -->";
        }
 }