Fixing rendertime
This commit is contained in:
parent
3c5fc43fdf
commit
51d89255cc
|
@ -23,58 +23,39 @@ 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(&$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",
|
$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),
|
round($profiler->get('database') - $profiler->get('database_write'), 3),
|
||||||
round($a->getProfiler()->get("database_write"), 3),
|
round($profiler->get('database_write'), 3),
|
||||||
round($a->getProfiler()->get("network"), 2),
|
round($profiler->get('network'), 2),
|
||||||
round($a->getProfiler()->get("rendering"), 2),
|
round($profiler->get('rendering'), 2),
|
||||||
round($a->getProfiler()->get("parser"), 2),
|
round($profiler->get('parser'), 2),
|
||||||
round($a->getProfiler()->get("file"), 2),
|
round($profiler->get('file'), 2),
|
||||||
round($duration - $a->getProfiler()->get("database")
|
round($duration - $profiler->get('database')
|
||||||
- $a->getProfiler()->get("network") - $a->getProfiler()->get("rendering")
|
- $profiler->get('network') - $profiler->get('rendering')
|
||||||
- $a->getProfiler()->get("parser") - $a->getProfiler()->get("file"), 2),
|
- $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")) {
|
$o .= '<pre>';
|
||||||
$o .= "<pre>";
|
$o .= $profiler->getRendertimeString();
|
||||||
$o .= "\nDatabase Read:\n";
|
$o .= '</pre>';
|
||||||
foreach ($a->callstack["database"] as $func => $time) {
|
|
||||||
$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>";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue