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

Rendertime: We now additionally show the db write time.

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 548775a1077d421ac0d064a27ddf7dcbd1496b1f..574e6e0951b72087586704e0e618fb582d7b8c6b 100755 (executable)
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -27,28 +27,35 @@ function rendertime_page_end(&$a, &$o) {
        $duration = microtime(true)-$a->performance["start"];
 
        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"),
-                                               round($a->performance["database"], 3),
-                                               round($a->performance["network"], 3),
-                                               round($a->performance["rendering"], 3),
-                                               round($a->performance["parser"], 3),
-                                               round($a->performance["file"], 3),
-                                               round($duration - $a->performance["database"] - $a->performance["network"]
-                                                        - $a->performance["rendering"] - $a->performance["parser"]
-                                                        - $a->performance["file"], 3),
-                                               round($duration, 3)
+               $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"] - $a->performance["database_write"], 3),
+                                               round($a->performance["database_write"], 3),
+                                               round($a->performance["network"], 2),
+                                               round($a->performance["rendering"], 2),
+                                               round($a->performance["parser"], 2),
+                                               round($a->performance["file"], 2),
+                                               round($duration - $a->performance["database"]
+                                                        - $a->performance["network"] - $a->performance["rendering"]
+                                                        - $a->performance["parser"] - $a->performance["file"], 2),
+                                               round($duration, 2)
                                                //round($a->performance["markstart"], 3)
                                                //round($a->performance["plugin"], 3)
                                                )."</div>";
 
                if (get_config("rendertime", "callstack")) {
                        $o .= "<pre>";
-                       $o .= "\nDatabase:\n";
+                       $o .= "\nDatabase Read:\n";
                        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) {