From 3d913d61430f3baf1117dee8470a722a7a59733c Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Thu, 6 Feb 2003 14:34:07 +0000 Subject: [PATCH] Backporting memory_get_usage() from HEAD. As far as the code is small there won't be any problems. --- ext/standard/basic_functions.c | 3 +++ ext/standard/php_var.h | 3 +++ ext/standard/var.c | 9 +++++++++ 3 files changed, 15 insertions(+) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index a6d0040b36..ee97d0b87a 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -545,6 +545,9 @@ function_entry basic_functions[] = { PHP_FE(call_user_method_array, second_arg_force_ref) PHP_FE(serialize, NULL) PHP_FE(unserialize, NULL) +#if MEMORY_LIMIT + PHP_FE(memory_get_usage, NULL) +#endif PHP_FE(var_dump, NULL) PHP_FE(var_export, NULL) diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h index 796e1a19e3..0a195816aa 100644 --- a/ext/standard/php_var.h +++ b/ext/standard/php_var.h @@ -28,6 +28,9 @@ PHP_FUNCTION(var_export); PHP_FUNCTION(debug_zval_dump); PHP_FUNCTION(serialize); PHP_FUNCTION(unserialize); +#if MEMORY_LIMIT +PHP_FUNCTION(memory_get_usage); +#endif void php_var_dump(zval **struc, int level TSRMLS_DC); void php_var_export(zval **struc, int level TSRMLS_DC); diff --git a/ext/standard/var.c b/ext/standard/var.c index b7aa15c54c..1ab4fbc052 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -679,6 +679,15 @@ PHP_FUNCTION(unserialize) /* }}} */ +#if MEMORY_LIMIT +/* {{{ proto int memory_get_usage() + Returns the allocated by PHP memory */ +PHP_FUNCTION(memory_get_usage) { + RETURN_LONG(AG(allocated_memory)); +} +/* }}} */ +#endif + /* * Local variables: * tab-width: 4 -- 2.50.1