dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] FO : Code cleaning, optimizations, new callstack available in the profiling tools

Browse Source
This commit is contained in:
Damien Metzger
2013-11-29 14:21:22 +01:00
parent 5c3f43141b
commit 9dc075ca39
5 changed files with 63 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/profiling/Controller.php
+15 -4
View File
@@ -414,10 +414,11 @@ abstract class Controller extends ControllerCore
$query_row = array(
'time' => $data['time'],
'query' => $data['query'],
'location' => $data['file'].':'.$data['line'],
'location' => $data['stack'][0]['file'].':'.$data['stack'][0]['line'],
'filesort' => false,
'rows' => 1,
'group_by' => false
'group_by' => false,
'stack' => $data['stack']
);
if (preg_match('/^\s*select\s+/i', $data['query']))
{
@@ -445,7 +446,7 @@ abstract class Controller extends ControllerCore
<div id="queries_table" style="display:none;margin:4px">
<table class="table std">
<tr><th>Time (ms)</th><th>Rows</th><th>Query</th><th>Location</th><th>Filesort</th><th>Group By</th></tr>';
foreach ($array_queries as $data)
foreach ($array_queries as &$data)
{
$data['location'] = str_replace('\\', '/', substr($data['location'], strlen(_PS_ROOT_DIR_)));
$data['query'] = str_replace('SQL_NO_CACHE ', '', $data['query']);
@@ -456,9 +457,18 @@ abstract class Controller extends ControllerCore
</div>
<div class="rte" style="text-align:left;padding:8px">
<h3><a name="stopwatch">Stopwatch (with SQL_NO_CACHE) (total = '.count(Db::getInstance()->queries).')</a></h3>';
$i = 1;
foreach ($array_queries as $data)
{
echo $hr.'<b '.$this->getTimeColor($data['time'] * 1000).'>'.round($data['time'] * 1000, 3).' ms</b> '.htmlspecialchars($data['query'], ENT_NOQUOTES, 'utf-8', false).'<br />in '.$data['location'].'<br />';
$echo_stack = '';
array_shift($data['stack']);
foreach ($data['stack'] as $call)
$echo_stack .= 'from '.str_replace('\\', '/', substr($call['file'], strlen(_PS_ROOT_DIR_))).':'.$call['line'].'<br />';
echo $hr.'<div onclick="$(\'#qbt'.$i.'\').toggle();"><b '.$this->getTimeColor($data['time'] * 1000).'>'.round($data['time'] * 1000, 3).' ms</b>
'.htmlspecialchars($data['query'], ENT_NOQUOTES, 'utf-8', false).'<br />
in '.$data['location'].'<br />
<div id="qbt'.($i++).'" style="display:none">'.$echo_stack.'</div>';
if (preg_match('/^\s*select\s+/i', $data['query']))
{
if ($data['filesort'])
@@ -467,6 +477,7 @@ abstract class Controller extends ControllerCore
if ($data['group_by'])
echo '<br /><b>Useless GROUP BY need to be removed</b>';
}
echo '</div>';
}
$queries = Db::getInstance()->uniqQueries;
arsort($queries);