diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-10-14 02:02:17 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-10-14 02:02:17 +0200 |
| commit | bb616b4135fba145c961f26a4ff612d6579b6b17 (patch) | |
| tree | 5dd39308e6ce584b231026eb543c65dbfb2124ad | |
| parent | 85407986ead970b60ca75fdada9de774248c9a81 (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/common.php | 9 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/functions_acp.php | 8 |
3 files changed, 6 insertions, 19 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 524c05ae70..061290dcea 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -59,15 +59,6 @@ if (!defined('PHPBB_INSTALLED')) exit; } -if (defined('DEBUG_EXTRA')) -{ - $base_memory_usage = 0; - if (function_exists('memory_get_usage')) - { - $base_memory_usage = memory_get_usage(); - } -} - // Load Extensions // dl() is deprecated and disabled by default as of PHP 5.3. if (!empty($load_extensions) && function_exists('dl')) 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; } } diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index c3806dc786..36e22e069f 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -106,15 +106,13 @@ function adm_page_footer($copyright_html = 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; } } |