Show memory-peak-usage in Benchmark

diff --git a/com.woltlab.wcf/template/benchmark.tpl b/com.woltlab.wcf/template/benchmark.tpl
index 9008fa5279fd0249fbaba9cfcbb56c48fddd7776..3b32bb4bf2df6ec07aeb16bdf19b2a002eb84351 100644 (file)
--- a/com.woltlab.wcf/template/benchmark.tpl
+++ b/com.woltlab.wcf/template/benchmark.tpl
@@ -1,4 +1,4 @@
-<p style="margin-top: 10px; font-size: .85em" id="benchmark">Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()}</p>
+<p style="margin-top: 10px; font-size: .85em" id="benchmark">Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</p>
 
 {if ENABLE_DEBUG_MODE} 
        <ul id="benchmarkDetails" style="display: none;">

diff --git a/wcfsetup/install/files/acp/templates/benchmark.tpl b/wcfsetup/install/files/acp/templates/benchmark.tpl
index 9008fa5279fd0249fbaba9cfcbb56c48fddd7776..3b32bb4bf2df6ec07aeb16bdf19b2a002eb84351 100644 (file)
--- a/wcfsetup/install/files/acp/templates/benchmark.tpl
+++ b/wcfsetup/install/files/acp/templates/benchmark.tpl
@@ -1,4 +1,4 @@
-<p style="margin-top: 10px; font-size: .85em" id="benchmark">Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()}</p>
+<p style="margin-top: 10px; font-size: .85em" id="benchmark">Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</p>
 
 {if ENABLE_DEBUG_MODE} 
        <ul id="benchmarkDetails" style="display: none;">

diff --git a/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php b/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php
index 2e9c701f33b530d5a4bd458c554caefb5a696bd2..4a1a05615d614b3279e2ae989c8c921a950bcd95 100644 (file)
--- a/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php
+++ b/wcfsetup/install/files/lib/system/benchmark/Benchmark.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\benchmark;
 use wcf\system\SingletonFactory;
+use wcf\util\FileUtil;
 
 /**
  * Provides functions to do a benchmark.
@@ -139,4 +140,13 @@ class Benchmark extends SingletonFactory {
        protected static function compareMicrotimes($startTime, $endTime) {
                return round($endTime - $startTime, 4);
        }
+       
+       /**
+        * Returns the formatted peak of memory_usage.
+        * 
+        * @return      string
+        */
+       public function getMemoryUsage() {
+               return FileUtil::formatFilesize(memory_get_peak_usage());
+       }
 }