mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Debug time display improvements.

Browse Source
This commit is contained in:
Cameron
2017-01-21 09:31:13 -08:00
parent f6925ee4e7
commit 15c586b5dc
1 changed files with 171 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

303
e107_handlers/db_debug_class.php
View File

@@ -350,169 +350,208 @@ class e107_db_debug {
return "<span class='label ".$inc."'>".$amount."</span>"; return "<span class='label ".$inc."'>".$amount."</span>";
} }
function Show_Performance() {
//
// Stats by Time Marker
//
global $db_time;
global $sql;
global $eTimingStart, $eTimingStop;
$this->Mark_Time('Stop'); function Show_Performance()
{
//
// Stats by Time Marker
//
global $db_time;
global $sql;
global $eTimingStart, $eTimingStop;
if (!E107_DBG_TIMEDETAILS) return ''; $this->Mark_Time('Stop');
$totTime = e107::getSingleton('e107_traffic')->TimeDelta($eTimingStart, $eTimingStop); if(!E107_DBG_TIMEDETAILS)
$text = "\n<table class='fborder table table-striped table-condensed'>\n"; {
$bRowHeaders=FALSE; return '';
reset($this->aTimeMarks); }
$aSum=$this->aTimeMarks[0]; // create a template from the 'real' array
$aSum['Index']='';
$aSum['What']='Total';
$aSum['Time']=0;
$aSum['DB Time']=0;
$aSum['DB Count']=0;
$aSum['Memory']='';
while (list($tKey, $tMarker) = each($this->aTimeMarks)) { $totTime = e107::getSingleton('e107_traffic')->TimeDelta($eTimingStart, $eTimingStop);
if (!$bRowHeaders) {
// First time: emit headers $text = "\n<table class='fborder table table-striped table-condensed'>\n";
$bRowHeaders=TRUE; $bRowHeaders = false;
$text .= "<tr><td class='fcaption' style='text-align:right'><b>".implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", array_keys($tMarker))."</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>OB Lev&nbsp;</b></td></tr>\n"; reset($this->aTimeMarks);
$aUnits = $tMarker; $aSum = $this->aTimeMarks[0]; // create a template from the 'real' array
foreach ($aUnits as $key=>$val) {
switch ($key) { $aSum['Index'] = '';
case 'DB Time': $aSum['What'] = 'Total';
case 'Time': $aSum['Time'] = 0;
$aUnits[$key] = '(msec)'; $aSum['DB Time'] = 0;
break; $aSum['DB Count'] = 0;
default: $aSum['Memory'] = 0;
$aUnits[$key] = '';
break; while(list($tKey, $tMarker) = each($this->aTimeMarks))
{
if(!$bRowHeaders)
{
// First time: emit headers
$bRowHeaders = true;
$text .= "<tr><td class='fcaption' style='text-align:right'><b>" . implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", array_keys($tMarker)) . "</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>OB Lev&nbsp;</b></td></tr>\n";
$aUnits = $tMarker;
foreach($aUnits as $key => $val)
{
switch($key)
{
case 'DB Time':
case 'Time':
$aUnits[$key] = '(msec)';
break;
default:
$aUnits[$key] = '';
break;
}
} }
$aUnits['OB Lev'] = 'lev(buf bytes)';
$aUnits['Memory'] = '(kb)';
$text .= "<tr><td class='fcaption' style='text-align:right'><b>" . implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", $aUnits) . "</b>&nbsp;</td></tr>\n";
}
$tMem = ($tMarker['Memory'] - $aSum['Memory']);
if($tMem < 0) // Quick Fix for negative numbers.
{
$tMem = 0.0000000001;
}
$tMarker['Memory'] = ($tMem ? number_format($tMem / 1024.0, 1) : '?'); // display if known
if($tMem > 400000) // Highlight high memory usage.
{
$tMarker['Memory'] = "<span class='label label-danger'>".$tMarker['Memory']."</span>";
}
$aSum['Memory'] += $tMem;
if($tMarker['What'] == 'Stop')
{
$tMarker['Time'] = '&nbsp;';
$tMarker['%Time'] = '&nbsp;';
$tMarker['%DB Count'] = '&nbsp;';
$tMarker['%DB Time'] = '&nbsp;';
$tMarker['DB Time'] = '&nbsp;';
$tMarker['OB Lev'] = $this->aOBMarks[$tKey];
$tMarker['DB Count'] = '&nbsp;';
}
else
{
// Convert from start time to delta time, i.e. from now to next entry
$nextMarker = current($this->aTimeMarks);
$aNextT = $nextMarker['Time'];
$aThisT = $tMarker['Time'];
$thisDelta = e107::getSingleton('e107_traffic')->TimeDelta($aThisT, $aNextT);
$aSum['Time'] += $thisDelta;
$aSum['DB Time'] += $tMarker['DB Time'];
$aSum['DB Count'] += $tMarker['DB Count'];
$tMarker['Time'] = number_format($thisDelta * 1000.0, 1);
$tMarker['%Time'] = $totTime ? number_format(100.0 * ($thisDelta / $totTime), 0) : 0;
$tMarker['%DB Count'] = number_format(100.0 * $tMarker['DB Count'] / $sql->db_QueryCount(), 0);
$tMarker['%DB Time'] = $db_time ? number_format(100.0 * $tMarker['DB Time'] / $db_time, 0) : 0;
$tMarker['DB Time'] = number_format($tMarker['DB Time'] * 1000.0, 1);
$tMarker['OB Lev'] = $this->aOBMarks[$tKey];
}
$text .= "<tr><td class='forumheader3' >" . implode("&nbsp;</td><td class='forumheader3' style='text-align:right'>", array_values($tMarker)) . "&nbsp;</td></tr>\n";
if(isset($this->aMarkNotes[$tKey]))
{
$text .= "<tr><td class='forumheader3' >&nbsp;</td><td class='forumheader3' colspan='4'>";
$text .= $this->aMarkNotes[$tKey] . "</td></tr>\n";
}
if($tMarker['What'] == 'Stop')
{
break;
} }
$aUnits['OB Lev'] = 'lev(buf bytes)';
$aUnits['Memory'] = '(kb)';
$text .= "<tr><td class='fcaption' style='text-align:right'><b>".implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", $aUnits)."</b>&nbsp;</td></tr>\n";
} }
$tMem = $tMarker['Memory']; $aSum['%Time'] = $totTime ? number_format(100.0 * ($aSum['Time'] / $totTime), 0) : 0;
$tMarker['Memory'] = ($tMem ? number_format($tMem/1024.0, 1) : '?'); // display if known $aSum['%DB Time'] = $db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0;
if ($tMarker['What'] == 'Stop') { $aSum['%DB Count'] = ($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0;
$tMarker['Time']='&nbsp;'; $aSum['Time'] = number_format($aSum['Time'] * 1000.0, 1);
$tMarker['%Time']='&nbsp;'; $aSum['DB Time'] = number_format($aSum['DB Time'] * 1000.0, 1);
$tMarker['%DB Count']='&nbsp;';
$tMarker['%DB Time']='&nbsp;';
$tMarker['DB Time']='&nbsp;';
$tMarker['OB Lev']=$this->aOBMarks[$tKey];
$tMarker['DB Count']='&nbsp;';
} else {
// Convert from start time to delta time, i.e. from now to next entry
$nextMarker=current($this->aTimeMarks);
$aNextT=$nextMarker['Time'];
$aThisT=$tMarker['Time'];
$thisDelta = e107::getSingleton('e107_traffic')->TimeDelta($aThisT, $aNextT);
$aSum['Time'] += $thisDelta;
$aSum['DB Time'] += $tMarker['DB Time'];
$aSum['DB Count'] += $tMarker['DB Count'];
$tMarker['Time']=number_format($thisDelta*1000.0, 1);
$tMarker['%Time']=$totTime ? number_format(100.0 * ($thisDelta / $totTime), 0) : 0;
$tMarker['%DB Count']=number_format(100.0 * $tMarker['DB Count'] / $sql->db_QueryCount(), 0);
$tMarker['%DB Time']=$db_time ? number_format(100.0 * $tMarker['DB Time'] / $db_time, 0) : 0;
$tMarker['DB Time']=number_format($tMarker['DB Time']*1000.0, 1);
$tMarker['OB Lev']=$this->aOBMarks[$tKey];
}
$text .= "<tr><td class='forumheader3' >".implode("&nbsp;</td><td class='forumheader3' style='text-align:right'>", array_values($tMarker))."&nbsp;</td></tr>\n";
if (isset($this->aMarkNotes[$tKey])) {
$text .= "<tr><td class='forumheader3' >&nbsp;</td><td class='forumheader3' colspan='4'>";
$text .= $this->aMarkNotes[$tKey]."</td></tr>\n";
}
if ($tMarker['What'] == 'Stop') break;
}
$aSum['%Time']=$totTime ? number_format(100.0 * ($aSum['Time'] / $totTime), 0) : 0;
$aSum['%DB Time']=$db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0;
$aSum['%DB Count']=($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0;
$aSum['Time']=number_format($aSum['Time'] * 1000.0, 1);
$aSum['DB Time']=number_format($aSum['DB Time']*1000.0, 1);
$text .= "<tr> $text .= "<tr>
<td class='fcaption'>&nbsp;</td> <td class='fcaption'>&nbsp;</td>
<td class='fcaption' style='text-align:right'><b>Total</b></td> <td class='fcaption' style='text-align:right'><b>Total</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['%Time']."</b></td> <td class='fcaption' style='text-align:right'><b>" . $aSum['%Time'] . "</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['%DB Time']."</b></td> <td class='fcaption' style='text-align:right'><b>" . $aSum['%DB Time'] . "</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['%DB Count']."</b></td> <td class='fcaption' style='text-align:right'><b>" . $aSum['%DB Count'] . "</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['Time']."</b></td> <td class='fcaption' style='text-align:right' title='Time (msec)'><b>" . $aSum['Time'] . "</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['DB Time']."</b></td> <td class='fcaption' style='text-align:right' title='DB Time (msec)'><b>" . $aSum['DB Time'] . "</b></td>
<td class='fcaption' style='text-align:right'><b>".$aSum['DB Count']."</b></td> <td class='fcaption' style='text-align:right'><b>" . $aSum['DB Count'] . "</b></td>
<td class='fcaption' style='text-align:right'><b>".$tMarker['Memory']."</b></td> <td class='fcaption' style='text-align:right' title='Memory (Kb)'><b>" . number_format($aSum['Memory'] / 1024, 1) . "</b></td>
<td class='fcaption' style='text-align:right'><b>".$tMarker['OB Lev']."</b></td> <td class='fcaption' style='text-align:right'><b>" . $tMarker['OB Lev'] . "</b></td>
</tr> </tr>
"; ";
// $text .= "<tr><td class='fcaption'><b>".implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", $aSum)."</b>&nbsp;</td><td class='fcaption'>&nbsp;</td></tr>\n"; // $text .= "<tr><td class='fcaption'><b>".implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", $aSum)."</b>&nbsp;</td><td class='fcaption'>&nbsp;</td></tr>\n";
$text .= "\n</table><br />\n"; $text .= "\n</table><br />\n";
// //
// Stats by Table // Stats by Table
// //
$text .= "\n<table class='fborder table table-striped table-condensed'>\n"; $text .= "\n<table class='fborder table table-striped table-condensed'>\n";
$bRowHeaders=FALSE; $bRowHeaders = false;
$aSum=$this->aDBbyTable['core']; // create a template from the 'real' array $aSum = $this->aDBbyTable['core']; // create a template from the 'real' array
$aSum['Table']='Total'; $aSum['Table'] = 'Total';
$aSum['%DB Count']=0; $aSum['%DB Count'] = 0;
$aSum['%DB Time']=0; $aSum['%DB Time'] = 0;
$aSum['DB Time']=0; $aSum['DB Time'] = 0;
$aSum['DB Count']=0; $aSum['DB Count'] = 0;
foreach ($this->aDBbyTable as $curTable) { foreach($this->aDBbyTable as $curTable)
if (!$bRowHeaders) { {
$bRowHeaders=TRUE; if(!$bRowHeaders)
$text .= "<tr><td class='fcaption'><b>".implode("</b></td><td class='fcaption'><b>", array_keys($curTable))."</b></td></tr>\n"; {
$aUnits = $curTable; $bRowHeaders = true;
foreach ($aUnits as $key=>$val) { $text .= "<tr><td class='fcaption'><b>" . implode("</b></td><td class='fcaption'><b>", array_keys($curTable)) . "</b></td></tr>\n";
switch ($key) { $aUnits = $curTable;
case 'DB Time': foreach($aUnits as $key => $val)
$aUnits[$key] = '(msec)'; {
break; switch($key)
default: {
$aUnits[$key] = ''; case 'DB Time':
break; $aUnits[$key] = '(msec)';
break;
default:
$aUnits[$key] = '';
break;
}
} }
$text .= "<tr><td class='fcaption' style='text-align:right'><b>" . implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", $aUnits) . "</b>&nbsp;</td></tr>\n";
} }
$text .= "<tr><td class='fcaption' style='text-align:right'><b>".implode("</b>&nbsp;</td><td class='fcaption' style='text-align:right'><b>", $aUnits)."</b>&nbsp;</td></tr>\n";
$aSum['DB Time'] += $curTable['DB Time'];
$aSum['DB Count'] += $curTable['DB Count'];
$curTable['%DB Count'] = number_format(100.0 * $curTable['DB Count'] / $sql->db_QueryCount(), 0);
$curTable['%DB Time'] = number_format(100.0 * $curTable['DB Time'] / $db_time, 0);
$curTable['DB Time'] = number_format($curTable['DB Time'] * 1000.0, 1);
$text .= "<tr><td class='forumheader3'>" . implode("&nbsp;</td><td class='forumheader3' style='text-align:right'>", array_values($curTable)) . "&nbsp;</td></tr>\n";
} }
$aSum['DB Time'] += $curTable['DB Time']; $aSum['%DB Time'] = $db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0;
$aSum['DB Count'] += $curTable['DB Count']; $aSum['%DB Count'] = ($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0;
$curTable['%DB Count']=number_format(100.0 * $curTable['DB Count'] / $sql->db_QueryCount(), 0); $aSum['DB Time'] = number_format($aSum['DB Time'] * 1000.0, 1);
$curTable['%DB Time']=number_format(100.0 * $curTable['DB Time'] / $db_time, 0); $text .= "<tr><td class='fcaption'><b>" . implode("&nbsp;</td><td class='fcaption' style='text-align:right'><b>", array_values($aSum)) . "&nbsp;</b></td></tr>\n";
$curTable['DB Time']=number_format($curTable['DB Time']*1000.0, 1); $text .= "\n</table><br />\n";
$text .= "<tr><td class='forumheader3'>".implode("&nbsp;</td><td class='forumheader3' style='text-align:right'>", array_values($curTable))."&nbsp;</td></tr>\n";
return $text;
} }
$aSum['%DB Time']=$db_time ? number_format(100.0 * ($aSum['DB Time'] / $db_time), 0) : 0;
$aSum['%DB Count']=($sql->db_QueryCount()) ? number_format(100.0 * ($aSum['DB Count'] / ($sql->db_QueryCount())), 0) : 0;
$aSum['DB Time']=number_format($aSum['DB Time']*1000.0, 1);
$text .= "<tr><td class='fcaption'><b>".implode("&nbsp;</td><td class='fcaption' style='text-align:right'><b>", array_values($aSum))."&nbsp;</b></td></tr>\n";
$text .= "\n</table><br />\n";
return $text;
}
function logDeprecated(){ function logDeprecated(){
$back_trace = debug_backtrace(); $back_trace = debug_backtrace();