From c6193558ea1828bbfd4b85a132c09d4f03e58956 Mon Sep 17 00:00:00 2001
From: Domas Mituzas <midom@users.mediawiki.org>
Date: Wed, 7 Jun 2006 20:13:29 +0000
Subject: [PATCH] use microtime(true), properly initialize non-existing arrays
 (avoids warnings :)

---
 includes/ProfilerSimple.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/includes/ProfilerSimple.php b/includes/ProfilerSimple.php
index 930c5451c3..ed058c65cd 100644
--- a/includes/ProfilerSimple.php
+++ b/includes/ProfilerSimple.php
@@ -14,12 +14,17 @@ 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;
@@ -33,7 +38,7 @@ class ProfilerSimple extends Profiler {
 		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) {
@@ -60,10 +65,13 @@ class ProfilerSimple extends Profiler {
 				$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;
@@ -83,9 +91,10 @@ class ProfilerSimple extends Profiler {
 		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);
 	}
-- 
2.20.1