X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FProfilerSimple.php;h=5989061dcdba7ede9d03b443842bf8f6ca5e452c;hb=cec03907dfcfa8d4fd03e5746e22e66c0fb638d3;hp=d96a755b32ac14843a3c7e277006f1c9543e98c3;hpb=e6a511848ab311c50b591d73d4df6440551392ce;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ProfilerSimple.php b/includes/ProfilerSimple.php
old mode 100755
new mode 100644
index d96a755b32..5989061dcd
--- a/includes/ProfilerSimple.php
+++ b/includes/ProfilerSimple.php
@@ -1,25 +1,35 @@
-<?php 
+<?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('Profiling.php');
-
 class ProfilerSimple extends Profiler {
-	function ProfilerSimple() {
-		global $wgRequestTime,$wgRUstart;
+	var $mMinimumTime = 0;
+	var $mProfileID = false;
+
+	function __construct() {
+		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["-setup"] =& $entry;
+			}
 			$entry['cpu'] += $elapsedcpu;
 			$entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
 			$entry['real'] += $elapsedreal;
@@ -28,66 +38,91 @@ class ProfilerSimple extends Profiler {
 		}
 	}
 
+	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 && 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) {
-		$memory = memory_get_usage();
-
 		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);
+		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" );
+				$this->mCollated[$message] = array(
+					'real' => 0.0, 'count' => 1);
 			}
 			elseif ($ofname != $functionname) {
 				$message = "Profiling error: in({$ofname}), out($functionname)";
-				wfDebug( "$message\n" );
+				$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;
-
+			$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);
 	}
 }
-?>