X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=rendertime%2Frendertime.php;h=627c8cd9a8e2a2f2210817469f03abd38e733f1f;hb=46de1b8b89980513d50275d9d8c78681dff82b56;hp=1a2a962f497d32e6364ef89a9b35838f4e2b06d7;hpb=461b3db9f449fdb1ce780a337cf2f1bb7aa35ac5;p=friendica-addons.git

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 1a2a962f..627c8cd9 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -1,75 +1,68 @@
 <?php
-
-
 /**
  * Name: rendertime
  * Description: Shows the time that was needed to render the current page
  * Version: 0.1
- * Author: Michael Vvogel <http://pirati.ca/profile/heluecht>
+ * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  *
  */
 
-use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\DI;
 
 function rendertime_install() {
-	register_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
-}
-
-
-function rendertime_uninstall() {
-	unregister_hook('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1');
-	unregister_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
+	Hook::register('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
 }
 
 function rendertime_init_1(&$a) {
 }
 
-function rendertime_page_end(&$a, &$o) {
+/**
+ * @param Friendica\App $a
+ * @param string $o
+ */
+function rendertime_page_end(Friendica\App $a, &$o)
+{
+
+	$profiler = DI::profiler();
 
-	$duration = microtime(true)-$a->performance["start"];
+	$duration = microtime(true) - $profiler->get('start');
 
 	$ignored_modules = ["fbrowser"];
-	$ignored = in_array($a->module, $ignored_modules);
+	$ignored = in_array(DI::module()->getName(), $ignored_modules);
 
-	if (is_site_admin() && ($_GET["mode"] != "minimal") && !$a->is_mobile && !$a->is_tablet && !$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 (is_site_admin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) {
 
-		if (Config::get("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 = $o . '<div class="renderinfo">' . DI::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)
+			) . '</div>';
 
-			$o .= "\nNetwork:\n";
-			foreach ($a->callstack["network"] AS $func => $time) {
-				$time = round($time, 3);
-				if ($time > 0)
-					$o .= $func.": ".$time."\n";
-			}
+			$total = microtime(true) - $profiler->get('start');
+			$rest = $total - ($profiler->get('ready') - $profiler->get('start')) - $profiler->get('init') - $profiler->get('content');
+			$o = $o . '<div class="renderinfo">' . DI::l10n()->t("Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s",
+				round($profiler->get('classinit') - $profiler->get('start'), 3),
+				round($profiler->get('ready') - $profiler->get('classinit'), 3),
+				round($profiler->get('init'), 3),
+				round($profiler->get('content'), 3),
+				round($rest, 3),
+				round($total, 3)
+				) . '</div>';
 
-			$o .= "</pre>";
+		if ($profiler->isRendertime()) {
+			$o .= '<pre>';
+			$o .= $profiler->getRendertimeString(DI::config()->get('rendertime', 'minimal_time', 0));
+			$o .= '</pre>';
 		}
 	}
 }