diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | malloc/Versions | 3 | ||||
| -rw-r--r-- | malloc/malloc.c | 146 | ||||
| -rw-r--r-- | malloc/malloc.h | 4 |
5 files changed, 160 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 7429533062..691649d4b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-04-08 Ulrich Drepper <drepper@redhat.com> + * malloc/malloc.c (malloc_info): New function. + * malloc/malloc.h: Declare it. + * malloc/Versions: Export malloc_info for GLIBC_2.10. + * sysdeps/unix/sysv/linux/preadv64.c (PREAD): Use __libc_pread64 to avoid PLT slot. @@ -18,9 +22,8 @@ * sysdeps/unix/sysv/linux/kernel-features.h: Power also has preadv/pwritev in 2.6.30. - * resolv/res_hconf.c (_res_hconf_trim_domain): Use strcasecmp + * resolv/nss_dns/dns-host.c (getanswer_r): Use strcasecmp instead of __strcasecmp. - * resolv/nss_dns/dns-host.c (getanswer_r): Likewise. * string/stratcliff.c (do_test): Add memchr tests.. * wcsmbs/wcsatcliff.c (MEMCHR): Define. diff --git a/NEWS b/NEWS index c50a66bb43..74feed6f3b 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -GNU C Library NEWS -- history of user-visible changes. 2009-4-7 +GNU C Library NEWS -- history of user-visible changes. 2009-4-8 Copyright (C) 1992-2008, 2009 Free Software Foundation, Inc. See the end for copying conditions. @@ -7,7 +7,7 @@ using `glibc' in the "product" field. Version 2.10 -* New interfaces: preadv, preadv64, pwritev, pwritev64 +* New interfaces: preadv, preadv64, pwritev, pwritev64, malloc_info Implemented by Ulrich Drepper. * New Linux interfaces: accept4, fallocate, fallocate64. diff --git a/malloc/Versions b/malloc/Versions index 0c578f95b6..cf0b1e559a 100644 --- a/malloc/Versions +++ b/malloc/Versions @@ -55,6 +55,9 @@ libc { # p* posix_memalign; } + GLIBC_2.10 { + malloc_info; + } GLIBC_PRIVATE { # Internal startup hook for libpthread. __libc_malloc_pthread_startup; diff --git a/malloc/malloc.c b/malloc/malloc.c index 48a73799e2..17e4e03bac 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -6219,6 +6219,152 @@ __posix_memalign (void **memptr, size_t alignment, size_t size) } weak_alias (__posix_memalign, posix_memalign) + +int +malloc_info (int options, FILE *fp) +{ + /* For now, at least. */ + if (options != 0) + return EINVAL; + + int n = 0; + size_t total_nblocks = 0; + size_t total_nfastblocks = 0; + size_t total_avail = 0; + size_t total_fastavail = 0; + + void mi_arena (mstate ar_ptr) + { + fprintf (fp, "<heap nr=\"%d\">\n<sizes>\n", n++); + + size_t nblocks = 0; + size_t nfastblocks = 0; + size_t avail = 0; + size_t fastavail = 0; + struct + { + size_t from; + size_t to; + size_t total; + size_t count; + } sizes[NFASTBINS + NBINS - 1]; +#define nsizes (sizeof (sizes) / sizeof (sizes[0])) + + mutex_lock (&ar_ptr->mutex); + + for (size_t i = 0; i < NFASTBINS; ++i) + { + mchunkptr p = fastbin (ar_ptr, i); + if (p != NULL) + { + size_t nthissize = 0; + size_t thissize = chunksize (p); + + while (p != NULL) + { + ++nthissize; + p = p->fd; + } + + fastavail += nthissize * thissize; + nfastblocks += nthissize; + sizes[i].from = thissize - (MALLOC_ALIGNMENT - 1); + sizes[i].to = thissize; + sizes[i].count = nthissize; + } + else + sizes[i].from = sizes[i].to = sizes[i].count = 0; + + sizes[i].total = sizes[i].count * sizes[i].to; + } + + mbinptr bin = bin_at (ar_ptr, 1); + struct malloc_chunk *r = bin->fd; + while (r != bin) + { + ++sizes[NFASTBINS].count; + sizes[NFASTBINS].total += r->size; + sizes[NFASTBINS].from = MIN (sizes[NFASTBINS].from, r->size); + sizes[NFASTBINS].to = MAX (sizes[NFASTBINS].to, r->size); + r = r->fd; + } + nblocks += sizes[NFASTBINS].count; + avail += sizes[NFASTBINS].total; + + for (size_t i = 2; i < NBINS; ++i) + { + bin = bin_at (ar_ptr, i); + r = bin->fd; + sizes[NFASTBINS - 1 + i].from = ~((size_t) 0); + sizes[NFASTBINS - 1 + i].to = sizes[NFASTBINS - 1 + i].total + = sizes[NFASTBINS - 1 + i].count = 0; + + while (r != bin) + { + ++sizes[NFASTBINS - 1 + i].count; + sizes[NFASTBINS - 1 + i].total += r->size; + sizes[NFASTBINS - 1 + i].from = MIN (sizes[NFASTBINS - 1 + i].from, + r->size); + sizes[NFASTBINS - 1 + i].to = MAX (sizes[NFASTBINS - 1 + i].to, + r->size); + + r = r->fd; + } + + if (sizes[NFASTBINS - 1 + i].count == 0) + sizes[NFASTBINS - 1 + i].from = 0; + nblocks += sizes[NFASTBINS - 1 + i].count; + avail += sizes[NFASTBINS - 1 + i].total; + } + + mutex_unlock (&ar_ptr->mutex); + + total_nfastblocks += nfastblocks; + total_fastavail += fastavail; + + total_nblocks += nblocks; + total_avail += avail; + + for (size_t i = 0; i < nsizes; ++i) + if (sizes[i].count != 0 && i != NFASTBINS) + fprintf (fp, "\ +<size from=\"%zu\" to=\"%zu\" total=\"%zu\" count=\"%zu\"/>\n", + sizes[i].from, sizes[i].to, sizes[i].total, sizes[i].count); + + if (sizes[NFASTBINS].count != 0) + fprintf (fp, "\ +<unsorted from=\"%zu\" to=\"%zu\" total=\"%zu\" count=\"%zu\"/>\n", + sizes[NFASTBINS].from, sizes[NFASTBINS].to, + sizes[NFASTBINS].total, sizes[NFASTBINS].count); + + fprintf (fp, + "</sizes>\n<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n" + "<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n" + "</heap>\n", + nfastblocks, fastavail, nblocks, avail); + } + + fputs ("<malloc version=\"1\">\n", fp); + + /* Iterate over all arenas currently in use. */ + mstate ar_ptr = &main_arena; + do + { + mi_arena (ar_ptr); + ar_ptr = ar_ptr->next; + } + while (ar_ptr != &main_arena); + + fprintf (fp, + "<total type=\"fast\" count=\"%zu\" size=\"%zu\"/>\n" + "<total type=\"rest\" count=\"%zu\" size=\"%zu\"/>\n" + "</malloc>\n", + total_nfastblocks, total_fastavail, total_nblocks, total_avail); + + return 0; +} + + strong_alias (__libc_calloc, __calloc) weak_alias (__libc_calloc, calloc) strong_alias (__libc_free, __cfree) weak_alias (__libc_free, cfree) strong_alias (__libc_free, __free) strong_alias (__libc_free, free) diff --git a/malloc/malloc.h b/malloc/malloc.h index 2c0ee35c4e..d0aedc0cdf 100644 --- a/malloc/malloc.h +++ b/malloc/malloc.h @@ -23,6 +23,7 @@ #include <features.h> #include <stddef.h> +#include <stdio.h> # define __malloc_ptr_t void * /* Used by GNU libc internals. */ @@ -144,6 +145,9 @@ extern size_t malloc_usable_size __MALLOC_P ((void *__ptr)); /* Prints brief summary statistics on stderr. */ extern void malloc_stats __MALLOC_P ((void)); +/* Output information about state of allocator to stream FP. */ +extern int malloc_info (int __options, FILE *__fp); + /* Record the state of all malloc variables in an opaque data structure. */ extern void *malloc_get_state __MALLOC_P ((void)); |