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']++;
}
}
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) {
$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");
'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']++;
}
/* 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)
$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) {
socket_sendto($sock,$packet,$plength,0x100,$wgUDPProfilerHost,$wgUDPProfilerPort);
}
}
+