From 69676c9f7b96469fd2a3085c681fcef04f64dbc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Thu, 23 Jun 2022 04:23:22 +0200 Subject: [PATCH 1/2] Changes: - enabled sub-directories for compiled/cached files which avoids large+slow directory descriptors - changed some double-quotes to single --- src/Render/FriendicaSmarty.php | 6 +++--- src/Render/FriendicaSmartyEngine.php | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php index 50dda5eba..399bda7b7 100644 --- a/src/Render/FriendicaSmarty.php +++ b/src/Render/FriendicaSmarty.php @@ -39,12 +39,12 @@ class FriendicaSmarty extends Smarty // setTemplateDir can be set to an array, which Smarty will parse in order. // The order is thus very important here - $template_dirs = ['theme' => "view/theme/$theme/" . self::SMARTY3_TEMPLATE_FOLDER . "/"]; + $template_dirs = ['theme' => 'view/theme/$theme/' . self::SMARTY3_TEMPLATE_FOLDER . '/']; if (!empty($theme_info['extends'])) { - $template_dirs = $template_dirs + ['extends' => "view/theme/" . $theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"]; + $template_dirs = $template_dirs + ['extends' => 'view/theme/' . $theme_info['extends'] . '/' . self::SMARTY3_TEMPLATE_FOLDER . '/']; } - $template_dirs = $template_dirs + ['base' => "view/" . self::SMARTY3_TEMPLATE_FOLDER . "/"]; + $template_dirs = $template_dirs + ['base' => 'view/' . self::SMARTY3_TEMPLATE_FOLDER . '/']; $this->setTemplateDir($template_dirs); $this->setCompileDir('view/smarty3/compiled/'); diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php index 9f35fbcc4..c64fd29e5 100644 --- a/src/Render/FriendicaSmartyEngine.php +++ b/src/Render/FriendicaSmartyEngine.php @@ -48,6 +48,19 @@ final class FriendicaSmartyEngine extends TemplateEngine $this->theme_info = $theme_info; $this->smarty = new FriendicaSmarty($this->theme, $this->theme_info); + /* + * Enable sub-directory splitting for reducing directory descriptor + * size. The default behavior is to put all compiled/cached files into + * one single directory. Under Linux and EXT4 (and maybe other FS) this + * will increase the descriptor's size (which contains information + * about entries inside the described directory. If the descriptor is + * getting to big, the system will slow down as it has to read the + * whole directory descriptor all over again (unless you have tons of + * RAM available + have enabled caching inode tables (aka. + * "descriptors"). Still it won't hurt you. + */ + $this->smarty->setUseSubDirs(true); + if (!is_writable(DI::basePath() . '/view/smarty3')) { $admin_message = DI::l10n()->t('The folder view/smarty3/ must be writable by webserver.'); DI::logger()->critical($admin_message); From 589d0360a473df62ef1b1f1b91a4180a0bcdb8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Thu, 23 Jun 2022 04:58:16 +0200 Subject: [PATCH 2/2] So simple ... Ops! --- src/Render/FriendicaSmarty.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php index 399bda7b7..c6dcef429 100644 --- a/src/Render/FriendicaSmarty.php +++ b/src/Render/FriendicaSmarty.php @@ -39,7 +39,7 @@ class FriendicaSmarty extends Smarty // setTemplateDir can be set to an array, which Smarty will parse in order. // The order is thus very important here - $template_dirs = ['theme' => 'view/theme/$theme/' . self::SMARTY3_TEMPLATE_FOLDER . '/']; + $template_dirs = ['theme' => "view/theme/$theme/" . self::SMARTY3_TEMPLATE_FOLDER . '/']; if (!empty($theme_info['extends'])) { $template_dirs = $template_dirs + ['extends' => 'view/theme/' . $theme_info['extends'] . '/' . self::SMARTY3_TEMPLATE_FOLDER . '/']; }