X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=rendertime%2Frendertime.php;h=d666c6a864309e3db498e3646cbc78cfb3bde74c;hb=6eee37e193f7308798f317889f0119c633ba32dd;hp=f73e08561f5ff4bf0cb6e32224223bed3ea36978;hpb=19495c1e1156f2fefd124d87f1fb4348b3da9631;p=friendica-addons.git

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index f73e0856..d666c6a8 100755
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -26,16 +26,48 @@ function rendertime_page_end(&$a, &$o) {
 
 	$duration = microtime(true)-$a->performance["start"];
 
-	$o = $o.'<div class="renderinfo">'.sprintf(t("Performance: Database: %s, Network: %s, Rendering: %s, Parser: %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($a->performance["markstart"], 3),
-						round($duration - $a->performance["database"] - $a->performance["network"]
-							 - $a->performance["rendering"] - $a->performance["parser"]
-							 - $a->performance["file"], 3),
-						round($duration, 3))."</div>";
+	$ignored_modules = array("fbrowser");
+	$ignored = in_array($a->module, $ignored_modules);
 
+	if (is_site_admin() AND ($_GET["mode"] != "minimal") AND !$a->is_mobile AND !$a->is_tablet AND !$ignored) {
+		$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 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) {
+				$time = round($time, 3);
+				if ($time > 0)
+					$o .= $func.": ".$time."\n";
+			}
+
+			$o .= "</pre>";
+		}
+	}
 }