From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 30 May 2006 14:51:54 +0000 (+0000)
Subject: MFB: Added memory_get_peak_usage() function for retrieving peak memory
X-Git-Tag: BEFORE_NEW_OUTPUT_API~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1aadb29d51865ebf0beb8e96ef8fb868b5f463fc;p=php

MFB: Added memory_get_peak_usage() function for retrieving peak memory
usage of a PHP script.
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 7f9fa01d41..ace8ebd32a 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -464,6 +464,7 @@ zend_function_entry basic_functions[] = {
 	PHP_FE(print_r,															NULL)
 #if MEMORY_LIMIT 
 	PHP_FE(memory_get_usage,												NULL)
+	PHP_FE(memory_get_peak_usage,												NULL)
 #endif
 
 	PHP_FE(register_shutdown_function,										NULL)
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h
index 7e8ca280cd..6aea4b0678 100644
--- a/ext/standard/php_var.h
+++ b/ext/standard/php_var.h
@@ -31,6 +31,7 @@ PHP_FUNCTION(serialize);
 PHP_FUNCTION(unserialize);
 #if MEMORY_LIMIT 
 PHP_FUNCTION(memory_get_usage);
+PHP_FUNCTION(memory_get_peak_usage);
 #endif
 
 PHPAPI void php_var_dump(zval **struc, int level, int verbose TSRMLS_DC);
diff --git a/ext/standard/var.c b/ext/standard/var.c
index dff8b472f4..01a9e0daf1 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -1154,6 +1154,12 @@ PHP_FUNCTION(memory_get_usage) {
 	RETURN_LONG(AG(allocated_memory));
 }
 /* }}} */
+/* {{{ proto int memory_get_peak_usage()
+    Returns the peak allocated by PHP memory */
+PHP_FUNCTION(memory_get_peak_usage) {
+	RETURN_LONG(AG(allocated_memory_peak));
+}
+/* }}} */
 #endif
 
 /*