[4.4] Invalid timings in debug plugin

plugins/system/debug/src/DataCollector/MemoryCollector.php

@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.Debug
+ *
+ * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Plugin\System\Debug\DataCollector;
+
+use Joomla\Plugin\System\Debug\AbstractDataCollector;
+use Joomla\Registry\Registry;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Collects info about the request duration as well as providing
+ * a way to log duration of any operations
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class MemoryCollector extends AbstractDataCollector
+{
+    /**
+     * @var   boolean
+     * @since __DEPLOY_VERSION__
+     */
+    protected $realUsage = false;
+
+    /**
+     * @var    float
+     * @since __DEPLOY_VERSION__
+     */
+    protected $peakUsage = 0;
+
+    /**
+     * @param   Registry  $params Parameters.
+     * @param   float     $peakUsage
+     * @param   boolean   $realUsage
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public function __construct(Registry $params, $peakUsage = null, $realUsage = null)
+    {
+        parent::__construct($params);
+
+        if ($peakUsage !== null) {
+            $this->peakUsage = $peakUsage;
+        }
+
+        if ($realUsage !== null) {
+            $this->realUsage = $realUsage;
+        }
+    }
+
+    /**
+     * Returns whether total allocated memory page size is used instead of actual used memory size
+     * by the application.  See $real_usage parameter on memory_get_peak_usage for details.
+     *
+     * @return boolean
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public function getRealUsage()
+    {
+        return $this->realUsage;
+    }
+
+    /**
+     * Sets whether total allocated memory page size is used instead of actual used memory size
+     * by the application.  See $real_usage parameter on memory_get_peak_usage for details.
+     *
+     * @param boolean $realUsage
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public function setRealUsage($realUsage)
+    {
+        $this->realUsage = $realUsage;
+    }
+
+    /**
+     * Returns the peak memory usage
+     *
+     * @return integer
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public function getPeakUsage()
+    {
+        return $this->peakUsage;
+    }
+
+    /**
+     * Updates the peak memory usage value
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public function updatePeakUsage()
+    {
+        if ($this->peakUsage === null) {
+            $this->peakUsage = memory_get_peak_usage($this->realUsage);
+        }
+    }
+
+    /**
+     * @return array
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public function collect()
+    {
+        $this->updatePeakUsage();
+
+        return [
+            'peak_usage'     => $this->peakUsage,
+            'peak_usage_str' => $this->getDataFormatter()->formatBytes($this->peakUsage, 3),
+        ];
+    }
+
+    /**
+     * @return string
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public function getName()
+    {
+        return 'memory';
+    }
+
+    /**
+     * @return array
+     *
+     * @since __DEPLOY_VERSION__
+     */
+    public function getWidgets()
+    {
+        return [
+            'memory' => [
+                'icon'    => 'cogs',
+                'tooltip' => 'Memory Usage',
+                'map'     => 'memory.peak_usage_str',
+                'default' => "'0B'",
+            ],
+        ];
+    }
+}

plugins/system/debug/src/DataCollector/ProfileCollector.php

@@ -84,8 +84,9 @@ public function __construct(Registry $params)
      * @param   string|null  $label      Public name
      * @param   string|null  $collector  The source of the collector
      *
-     * @since  4.0.0
      * @return void
+     *
+     * @since  4.0.0
      */
     public function startMeasure($name, $label = null, $collector = null)
     {
@@ -103,8 +104,9 @@ public function startMeasure($name, $label = null, $collector = null)
      *
      * @param   string  $name  Group name.
      *
-     * @since  4.0.0
      * @return bool
+     *
+     * @since  4.0.0
      */
     public function hasStartedMeasure($name): bool
     {
@@ -117,9 +119,11 @@ public function hasStartedMeasure($name): bool
      * @param   string  $name    Measurement name.
      * @param   array   $params  Parameters
      *
+     * @return void
+     *
      * @since  4.0.0
+     *
      * @throws DebugBarException
-     * @return void
      */
     public function stopMeasure($name, array $params = [])
     {
@@ -129,13 +133,7 @@ public function stopMeasure($name, array $params = [])
             throw new DebugBarException("Failed stopping measure '$name' because it hasn't been started");
         }
 
-        $this->addMeasure(
-            $this->startedMeasures[$name]['label'],
-            $this->startedMeasures[$name]['start'],
-            $end,
-            $params,
-            $this->startedMeasures[$name]['collector']
-        );
+        $this->addMeasure($this->startedMeasures[$name]['label'], $this->startedMeasures[$name]['start'], $end, $params, $this->startedMeasures[$name]['collector']);
 
         unset($this->startedMeasures[$name]);
     }
@@ -149,8 +147,9 @@ public function stopMeasure($name, array $params = [])
      * @param   array        $params     Parameters.
      * @param   string|null  $collector  A collector.
      *
-     * @since  4.0.0
      * @return void
+     *
+     * @since  4.0.0
      */
     public function addMeasure($label, $start, $end, array $params = [], $collector = null)
     {
@@ -174,8 +173,9 @@ public function addMeasure($label, $start, $end, array $params = [], $collector
      * @param   \Closure     $closure    A closure.
      * @param   string|null  $collector  A collector.
      *
-     * @since  4.0.0
      * @return void
+     *
+     * @since  4.0.0
      */
     public function measure($label, \Closure $closure, $collector = null)
     {
@@ -189,8 +189,9 @@ public function measure($label, \Closure $closure, $collector = null)
     /**
      * Returns an array of all measures
      *
-     * @since  4.0.0
      * @return array
+     *
+     * @since  4.0.0
      */
     public function getMeasures(): array
     {
@@ -200,8 +201,9 @@ public function getMeasures(): array
     /**
      * Returns the request start time
      *
-     * @since  4.0.0
      * @return float
+     *
+     * @since  4.0.0
      */
     public function getRequestStartTime(): float
     {
@@ -211,8 +213,9 @@ public function getRequestStartTime(): float
     /**
      * Returns the request end time
      *
-     * @since  4.0.0
      * @return float
+     *
+     * @since  4.0.0
      */
     public function getRequestEndTime(): float
     {
@@ -222,8 +225,9 @@ public function getRequestEndTime(): float
     /**
      * Returns the duration of a request
      *
-     * @since  4.0.0
      * @return float
+     *
+     * @since  4.0.0
      */
     public function getRequestDuration(): float
     {
@@ -234,15 +238,32 @@ public function getRequestDuration(): float
         return microtime(true) - $this->requestStartTime;
     }
 
+    /**
+     * Sets request end time.
+     *
+     * @param   float  $time  Request end time.
+     *
+     * @return $this
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    public function setRequestEndTime($time): self
+    {
+        $this->requestEndTime = $time;
+
+        return $this;
+    }
+
     /**
      * Called by the DebugBar when data needs to be collected
      *
-     * @since  4.0.0
      * @return array Collected data
+     *
+     * @since  4.0.0
      */
     public function collect(): array
     {
-        $this->requestEndTime = microtime(true);
+        $this->requestEndTime = $this->requestEndTime ?? microtime(true);
 
         $start = $this->requestStartTime;
 
@@ -284,8 +305,9 @@ function ($a, $b) {
     /**
      * Returns the unique name of the collector
      *
-     * @since  4.0.0
      * @return string
+     *
+     * @since  4.0.0
      */
     public function getName(): string
     {
@@ -296,8 +318,9 @@ public function getName(): string
      * Returns a hash where keys are control names and their values
      * an array of options as defined in {@see \DebugBar\JavascriptRenderer::addControl()}
      *
-     * @since  4.0.0
      * @return array
+     *
+     * @since  4.0.0
      */
     public function getWidgets(): array
     {