MFH: Take small blocks cache into account in memory_get_usage()

arnaud-lb · arnaud-lb · commit b4d9c79162a5 · 2009-05-30T16:42:13.000Z
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -2496,7 +2496,11 @@ ZEND_API size_t zend_memory_usage(int real_usage TSRMLS_DC)
 	if (real_usage) {
 		return AG(mm_heap)->real_size;
 	} else {
-		return AG(mm_heap)->size;
+		size_t usage = AG(mm_heap)->size;
+#if ZEND_MM_CACHE
+		usage -= AG(mm_heap)->cached;
+#endif
+		return usage;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2496,7 +2496,11 @@ ZEND_API size_t zend_memory_usage(int real_usage TSRMLS_DC)`
`2496`	`2496`	`if (real_usage) {`
`2497`	`2497`	`return AG(mm_heap)->real_size;`
`2498`	`2498`	`} else {`
`2499`		`- return AG(mm_heap)->size;`
	`2499`	`+ size_t usage = AG(mm_heap)->size;`
	`2500`	`+#if ZEND_MM_CACHE`
	`2501`	`+ usage -= AG(mm_heap)->cached;`
	`2502`	`+#endif`
	`2503`	`+ return usage;`
`2500`	`2504`	`}`
`2501`	`2505`	`}`
`2502`	`2506`