php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-12-01 23:51:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

reorganized debug panels.

Browse Source
This commit is contained in:
Qiang Xue
2013-07-26 08:16:54 -04:00
parent 6e851e9547
commit b42f5181e7
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
framework/yii/debug/panels/ProfilingPanel.php
View File

@@ -25,6 +25,22 @@ class ProfilingPanel extends Panel
return 'Profiling'; return 'Profiling';
} }
public function getSummary()
{
$memory = sprintf('%.1f MB', $this->data['memory'] / 1048576);
$time = number_format($this->data['time'] * 1000) . ' ms';
$url = $this->getUrl();
return <<<EOD
<div class="yii-debug-toolbar-block">
<a href="$url" title="total processing time">Time: <span class="label">$time</span></a>
</div>
<div class="yii-debug-toolbar-block">
<a href="$url" title="peak memory consumption">Memory: <span class="label">$memory</span></a>
</div>
EOD;
}
public function getDetail() public function getDetail()
{ {
$messages = $this->data['messages']; $messages = $this->data['messages'];
@@ -58,8 +74,13 @@ class ProfilingPanel extends Panel
} }
$rows = implode("\n", $rows); $rows = implode("\n", $rows);
$memory = sprintf('%.1f MB', $this->data['memory'] / 1048576);
$time = number_format($this->data['time'] * 1000) . ' ms';
return <<<EOD return <<<EOD
<h1>Performance Profiling</h1> <h2>Performance Profiling</h2>
<p>Total processing time: <b>$time</b>; Peak memory: <b>$memory</b>.</p>
<table class="table table-condensed table-bordered table-striped table-hover" style="table-layout: fixed;"> <table class="table table-condensed table-bordered table-striped table-hover" style="table-layout: fixed;">
<thead> <thead>
@@ -81,6 +102,8 @@ EOD;
$target = $this->module->logTarget; $target = $this->module->logTarget;
$messages = $target->filterMessages($target->messages, Logger::LEVEL_PROFILE); $messages = $target->filterMessages($target->messages, Logger::LEVEL_PROFILE);
return array( return array(
'memory' => memory_get_peak_usage(),
'time' => microtime(true) - YII_BEGIN_TIME,
'messages' => $messages, 'messages' => $messages,
); );
} }

23
framework/yii/debug/panels/RequestPanel.php
View File

@@ -28,19 +28,9 @@ class RequestPanel extends Panel
public function getSummary() public function getSummary()
{ {
$memory = sprintf('%.1f MB', $this->data['memory'] / 1048576);
$time = number_format($this->data['time'] * 1000) . ' ms';
$url = $this->getUrl(); $url = $this->getUrl();
return <<<EOD return <<<EOD
<div class="yii-debug-toolbar-block">
<a href="$url">Memory: <span class="label">$memory</span></a>
</div>
<div class="yii-debug-toolbar-block">
<a href="$url">Time: <span class="label">$time</span></a>
</div>
<div class="yii-debug-toolbar-block"> <div class="yii-debug-toolbar-block">
<a href="$url">Action: <span class="label">{$this->data['action']}</span></a> <a href="$url">Action: <span class="label">{$this->data['action']}</span></a>
</div> </div>
@@ -81,17 +71,6 @@ EOD;
), ),
), ),
)); ));
return "<h1>Request Information</h1>\n"
. $this->renderData('Routing', $data) . "\n"
. $this->renderData('Flashes', $this->data['flashes']) . "\n"
. $this->renderData('$_GET', $this->data['GET']) . "\n"
. $this->renderData('$_POST', $this->data['POST']) . "\n"
. $this->renderData('$_COOKIE', $this->data['COOKIE']) . "\n"
. $this->renderData('$_FILES', $this->data['FILES']) . "\n"
. $this->renderData('$_SESSION', $this->data['SESSION']) . "\n"
. $this->renderData('$_SERVER', $this->data['SERVER']) . "\n"
. $this->renderData('Request Headers', $this->data['requestHeaders']) . "\n"
. $this->renderData('Response Headers', $this->data['responseHeaders']);
} }
public function save() public function save()
@@ -133,8 +112,6 @@ EOD;
/** @var \yii\web\Session $session */ /** @var \yii\web\Session $session */
$session = Yii::$app->getComponent('session', false); $session = Yii::$app->getComponent('session', false);
return array( return array(
'memory' => memory_get_peak_usage(),
'time' => microtime(true) - YII_BEGIN_TIME,
'flashes' => $session ? $session->getAllFlashes() : array(), 'flashes' => $session ? $session->getAllFlashes() : array(),
'requestHeaders' => $requestHeaders, 'requestHeaders' => $requestHeaders,
'responseHeaders' => $responseHeaders, 'responseHeaders' => $responseHeaders,