bjori Tue Jul 25 16:41:04 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c var.c
Log:
MFH: Update protos & arginfo for memory_get_usage() & memory_get_peak_usage()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.17&r2=1.725.2.31.2.18&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.17
php-src/ext/standard/basic_functions.c:1.725.2.31.2.18
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.17 Wed Jul 19
12:25:46 2006
+++ php-src/ext/standard/basic_functions.c Tue Jul 25 16:41:04 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.17 2006/07/19 12:25:46 mike Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.18 2006/07/25 16:41:04 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3054,11 +3054,13 @@
#if MEMORY_LIMIT
static
-ZEND_BEGIN_ARG_INFO(arginfo_memory_get_usage, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_usage, 0, 0, 0)
+ ZEND_ARG_INFO(0, real_usage)
ZEND_END_ARG_INFO()
static
-ZEND_BEGIN_ARG_INFO(arginfo_memory_get_peak_usage, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_peak_usage, 0, 0, 0)
+ ZEND_ARG_INFO(0, real_usage)
ZEND_END_ARG_INFO()
#endif
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.6&r2=1.203.2.7.2.7&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.7.2.6
php-src/ext/standard/var.c:1.203.2.7.2.7
--- php-src/ext/standard/var.c:1.203.2.7.2.6 Tue Jul 25 13:40:05 2006
+++ php-src/ext/standard/var.c Tue Jul 25 16:41:04 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.203.2.7.2.6 2006/07/25 13:40:05 dmitry Exp $ */
+/* $Id: var.c,v 1.203.2.7.2.7 2006/07/25 16:41:04 bjori Exp $ */
@@ -909,7 +909,7 @@
/* }}} */
#if MEMORY_LIMIT
-/* {{{ proto int memory_get_usage()
+/* {{{ proto int memory_get_usage([real_usage])
Returns the allocated by PHP memory */
PHP_FUNCTION(memory_get_usage) {
zend_bool real_usage = 0;
@@ -921,7 +921,7 @@
RETURN_LONG(zend_memory_usage(real_usage TSRMLS_CC));
}
/* }}} */
-/* {{{ proto int memory_get_peak_usage()
+/* {{{ proto int memory_get_peak_usage([real_usage])
Returns the peak allocated by PHP memory */
PHP_FUNCTION(memory_get_peak_usage) {
zend_bool real_usage = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
