From 767ac573af453f8eef538430f828ef0779b7fb93 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@kunena.org>
Date: Thu, 16 Oct 2014 12:42:34 +0300
Subject: [PATCH] Add initial loading time to debugger timeline

---
 system/src/Grav/Common/Debugger.php |  1 +
 system/src/Grav/Common/Grav.php     | 45 +++++++++++++++--------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/system/src/Grav/Common/Debugger.php b/system/src/Grav/Common/Debugger.php
index 6f485d396..cc494bd82 100644
--- a/system/src/Grav/Common/Debugger.php
+++ b/system/src/Grav/Common/Debugger.php
@@ -19,6 +19,7 @@ class Debugger
     public function __construct()
     {
         $this->debugbar = new StandardDebugBar();
+        $this->debugbar['time']->addMeasure('Loading', $this->debugbar['time']->getRequestStartTime(), microtime(true));
     }
 
     public function init()
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index c4dca02f4..c3bf5bc3b 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -152,30 +152,33 @@ class Grav extends Container
         // Use output buffering to prevent headers from being sent too early.
         ob_start();
 
-        // Initialize configuration.
-        $this['debugger']->startTimer('_config', 'Configuration');
-        $this['config']->init();
-        $this['debugger']->stopTimer('_config');
+        /** @var Debugger $debugger */
+        $debugger = $this['debugger'];
 
-        $this['debugger']->startTimer('_debugger', 'Debugger');
-        $this['debugger']->init();
-        $this['debugger']->stopTimer('_debugger');
+        // Initialize configuration.
+        $debugger->startTimer('_config', 'Configuration');
+        $this['config']->init();
+        $debugger->stopTimer('_config');
+
+        $debugger->startTimer('_debugger', 'Debugger');
+        $debugger->init();
+        $debugger->stopTimer('_debugger');
 
         $this['config']->debug();
 
-        $this['debugger']->startTimer('streams', 'Streams');
+        $debugger->startTimer('streams', 'Streams');
         $this['streams'];
-        $this['debugger']->stopTimer('streams');
+        $debugger->stopTimer('streams');
 
-        $this['debugger']->startTimer('plugins', 'Plugins');
+        $debugger->startTimer('plugins', 'Plugins');
         $this['plugins']->init();
         $this->fireEvent('onPluginsInitialized');
-        $this['debugger']->stopTimer('plugins');
+        $debugger->stopTimer('plugins');
 
-        $this['debugger']->startTimer('themes', 'Themes');
+        $debugger->startTimer('themes', 'Themes');
         $this['themes']->init();
         $this->fireEvent('onThemeInitialized');
-        $this['debugger']->stopTimer('themes');
+        $debugger->stopTimer('themes');
 
         $task = $this['task'];
         if ($task) {
@@ -183,32 +186,32 @@ class Grav extends Container
         }
 
         $this['assets']->init();
-        $this['debugger']->addAssets();
+        $debugger->addAssets();
         $this->fireEvent('onAssetsInitialized');
 
-        $this['debugger']->startTimer('twig', 'Twig');
+        $debugger->startTimer('twig', 'Twig');
         $this['twig']->init();
-        $this['debugger']->stopTimer('twig');
+        $debugger->stopTimer('twig');
 
-        $this['debugger']->startTimer('pages', 'Pages');
+        $debugger->startTimer('pages', 'Pages');
         $this['pages']->init();
         $this->fireEvent('onPagesInitialized');
-        $this['debugger']->stopTimer('pages');
+        $debugger->stopTimer('pages');
 
         $this->fireEvent('onPageInitialized');
 
 
 
         // Process whole page as required
-        $this['debugger']->startTimer('render', 'Render');
+        $debugger->startTimer('render', 'Render');
         $this->output = $this['output'];
         $this->fireEvent('onOutputGenerated');
-        $this['debugger']->stopTimer('render');
+        $debugger->stopTimer('render');
 
         // Set the header type
         $this->header();
         echo $this->output;
-        $this['debugger']->render();
+        $debugger->render();
 
         $this->fireEvent('onOutputRendered');