Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert removal of CPU time profiling in 29658-29661. Those 0's and 10's will add up to the correct guestimate reliably, as long as the decision as to which function gets the tick does not depend on the function. The variance of course will be larger, but it was pretty large to start with. Should fix breakage in report.py.

Browse source
This commit is contained in:
Tim Starling 2008-01-26 01:49:17 +00:00
parent c089260cd7
commit 1dd3b7fb35
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
includes/ProfilerSimple.php
View file

@ -12,18 +12,22 @@ class ProfilerSimple extends Profiler {
var $mProfileID = false;
function __construct() {
global $wgRequestTime;
if (!empty($wgRequestTime)) {
$this->mWorkStack[] = array( '-total', 0, $wgRequestTime);
global $wgRequestTime,$wgRUstart;
if (!empty($wgRequestTime) && !empty($wgRUstart)) {
$this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
$elapsedcpu = $this->getCpuTime() - $this->getCpuTime($wgRUstart);
$elapsedreal = microtime(true) - $wgRequestTime;
$entry =& $this->mCollated["-setup"];
if (!is_array($entry)) {
$entry = array('real' => 0.0, 'count' => 0);
$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;
$entry['real_sq'] += $elapsedreal*$elapsedreal;
$entry['count']++;
}
}
@ -49,7 +53,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->mWorkStack[] = array($functionname, count( $this->mWorkStack ), microtime(true), $this->getCpuTime());
}
function profileOut($functionname) {
@ -59,7 +63,7 @@ class ProfilerSimple extends Profiler {
$this->debug(str_repeat(' ', count($this->mWorkStack) - 1).'Exiting '.$functionname."\n");
}
list($ofname, /* $ocount */ ,$ortime) = array_pop($this->mWorkStack);
list($ofname, /* $ocount */ ,$ortime,$octime) = array_pop($this->mWorkStack);
if (!$ofname) {
$this->debug("Profiling error: $functionname\n");
@ -78,12 +82,16 @@ class ProfilerSimple extends Profiler {
'real' => 0.0, 'count' => 1);
}
$entry =& $this->mCollated[$functionname];
$elapsedcpu = $this->getCpuTime() - $octime;
$elapsedreal = microtime(true) - $ortime;
if (!is_array($entry)) {
$entry = array('real' => 0.0, 'count' => 0);
$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']++;
}
@ -93,6 +101,17 @@ 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)

5
includes/ProfilerSimpleUDP.php
View file

@ -22,8 +22,8 @@ class ProfilerSimpleUDP extends ProfilerSimple {
$plength=0;
$packet="";
foreach ($this->mCollated as $entry=>$pfdata) {
$pfline=sprintf ("%s %s %d 0 0 %f 0 %s\n", $this->getProfileID(),"-",$pfdata['count'],
$pfdata['real'],$entry);
$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);
$length=strlen($pfline);
/* printf("<!-- $pfline -->"); */
if ($length+$plength>1400) {
@ -37,3 +37,4 @@ class ProfilerSimpleUDP extends ProfilerSimple {
socket_sendto($sock,$packet,$plength,0x100,$wgUDPProfilerHost,$wgUDPProfilerPort);
}
}