mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-24 18:41:52 +02:00
Merge pull request #415 from naderman/ticket/10412
[ticket/10412] Replace memory_get_usage with memory_get_peak_usage
This commit is contained in:
@@ -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'))
|
||||
|
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user