]> granicus.if.org Git - php/commitdiff
Make zend_memory_peak_usage() to be avalable even without --enable-memory-limit
authorDmitry Stogov <dmitry@php.net>
Thu, 12 Oct 2006 06:46:51 +0000 (06:46 +0000)
committerDmitry Stogov <dmitry@php.net>
Thu, 12 Oct 2006 06:46:51 +0000 (06:46 +0000)
Zend/zend_alloc.c
Zend/zend_alloc.h

index a51e963b4ac136a329acbda1be575c6220d0e2d7..5303c9b1fb6242c9dc37e41bdc7800f67b1d255d 100644 (file)
@@ -1808,16 +1808,18 @@ ZEND_API size_t zend_memory_usage(int real_usage TSRMLS_DC)
        }
 }
 
-#if MEMORY_LIMIT
 ZEND_API size_t zend_memory_peak_usage(int real_usage TSRMLS_DC)
 {
+#if MEMORY_LIMIT
        if (real_usage) {
                return AG(mm_heap)->real_peak;
        } else {
                return AG(mm_heap)->peak;
        }
-}
+#else
+       return 0;
 #endif
+}
 
 ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC)
 {
index 9be4342348664c9ebdcd45d71e5ac43b54b0882c..48f941ba7d3da54876cb29d1dcc843c0799d7f01 100644 (file)
@@ -108,10 +108,8 @@ void zend_debug_alloc_output(char *format, ...);
 #define full_mem_check(silent)
 #endif
 
-#if MEMORY_LIMIT
 ZEND_API size_t zend_memory_usage(int real_usage TSRMLS_DC);
 ZEND_API size_t zend_memory_peak_usage(int real_usage TSRMLS_DC);
-#endif
 
 END_EXTERN_C()