summaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2019-08-08 22:02:27 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-08-08 22:02:27 +0200
commitb6d2c4475d5abc05dd009575b90556bdd3c78ad0 (patch)
treecc467df460e9dd8ca4776e91b12771ccc8253ee1 /malloc
parentAdd SYNC_FILE_RANGE_WRITE_AND_WAIT from Linux 5.2 to bits/fcntl-linux.h. (diff)
downloadglibc-b6d2c4475d5abc05dd009575b90556bdd3c78ad0.tar.gz
glibc-b6d2c4475d5abc05dd009575b90556bdd3c78ad0.tar.bz2
glibc-b6d2c4475d5abc05dd009575b90556bdd3c78ad0.zip
malloc: Fix missing accounting of top chunk in malloc_info [BZ #24026]
Fixes `<total type="rest" size="..."> incorrectly showing as 0 most of the time. The rest value being wrong is significant because to compute the actual amount of memory handed out via malloc, the user must subtract it from <system type="current" size="...">. That result being wrong makes investigating memory fragmentation issues like <https://bugzilla.redhat.com/show_bug.cgi?id=843478> close to impossible.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 343d89f489..0e65d636cd 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -5406,6 +5406,12 @@ __malloc_info (int options, FILE *fp)
__libc_lock_lock (ar_ptr->mutex);
+ /* Account for top chunk. The top-most available chunk is
+ treated specially and is never in any bin. See "initial_top"
+ comments. */
+ avail = chunksize (ar_ptr->top);
+ nblocks = 1; /* Top always exists. */
+
for (size_t i = 0; i < NFASTBINS; ++i)
{
mchunkptr p = fastbin (ar_ptr, i);