Improved performance profiler

diff --git a/index.php b/index.php
index dd884a976ef3036237b3687047d8f13aa79f7605..fdb15fdd884cbe4a0c9080374c571fe40df7e39e 100644 (file)
--- a/index.php
+++ b/index.php
@@ -21,6 +21,8 @@
 
 use Dice\Dice;
 
+$start_time = microtime(true);
+
 if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
        die('Vendor path not found. Please execute "bin/composer.phar --no-dev install" on the command line in the web root.');
 }
@@ -39,5 +41,6 @@ $a->runFrontend(
        $dice->create(\Friendica\App\Router::class),
        $dice->create(\Friendica\Core\PConfig\IPConfig::class),
        $dice->create(\Friendica\Security\Authentication::class),
-       $dice->create(\Friendica\App\Page::class)
+       $dice->create(\Friendica\App\Page::class),
+       $start_time
 );

diff --git a/src/App.php b/src/App.php
index c69abf212748239dbb1cba3a5890eca8736426d4..fca8052e321434c313615b53daacbfc3aa2cc484 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -415,8 +415,14 @@ class App
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public function runFrontend(App\Module $module, App\Router $router, IPConfig $pconfig, Authentication $auth, App\Page $page)
+       public function runFrontend(App\Module $module, App\Router $router, IPConfig $pconfig, Authentication $auth, App\Page $page, int $start_time = 0)
        {
+               if ($start_time != 0) {
+                       $this->profiler->set($start_time, 'start');
+               }
+
+               $this->profiler->set(microtime(true), 'classinit');
+
                $moduleName = $module->getName();
 
                try {
@@ -551,12 +557,12 @@ class App
                        $module = $module->determineClass($this->args, $router, $this->config);
 
                        // Let the module run it's internal process (init, get, post, ...)
-                       $module->run($this->l10n, $this->baseURL, $this->logger, $_SERVER, $_POST);
+                       $module->run($this->l10n, $this->baseURL, $this->logger, $this->profiler, $_SERVER, $_POST);
                } catch (HTTPException $e) {
                        ModuleHTTPException::rawContent($e);
                }
 
-               $page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig);
+               $page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->profiler, $this->config, $pconfig);
        }
 
        /**

diff --git a/src/App/Module.php b/src/App/Module.php
index 58c595cb7baf18c092eff15537f781fd08a88459..fff7641b76059113bd194fa5ba9cbabeb9866a67 100644 (file)
--- a/src/App/Module.php
+++ b/src/App/Module.php
@@ -30,6 +30,7 @@ use Friendica\Module\HTTPException\MethodNotAllowed;
 use Friendica\Module\HTTPException\PageNotFound;
 use Friendica\Network\HTTPException\MethodNotAllowedException;
 use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -234,7 +235,7 @@ class Module
         *
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public function run(Core\L10n $l10n, App\BaseURL $baseUrl, LoggerInterface $logger, array $server, array $post)
+       public function run(Core\L10n $l10n, App\BaseURL $baseUrl, LoggerInterface $logger, Profiler $profiler, array $server, array $post)
        {
                if ($this->printNotAllowedAddon) {
                        notice($l10n->t("You must be logged in to use addons. "));
@@ -266,10 +267,15 @@ class Module
 
                $placeholder = '';
 
+               $profiler->set(microtime(true), 'ready');
+               $timestamp = microtime(true);
+
                Core\Hook::callAll($this->module . '_mod_init', $placeholder);
 
                call_user_func([$this->module_class, 'init'], $this->module_parameters);
 
+               $profiler->set(microtime(true) - $timestamp, 'init');
+
                if ($server['REQUEST_METHOD'] === 'POST') {
                        Core\Hook::callAll($this->module . '_mod_post', $post);
                        call_user_func([$this->module_class, 'post'], $this->module_parameters);

diff --git a/src/App/Page.php b/src/App/Page.php
index 8c32286895d397717009f891c976bc882582eb28..af1f1810b705d36e92d966aaac1e7e85679584f7 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -36,6 +36,7 @@ use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
+use Friendica\Util\Profiler;
 
 /**
  * Contains the page specific environment variables for the current Page
@@ -375,7 +376,7 @@ class Page implements ArrayAccess
         *
         * @throws HTTPException\InternalServerErrorException
         */
-       public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, IConfig $config, IPConfig $pconfig)
+       public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, Profiler $profiler, IConfig $config, IPConfig $pconfig)
        {
                $moduleName = $module->getName();
 
@@ -384,7 +385,9 @@ class Page implements ArrayAccess
                 *
                 * Sets the $Page->page['content'] variable
                 */
+               $timestamp = microtime(true);
                $this->initContent($module, $mode);
+               $profiler->set(microtime(true) - $timestamp, 'content');
 
                // Load current theme info after module has been initialized as theme could have been set in module
                $currentTheme = $app->getCurrentTheme();

diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index 5cc93e681537a27ae6b185375d98fb6f432f3ab5..a60601098d450ff4f6a043be9bc6f34861cdfdb2 100644 (file)
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -134,7 +134,7 @@ class Profiler implements ContainerInterface
        public function resetPerformance()
        {
                $this->performance = [];
-               $this->performance['start'] = microtime(true);
+               $this->performance['start'] = $this->performance['ready'] = microtime(true);
                $this->performance['database'] = 0;
                $this->performance['database_write'] = 0;
                $this->performance['cache'] = 0;
@@ -145,6 +145,9 @@ class Profiler implements ContainerInterface
                $this->performance['parser'] = 0;
                $this->performance['marktime'] = 0;
                $this->performance['marktime'] = microtime(true);
+               $this->performance['frontend'] = 0;
+               $this->performance['init'] = 0;
+               $this->performance['content'] = 0;
        }
 
        /**
@@ -277,6 +280,11 @@ class Profiler implements ContainerInterface
                }
        }
 
+       public function set($timestamp, $id)
+       {
+               $this->performance[$id] = $timestamp;
+       }
+
        /**
         * Returns true if the container can return an entry for the given identifier.
         * Returns false otherwise.