From 24ff3d3d85de38685ae76c6e8419baff0580c4d9 Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 30 Dec 2013 10:30:43 +0400 Subject: [PATCH 1/2] improved debug module profile panel --- extensions/yii/debug/models/search/Log.php | 2 +- extensions/yii/debug/models/search/Profile.php | 75 +++++++++++++++ extensions/yii/debug/panels/DbPanel.php | 2 +- extensions/yii/debug/panels/ProfilingPanel.php | 107 ++++++++++++--------- .../yii/debug/views/default/panels/db/summary.php | 2 +- .../debug/views/default/panels/profile/detail.php | 34 +++++++ .../debug/views/default/panels/profile/summary.php | 6 ++ 7 files changed, 182 insertions(+), 46 deletions(-) create mode 100644 extensions/yii/debug/models/search/Profile.php create mode 100644 extensions/yii/debug/views/default/panels/profile/detail.php create mode 100644 extensions/yii/debug/views/default/panels/profile/summary.php diff --git a/extensions/yii/debug/models/search/Log.php b/extensions/yii/debug/models/search/Log.php index ab8c754..38fa343 100644 --- a/extensions/yii/debug/models/search/Log.php +++ b/extensions/yii/debug/models/search/Log.php @@ -22,7 +22,7 @@ class Log extends Base public $category; /** - * @var integer ajax attribute input search value + * @var integer message attribute input search value */ public $message; diff --git a/extensions/yii/debug/models/search/Profile.php b/extensions/yii/debug/models/search/Profile.php new file mode 100644 index 0000000..357c019 --- /dev/null +++ b/extensions/yii/debug/models/search/Profile.php @@ -0,0 +1,75 @@ + 'Category', + 'info' => 'Info', + ]; + } + + /** + * Returns data provider with filled models. Filter applied if needed. + * @param array $params + * @param array $models + * @return \yii\data\ArrayDataProvider + */ + public function search($params, $models) + { + $dataProvider = new ArrayDataProvider([ + 'allModels' => $models, + 'pagination' => [ + 'pageSize' => 10, + ], + 'sort' => [ + 'attributes' => ['category','info','duration'], + 'defaultOrder' => [ + 'duration' => SORT_DESC, + ], + ], + ]); + + if (!($this->load($params) && $this->validate())) { + return $dataProvider; + } + + $filter = new Filter(); + $this->addCondition($filter, 'category', true); + $this->addCondition($filter, 'info', true); + $dataProvider->allModels = $filter->filter($models); + + return $dataProvider; + } + +} diff --git a/extensions/yii/debug/panels/DbPanel.php b/extensions/yii/debug/panels/DbPanel.php index ebac11f..73b2fa7 100644 --- a/extensions/yii/debug/panels/DbPanel.php +++ b/extensions/yii/debug/panels/DbPanel.php @@ -121,7 +121,7 @@ class DbPanel extends Panel */ protected function getModels() { - if ($this->_models === null || $refresh) { + if ($this->_models === null) { $this->_models = []; $timings = $this->calculateTimings(); diff --git a/extensions/yii/debug/panels/ProfilingPanel.php b/extensions/yii/debug/panels/ProfilingPanel.php index 49cf081..e3037e9 100644 --- a/extensions/yii/debug/panels/ProfilingPanel.php +++ b/extensions/yii/debug/panels/ProfilingPanel.php @@ -9,8 +9,8 @@ namespace yii\debug\panels; use Yii; use yii\debug\Panel; -use yii\helpers\Html; use yii\log\Logger; +use yii\debug\models\search\Profile; /** * Debugger panel that collects and displays performance profiling info. @@ -20,6 +20,17 @@ use yii\log\Logger; */ class ProfilingPanel extends Panel { + + /** + * @var array profile messages timings + */ + private $_timings; + + /** + * @var array current request profile timings + */ + private $_models; + public function getName() { return 'Profiling'; @@ -27,25 +38,41 @@ class ProfilingPanel extends Panel public function getSummary() { - $memory = sprintf('%.1f MB', $this->data['memory'] / 1048576); - $time = number_format($this->data['time'] * 1000) . ' ms'; - $url = $this->getUrl(); - - return << - Time $time - -
- Memory $memory -
-EOD; + return Yii::$app->view->render('panels/profile/summary',[ + 'memory' => sprintf('%.1f MB', $this->data['memory'] / 1048576), + 'time' => number_format($this->data['time'] * 1000) . ' ms', + 'panel' => $this + ]); } public function getDetail() { + $searchModel = new Profile(); + $dataProvider = $searchModel->search($_GET, $this->getModels()); + + return Yii::$app->view->render('panels/profile/detail',[ + 'panel' => $this, + 'dataProvider' => $dataProvider, + 'searchModel' => $searchModel, + 'memory' => sprintf('%.1f MB', $this->data['memory'] / 1048576), + 'time' => number_format($this->data['time'] * 1000) . ' ms', + ]); + } + + /** + * Calculates given request profile messages timings. + * @return array timings + */ + protected function calculateTimings() + { + if ($this->_timings !== null) { + return $this->_timings; + } + $messages = $this->data['messages']; $timings = []; $stack = []; + foreach ($messages as $i => $log) { list($token, $level, $category, $timestamp, $traces) = $log; if ($level == Logger::LEVEL_PROFILE_BEGIN) { @@ -62,36 +89,7 @@ EOD; $timings[] = [count($stack), $last[0], $last[2], $now - $last[3], $last[4]]; } - $rows = []; - foreach ($timings as $timing) { - $time = sprintf('%.1f ms', $timing[3] * 1000); - $procedure = str_repeat('→', $timing[0]) . Html::encode($timing[1]); - $category = Html::encode($timing[2]); - $rows[] = "$time$category$procedure"; - } - $rows = implode("\n", $rows); - - $memory = sprintf('%.1f MB', $this->data['memory'] / 1048576); - $time = number_format($this->data['time'] * 1000) . ' ms'; - - return <<Performance Profiling - -

Total processing time: $time; Peak memory: $memory.

- - - - - - - - - - -$rows - -
TimeCategoryProcedure
-EOD; + return $this->_timings = $timings; } public function save() @@ -104,4 +102,27 @@ EOD; 'messages' => $messages, ]; } + + /** + * Returns array of profiling models that can be used in data provider. + * @return array models + */ + protected function getModels() + { + if ($this->_models === null) { + $this->_models = []; + $timings = $this->calculateTimings(); + + foreach($timings as $profileTiming) { + $this->_models[] = [ + 'duration' => $profileTiming[3] * 1000, #in milliseconds + 'category' => $profileTiming[2], + 'info' => $profileTiming[1], + 'level' => $profileTiming[0], + ]; + } + } + return $this->_models; + } + } diff --git a/extensions/yii/debug/views/default/panels/db/summary.php b/extensions/yii/debug/views/default/panels/db/summary.php index 1c3bdfa..c21715e 100644 --- a/extensions/yii/debug/views/default/panels/db/summary.php +++ b/extensions/yii/debug/views/default/panels/db/summary.php @@ -1,6 +1,6 @@
- + DB
diff --git a/extensions/yii/debug/views/default/panels/profile/detail.php b/extensions/yii/debug/views/default/panels/profile/detail.php new file mode 100644 index 0000000..0431c74 --- /dev/null +++ b/extensions/yii/debug/views/default/panels/profile/detail.php @@ -0,0 +1,34 @@ + +

Performance Profiling

+

Total processing time: ; Peak memory: .

+ $dataProvider, + 'id' => 'profile-panel-detailed-grid', + 'filterModel' => $searchModel, + 'filterUrl' => $panel->getUrl(), + 'columns' => [ + ['class' => 'yii\grid\SerialColumn'], + [ + 'attribute' => 'duration', + 'value' => function ($data) + { + return sprintf('%.1f ms',$data['duration']); + }, + ], + 'category', + [ + 'attribute' => 'info', + 'value' => function ($data) + { + return str_repeat('→', $data['level']) . $data['info']; + }, + 'options' => [ + 'width' => '60%', + ], + ], + ], +]); +?> \ No newline at end of file diff --git a/extensions/yii/debug/views/default/panels/profile/summary.php b/extensions/yii/debug/views/default/panels/profile/summary.php new file mode 100644 index 0000000..dd2a679 --- /dev/null +++ b/extensions/yii/debug/views/default/panels/profile/summary.php @@ -0,0 +1,6 @@ +
+ Time +
+
+ Memory +
\ No newline at end of file From 9a416f3cc46d511ea5116c985929aea779cecbd3 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 31 Dec 2013 01:16:58 +0400 Subject: [PATCH 2/2] CS fixes --- extensions/yii/debug/models/search/Db.php | 2 +- extensions/yii/debug/models/search/Log.php | 2 +- extensions/yii/debug/models/search/Profile.php | 2 +- extensions/yii/debug/panels/DbPanel.php | 4 ++-- extensions/yii/debug/panels/LogPanel.php | 4 ++-- extensions/yii/debug/panels/ProfilingPanel.php | 6 +++--- extensions/yii/debug/views/default/panels/db/detail.php | 11 ++++------- extensions/yii/debug/views/default/panels/log/detail.php | 14 +++++--------- .../yii/debug/views/default/panels/profile/detail.php | 6 ++---- 9 files changed, 21 insertions(+), 30 deletions(-) diff --git a/extensions/yii/debug/models/search/Db.php b/extensions/yii/debug/models/search/Db.php index c5592fe..25cdbbd 100644 --- a/extensions/yii/debug/models/search/Db.php +++ b/extensions/yii/debug/models/search/Db.php @@ -53,7 +53,7 @@ class Db extends Base 'pageSize' => 10, ], 'sort' => [ - 'attributes' => ['duration','type','query'], + 'attributes' => ['duration', 'type', 'query'], 'defaultOrder' => [ 'duration' => SORT_DESC, ], diff --git a/extensions/yii/debug/models/search/Log.php b/extensions/yii/debug/models/search/Log.php index 38fa343..1a170b2 100644 --- a/extensions/yii/debug/models/search/Log.php +++ b/extensions/yii/debug/models/search/Log.php @@ -59,7 +59,7 @@ class Log extends Base 'pageSize' => 10, ], 'sort' => [ - 'attributes' => ['time','level','category','message'], + 'attributes' => ['time', 'level', 'category', 'message'], ], ]); diff --git a/extensions/yii/debug/models/search/Profile.php b/extensions/yii/debug/models/search/Profile.php index 357c019..ef630a3 100644 --- a/extensions/yii/debug/models/search/Profile.php +++ b/extensions/yii/debug/models/search/Profile.php @@ -53,7 +53,7 @@ class Profile extends Base 'pageSize' => 10, ], 'sort' => [ - 'attributes' => ['category','info','duration'], + 'attributes' => ['category', 'info', 'duration'], 'defaultOrder' => [ 'duration' => SORT_DESC, ], diff --git a/extensions/yii/debug/panels/DbPanel.php b/extensions/yii/debug/panels/DbPanel.php index 73b2fa7..043cfab 100644 --- a/extensions/yii/debug/panels/DbPanel.php +++ b/extensions/yii/debug/panels/DbPanel.php @@ -53,9 +53,9 @@ class DbPanel extends Panel public function getDetail() { $searchModel = new Db(); - $dataProvider = $searchModel->search($_GET, $this->getModels()); + $dataProvider = $searchModel->search(Yii::$app->request->get(), $this->getModels()); - return Yii::$app->view->render('panels/db/detail',[ + return Yii::$app->view->render('panels/db/detail', [ 'panel' => $this, 'dataProvider' => $dataProvider, 'searchModel' => $searchModel, diff --git a/extensions/yii/debug/panels/LogPanel.php b/extensions/yii/debug/panels/LogPanel.php index 427fb54..160bca8 100644 --- a/extensions/yii/debug/panels/LogPanel.php +++ b/extensions/yii/debug/panels/LogPanel.php @@ -33,13 +33,13 @@ class LogPanel extends Panel public function getSummary() { - return Yii::$app->view->render('panels/log/summary',['data' => $this->data, 'panel' => $this]); + return Yii::$app->view->render('panels/log/summary', ['data' => $this->data, 'panel' => $this]); } public function getDetail() { $searchModel = new Log(); - $dataProvider = $searchModel->search($_GET, $this->getModels()); + $dataProvider = $searchModel->search(Yii::$app->request->get(), $this->getModels()); return Yii::$app->view->render('panels/log/detail',[ 'dataProvider' => $dataProvider, diff --git a/extensions/yii/debug/panels/ProfilingPanel.php b/extensions/yii/debug/panels/ProfilingPanel.php index e3037e9..71b76aa 100644 --- a/extensions/yii/debug/panels/ProfilingPanel.php +++ b/extensions/yii/debug/panels/ProfilingPanel.php @@ -38,7 +38,7 @@ class ProfilingPanel extends Panel public function getSummary() { - return Yii::$app->view->render('panels/profile/summary',[ + return Yii::$app->view->render('panels/profile/summary', [ 'memory' => sprintf('%.1f MB', $this->data['memory'] / 1048576), 'time' => number_format($this->data['time'] * 1000) . ' ms', 'panel' => $this @@ -48,9 +48,9 @@ class ProfilingPanel extends Panel public function getDetail() { $searchModel = new Profile(); - $dataProvider = $searchModel->search($_GET, $this->getModels()); + $dataProvider = $searchModel->search(Yii::$app->request->get(), $this->getModels()); - return Yii::$app->view->render('panels/profile/detail',[ + return Yii::$app->view->render('panels/profile/detail', [ 'panel' => $this, 'dataProvider' => $dataProvider, 'searchModel' => $searchModel, diff --git a/extensions/yii/debug/views/default/panels/db/detail.php b/extensions/yii/debug/views/default/panels/db/detail.php index 218bdf4..4faaae3 100644 --- a/extensions/yii/debug/views/default/panels/db/detail.php +++ b/extensions/yii/debug/views/default/panels/db/detail.php @@ -15,29 +15,26 @@ echo GridView::widget([ ['class' => 'yii\grid\SerialColumn'], [ 'attribute' => 'duration', - 'value' => function ($data) - { + 'value' => function ($data) { return sprintf('%.1f ms',$data['duration']); }, ], [ 'attribute' => 'type', - 'value' => function ($data) - { + 'value' => function ($data) { return Html::encode(mb_strtoupper($data['type'],'utf8')); }, ], [ 'attribute' => 'query', - 'value' => function ($data) - { + 'value' => function ($data) { $query = Html::encode($data['query']); if (!empty($data['trace'])) { $query .= Html::ul($data['trace'], [ 'class' => 'trace', 'item' => function ($trace) { - return "
  • {$trace['file']}({$trace['line']})
    • "; + return "
  • {$trace['file']} ({$trace['line']})
    • "; }, ]); } diff --git a/extensions/yii/debug/views/default/panels/log/detail.php b/extensions/yii/debug/views/default/panels/log/detail.php index 10fb879..d40996a 100644 --- a/extensions/yii/debug/views/default/panels/log/detail.php +++ b/extensions/yii/debug/views/default/panels/log/detail.php @@ -12,7 +12,7 @@ echo GridView::widget([ 'id' => 'log-panel-detailed-grid', 'filterModel' => $searchModel, 'filterUrl' => $panel->getUrl(), - 'rowOptions' => function ($model, $key, $index, $grid){ + 'rowOptions' => function ($model, $key, $index, $grid) { switch($model['level']) { case Logger::LEVEL_ERROR : return ['class' => 'danger']; case Logger::LEVEL_WARNING : return ['class' => 'warning']; @@ -24,8 +24,7 @@ echo GridView::widget([ ['class' => 'yii\grid\SerialColumn'], [ 'attribute' => 'time', - 'value' => function ($data) - { + 'value' => function ($data) { $timeInSeconds = $data['time'] / 1000; $millisecondsDiff = (int)(($timeInSeconds - (int)$timeInSeconds) * 1000); return date('H:i:s.',$timeInSeconds) . sprintf('%03d',$millisecondsDiff); @@ -33,8 +32,7 @@ echo GridView::widget([ ], [ 'attribute' => 'level', - 'value' => function ($data) - { + 'value' => function ($data) { return Logger::getLevelName($data['level']); }, 'filter' => [ @@ -47,15 +45,13 @@ echo GridView::widget([ 'category', [ 'attribute' => 'message', - 'value' => function ($data) - { + 'value' => function ($data) { $message = nl2br(Html::encode($data['message'])); if (!empty($data['trace'])) { $message .= Html::ul($data['trace'], [ 'class' => 'trace', - 'item' => function ($trace) - { + 'item' => function ($trace) { return "
  • {$trace['file']} ({$trace['line']})
    • "; } ]); diff --git a/extensions/yii/debug/views/default/panels/profile/detail.php b/extensions/yii/debug/views/default/panels/profile/detail.php index 0431c74..4eceb82 100644 --- a/extensions/yii/debug/views/default/panels/profile/detail.php +++ b/extensions/yii/debug/views/default/panels/profile/detail.php @@ -13,16 +13,14 @@ echo GridView::widget([ ['class' => 'yii\grid\SerialColumn'], [ 'attribute' => 'duration', - 'value' => function ($data) - { + 'value' => function ($data) { return sprintf('%.1f ms',$data['duration']); }, ], 'category', [ 'attribute' => 'info', - 'value' => function ($data) - { + 'value' => function ($data) { return str_repeat('→', $data['level']) . $data['info']; }, 'options' => [