X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FProfiler.php;h=240273bde3ce319594cbe4c6a4adc7de6dcada33;hb=05bd0d0b671ad509465fa6cddabc3c2a07c796a7;hp=2d3da3a9c0b99f762a29f9b9bb9e7288a87ab337;hpb=5e5c39b0e12154551ece88692c1567fc04db86ec;p=friendica.git

diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index 2d3da3a9c0..240273bde3 100644
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -1,7 +1,28 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Util;
 
+use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\IConfig;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -11,7 +32,7 @@ use Psr\Log\LoggerInterface;
  * A class to store profiling data
  * It can handle different logging data for specific functions or global performance measures
  *
- * It stores the data as log entries (@see LoggerInterface )
+ * It stores the data as log entries (@see LoggerInterface)
  */
 class Profiler implements ContainerInterface
 {
@@ -33,13 +54,33 @@ class Profiler implements ContainerInterface
 	private $rendertime;
 
 	/**
-	 * @param bool $enabled           True, if the Profiler is enabled
-	 * @param bool $renderTime        True, if the Profiler should measure the whole rendertime including functions
+	 * True, if the Profiler should measure the whole rendertime including functions
+	 *
+	 * @return bool
 	 */
-	public function __construct($enabled = false, $renderTime = false)
+	public function isRendertime()
 	{
-		$this->enabled = $enabled;
-		$this->rendertime = $renderTime;
+		return $this->rendertime;
+	}
+
+	/**
+	 * Updates the enabling of the current profiler
+	 *
+	 * @param IConfig $config
+	 */
+	public function update(IConfig $config)
+	{
+		$this->enabled = $config->get('system', 'profiler');
+		$this->rendertime = $config->get('rendertime', 'callstack');
+	}
+
+	/**
+	 * @param Cache $configCache The configuration cache
+	 */
+	public function __construct(Cache $configCache)
+	{
+		$this->enabled = $configCache->get('system', 'profiler');
+		$this->rendertime = $configCache->get('rendertime', 'callstack');
 		$this->reset();
 	}
 
@@ -57,7 +98,7 @@ class Profiler implements ContainerInterface
 			return;
 		}
 
-		$duration = (float) (microtime(true) - $timestamp);
+		$duration = floatval(microtime(true) - $timestamp);
 
 		if (!isset($this->performance[$value])) {
 			// Prevent ugly E_NOTICE
@@ -120,86 +161,97 @@ class Profiler implements ContainerInterface
 	}
 
 	/**
-	 * Save the current profiling data to a log entry
+	 * Returns the rendertime string
 	 *
-	 * @param LoggerInterface $logger The logger to save the current log
-	 * @param string          $message Additional message for the log
+	 * @return string the rendertime
 	 */
-	public function saveLog(LoggerInterface $logger, $message = '')
+	public function getRendertimeString()
 	{
-		// Write down the performance values into the log
-		if (!$this->enabled) {
-			return;
-		}
-		$duration = microtime(true) - $this->get('start');
-		$logger->info(
-			$message,
-			[
-				'action' => 'profiling',
-				'database_read' => round($this->get('database') - $this->get('database_write'), 3),
-				'database_write' => round($this->get('database_write'), 3),
-				'cache_read' => round($this->get('cache'), 3),
-				'cache_write' => round($this->get('cache_write'), 3),
-				'network_io' => round($this->get('network'), 2),
-				'file_io' => round($this->get('file'), 2),
-				'other_io' => round($duration - ($this->get('database')
-						+ $this->get('cache') + $this->get('cache_write')
-						+ $this->get('network') + $this->get('file')), 2),
-				'total' => round($duration, 2)
-			]
-		);
+		$output = '';
 
-		if (!$this->rendertime) {
-			return;
+		if (!$this->enabled || !$this->rendertime) {
+			return $output;
 		}
-		
-		$o = '';
+
 		if (isset($this->callstack["database"])) {
-			$o .= "\nDatabase Read:\n";
+			$output .= "\nDatabase Read:\n";
 			foreach ($this->callstack["database"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
+					$output .= $func . ": " . $time . "\n";
 				}
 			}
 		}
 		if (isset($this->callstack["database_write"])) {
-			$o .= "\nDatabase Write:\n";
+			$output .= "\nDatabase Write:\n";
 			foreach ($this->callstack["database_write"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
+					$output .= $func . ": " . $time . "\n";
 				}
 			}
 		}
 		if (isset($this->callstack["cache"])) {
-			$o .= "\nCache Read:\n";
+			$output .= "\nCache Read:\n";
 			foreach ($this->callstack["cache"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
+					$output .= $func . ": " . $time . "\n";
 				}
 			}
 		}
 		if (isset($this->callstack["cache_write"])) {
-			$o .= "\nCache Write:\n";
+			$output .= "\nCache Write:\n";
 			foreach ($this->callstack["cache_write"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
+					$output .= $func . ": " . $time . "\n";
 				}
 			}
 		}
 		if (isset($this->callstack["network"])) {
-			$o .= "\nNetwork:\n";
+			$output .= "\nNetwork:\n";
 			foreach ($this->callstack["network"] as $func => $time) {
 				$time = round($time, 3);
 				if ($time > 0) {
-					$o .= $func . ": " . $time . "\n";
+					$output .= $func . ": " . $time . "\n";
 				}
 			}
 		}
-		$logger->info($message . ": " . $o, ['action' => 'profiling']);
+
+		return $output;
+	}
+
+	/**
+	 * Save the current profiling data to a log entry
+	 *
+	 * @param LoggerInterface $logger  The logger to save the current log
+	 * @param string          $message Additional message for the log
+	 */
+	public function saveLog(LoggerInterface $logger, $message = '')
+	{
+		$duration = microtime(true) - $this->get('start');
+		$logger->info(
+			$message,
+			[
+				'action' => 'profiling',
+				'database_read' => round($this->get('database') - $this->get('database_write'), 3),
+				'database_write' => round($this->get('database_write'), 3),
+				'cache_read' => round($this->get('cache'), 3),
+				'cache_write' => round($this->get('cache_write'), 3),
+				'network_io' => round($this->get('network'), 2),
+				'file_io' => round($this->get('file'), 2),
+				'other_io' => round($duration - ($this->get('database')
+						+ $this->get('cache') + $this->get('cache_write')
+						+ $this->get('network') + $this->get('file')), 2),
+				'total' => round($duration, 2)
+			]
+		);
+
+		if ($this->isRendertime()) {
+			$output = $this->getRendertimeString();
+			$logger->info($message . ": " . $output, ['action' => 'profiling']);
+		}
 	}
 
 	/**