aboutsummaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
Diffstat (limited to 'malloc')
-rw-r--r--malloc/arena.c791
-rw-r--r--malloc/hooks.c648
-rw-r--r--malloc/malloc.c4283
-rw-r--r--malloc/malloc.h53
-rw-r--r--malloc/mallocbug.c18
-rw-r--r--malloc/mcheck.c99
-rw-r--r--malloc/mcheck.h21
-rw-r--r--malloc/memusage.c430
-rw-r--r--malloc/memusagestat.c346
-rw-r--r--malloc/morecore.c17
-rw-r--r--malloc/mtrace.c183
-rw-r--r--malloc/obstack.c145
-rw-r--r--malloc/obstack.h678
-rw-r--r--malloc/set-freeres.c8
-rw-r--r--malloc/tst-mallocstate.c14
-rw-r--r--malloc/tst-mtrace.c12
-rw-r--r--malloc/tst-realloc.c12
17 files changed, 4004 insertions, 3754 deletions
diff --git a/malloc/arena.c b/malloc/arena.c
index 5beb13d98b..5088a253ec 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -21,12 +21,12 @@
/* Compile-time constants. */
-#define HEAP_MIN_SIZE (32*1024)
+#define HEAP_MIN_SIZE (32 * 1024)
#ifndef HEAP_MAX_SIZE
# ifdef DEFAULT_MMAP_THRESHOLD_MAX
# define HEAP_MAX_SIZE (2 * DEFAULT_MMAP_THRESHOLD_MAX)
# else
-# define HEAP_MAX_SIZE (1024*1024) /* must be a power of two */
+# define HEAP_MAX_SIZE (1024 * 1024) /* must be a power of two */
# endif
#endif
@@ -39,7 +39,7 @@
#ifndef THREAD_STATS
-#define THREAD_STATS 0
+# define THREAD_STATS 0
#endif
/* If THREAD_STATS is non-zero, some statistics on mutex locking are
@@ -53,12 +53,13 @@
malloc_chunks. It is allocated with mmap() and always starts at an
address aligned to HEAP_MAX_SIZE. */
-typedef struct _heap_info {
+typedef struct _heap_info
+{
mstate ar_ptr; /* Arena for this heap. */
struct _heap_info *prev; /* Previous heap. */
size_t size; /* Current size in bytes. */
- size_t mprotect_size; /* Size in bytes that has been mprotected
- PROT_READ|PROT_WRITE. */
+ size_t mprotect_size; /* Size in bytes that has been mprotected
+ PROT_READ|PROT_WRITE. */
/* Make sure the following data is properly aligned, particularly
that sizeof (heap_info) + 2 * SIZE_SZ is a multiple of
MALLOC_ALIGNMENT. */
@@ -68,8 +69,8 @@ typedef struct _heap_info {
/* Get a compile-time error if the heap_info padding is not correct
to make alignment work as expected in sYSMALLOc. */
extern int sanity_check_heap_info_alignment[(sizeof (heap_info)
- + 2 * SIZE_SZ) % MALLOC_ALIGNMENT
- ? -1 : 1];
+ + 2 * SIZE_SZ) % MALLOC_ALIGNMENT
+ ? -1 : 1];
/* Thread specific data */
@@ -80,9 +81,9 @@ static mstate free_list;
#if THREAD_STATS
static int stat_n_heaps;
-#define THREAD_STAT(x) x
+# define THREAD_STAT(x) x
#else
-#define THREAD_STAT(x) do ; while(0)
+# define THREAD_STAT(x) do ; while (0)
#endif
/* Mapped memory in non-main arenas (reliable only for NO_THREADS). */
@@ -103,28 +104,28 @@ int __malloc_initialized = -1;
in the new arena. */
#define arena_get(ptr, size) do { \
- arena_lookup(ptr); \
- arena_lock(ptr, size); \
-} while(0)
+ arena_lookup (ptr); \
+ arena_lock (ptr, size); \
+ } while (0)
#define arena_lookup(ptr) do { \
- void *vptr = NULL; \
- ptr = (mstate)tsd_getspecific(arena_key, vptr); \
-} while(0)
+ void *vptr = NULL; \
+ ptr = (mstate) tsd_getspecific (arena_key, vptr); \
+ } while (0)
-# define arena_lock(ptr, size) do { \
- if(ptr) \
- (void)mutex_lock(&ptr->mutex); \
- else \
- ptr = arena_get2(ptr, (size), NULL); \
-} while(0)
+#define arena_lock(ptr, size) do { \
+ if (ptr) \
+ (void) mutex_lock (&ptr->mutex); \
+ else \
+ ptr = arena_get2 (ptr, (size), NULL); \
+ } while (0)
/* find the heap and corresponding arena for a given ptr */
#define heap_for_ptr(ptr) \
- ((heap_info *)((unsigned long)(ptr) & ~(HEAP_MAX_SIZE-1)))
+ ((heap_info *) ((unsigned long) (ptr) & ~(HEAP_MAX_SIZE - 1)))
#define arena_for_chunk(ptr) \
- (chunk_non_main_arena(ptr) ? heap_for_ptr(ptr)->ar_ptr : &main_arena)
+ (chunk_non_main_arena (ptr) ? heap_for_ptr (ptr)->ar_ptr : &main_arena)
/**************************************************************************/
@@ -133,51 +134,58 @@ int __malloc_initialized = -1;
/* atfork support. */
-static void *(*save_malloc_hook) (size_t __size, const void *);
+static void *(*save_malloc_hook)(size_t __size, const void *);
static void (*save_free_hook) (void *__ptr, const void *);
static void *save_arena;
-#ifdef ATFORK_MEM
+# ifdef ATFORK_MEM
ATFORK_MEM;
-#endif
+# endif
/* Magic value for the thread-specific arena pointer when
malloc_atfork() is in use. */
-#define ATFORK_ARENA_PTR ((void*)-1)
+# define ATFORK_ARENA_PTR ((void *) -1)
/* The following hooks are used while the `atfork' handling mechanism
is active. */
-static void*
-malloc_atfork(size_t sz, const void *caller)
+static void *
+malloc_atfork (size_t sz, const void *caller)
{
void *vptr = NULL;
void *victim;
- tsd_getspecific(arena_key, vptr);
- if(vptr == ATFORK_ARENA_PTR) {
- /* We are the only thread that may allocate at all. */
- if(save_malloc_hook != malloc_check) {
- return _int_malloc(&main_arena, sz);
- } else {
- if(top_check()<0)
- return 0;
- victim = _int_malloc(&main_arena, sz+1);
- return mem2mem_check(victim, sz);
+ tsd_getspecific (arena_key, vptr);
+ if (vptr == ATFORK_ARENA_PTR)
+ {
+ /* We are the only thread that may allocate at all. */
+ if (save_malloc_hook != malloc_check)
+ {
+ return _int_malloc (&main_arena, sz);
+ }
+ else
+ {
+ if (top_check () < 0)
+ return 0;
+
+ victim = _int_malloc (&main_arena, sz + 1);
+ return mem2mem_check (victim, sz);
+ }
+ }
+ else
+ {
+ /* Suspend the thread until the `atfork' handlers have completed.
+ By that time, the hooks will have been reset as well, so that
+ mALLOc() can be used again. */
+ (void) mutex_lock (&list_lock);
+ (void) mutex_unlock (&list_lock);
+ return __libc_malloc (sz);
}
- } else {
- /* Suspend the thread until the `atfork' handlers have completed.
- By that time, the hooks will have been reset as well, so that
- mALLOc() can be used again. */
- (void)mutex_lock(&list_lock);
- (void)mutex_unlock(&list_lock);
- return __libc_malloc(sz);
- }
}
static void
-free_atfork(void* mem, const void *caller)
+free_atfork (void *mem, const void *caller)
{
void *vptr = NULL;
mstate ar_ptr;
@@ -186,17 +194,17 @@ free_atfork(void* mem, const void *caller)
if (mem == 0) /* free(0) has no effect */
return;
- p = mem2chunk(mem); /* do not bother to replicate free_check here */
+ p = mem2chunk (mem); /* do not bother to replicate free_check here */
- if (chunk_is_mmapped(p)) /* release mmapped memory. */
- {
- munmap_chunk(p);
- return;
- }
+ if (chunk_is_mmapped (p)) /* release mmapped memory. */
+ {
+ munmap_chunk (p);
+ return;
+ }
- ar_ptr = arena_for_chunk(p);
- tsd_getspecific(arena_key, vptr);
- _int_free(ar_ptr, p, vptr == ATFORK_ARENA_PTR);
+ ar_ptr = arena_for_chunk (p);
+ tsd_getspecific (arena_key, vptr);
+ _int_free (ar_ptr, p, vptr == ATFORK_ARENA_PTR);
}
@@ -214,33 +222,36 @@ ptmalloc_lock_all (void)
{
mstate ar_ptr;
- if(__malloc_initialized < 1)
+ if (__malloc_initialized < 1)
return;
- if (mutex_trylock(&list_lock))
+
+ if (mutex_trylock (&list_lock))
{
void *my_arena;
- tsd_getspecific(arena_key, my_arena);
+ tsd_getspecific (arena_key, my_arena);
if (my_arena == ATFORK_ARENA_PTR)
- /* This is the same thread which already locks the global list.
- Just bump the counter. */
- goto out;
+ /* This is the same thread which already locks the global list.
+ Just bump the counter. */
+ goto out;
/* This thread has to wait its turn. */
- (void)mutex_lock(&list_lock);
+ (void) mutex_lock (&list_lock);
+ }
+ for (ar_ptr = &main_arena;; )
+ {
+ (void) mutex_lock (&ar_ptr->mutex);
+ ar_ptr = ar_ptr->next;
+ if (ar_ptr == &main_arena)
+ break;
}
- for(ar_ptr = &main_arena;;) {
- (void)mutex_lock(&ar_ptr->mutex);
- ar_ptr = ar_ptr->next;
- if(ar_ptr == &main_arena) break;
- }
save_malloc_hook = __malloc_hook;
save_free_hook = __free_hook;
__malloc_hook = malloc_atfork;
__free_hook = free_atfork;
/* Only the current thread may perform malloc/free calls now. */
- tsd_getspecific(arena_key, save_arena);
- tsd_setspecific(arena_key, ATFORK_ARENA_PTR);
- out:
+ tsd_getspecific (arena_key, save_arena);
+ tsd_setspecific (arena_key, ATFORK_ARENA_PTR);
+out:
++atfork_recursive_cntr;
}
@@ -249,19 +260,23 @@ ptmalloc_unlock_all (void)
{
mstate ar_ptr;
- if(__malloc_initialized < 1)
+ if (__malloc_initialized < 1)
return;
+
if (--atfork_recursive_cntr != 0)
return;
- tsd_setspecific(arena_key, save_arena);
+
+ tsd_setspecific (arena_key, save_arena);
__malloc_hook = save_malloc_hook;
__free_hook = save_free_hook;
- for(ar_ptr = &main_arena;;) {
- (void)mutex_unlock(&ar_ptr->mutex);
- ar_ptr = ar_ptr->next;
- if(ar_ptr == &main_arena) break;
- }
- (void)mutex_unlock(&list_lock);
+ for (ar_ptr = &main_arena;; )
+ {
+ (void) mutex_unlock (&ar_ptr->mutex);
+ ar_ptr = ar_ptr->next;
+ if (ar_ptr == &main_arena)
+ break;
+ }
+ (void) mutex_unlock (&list_lock);
}
# ifdef __linux__
@@ -276,31 +291,33 @@ ptmalloc_unlock_all2 (void)
{
mstate ar_ptr;
- if(__malloc_initialized < 1)
+ if (__malloc_initialized < 1)
return;
- tsd_setspecific(arena_key, save_arena);
+
+ tsd_setspecific (arena_key, save_arena);
__malloc_hook = save_malloc_hook;
__free_hook = save_free_hook;
free_list = NULL;
- for(ar_ptr = &main_arena;;) {
- mutex_init(&ar_ptr->mutex);
- if (ar_ptr != save_arena) {
- ar_ptr->next_free = free_list;
- free_list = ar_ptr;
+ for (ar_ptr = &main_arena;; )
+ {
+ mutex_init (&ar_ptr->mutex);
+ if (ar_ptr != save_arena)
+ {
+ ar_ptr->next_free = free_list;
+ free_list = ar_ptr;
+ }
+ ar_ptr = ar_ptr->next;
+ if (ar_ptr == &main_arena)
+ break;
}
- ar_ptr = ar_ptr->next;
- if(ar_ptr == &main_arena) break;
- }
- mutex_init(&list_lock);
+ mutex_init (&list_lock);
atfork_recursive_cntr = 0;
}
# else
# define ptmalloc_unlock_all2 ptmalloc_unlock_all
-
# endif
-
#endif /* !NO_THREADS */
/* Initialization routine. */
@@ -317,20 +334,20 @@ next_env_entry (char ***position)
while (*current != NULL)
{
if (__builtin_expect ((*current)[0] == 'M', 0)
- && (*current)[1] == 'A'
- && (*current)[2] == 'L'
- && (*current)[3] == 'L'
- && (*current)[4] == 'O'
- && (*current)[5] == 'C'
- && (*current)[6] == '_')
- {
- result = &(*current)[7];
+ && (*current)[1] == 'A'
+ && (*current)[2] == 'L'
+ && (*current)[3] == 'L'
+ && (*current)[4] == 'O'
+ && (*current)[5] == 'C'
+ && (*current)[6] == '_')
+ {
+ result = &(*current)[7];
- /* Save current position for next visit. */
- *position = ++current;
+ /* Save current position for next visit. */
+ *position = ++current;
- break;
- }
+ break;
+ }
++current;
}
@@ -353,7 +370,9 @@ libc_hidden_proto (_dl_open_hook);
static void
ptmalloc_init (void)
{
- if(__malloc_initialized >= 0) return;
+ if (__malloc_initialized >= 0)
+ return;
+
__malloc_initialized = 0;
#ifdef SHARED
@@ -364,13 +383,13 @@ ptmalloc_init (void)
if (_dl_open_hook != NULL
|| (_dl_addr (ptmalloc_init, &di, &l, NULL) != 0
- && l->l_ns != LM_ID_BASE))
+ && l->l_ns != LM_ID_BASE))
__morecore = __failing_morecore;
#endif
- tsd_key_create(&arena_key, NULL);
- tsd_setspecific(arena_key, (void *)&main_arena);
- thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_unlock_all2);
+ tsd_key_create (&arena_key, NULL);
+ tsd_setspecific (arena_key, (void *) &main_arena);
+ thread_atfork (ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_unlock_all2);
const char *s = NULL;
if (__builtin_expect (_environ != NULL, 1))
{
@@ -378,66 +397,67 @@ ptmalloc_init (void)
char *envline;
while (__builtin_expect ((envline = next_env_entry (&runp)) != NULL,
- 0))
- {
- size_t len = strcspn (envline, "=");
-
- if (envline[len] != '=')
- /* This is a "MALLOC_" variable at the end of the string
- without a '=' character. Ignore it since otherwise we
- will access invalid memory below. */
- continue;
-
- switch (len)
- {
- case 6:
- if (memcmp (envline, "CHECK_", 6) == 0)
- s = &envline[7];
- break;
- case 8:
- if (! __builtin_expect (__libc_enable_secure, 0))
- {
- if (memcmp (envline, "TOP_PAD_", 8) == 0)
- __libc_mallopt(M_TOP_PAD, atoi(&envline[9]));
- else if (memcmp (envline, "PERTURB_", 8) == 0)
- __libc_mallopt(M_PERTURB, atoi(&envline[9]));
- }
- break;
- case 9:
- if (! __builtin_expect (__libc_enable_secure, 0))
- {
- if (memcmp (envline, "MMAP_MAX_", 9) == 0)
- __libc_mallopt(M_MMAP_MAX, atoi(&envline[10]));
- else if (memcmp (envline, "ARENA_MAX", 9) == 0)
- __libc_mallopt(M_ARENA_MAX, atoi(&envline[10]));
- }
- break;
- case 10:
- if (! __builtin_expect (__libc_enable_secure, 0))
- {
- if (memcmp (envline, "ARENA_TEST", 10) == 0)
- __libc_mallopt(M_ARENA_TEST, atoi(&envline[11]));
- }
- break;
- case 15:
- if (! __builtin_expect (__libc_enable_secure, 0))
- {
- if (memcmp (envline, "TRIM_THRESHOLD_", 15) == 0)
- __libc_mallopt(M_TRIM_THRESHOLD, atoi(&envline[16]));
- else if (memcmp (envline, "MMAP_THRESHOLD_", 15) == 0)
- __libc_mallopt(M_MMAP_THRESHOLD, atoi(&envline[16]));
- }
- break;
- default:
- break;
- }
- }
+ 0))
+ {
+ size_t len = strcspn (envline, "=");
+
+ if (envline[len] != '=')
+ /* This is a "MALLOC_" variable at the end of the string
+ without a '=' character. Ignore it since otherwise we
+ will access invalid memory below. */
+ continue;
+
+ switch (len)
+ {
+ case 6:
+ if (memcmp (envline, "CHECK_", 6) == 0)
+ s = &envline[7];
+ break;
+ case 8:
+ if (!__builtin_expect (__libc_enable_secure, 0))
+ {
+ if (memcmp (envline, "TOP_PAD_", 8) == 0)
+ __libc_mallopt (M_TOP_PAD, atoi (&envline[9]));
+ else if (memcmp (envline, "PERTURB_", 8) == 0)
+ __libc_mallopt (M_PERTURB, atoi (&envline[9]));
+ }
+ break;
+ case 9:
+ if (!__builtin_expect (__libc_enable_secure, 0))
+ {
+ if (memcmp (envline, "MMAP_MAX_", 9) == 0)
+ __libc_mallopt (M_MMAP_MAX, atoi (&envline[10]));
+ else if (memcmp (envline, "ARENA_MAX", 9) == 0)
+ __libc_mallopt (M_ARENA_MAX, atoi (&envline[10]));
+ }
+ break;
+ case 10:
+ if (!__builtin_expect (__libc_enable_secure, 0))
+ {
+ if (memcmp (envline, "ARENA_TEST", 10) == 0)
+ __libc_mallopt (M_ARENA_TEST, atoi (&envline[11]));
+ }
+ break;
+ case 15:
+ if (!__builtin_expect (__libc_enable_secure, 0))
+ {
+ if (memcmp (envline, "TRIM_THRESHOLD_", 15) == 0)
+ __libc_mallopt (M_TRIM_THRESHOLD, atoi (&envline[16]));
+ else if (memcmp (envline, "MMAP_THRESHOLD_", 15) == 0)
+ __libc_mallopt (M_MMAP_THRESHOLD, atoi (&envline[16]));
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ if (s && s[0])
+ {
+ __libc_mallopt (M_CHECK_ACTION, (int) (s[0] - '0'));
+ if (check_action != 0)
+ __malloc_check_init ();
}
- if(s && s[0]) {
- __libc_mallopt(M_CHECK_ACTION, (int)(s[0] - '0'));
- if (check_action != 0)
- __malloc_check_init();
- }
void (*hook) (void) = atomic_forced_read (__malloc_initialize_hook);
if (hook != NULL)
(*hook)();
@@ -446,11 +466,11 @@ ptmalloc_init (void)
/* There are platforms (e.g. Hurd) with a link-time hook mechanism. */
#ifdef thread_atfork_static
-thread_atfork_static(ptmalloc_lock_all, ptmalloc_unlock_all, \
- ptmalloc_unlock_all2)
+thread_atfork_static (ptmalloc_lock_all, ptmalloc_unlock_all, \
+ ptmalloc_unlock_all2)
#endif
-
+
/* Managing heaps and arenas (for concurrent threads) */
@@ -459,30 +479,33 @@ thread_atfork_static(ptmalloc_lock_all, ptmalloc_unlock_all, \
/* Print the complete contents of a single heap to stderr. */
static void
-dump_heap(heap_info *heap)
+dump_heap (heap_info *heap)
{
char *ptr;
mchunkptr p;
- fprintf(stderr, "Heap %p, size %10lx:\n", heap, (long)heap->size);
- ptr = (heap->ar_ptr != (mstate)(heap+1)) ?
- (char*)(heap + 1) : (char*)(heap + 1) + sizeof(struct malloc_state);
- p = (mchunkptr)(((unsigned long)ptr + MALLOC_ALIGN_MASK) &
- ~MALLOC_ALIGN_MASK);
- for(;;) {
- fprintf(stderr, "chunk %p size %10lx", p, (long)p->size);
- if(p == top(heap->ar_ptr)) {
- fprintf(stderr, " (top)\n");
- break;
- } else if(p->size == (0|PREV_INUSE)) {
- fprintf(stderr, " (fence)\n");
- break;
+ fprintf (stderr, "Heap %p, size %10lx:\n", heap, (long) heap->size);
+ ptr = (heap->ar_ptr != (mstate) (heap + 1)) ?
+ (char *) (heap + 1) : (char *) (heap + 1) + sizeof (struct malloc_state);
+ p = (mchunkptr) (((unsigned long) ptr + MALLOC_ALIGN_MASK) &
+ ~MALLOC_ALIGN_MASK);
+ for (;; )
+ {
+ fprintf (stderr, "chunk %p size %10lx", p, (long) p->size);
+ if (p == top (heap->ar_ptr))
+ {
+ fprintf (stderr, " (top)\n");
+ break;
+ }
+ else if (p->size == (0 | PREV_INUSE))
+ {
+ fprintf (stderr, " (fence)\n");
+ break;
+ }
+ fprintf (stderr, "\n");
+ p = next_chunk (p);
}
- fprintf(stderr, "\n");
- p = next_chunk(p);
- }
}
-
#endif /* MALLOC_DEBUG > 1 */
/* If consecutive mmap (0, HEAP_MAX_SIZE << 1, ...) calls return decreasing
@@ -500,18 +523,18 @@ static char *aligned_heap_area;
static heap_info *
internal_function
-new_heap(size_t size, size_t top_pad)
+new_heap (size_t size, size_t top_pad)
{
- size_t page_mask = GLRO(dl_pagesize) - 1;
+ size_t page_mask = GLRO (dl_pagesize) - 1;
char *p1, *p2;
unsigned long ul;
heap_info *h;
- if(size+top_pad < HEAP_MIN_SIZE)
+ if (size + top_pad < HEAP_MIN_SIZE)
size = HEAP_MIN_SIZE;
- else if(size+top_pad <= HEAP_MAX_SIZE)
+ else if (size + top_pad <= HEAP_MAX_SIZE)
size += top_pad;
- else if(size > HEAP_MAX_SIZE)
+ else if (size > HEAP_MAX_SIZE)
return 0;
else
size = HEAP_MAX_SIZE;
@@ -522,46 +545,55 @@ new_heap(size_t size, size_t top_pad)
mapping (on Linux, this is the case for all non-writable mappings
anyway). */
p2 = MAP_FAILED;
- if(aligned_heap_area) {
- p2 = (char *)MMAP(aligned_heap_area, HEAP_MAX_SIZE, PROT_NONE,
- MAP_NORESERVE);
- aligned_heap_area = NULL;
- if (p2 != MAP_FAILED && ((unsigned long)p2 & (HEAP_MAX_SIZE-1))) {
- __munmap(p2, HEAP_MAX_SIZE);
- p2 = MAP_FAILED;
+ if (aligned_heap_area)
+ {
+ p2 = (char *) MMAP (aligned_heap_area, HEAP_MAX_SIZE, PROT_NONE,
+