Spaces to tabs

[lhc/web/wiklou.git] / includes / ProfilerSimple.php

diff --git a/includes/ProfilerSimple.php b/includes/ProfilerSimple.php
index d5bdaf9..8aab1ec 100644 (file)
--- a/includes/ProfilerSimple.php
+++ b/includes/ProfilerSimple.php
@@ -1,20 +1,24 @@
 <?php
 /**
- * Simple profiler base class
- * @package MediaWiki
+ * @file
+ * @ingroup Profiler
  */
 
+if ( !class_exists( 'Profiler' ) ) {
+       require_once(dirname(__FILE__).'/Profiler.php');
+}
+
 /**
- * @todo document
- * @package MediaWiki
+ * Simple profiler base class.
+ * @todo document methods (?)
+ * @ingroup Profiler
  */
-require_once(dirname(__FILE__).'/Profiler.php');
-
 class ProfilerSimple extends Profiler {
        var $mMinimumTime = 0;
+       var $mProfileID = false;
 
-       function ProfilerSimple() {
-               global $wgRequestTime,$wgRUstart;
+       function __construct() {
+               global $wgRequestTime, $wgRUstart;
                if (!empty($wgRequestTime) && !empty($wgRUstart)) {
                        $this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
 
@@ -24,8 +28,7 @@ class ProfilerSimple extends Profiler {
                        $entry =& $this->mCollated["-setup"];
                        if (!is_array($entry)) {
                                $entry = array('cpu'=> 0.0, 'cpu_sq' => 0.0, 'real' => 0.0, 'real_sq' => 0.0, 'count' => 0);
-                               $this->mCollated[$functionname] =& $entry;
-                               
+                               $this->mCollated["-setup"] =& $entry;
                        }
                        $entry['cpu'] += $elapsedcpu;
                        $entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
@@ -39,24 +42,34 @@ class ProfilerSimple extends Profiler {
                $this->mMinimumTime = $min;
        }
 
+       function setProfileID( $id ) {
+               $this->mProfileID = $id;
+       }
+
+       function getProfileID() {
+               if ( $this->mProfileID === false ) {
+                       return wfWikiID();
+               } else {
+                       return $this->mProfileID;
+               }
+       }
+
        function profileIn($functionname) {
                global $wgDebugFunctionEntry;
                if ($wgDebugFunctionEntry) {
                        $this->debug(str_repeat(' ', count($this->mWorkStack)).'Entering '.$functionname."\n");
                }
-               $this->mWorkStack[] = array($functionname, count( $this->mWorkStack ), microtime(true), $this->getCpuTime());           
+               $this->mWorkStack[] = array($functionname, count( $this->mWorkStack ), microtime(true), $this->getCpuTime());
        }
 
        function profileOut($functionname) {
-               $memory = memory_get_usage();
-
                global $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) {
                        $this->debug("Profiling error: $functionname\n");
@@ -65,10 +78,14 @@ class ProfilerSimple extends Profiler {
                                $message = "Profile section ended by close(): {$ofname}";
                                $functionname = $ofname;
                                $this->debug( "$message\n" );
+                               $this->mCollated[$message] = array(
+                                       'real' => 0.0, 'count' => 1);
                        }
                        elseif ($ofname != $functionname) {
                                $message = "Profiling error: in({$ofname}), out($functionname)";
                                $this->debug( "$message\n" );
+                               $this->mCollated[$message] = array(
+                                       'real' => 0.0, 'count' => 1);
                        }
                        $entry =& $this->mCollated[$functionname];
                        $elapsedcpu = $this->getCpuTime() - $octime;
@@ -76,7 +93,6 @@ class ProfilerSimple extends Profiler {
                        if (!is_array($entry)) {
                                $entry = array('cpu'=> 0.0, 'cpu_sq' => 0.0, 'real' => 0.0, 'real_sq' => 0.0, 'count' => 0);
                                $this->mCollated[$functionname] =& $entry;
-                               
                        }
                        $entry['cpu'] += $elapsedcpu;
                        $entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
@@ -93,9 +109,10 @@ class ProfilerSimple extends Profiler {
 
        function getCpuTime($ru=null) {
                if ( function_exists( 'getrusage' ) ) {
-                       if ( $ru == null )
+                       if ( $ru == null ) {
                                $ru = getrusage();
-                       return ($ru['ru_utime.tv_sec'] + $ru['ru_stime.tv_sec'] + ($ru['ru_utime.tv_usec'] + 
+                       }
+                       return ($ru['ru_utime.tv_sec'] + $ru['ru_stime.tv_sec'] + ($ru['ru_utime.tv_usec'] +
                                $ru['ru_stime.tv_usec']) * 1e-6);
                } else {
                        return 0;
@@ -104,16 +121,10 @@ class ProfilerSimple extends Profiler {
 
        /* If argument is passed, it assumes that it is dual-format time string, returns proper float time value */
        function getTime($time=null) {
-               if ($time==null)
+               if ($time==null) {
                        return microtime(true);
+               }
                list($a,$b)=explode(" ",$time);
                return (float)($a+$b);
        }
-
-       function debug( $s ) {
-               if (function_exists( 'wfDebug' ) ) {
-                       wfDebug( $s );
-               }
-       }
 }
-?>