Changed Massif to record the 'slop' heap bytes caused by rounding asked-for
sizes up to a multiple of 8 (or whatever --alignment is). This is combined
with the "admin" bytes, resulting in the "extra" bytes. Added
VG_(malloc_usable_size) to the tool interface to support this.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7133 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/massif/tests/deep-B.post.exp b/massif/tests/deep-B.post.exp
index a797f30..4fbfde0 100644
--- a/massif/tests/deep-B.post.exp
+++ b/massif/tests/deep-B.post.exp
@@ -6,7 +6,7 @@
KB
-1.055^ :
+2.031^ :
| :
| @ :
| @ :
@@ -27,32 +27,32 @@
| : : : : : : : : @ :
| : : : : : : : : @ :
0 +----------------------------------------------------------------@------>KB
- 0 1.055
+ 0 2.031
Number of snapshots: 11
Detailed snapshots: [9]
--------------------------------------------------------------------------------
- n time(B) total(B) useful-heap(B) admin-heap(B) stacks(B)
+ n time(B) total(B) useful-heap(B) extra-heap(B) stacks(B)
--------------------------------------------------------------------------------
0 0 0 0 0 0
- 1 108 108 100 8 0
- 2 216 216 200 16 0
- 3 324 324 300 24 0
- 4 432 432 400 32 0
- 5 540 540 500 40 0
- 6 648 648 600 48 0
- 7 756 756 700 56 0
- 8 864 864 800 64 0
- 9 972 972 900 72 0
-92.59% (900B) (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
-->92.59% (900B) 0x........: a5 (deep.c:23)
- ->92.59% (900B) 0x........: a4 (deep.c:24)
- ->92.59% (900B) 0x........: a3 (deep.c:25)
- ->92.59% (900B) 0x........: a2 (deep.c:26)
- ->92.59% (900B) 0x........: a1 (deep.c:27)
- ->92.59% (900B) 0x........: main (deep.c:35)
+ 1 208 208 200 8 0
+ 2 416 416 400 16 0
+ 3 624 624 600 24 0
+ 4 832 832 800 32 0
+ 5 1,040 1,040 1,000 40 0
+ 6 1,248 1,248 1,200 48 0
+ 7 1,456 1,456 1,400 56 0
+ 8 1,664 1,664 1,600 64 0
+ 9 1,872 1,872 1,800 72 0
+96.15% (1,800B) (heap allocation functions) malloc/new/new[], --alloc-fns, etc.
+->96.15% (1,800B) 0x........: a5 (deep.c:23)
+ ->96.15% (1,800B) 0x........: a4 (deep.c:24)
+ ->96.15% (1,800B) 0x........: a3 (deep.c:25)
+ ->96.15% (1,800B) 0x........: a2 (deep.c:26)
+ ->96.15% (1,800B) 0x........: a1 (deep.c:27)
+ ->96.15% (1,800B) 0x........: main (deep.c:35)
--------------------------------------------------------------------------------
- n time(B) total(B) useful-heap(B) admin-heap(B) stacks(B)
+ n time(B) total(B) useful-heap(B) extra-heap(B) stacks(B)
--------------------------------------------------------------------------------
- 10 1,080 1,080 1,000 80 0
+ 10 2,080 2,080 2,000 80 0