]> 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:47:04 +0000 (06:47 +0000)
committerDmitry Stogov <dmitry@php.net>
Thu, 12 Oct 2006 06:47:04 +0000 (06:47 +0000)
Zend/zend_alloc.c
Zend/zend_alloc.h

index c5bf1804c81da82717d9365558595ae6c1b5f063..8974cabf09c3226ef7bee30afefaea6dd7d6dd3d 100644 (file)
@@ -1850,16 +1850,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 c251bd0ec425f4231f47bb13b875bd25d831aa26..00672f9b0ba2e2085135ac7c66893429b43153ee 100644 (file)
@@ -119,10 +119,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()