aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-10-14 02:02:17 +0200
committerNils Adermann <naderman@naderman.de>2011-10-14 02:02:17 +0200
commitbb616b4135fba145c961f26a4ff612d6579b6b17 (patch)
tree5dd39308e6ce584b231026eb543c65dbfb2124ad /phpBB/includes/functions.php
parent85407986ead970b60ca75fdada9de774248c9a81 (diff)
downloadforums-bb616b4135fba145c961f26a4ff612d6579b6b17.tar
forums-bb616b4135fba145c961f26a4ff612d6579b6b17.tar.gz
forums-bb616b4135fba145c961f26a4ff612d6579b6b17.tar.bz2
forums-bb616b4135fba145c961f26a4ff612d6579b6b17.tar.xz
forums-bb616b4135fba145c961f26a4ff612d6579b6b17.zip
[ticket/10412] Replace memory_get_usage with memory_get_peak_usage
PHPBB3-10412
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 8f41e18db6..688c7f2000 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4627,15 +4627,13 @@ function page_footer($run_cron = true)
if ($auth->acl_get('a_') && defined('DEBUG_EXTRA'))
{
- if (function_exists('memory_get_usage'))
+ if (function_exists('memory_get_peak_usage'))
{
- if ($memory_usage = memory_get_usage())
+ if ($memory_usage = memory_get_peak_usage())
{
- global $base_memory_usage;
- $memory_usage -= $base_memory_usage;
$memory_usage = get_formatted_filesize($memory_usage);
- $debug_output .= ' | Memory Usage: ' . $memory_usage;
+ $debug_output .= ' | Peak Memory Usage: ' . $memory_usage;
}
}