tobias/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #814 from nupplaphil/6691-rendertime-fix

Browse source 
[rendertime] Bugfix Callstack
This commit is contained in:
Hypolite Petovan 2019-02-20 12:09:29 -05:00 committed by GitHub
commit ecb7a5a3eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
rendertime/rendertime.php
View file

@ -6,7 +6,7 @@
* Author: Michael Vogel <http://pirati.ca/profile/heluecht> * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
* *
*/ */
use Friendica\Core\Config;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -23,58 +23,41 @@ function rendertime_uninstall() {
function rendertime_init_1(&$a) { function rendertime_init_1(&$a) {
} }
function rendertime_page_end(&$a, &$o) { /**
* @param Friendica\App $a
* @param string $o
*/
function rendertime_page_end(Friendica\App $a, &$o)
{
$duration = microtime(true)-$a->getProfiler()->get("start"); $profiler = $a->getProfiler();
$duration = microtime(true) - $profiler->get('start');
$ignored_modules = ["fbrowser"]; $ignored_modules = ["fbrowser"];
$ignored = in_array($a->module, $ignored_modules); $ignored = in_array($a->module, $ignored_modules);
if (is_site_admin() && (defaults($_GET, "mode", '') != "minimal") && !$a->is_mobile && !$a->is_tablet && !$ignored) { if (is_site_admin() && (defaults($_GET, "mode", '') != "minimal") && !$a->is_mobile && !$a->is_tablet && !$ignored) {
$o = $o.'<div class="renderinfo">'. L10n::t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
round($a->getProfiler()->get("database") - $a->getProfiler()->get("database_write"), 3), $o = $o . '<div class="renderinfo">' . L10n::t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
round($a->getProfiler()->get("database_write"), 3), round($profiler->get('database') - $profiler->get('database_write'), 3),
round($a->getProfiler()->get("network"), 2), round($profiler->get('database_write'), 3),
round($a->getProfiler()->get("rendering"), 2), round($profiler->get('network'), 2),
round($a->getProfiler()->get("parser"), 2), round($profiler->get('rendering'), 2),
round($a->getProfiler()->get("file"), 2), round($profiler->get('parser'), 2),
round($duration - $a->getProfiler()->get("database") round($profiler->get('file'), 2),
- $a->getProfiler()->get("network") - $a->getProfiler()->get("rendering") round($duration - $profiler->get('database')
- $a->getProfiler()->get("parser") - $a->getProfiler()->get("file"), 2), - $profiler->get('network') - $profiler->get('rendering')
- $profiler->get('parser') - $profiler->get('file'), 2),
round($duration, 2) round($duration, 2)
//round($a->getProfiler()->get("markstart"), 3) //round($profiler->get('markstart'), 3)
//round($a->getProfiler()->get("plugin"), 3) //round($profiler->get('plugin'), 3)
)."</div>"; ) . '</div>';
if (Config::get("rendertime", "callstack")) { if ($profiler->isRendertime()) {
$o .= "<pre>"; $o .= '<pre>';
$o .= "\nDatabase Read:\n"; $o .= $profiler->getRendertimeString();
foreach ($a->callstack["database"] as $func => $time) { $o .= '</pre>';
$time = round($time, 3);
if ($time > 0) {
$o .= $func.": ".$time."\n";
}
}
$o .= "\nDatabase Write:\n";
foreach ($a->callstack["database_write"] as $func => $time) {
$time = round($time, 3);
if ($time > 0) {
$o .= $func.": ".$time."\n";
}
}
$o .= "\nNetwork:\n";
foreach ($a->callstack["network"] as $func => $time) {
$time = round($time, 3);
if ($time > 0) {
$o .= $func.": ".$time."\n";
}
}
$o .= "</pre>";
} }
} }
} }