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;
* 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
{
private $rendertime;
/**
- * @var LoggerInterface The profiler logger
+ * True, if the Profiler should measure the whole rendertime including functions
+ *
+ * @return bool
*/
- private $logger;
+ public function isRendertime()
+ {
+ return $this->rendertime;
+ }
/**
- * @param LoggerInterface $logger The profiler logger
- * @param bool $enabled True, if the Profiler is enabled
- * @param bool $renderTime True, if the Profiler should measure the whole rendertime including functions
+ * Updates the enabling of the current profiler
+ *
+ * @param IConfig $config
*/
- public function __construct(LoggerInterface $logger, $enabled = false, $renderTime = false)
+ public function update(IConfig $config)
{
- $this->enabled = $enabled;
- $this->rendertime = $renderTime;
- $this->logger = $logger;
+ $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();
}
return;
}
- $duration = (float) (microtime(true) - $timestamp);
+ $duration = floatval(microtime(true) - $timestamp);
if (!isset($this->performance[$value])) {
// Prevent ugly E_NOTICE
}
/**
- * Save the current profiling data to a log entry
+ * Returns the rendertime string
*
- * @param string $message Additional message for the log
+ * @return string the rendertime
*/
- public function saveLog($message = '')
+ public function getRendertimeString()
{
- // Write down the performance values into the log
- if (!$this->enabled) {
- return;
- }
- $duration = microtime(true) - $this->get('start');
- $this->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";
}
}
}
- $this->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']);
+ }
}
/**