* Add wfReadOnlyReason() to supply the reason for the wiki being read only. Use it...

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

diff --git a/includes/ProfilerSimple.php b/includes/ProfilerSimple.php
index 2d0d01b..20ab99c 100644 (file)
--- a/includes/ProfilerSimple.php
+++ b/includes/ProfilerSimple.php
@@ -1,20 +1,17 @@
 <?php
-/**
- * Simple profiler base class
- * @package MediaWiki
- */
 
-/**
- * @todo document
- * @package MediaWiki
- */
 require_once(dirname(__FILE__).'/Profiler.php');
 
+/**
+ * Simple profiler base class.
+ * @todo document methods (?)
+ * @addtogroup Profiler
+ */
 class ProfilerSimple extends Profiler {
        var $mMinimumTime = 0;
        var $mProfileID = false;
 
-       function ProfilerSimple() {
+       function __construct() {
                global $wgRequestTime,$wgRUstart;
                if (!empty($wgRequestTime) && !empty($wgRUstart)) {
                        $this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
@@ -25,8 +22,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;
@@ -57,19 +53,17 @@ class ProfilerSimple extends Profiler {
                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");
@@ -78,10 +72,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;
@@ -89,7 +87,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;
@@ -129,4 +126,4 @@ class ProfilerSimple extends Profiler {
                }
        }
 }
-?>
+