From e1fdf03f02043eb046f0a10369c9a1ebecd6442b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Mon, 18 Feb 2019 18:20:00 +0100 Subject: [PATCH 1/2] Fixes: - `$a->performance['id']` is outdated, there is now `$a->getProfiler()->get('id')` - `AS` is no constant but a keyword (see `foreach()`) - added curly braces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- rendertime/rendertime.php | 42 ++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index 6a323d68..adf9de00 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -25,47 +25,53 @@ function rendertime_init_1(&$a) { function rendertime_page_end(&$a, &$o) { - $duration = microtime(true)-$a->performance["start"]; + $duration = microtime(true)-$a->getProfiler()->get("start"); $ignored_modules = ["fbrowser"]; $ignored = in_array($a->module, $ignored_modules); if (is_site_admin() && (defaults($_GET, "mode", '') != "minimal") && !$a->is_mobile && !$a->is_tablet && !$ignored) { $o = $o.'
'. L10n::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($a->getProfiler()->get("database") - $a->getProfiler()->get("database_write"), 3), + round($a->getProfiler()->get("database_write"), 3), + round($a->getProfiler()->get("network"), 2), + round($a->getProfiler()->get("rendering"), 2), + round($a->getProfiler()->get("parser") 2), + round($a->getProfiler()->get("file"), 2), + round($duration - $a->getProfiler()->get("database") + - $a->getProfiler()->get("network") - $a->getProfiler()->get("rendering") + - $a->getProfiler()->get("parser") - $a->getProfiler()->get("file"), 2), round($duration, 2) - //round($a->performance["markstart"], 3) - //round($a->performance["plugin"], 3) + //round($a->getProfiler()->get("markstart"), 3) + //round($a->getProfiler()->get("plugin"), 3) )."
"; if (Config::get("rendertime", "callstack")) { $o .= "
";
 			$o .= "\nDatabase Read:\n";
-			foreach ($a->callstack["database"] AS $func => $time) {
+			foreach ($a->callstack["database"] as $func => $time) {
 				$time = round($time, 3);
-				if ($time > 0)
+
+				if ($time > 0) {
 					$o .= $func.": ".$time."\n";
+				}
 			}
 			$o .= "\nDatabase Write:\n";
-			foreach ($a->callstack["database_write"] AS $func => $time) {
+			foreach ($a->callstack["database_write"] as $func => $time) {
 				$time = round($time, 3);
-				if ($time > 0)
+
+				if ($time > 0) {
 					$o .= $func.": ".$time."\n";
+				}
 			}
 
 			$o .= "\nNetwork:\n";
-			foreach ($a->callstack["network"] AS $func => $time) {
+			foreach ($a->callstack["network"] as $func => $time) {
 				$time = round($time, 3);
-				if ($time > 0)
+
+				if ($time > 0) {
 					$o .= $func.": ".$time."\n";
+				}
 			}
 
 			$o .= "
"; From 35974aced9cec1cc343e8ff323aeff5c36c31b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Mon, 18 Feb 2019 18:28:55 +0100 Subject: [PATCH 2/2] Fixed parser error --- rendertime/rendertime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index adf9de00..65de10ca 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -36,7 +36,7 @@ function rendertime_page_end(&$a, &$o) { round($a->getProfiler()->get("database_write"), 3), round($a->getProfiler()->get("network"), 2), round($a->getProfiler()->get("rendering"), 2), - round($a->getProfiler()->get("parser") 2), + round($a->getProfiler()->get("parser"), 2), round($a->getProfiler()->get("file"), 2), round($duration - $a->getProfiler()->get("database") - $a->getProfiler()->get("network") - $a->getProfiler()->get("rendering")