Clarifying unorthodox MIME type

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

diff --git a/includes/ProfilerSimple.php b/includes/ProfilerSimple.php
old mode 100755 (executable)
new mode 100644 (file)
index 930c545..07cc149
--- a/includes/ProfilerSimple.php
+++ b/includes/ProfilerSimple.php
@@ -1,51 +1,65 @@
 <?php
-/**
- * Simple profiler base class
- * @package MediaWiki
- */
+
+require_once(dirname(__FILE__).'/Profiler.php');
 
 /**
- * @todo document
- * @package MediaWiki
+ * Simple profiler base class.
+ * @todo document methods (?)
+ * @addtogroup Profiler
  */
-require_once(dirname(__FILE__).'/Profiling.php');
-
 class ProfilerSimple extends Profiler {
-       function ProfilerSimple() {
-               global $wgRequestTime,$wgRUstart;
-               if (!empty($wgRequestTime) && !empty($wgRUstart)) {
-                       $this->mWorkStack[] = array( '-total', 0, $this->getTime($wgRequestTime),$this->getCpuTime($wgRUstart));
+       var $mMinimumTime = 0;
+       var $mProfileID = false;
+
+       function __construct() {
+               global $wgRequestTime;
+               if (!empty($wgRequestTime)) {
+                       $this->mWorkStack[] = array( '-total', 0, $wgRequestTime);
 
-                       $elapsedcpu = $this->getCpuTime() - $this->getCpuTime($wgRUstart);
-                       $elapsedreal = $this->getTime() - $this->getTime($wgRequestTime);
+                       $elapsedreal = microtime(true) - $wgRequestTime;
 
                        $entry =& $this->mCollated["-setup"];
-                       $entry['cpu'] += $elapsedcpu;
-                       $entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
+                       if (!is_array($entry)) {
+                               $entry = array('real' => 0.0, 'count' => 0);
+                               $this->mCollated["-setup"] =& $entry;
+                       }
                        $entry['real'] += $elapsedreal;
-                       $entry['real_sq'] += $elapsedreal*$elapsedreal;
                        $entry['count']++;
                }
        }
 
+       function setMinimum( $min ) {
+               $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 ), $this->getTime(), $this->getCpuTime());
+               $this->mWorkStack[] = array($functionname, count( $this->mWorkStack),microtime(true));
        }
 
        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) = array_pop($this->mWorkStack);
 
                if (!$ofname) {
                        $this->debug("Profiling error: $functionname\n");
@@ -54,20 +68,22 @@ 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;
-                       $elapsedreal = $this->getTime() - $ortime;
-
-                       $entry['cpu'] += $elapsedcpu;
-                       $entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
+                       $elapsedreal = microtime(true) - $ortime;
+                       if (!is_array($entry)) {
+                               $entry = array('real' => 0.0, 'count' => 0);
+                               $this->mCollated[$functionname] =& $entry;
+                       }
                        $entry['real'] += $elapsedreal;
-                       $entry['real_sq'] += $elapsedreal*$elapsedreal;
                        $entry['count']++;
 
                }
@@ -77,15 +93,10 @@ class ProfilerSimple extends Profiler {
                /* Implement in output subclasses */
        }
 
-       function getCpuTime($ru=null) {
-               if ($ru==null)
-                       $ru=getrusage();
-               return ($ru['ru_utime.tv_sec']+$ru['ru_stime.tv_sec']+($ru['ru_utime.tv_usec']+$ru['ru_stime.tv_usec'])*1e-6);
-       }
-
+       /* 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)
-                       $time=microtime();
+                       return microtime(true);
                list($a,$b)=explode(" ",$time);
                return (float)($a+$b);
        }
@@ -96,4 +107,4 @@ class ProfilerSimple extends Profiler {
                }
        }
 }
-?>
+