From 51d89255cc44f01c6740362b659a0b0716512628 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Wed, 20 Feb 2019 17:12:40 +0100 Subject: [PATCH 1/4] Fixing rendertime --- rendertime/rendertime.php | 71 ++++++++++++++------------------------- 1 file changed, 26 insertions(+), 45 deletions(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index 65de10ca..281059d7 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -23,58 +23,39 @@ function rendertime_uninstall() { 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 = 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->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->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) {
-				$time = round($time, 3);
+		$o = $o . '
' . L10n::t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s", + round($profiler->get('database') - $profiler->get('database_write'), 3), + round($profiler->get('database_write'), 3), + round($profiler->get('network'), 2), + round($profiler->get('rendering'), 2), + round($profiler->get('parser'), 2), + round($profiler->get('file'), 2), + round($duration - $profiler->get('database') + - $profiler->get('network') - $profiler->get('rendering') + - $profiler->get('parser') - $profiler->get('file'), 2), + round($duration, 2) + //round($profiler->get('markstart'), 3) + //round($profiler->get('plugin'), 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 .= "
"; - } + $o .= '
';
+		$o .= $profiler->getRendertimeString();
+		$o .= '
'; } } From a5d77d44138fdafe4285efea46dda19f45c8e0e3 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Wed, 20 Feb 2019 17:20:16 +0100 Subject: [PATCH 2/4] adding test --- rendertime/rendertime.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index 281059d7..5560433e 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -54,8 +54,10 @@ function rendertime_page_end(&$a, &$o) //round($profiler->get('plugin'), 3) ) . ''; - $o .= '
';
-		$o .= $profiler->getRendertimeString();
-		$o .= '
'; + if ($profiler->isRendertime()) { + $o .= '
';
+			$o .= $profiler->getRendertimeString();
+			$o .= '
'; + } } } From 0d2481408602b659c1c6e71d847032e73d9a4080 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Wed, 20 Feb 2019 17:28:32 +0100 Subject: [PATCH 3/4] Adding type-hint --- rendertime/rendertime.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index 5560433e..50c0ad5a 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -6,7 +6,7 @@ * Author: Michael Vogel * */ -use Friendica\Core\Config; + use Friendica\Core\Hook; use Friendica\Core\L10n; @@ -27,7 +27,7 @@ function rendertime_init_1(&$a) { * @param Friendica\App $a * @param string $o */ -function rendertime_page_end(&$a, &$o) +function rendertime_page_end(Friendica\App &$a, &$o) { $profiler = $a->getProfiler(); From 771fb3587534ece48cab0fa2460d0e6269543aea Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Wed, 20 Feb 2019 17:28:38 +0100 Subject: [PATCH 4/4] Adding type-hint --- rendertime/rendertime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index 50c0ad5a..5af6f512 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -27,7 +27,7 @@ function rendertime_init_1(&$a) { * @param Friendica\App $a * @param string $o */ -function rendertime_page_end(Friendica\App &$a, &$o) +function rendertime_page_end(Friendica\App $a, &$o) { $profiler = $a->getProfiler();