Using a better method to get the English language file.

[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 d96a755..0f2b59a
--- a/includes/ProfilerSimple.php
+++ b/includes/ProfilerSimple.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /**
  * Simple profiler base class
  * @package MediaWiki
@@ -8,18 +8,23 @@
  * @todo document
  * @package MediaWiki
  */
-require_once('Profiling.php');
+require_once(dirname(__FILE__).'/Profiler.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));
+                       $this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
 
                        $elapsedcpu = $this->getCpuTime() - $this->getCpuTime($wgRUstart);
-                       $elapsedreal = $this->getTime() - $this->getTime($wgRequestTime);
+                       $elapsedreal = microtime(true) - $wgRequestTime;
 
                        $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;
+                               
+                       }
                        $entry['cpu'] += $elapsedcpu;
                        $entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
                        $entry['real'] += $elapsedreal;
@@ -30,10 +35,10 @@ class ProfilerSimple extends Profiler {
 
        function profileIn($functionname) {
                global $wgDebugFunctionEntry;
-               if ($wgDebugFunctionEntry && function_exists('wfDebug')) {
-                       wfDebug(str_repeat(' ', count($this->mWorkStack)).'Entering '.$functionname."\n");
+               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), $this->getCpuTime());           
        }
 
        function profileOut($functionname) {
@@ -41,53 +46,68 @@ class ProfilerSimple extends Profiler {
 
                global $wgDebugFunctionEntry;
 
-               if ($wgDebugFunctionEntry && function_exists('wfDebug')) {
-                       wfDebug(str_repeat(' ', count($this->mWorkStack) - 1).'Exiting '.$functionname."\n");
+               if ($wgDebugFunctionEntry) {
+                       $this->debug(str_repeat(' ', count($this->mWorkStack) - 1).'Exiting '.$functionname."\n");
                }
 
                list($ofname,$ocount,$ortime,$octime) = array_pop($this->mWorkStack);
 
                if (!$ofname) {
-                       wfDebug("Profiling error: $functionname\n");
+                       $this->debug("Profiling error: $functionname\n");
                } else {
                        if ($functionname == 'close') {
                                $message = "Profile section ended by close(): {$ofname}";
                                $functionname = $ofname;
-                               wfDebug( "$message\n" );
+                               $this->debug( "$message\n" );
                        }
                        elseif ($ofname != $functionname) {
                                $message = "Profiling error: in({$ofname}), out($functionname)";
-                               wfDebug( "$message\n" );
+                               $this->debug( "$message\n" );
                        }
                        $entry =& $this->mCollated[$functionname];
-                       
                        $elapsedcpu = $this->getCpuTime() - $octime;
-                       $elapsedreal = $this->getTime() - $ortime;
-
+                       $elapsedreal = microtime(true) - $ortime;
+                       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;
                        $entry['real'] += $elapsedreal;
                        $entry['real_sq'] += $elapsedreal*$elapsedreal;
                        $entry['count']++;
-                               
+
                }
        }
 
-       function getFunctionReport() {          
+       function getFunctionReport() {
                /* 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 ( function_exists( 'getrusage' ) ) {
+                       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);
+               } else {
+                       return 0;
+               }
        }
 
+       /* 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);
        }
+
+       function debug( $s ) {
+               if (function_exists( 'wfDebug' ) ) {
+                       wfDebug( $s );
+               }
+       }
 }
 ?>