X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=rendertime%2Frendertime.php;h=731cf0037741fd618cda3f9fefde71751fedd95b;hb=983d334ef5d82d63eab4de56d0c74342324f257c;hp=5af6f5129e86a27e08fe1220d511c7cdfc3b80ca;hpb=ffe5038102b53dc9e00ef0b52d33e27226d35f7f;p=friendica-addons.git

diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 5af6f512..731cf003 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -7,56 +7,88 @@
  *
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\DI;
 
 function rendertime_install() {
 	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_uninstall() {
-	Hook::unregister('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1');
-	Hook::unregister('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
+function rendertime_addon_admin(string &$o)
+{
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/rendertime/');
+
+	$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);
 }
 
 /**
- * @param Friendica\App $a
  * @param string $o
  */
-function rendertime_page_end(Friendica\App $a, &$o)
+function rendertime_page_end(string &$o)
 {
-
-	$profiler = $a->getProfiler();
+	$profiler = DI::profiler();
 
 	$duration = microtime(true) - $profiler->get('start');
 
-	$ignored_modules = ["fbrowser"];
-	$ignored = in_array($a->module, $ignored_modules);
+	$ignored_modules = [
+		\Friendica\Module\Media\Photo\Browser::class,
+		\Friendica\Module\Media\Attachment\Browser::class,
+	];
+	$ignored = in_array(DI::router()->getModuleClass(), $ignored_modules);
 
-	if (is_site_admin() && (defaults($_GET, "mode", '') != "minimal") && !$a->is_mobile && !$a->is_tablet && !$ignored) {
+	if (DI::userSession()->isSiteAdmin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) {
 
-		$o = $o . '<div class="renderinfo">' . L10n::t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
+		$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('session'), 2),
 				round($profiler->get('file'), 2),
 				round($duration - $profiler->get('database')
 					- $profiler->get('network') - $profiler->get('rendering')
-					- $profiler->get('parser') - $profiler->get('file'), 2),
+					- $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();
+			$o .= $profiler->getRendertimeString(floatval(DI::config()->get('rendertime', 'minimal_time', 0)));
 			$o .= '</pre>';
 		}
 	}