X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=rendertime%2Frendertime.php;h=731cf0037741fd618cda3f9fefde71751fedd95b;hb=2e9b8111fb09fd64d06e28128c0fbafa2a448c03;hp=1f45bc2d0477b31c41b8d650b4c765d3c0002d61;hpb=118d086e32bfeaab8131199f971b35a8eeb58c54;p=friendica-addons.git

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
old mode 100755
new mode 100644
index 1f45bc2d..731cf003
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -1,63 +1,95 @@
 <?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\App;
+use Friendica\Core\Hook;
+use Friendica\Core\Renderer;
+use Friendica\DI;
+
 function rendertime_install() {
-	register_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
+	Hook::register('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
+	DI::config()->set('system', 'profiler', true);
+}
+
+function rendertime_uninstall()
+{
+	DI::config()->delete('system', 'profiler');
+}
+
+function rendertime_init_1()
+{
 }
 
+function rendertime_addon_admin(string &$o)
+{
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/rendertime/');
 
-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');
+	$o = Renderer::replaceMacros($t, [
+		'$submit' => DI::l10n()->t('Save Settings'),
+		'$callstack' => ['callstack', DI::l10n()->t('Show callstack'), DI::config()->get('rendertime', 'callstack'), DI::l10n()->t('Show detailed performance measures in the callstack. When deactivated, only the summary will be displayed.')],
+		'$minimal_time' => ['minimal_time', DI::l10n()->t('Minimal time'), DI::config()->get('rendertime', 'minimal_time'), DI::l10n()->t('Minimal time that an activity needs to be listed in the callstack.')],
+	]);
 }
 
-function rendertime_init_1(&$a) {
+function rendertime_addon_admin_post()
+{
+	DI::config()->set('rendertime', 'callstack', $_POST['callstack'] ?? false);
+	DI::config()->set('rendertime', 'minimal_time', $_POST['minimal_time'] ?? 0);
 }
 
-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, 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), // Not used anymore
-						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)
-						//round($a->performance["markstart"], 3)
-						//round($a->performance["plugin"], 3)
-						)."</div>";
-
-		if (get_config("rendertime", "callstack")) {
-			$o .= "<pre>";
-			$o .= "\nDatabase:\n";
-			foreach ($a->callstack["database"] 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>";
+/**
+ * @param string $o
+ */
+function rendertime_page_end(string &$o)
+{
+	$profiler = DI::profiler();
+
+	$duration = microtime(true) - $profiler->get('start');
+
+	$ignored_modules = [
+		\Friendica\Module\Media\Photo\Browser::class,
+		\Friendica\Module\Media\Attachment\Browser::class,
+	];
+	$ignored = in_array(DI::router()->getModuleClass(), $ignored_modules);
+
+	if (DI::userSession()->isSiteAdmin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) {
+
+		$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('session'), 2),
+				round($profiler->get('file'), 2),
+				round($duration - $profiler->get('database')
+					- $profiler->get('network') - $profiler->get('rendering')
+					- $profiler->get('session') - $profiler->get('file'), 2),
+				round($duration, 2)
+			//round($profiler->get('markstart'), 3)
+			//round($profiler->get('plugin'), 3)
+			) . '</div>';
+
+			$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>';
+
+		if ($profiler->isRendertime()) {
+			$o .= '<pre>';
+			$o .= $profiler->getRendertimeString(floatval(DI::config()->get('rendertime', 'minimal_time', 0)));
+			$o .= '</pre>';
 		}
 	}
 }