Make zend_memory_peak_usage() to be avalable even without --enable-memory-limit

dstogov · dstogov · commit e6fd66facbe1 · 2006-10-12T06:46:51.000Z
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -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)
 {
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
@@ -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()
 

Original file line number	Diff line number	Diff line change
`@@ -1808,16 +1808,18 @@ ZEND_API size_t zend_memory_usage(int real_usage TSRMLS_DC)`
`1808`	`1808`	`}`
`1809`	`1809`	`}`
`1810`	`1810`
`1811`		`-#if MEMORY_LIMIT`
`1812`	`1811`	`ZEND_API size_t zend_memory_peak_usage(int real_usage TSRMLS_DC)`
`1813`	`1812`	`{`
	`1813`	`+#if MEMORY_LIMIT`
`1814`	`1814`	`if (real_usage) {`
`1815`	`1815`	`return AG(mm_heap)->real_peak;`
`1816`	`1816`	`} else {`
`1817`	`1817`	`return AG(mm_heap)->peak;`
`1818`	`1818`	`}`
`1819`		`-}`
	`1819`	`+#else`
	`1820`	`+ return 0;`
`1820`	`1821`	`#endif`
	`1822`	`+}`
`1821`	`1823`
`1822`	`1824`	`ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC)`
`1823`	`1825`	`{`