From 34eb41579c6c34fa60ec6f1aac7b70ba6e1bebcc Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 15 Nov 2017 11:40:41 +0100 Subject: malloc: Account for all heaps in an arena in malloc_info [BZ #22439] This commit adds a "subheaps" field to the malloc_info output that shows the number of heaps that were allocated to extend a non-main arena. Reviewed-by: Siddhesh Poyarekar --- malloc/malloc.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'malloc') diff --git a/malloc/malloc.c b/malloc/malloc.c index 0494e8c..2999ac4 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -5457,11 +5457,19 @@ __malloc_info (int options, FILE *fp) size_t heap_size = 0; size_t heap_mprotect_size = 0; + size_t heap_count = 0; if (ar_ptr != &main_arena) { + /* Iterate over the arena heaps from back to front. */ heap_info *heap = heap_for_ptr (top (ar_ptr)); - heap_size = heap->size; - heap_mprotect_size = heap->mprotect_size; + do + { + heap_size += heap->size; + heap_mprotect_size += heap->mprotect_size; + heap = heap->prev; + ++heap_count; + } + while (heap != NULL); } __libc_lock_unlock (ar_ptr->mutex); @@ -5499,8 +5507,9 @@ __malloc_info (int options, FILE *fp) { fprintf (fp, "\n" - "\n", - heap_size, heap_mprotect_size); + "\n" + "\n", + heap_size, heap_mprotect_size, heap_count); total_aspace += heap_size; total_aspace_mprotect += heap_mprotect_size; } -- cgit v1.1