From: Domas Mituzas <midom@users.mediawiki.org>
Date: Sat, 12 Jan 2008 17:32:21 +0000 (+0000)
Subject: aaaAAAAAAAAAaaaaaAAAAAAAAAAaaaaaaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaaaaaaAAAAAAAAAAAAAAAAA... 
X-Git-Tag: 1.31.0-rc.0~50045
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=db50ad8f74bda276d21effd6285334e0fbe2c9de;p=lhc%2Fweb%2Fwiklou.git

aaaAAAAAAAAAaaaaaAAAAAAAAAAaaaaaaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaaaaaaAAAAAAAAAAAAAAAAAAAaaaaaaaAAAAAAAAAaaaaaAAAAAAAAAAAAAAAAAAAAAAAAaaaaaaaaaaaaaaaaaaaaaaAAAAAAAAAAAAAAAAAAAaaaaaaAAAAAAAAAAAAAAAAAAAaaaaaaaAAAAAAAAAaaaaaAAAAAAAAAAAAAAAAAAAAAAAAaaaaaaaaaaaaaaaaaaaaaaAAAAAAAAAAAAAAAAAAAaaaaaaAAAAAAAAAAAAAAAAAAAaaaaaaaAAAAAAAAAaaaaaAAAAAAAAAAAAAAAAAAAAAAAAaaaaaaaaaaaaaaaaaaaaaaa:
* ditch CPU profiling from ProfilerSimple, because:
** getrusage() is updated just on end of quant, which is 10ms on our new servers and 1ms on old ones:
*** All CPU profiling before looked reasonable just just just because lots of 0's and 10's sometimes add up to reasonable guestimate.
---

diff --git a/includes/ProfilerSimple.php b/includes/ProfilerSimple.php
index b07f2517fb..7239df98b6 100644
--- a/includes/ProfilerSimple.php
+++ b/includes/ProfilerSimple.php
@@ -12,22 +12,18 @@ class ProfilerSimple extends Profiler {
 	var $mProfileID = false;
 
 	function __construct() {
-		global $wgRequestTime,$wgRUstart;
-		if (!empty($wgRequestTime) && !empty($wgRUstart)) {
-			$this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
+		global $wgRequestTime;
+		if (!empty($wgRequestTime)) {
+			$this->mWorkStack[] = array( '-total', 0, $wgRequestTime);
 
-			$elapsedcpu = $this->getCpuTime() - $this->getCpuTime($wgRUstart);
 			$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);
+				$entry = array('real' => 0.0, 'count' => 0);
 				$this->mCollated["-setup"] =& $entry;
 			}
-			$entry['cpu'] += $elapsedcpu;
-			$entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
 			$entry['real'] += $elapsedreal;
-			$entry['real_sq'] += $elapsedreal*$elapsedreal;
 			$entry['count']++;
 		}
 	}
@@ -53,7 +49,7 @@ 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));
 	}
 
 	function profileOut($functionname) {
@@ -81,13 +77,10 @@ class ProfilerSimple extends Profiler {
 			$elapsedcpu = $this->getCpuTime() - $octime;
 			$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);
+				$entry = array('real' => 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']++;
 
 		}
@@ -97,17 +90,6 @@ class ProfilerSimple extends Profiler {
 		/* Implement in output subclasses */
 	}
 
-	function getCpuTime($ru=null) {
-		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)
diff --git a/includes/ProfilerSimpleUDP.php b/includes/ProfilerSimpleUDP.php
index 7d2f7e21b3..7fcd9ba2b5 100644
--- a/includes/ProfilerSimpleUDP.php
+++ b/includes/ProfilerSimpleUDP.php
@@ -22,8 +22,8 @@ class ProfilerSimpleUDP extends ProfilerSimple {
 		$plength=0;
 		$packet="";
 		foreach ($this->mCollated as $entry=>$pfdata) {
-			$pfline=sprintf ("%s %s %d %f %f %f %f %s\n", $this->getProfileID(),"-",$pfdata['count'],
-				$pfdata['cpu'],$pfdata['cpu_sq'],$pfdata['real'],$pfdata['real_sq'],$entry);
+			$pfline=sprintf ("%s %s %d 0 0 %f 0 %s\n", $this->getProfileID(),"-",$pfdata['count'],
+				$pfdata['real'],$entry);
 			$length=strlen($pfline);
 			/* printf("<!-- $pfline -->"); */
 			if ($length+$plength>1400) {
@@ -37,4 +37,3 @@ class ProfilerSimpleUDP extends ProfilerSimple {
 		socket_sendto($sock,$packet,$plength,0x100,$wgUDPProfilerHost,$wgUDPProfilerPort);
 	}
 }
-