mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:11:47 +02:00
Code Issues Releases Wiki Activity

Merge pull request #415 from naderman/ticket/10412

Browse Source 
[ticket/10412] Replace memory_get_usage with memory_get_peak_usage
This commit is contained in:
Igor Wiedler
2011-10-13 17:06:42 -07:00
parent 85407986ea bb616b4135
commit 5d055747d1
3 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/common.php
View File

@@ -59,15 +59,6 @@ if (!defined('PHPBB_INSTALLED'))
exit; exit;
} }
if (defined('DEBUG_EXTRA'))
{
$base_memory_usage = 0;
if (function_exists('memory_get_usage'))
{
$base_memory_usage = memory_get_usage();
}
}
// Load Extensions // Load Extensions
// dl() is deprecated and disabled by default as of PHP 5.3. // dl() is deprecated and disabled by default as of PHP 5.3.
if (!empty($load_extensions) && function_exists('dl')) if (!empty($load_extensions) && function_exists('dl'))

8
phpBB/includes/functions.php
View File

@@ -4627,15 +4627,13 @@ function page_footer($run_cron = true)
if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) 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); $memory_usage = get_formatted_filesize($memory_usage);
$debug_output .= ' | Memory Usage: ' . $memory_usage; $debug_output .= ' | Peak Memory Usage: ' . $memory_usage;
} }
} }

8
phpBB/includes/functions_acp.php
View File

@@ -106,15 +106,13 @@ function adm_page_footer($copyright_html = true)
if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) 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); $memory_usage = get_formatted_filesize($memory_usage);
$debug_output .= ' | Memory Usage: ' . $memory_usage; $debug_output .= ' | Peak Memory Usage: ' . $memory_usage;
} }
} }