Merge pull request #368 from annando/rendertime-db-write

Rendertime: We now additionally show the db write time.
This commit is contained in:
Tobias Diekershoff 2016-08-30 09:39:27 +02:00 committed by GitHub
commit 3506b62ff6

View file

@ -27,28 +27,35 @@ function rendertime_page_end(&$a, &$o) {
$duration = microtime(true)-$a->performance["start"]; $duration = microtime(true)-$a->performance["start"];
if (is_site_admin() AND ($_GET["mode"] != "minimal") AND !$a->is_mobile AND !$a->is_tablet) { if (is_site_admin() AND ($_GET["mode"] != "minimal") AND !$a->is_mobile AND !$a->is_tablet) {
$o = $o.'<div class="renderinfo">'.sprintf(t("Database: %s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s"), $o = $o.'<div class="renderinfo">'.sprintf(t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s"),
round($a->performance["database"], 3), round($a->performance["database"] - $a->performance["database_write"], 3),
round($a->performance["network"], 3), round($a->performance["database_write"], 3),
round($a->performance["rendering"], 3), round($a->performance["network"], 2),
round($a->performance["parser"], 3), round($a->performance["rendering"], 2),
round($a->performance["file"], 3), round($a->performance["parser"], 2),
round($duration - $a->performance["database"] - $a->performance["network"] round($a->performance["file"], 2),
- $a->performance["rendering"] - $a->performance["parser"] round($duration - $a->performance["database"]
- $a->performance["file"], 3), - $a->performance["network"] - $a->performance["rendering"]
round($duration, 3) - $a->performance["parser"] - $a->performance["file"], 2),
round($duration, 2)
//round($a->performance["markstart"], 3) //round($a->performance["markstart"], 3)
//round($a->performance["plugin"], 3) //round($a->performance["plugin"], 3)
)."</div>"; )."</div>";
if (get_config("rendertime", "callstack")) { if (get_config("rendertime", "callstack")) {
$o .= "<pre>"; $o .= "<pre>";
$o .= "\nDatabase:\n"; $o .= "\nDatabase Read:\n";
foreach ($a->callstack["database"] AS $func => $time) { foreach ($a->callstack["database"] AS $func => $time) {
$time = round($time, 3); $time = round($time, 3);
if ($time > 0) if ($time > 0)
$o .= $func.": ".$time."\n"; $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"; $o .= "\nNetwork:\n";
foreach ($a->callstack["network"] AS $func => $time) { foreach ($a->callstack["network"] AS $func => $time) {