2002-01-29 07:54:51 +00:00
|
|
|
|
/* Malloc implementation for multiple threads without lock contention.
|
2005-03-01 20:30:29 +00:00
|
|
|
|
Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
2002-01-29 07:54:51 +00:00
|
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
Contributed by Wolfram Gloger <wg@malloc.de>, 2001.
|
|
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2002-08-26 22:40:48 +00:00
|
|
|
|
modify it under the terms of the GNU Lesser General Public License as
|
|
|
|
|
published by the Free Software Foundation; either version 2.1 of the
|
2002-01-29 07:54:51 +00:00
|
|
|
|
License, or (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2002-08-26 22:40:48 +00:00
|
|
|
|
Lesser General Public License for more details.
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
2002-08-26 22:40:48 +00:00
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2002-01-29 07:54:51 +00:00
|
|
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
|
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
2004-12-22 20:10:10 +00:00
|
|
|
|
/* $Id$ */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
2005-03-01 20:30:29 +00:00
|
|
|
|
#include <stdbool.h>
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
|
/* Compile-time constants. */
|
|
|
|
|
|
|
|
|
|
#define HEAP_MIN_SIZE (32*1024)
|
|
|
|
|
#ifndef HEAP_MAX_SIZE
|
2004-12-22 20:10:10 +00:00
|
|
|
|
#define HEAP_MAX_SIZE (1024*1024) /* must be a power of two */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* HEAP_MIN_SIZE and HEAP_MAX_SIZE limit the size of mmap()ed heaps
|
|
|
|
|
that are dynamically created for multi-threaded programs. The
|
|
|
|
|
maximum size must be a power of two, for fast determination of
|
|
|
|
|
which heap belongs to a chunk. It should be much larger than the
|
|
|
|
|
mmap threshold, so that requests with a size just below that
|
|
|
|
|
threshold can be fulfilled without creating too many heaps. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef THREAD_STATS
|
|
|
|
|
#define THREAD_STATS 0
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* If THREAD_STATS is non-zero, some statistics on mutex locking are
|
|
|
|
|
computed. */
|
|
|
|
|
|
|
|
|
|
/***************************************************************************/
|
|
|
|
|
|
|
|
|
|
#define top(ar_ptr) ((ar_ptr)->top)
|
|
|
|
|
|
|
|
|
|
/* A heap is a single contiguous memory region holding (coalesceable)
|
|
|
|
|
malloc_chunks. It is allocated with mmap() and always starts at an
|
|
|
|
|
address aligned to HEAP_MAX_SIZE. Not used unless compiling with
|
|
|
|
|
USE_ARENAS. */
|
|
|
|
|
|
|
|
|
|
typedef struct _heap_info {
|
|
|
|
|
mstate ar_ptr; /* Arena for this heap. */
|
|
|
|
|
struct _heap_info *prev; /* Previous heap. */
|
|
|
|
|
size_t size; /* Current size in bytes. */
|
2004-12-22 20:10:10 +00:00
|
|
|
|
size_t pad; /* Make sure the following data is properly aligned. */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
} heap_info;
|
|
|
|
|
|
|
|
|
|
/* Thread specific data */
|
|
|
|
|
|
|
|
|
|
static tsd_key_t arena_key;
|
|
|
|
|
static mutex_t list_lock;
|
|
|
|
|
|
|
|
|
|
#if THREAD_STATS
|
|
|
|
|
static int stat_n_heaps;
|
|
|
|
|
#define THREAD_STAT(x) x
|
|
|
|
|
#else
|
|
|
|
|
#define THREAD_STAT(x) do ; while(0)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Mapped memory in non-main arenas (reliable only for NO_THREADS). */
|
|
|
|
|
static unsigned long arena_mem;
|
|
|
|
|
|
2002-11-20 09:40:55 +00:00
|
|
|
|
/* Already initialized? */
|
|
|
|
|
int __malloc_initialized = -1;
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
|
/**************************************************************************/
|
|
|
|
|
|
|
|
|
|
#if USE_ARENAS
|
|
|
|
|
|
|
|
|
|
/* arena_get() acquires an arena and locks the corresponding mutex.
|
|
|
|
|
First, try the one last locked successfully by this thread. (This
|
|
|
|
|
is the common case and handled with a macro for speed.) Then, loop
|
|
|
|
|
once over the circularly linked list of arenas. If no arena is
|
|
|
|
|
readily available, create a new one. In this latter case, `size'
|
|
|
|
|
is just a hint as to how much memory will be required immediately
|
|
|
|
|
in the new arena. */
|
|
|
|
|
|
|
|
|
|
#define arena_get(ptr, size) do { \
|
|
|
|
|
Void_t *vptr = NULL; \
|
|
|
|
|
ptr = (mstate)tsd_getspecific(arena_key, vptr); \
|
|
|
|
|
if(ptr && !mutex_trylock(&ptr->mutex)) { \
|
|
|
|
|
THREAD_STAT(++(ptr->stat_lock_direct)); \
|
|
|
|
|
} else \
|
|
|
|
|
ptr = arena_get2(ptr, (size)); \
|
|
|
|
|
} 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)))
|
|
|
|
|
#define arena_for_chunk(ptr) \
|
|
|
|
|
(chunk_non_main_arena(ptr) ? heap_for_ptr(ptr)->ar_ptr : &main_arena)
|
|
|
|
|
|
|
|
|
|
#else /* !USE_ARENAS */
|
|
|
|
|
|
|
|
|
|
/* There is only one arena, main_arena. */
|
|
|
|
|
|
|
|
|
|
#if THREAD_STATS
|
|
|
|
|
#define arena_get(ar_ptr, sz) do { \
|
|
|
|
|
ar_ptr = &main_arena; \
|
|
|
|
|
if(!mutex_trylock(&ar_ptr->mutex)) \
|
|
|
|
|
++(ar_ptr->stat_lock_direct); \
|
|
|
|
|
else { \
|
|
|
|
|
(void)mutex_lock(&ar_ptr->mutex); \
|
|
|
|
|
++(ar_ptr->stat_lock_wait); \
|
|
|
|
|
} \
|
|
|
|
|
} while(0)
|
|
|
|
|
#else
|
|
|
|
|
#define arena_get(ar_ptr, sz) do { \
|
|
|
|
|
ar_ptr = &main_arena; \
|
|
|
|
|
(void)mutex_lock(&ar_ptr->mutex); \
|
|
|
|
|
} while(0)
|
|
|
|
|
#endif
|
|
|
|
|
#define arena_for_chunk(ptr) (&main_arena)
|
|
|
|
|
|
|
|
|
|
#endif /* USE_ARENAS */
|
|
|
|
|
|
|
|
|
|
/**************************************************************************/
|
|
|
|
|
|
|
|
|
|
#ifndef NO_THREADS
|
|
|
|
|
|
|
|
|
|
/* atfork support. */
|
|
|
|
|
|
2004-09-08 08:12:39 +00:00
|
|
|
|
static __malloc_ptr_t (*save_malloc_hook) (size_t __size,
|
|
|
|
|
__const __malloc_ptr_t);
|
2002-12-06 11:15:07 +00:00
|
|
|
|
# if !defined _LIBC || !defined USE_TLS || (defined SHARED && !USE___THREAD)
|
2004-09-08 08:12:39 +00:00
|
|
|
|
static __malloc_ptr_t (*save_memalign_hook) (size_t __align, size_t __size,
|
|
|
|
|
__const __malloc_ptr_t);
|
2002-12-06 11:15:07 +00:00
|
|
|
|
# endif
|
2004-09-08 08:12:39 +00:00
|
|
|
|
static void (*save_free_hook) (__malloc_ptr_t __ptr,
|
|
|
|
|
__const __malloc_ptr_t);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
static Void_t* save_arena;
|
|
|
|
|
|
|
|
|
|
/* Magic value for the thread-specific arena pointer when
|
|
|
|
|
malloc_atfork() is in use. */
|
|
|
|
|
|
|
|
|
|
#define ATFORK_ARENA_PTR ((Void_t*)-1)
|
|
|
|
|
|
|
|
|
|
/* The following hooks are used while the `atfork' handling mechanism
|
|
|
|
|
is active. */
|
|
|
|
|
|
|
|
|
|
static Void_t*
|
|
|
|
|
malloc_atfork(size_t sz, const Void_t *caller)
|
|
|
|
|
{
|
|
|
|
|
Void_t *vptr = NULL;
|
|
|
|
|
Void_t *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);
|
|
|
|
|
}
|
|
|
|
|
} 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 public_mALLOc(sz);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
free_atfork(Void_t* mem, const Void_t *caller)
|
|
|
|
|
{
|
|
|
|
|
Void_t *vptr = NULL;
|
|
|
|
|
mstate ar_ptr;
|
|
|
|
|
mchunkptr p; /* chunk corresponding to mem */
|
|
|
|
|
|
|
|
|
|
if (mem == 0) /* free(0) has no effect */
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
p = mem2chunk(mem); /* do not bother to replicate free_check here */
|
|
|
|
|
|
|
|
|
|
#if HAVE_MMAP
|
|
|
|
|
if (chunk_is_mmapped(p)) /* release mmapped memory. */
|
|
|
|
|
{
|
|
|
|
|
munmap_chunk(p);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
ar_ptr = arena_for_chunk(p);
|
|
|
|
|
tsd_getspecific(arena_key, vptr);
|
|
|
|
|
if(vptr != ATFORK_ARENA_PTR)
|
|
|
|
|
(void)mutex_lock(&ar_ptr->mutex);
|
|
|
|
|
_int_free(ar_ptr, mem);
|
|
|
|
|
if(vptr != ATFORK_ARENA_PTR)
|
|
|
|
|
(void)mutex_unlock(&ar_ptr->mutex);
|
|
|
|
|
}
|
|
|
|
|
|
2005-09-27 05:45:26 +00:00
|
|
|
|
|
|
|
|
|
/* Counter for number of times the list is locked by the same thread. */
|
|
|
|
|
static unsigned int atfork_recursive_cntr;
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
|
/* The following two functions are registered via thread_atfork() to
|
|
|
|
|
make sure that the mutexes remain in a consistent state in the
|
|
|
|
|
fork()ed version of a thread. Also adapt the malloc and free hooks
|
|
|
|
|
temporarily, because the `atfork' handler mechanism may use
|
|
|
|
|
malloc/free internally (e.g. in LinuxThreads). */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-09-08 08:12:39 +00:00
|
|
|
|
ptmalloc_lock_all (void)
|
2002-01-29 07:54:51 +00:00
|
|
|
|
{
|
|
|
|
|
mstate ar_ptr;
|
|
|
|
|
|
2002-11-20 09:40:55 +00:00
|
|
|
|
if(__malloc_initialized < 1)
|
|
|
|
|
return;
|
2005-09-27 05:45:26 +00:00
|
|
|
|
if (mutex_trylock(&list_lock))
|
|
|
|
|
{
|
|
|
|
|
Void_t *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 thread has to wait its turn. */
|
|
|
|
|
(void)mutex_lock(&list_lock);
|
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
|
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);
|
2005-09-27 05:45:26 +00:00
|
|
|
|
out:
|
|
|
|
|
++atfork_recursive_cntr;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-09-08 08:12:39 +00:00
|
|
|
|
ptmalloc_unlock_all (void)
|
2002-01-29 07:54:51 +00:00
|
|
|
|
{
|
|
|
|
|
mstate ar_ptr;
|
|
|
|
|
|
2002-11-20 09:40:55 +00:00
|
|
|
|
if(__malloc_initialized < 1)
|
|
|
|
|
return;
|
2005-09-27 05:45:26 +00:00
|
|
|
|
if (--atfork_recursive_cntr != 0)
|
|
|
|
|
return;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef __linux__
|
|
|
|
|
|
2005-10-10 13:44:03 +00:00
|
|
|
|
/* In NPTL, unlocking a mutex in the child process after a
|
2002-01-29 07:54:51 +00:00
|
|
|
|
fork() is currently unsafe, whereas re-initializing it is safe and
|
|
|
|
|
does not leak resources. Therefore, a special atfork handler is
|
|
|
|
|
installed for the child. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-09-08 08:12:39 +00:00
|
|
|
|
ptmalloc_unlock_all2 (void)
|
2002-01-29 07:54:51 +00:00
|
|
|
|
{
|
|
|
|
|
mstate ar_ptr;
|
|
|
|
|
|
2002-11-20 09:40:55 +00:00
|
|
|
|
if(__malloc_initialized < 1)
|
|
|
|
|
return;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
#if defined _LIBC || defined MALLOC_HOOKS
|
|
|
|
|
tsd_setspecific(arena_key, save_arena);
|
|
|
|
|
__malloc_hook = save_malloc_hook;
|
|
|
|
|
__free_hook = save_free_hook;
|
|
|
|
|
#endif
|
|
|
|
|
for(ar_ptr = &main_arena;;) {
|
2002-12-12 00:38:54 +00:00
|
|
|
|
mutex_init(&ar_ptr->mutex);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
ar_ptr = ar_ptr->next;
|
|
|
|
|
if(ar_ptr == &main_arena) break;
|
|
|
|
|
}
|
2002-12-12 00:38:54 +00:00
|
|
|
|
mutex_init(&list_lock);
|
2005-10-10 13:44:03 +00:00
|
|
|
|
atfork_recursive_cntr = 0;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
#define ptmalloc_unlock_all2 ptmalloc_unlock_all
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#endif /* !defined NO_THREADS */
|
|
|
|
|
|
|
|
|
|
/* Initialization routine. */
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
#include <string.h>
|
|
|
|
|
extern char **_environ;
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
internal_function
|
|
|
|
|
next_env_entry (char ***position)
|
|
|
|
|
{
|
|
|
|
|
char **current = *position;
|
|
|
|
|
char *result = NULL;
|
|
|
|
|
|
|
|
|
|
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];
|
|
|
|
|
|
|
|
|
|
/* Save current position for next visit. */
|
|
|
|
|
*position = ++current;
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
++current;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
#endif /* _LIBC */
|
|
|
|
|
|
2002-12-06 11:15:07 +00:00
|
|
|
|
/* Set up basic state so that _int_malloc et al can work. */
|
|
|
|
|
static void
|
2004-09-08 08:12:39 +00:00
|
|
|
|
ptmalloc_init_minimal (void)
|
2002-12-06 11:15:07 +00:00
|
|
|
|
{
|
|
|
|
|
#if DEFAULT_TOP_PAD != 0
|
|
|
|
|
mp_.top_pad = DEFAULT_TOP_PAD;
|
|
|
|
|
#endif
|
|
|
|
|
mp_.n_mmaps_max = DEFAULT_MMAP_MAX;
|
|
|
|
|
mp_.mmap_threshold = DEFAULT_MMAP_THRESHOLD;
|
|
|
|
|
mp_.trim_threshold = DEFAULT_TRIM_THRESHOLD;
|
|
|
|
|
mp_.pagesize = malloc_getpagesize;
|
|
|
|
|
}
|
|
|
|
|
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
|
|
2002-12-06 11:15:07 +00:00
|
|
|
|
#ifdef _LIBC
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
|
# ifdef SHARED
|
|
|
|
|
static void *
|
|
|
|
|
__failing_morecore (ptrdiff_t d)
|
|
|
|
|
{
|
|
|
|
|
return (void *) MORECORE_FAILURE;
|
|
|
|
|
}
|
Update.
2004-10-18 Jakub Jelinek <jakub@redhat.com>
* elf/dl-libc.c (__libc_dlsym_private, __libc_register_dl_open_hook):
New functions.
(__libc_dlopen_mode): Call __libc_register_dl_open_hook and
__libc_register_dlfcn_hook.
* dlfcn/Makefile (routines, elide-routines.os): Set.
Add rules to build and test tststatic2.
* dlfcn/tststatic2.c: New test.
* dlfcn/modstatic2.c: New test module.
* dlfcn/dladdr.c: Call _dlfcn_hook from libdl.so if not NULL.
Define __ prefixed routine in libc.a and in libdl.a just call it.
* dlfcn/dladdr1.c: Likewise.
* dlfcn/dlclose.c: Likewise.
* dlfcn/dlerror.c: Likewise.
* dlfcn/dlinfo.c: Likewise.
* dlfcn/dlmopen.c: Likewise.
* dlfcn/dlopen.c: Likewise.
* dlfcn/dlopenold.c: Likewise.
* dlfcn/dlsym.c: Likewise.
* dlfcn/dlvsym.c: Likewise.
* dlfcn/sdladdr.c: New file.
* dlfcn/sdladdr1.c: New file.
* dlfcn/sdlclose.c: New file.
* dlfcn/sdlerror.c: New file.
* dlfcn/sdlinfo.c: New file.
* dlfcn/sdlopen.c: New file.
* dlfcn/sdlsym.c: New file.
* dlfcn/sdlvsym.c: New file.
* dlfcn/Versions (libdl): Export _dlfcn_hook@GLIBC_PRIVATE.
* include/dlfcn.h (DL_CALLER_DECL, DL_CALLER RETURN_ADDRESS): Define.
(struct dlfcn_hook): New type.
(_dlfcn_hook): New extern decl.
(__dlopen, __dlclose, __dlsym, __dlerror, __dladdr, __dladdr1,
__dlinfo, __dlmopen, __libc_dlsym_private,
__libc_register_dl_open_hook, __libc_register_dlfcn_hook): New
prototypes.
(__dlvsym): Use DL_CALLER_DECL.
* include/libc-symbols.h: Define libdl_hidden_proto and friends.
* malloc/arena.c (_dl_open_hook): Extern decl.
(ptmalloc_init): Don't call _dl_addr when dlopened from statically
linked programs but don't use brk for them either.
2004-10-18 23:17:46 +00:00
|
|
|
|
|
|
|
|
|
extern struct dl_open_hook *_dl_open_hook;
|
|
|
|
|
libc_hidden_proto (_dl_open_hook);
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
|
# endif
|
|
|
|
|
|
2002-12-06 11:15:07 +00:00
|
|
|
|
# if defined SHARED && defined USE_TLS && !USE___THREAD
|
|
|
|
|
/* This is called by __pthread_initialize_minimal when it needs to use
|
|
|
|
|
malloc to set up the TLS state. We cannot do the full work of
|
|
|
|
|
ptmalloc_init (below) until __pthread_initialize_minimal has finished,
|
|
|
|
|
so it has to switch to using the special startup-time hooks while doing
|
|
|
|
|
those allocations. */
|
|
|
|
|
void
|
|
|
|
|
__libc_malloc_pthread_startup (bool first_time)
|
|
|
|
|
{
|
|
|
|
|
if (first_time)
|
|
|
|
|
{
|
|
|
|
|
ptmalloc_init_minimal ();
|
|
|
|
|
save_malloc_hook = __malloc_hook;
|
|
|
|
|
save_memalign_hook = __memalign_hook;
|
|
|
|
|
save_free_hook = __free_hook;
|
|
|
|
|
__malloc_hook = malloc_starter;
|
|
|
|
|
__memalign_hook = memalign_starter;
|
|
|
|
|
__free_hook = free_starter;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
__malloc_hook = save_malloc_hook;
|
|
|
|
|
__memalign_hook = save_memalign_hook;
|
|
|
|
|
__free_hook = save_free_hook;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
# endif
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
|
static void
|
2004-09-08 08:12:39 +00:00
|
|
|
|
ptmalloc_init (void)
|
2002-01-29 07:54:51 +00:00
|
|
|
|
{
|
|
|
|
|
#if __STD_C
|
|
|
|
|
const char* s;
|
|
|
|
|
#else
|
|
|
|
|
char* s;
|
|
|
|
|
#endif
|
|
|
|
|
int secure = 0;
|
|
|
|
|
|
|
|
|
|
if(__malloc_initialized >= 0) return;
|
|
|
|
|
__malloc_initialized = 0;
|
|
|
|
|
|
2002-12-06 11:15:07 +00:00
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
# if defined SHARED && defined USE_TLS && !USE___THREAD
|
|
|
|
|
/* ptmalloc_init_minimal may already have been called via
|
|
|
|
|
__libc_malloc_pthread_startup, above. */
|
|
|
|
|
if (mp_.pagesize == 0)
|
|
|
|
|
# endif
|
|
|
|
|
#endif
|
|
|
|
|
ptmalloc_init_minimal();
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
|
|
#ifndef NO_THREADS
|
2002-12-06 11:15:07 +00:00
|
|
|
|
# if defined _LIBC && defined USE_TLS
|
|
|
|
|
/* We know __pthread_initialize_minimal has already been called,
|
|
|
|
|
and that is enough. */
|
|
|
|
|
# define NO_STARTER
|
|
|
|
|
# endif
|
|
|
|
|
# ifndef NO_STARTER
|
2002-01-29 07:54:51 +00:00
|
|
|
|
/* With some threads implementations, creating thread-specific data
|
|
|
|
|
or initializing a mutex may call malloc() itself. Provide a
|
|
|
|
|
simple starter version (realloc() won't work). */
|
|
|
|
|
save_malloc_hook = __malloc_hook;
|
2002-12-06 11:15:07 +00:00
|
|
|
|
save_memalign_hook = __memalign_hook;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
save_free_hook = __free_hook;
|
|
|
|
|
__malloc_hook = malloc_starter;
|
2002-12-06 11:15:07 +00:00
|
|
|
|
__memalign_hook = memalign_starter;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
__free_hook = free_starter;
|
2002-12-06 11:15:07 +00:00
|
|
|
|
# ifdef _LIBC
|
2002-01-29 07:54:51 +00:00
|
|
|
|
/* Initialize the pthreads interface. */
|
|
|
|
|
if (__pthread_initialize != NULL)
|
|
|
|
|
__pthread_initialize();
|
2002-12-06 11:15:07 +00:00
|
|
|
|
# endif /* !defined _LIBC */
|
|
|
|
|
# endif /* !defined NO_STARTER */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
#endif /* !defined NO_THREADS */
|
|
|
|
|
mutex_init(&main_arena.mutex);
|
|
|
|
|
main_arena.next = &main_arena;
|
|
|
|
|
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
|
#if defined _LIBC && defined SHARED
|
Update.
2004-10-18 Jakub Jelinek <jakub@redhat.com>
* elf/dl-libc.c (__libc_dlsym_private, __libc_register_dl_open_hook):
New functions.
(__libc_dlopen_mode): Call __libc_register_dl_open_hook and
__libc_register_dlfcn_hook.
* dlfcn/Makefile (routines, elide-routines.os): Set.
Add rules to build and test tststatic2.
* dlfcn/tststatic2.c: New test.
* dlfcn/modstatic2.c: New test module.
* dlfcn/dladdr.c: Call _dlfcn_hook from libdl.so if not NULL.
Define __ prefixed routine in libc.a and in libdl.a just call it.
* dlfcn/dladdr1.c: Likewise.
* dlfcn/dlclose.c: Likewise.
* dlfcn/dlerror.c: Likewise.
* dlfcn/dlinfo.c: Likewise.
* dlfcn/dlmopen.c: Likewise.
* dlfcn/dlopen.c: Likewise.
* dlfcn/dlopenold.c: Likewise.
* dlfcn/dlsym.c: Likewise.
* dlfcn/dlvsym.c: Likewise.
* dlfcn/sdladdr.c: New file.
* dlfcn/sdladdr1.c: New file.
* dlfcn/sdlclose.c: New file.
* dlfcn/sdlerror.c: New file.
* dlfcn/sdlinfo.c: New file.
* dlfcn/sdlopen.c: New file.
* dlfcn/sdlsym.c: New file.
* dlfcn/sdlvsym.c: New file.
* dlfcn/Versions (libdl): Export _dlfcn_hook@GLIBC_PRIVATE.
* include/dlfcn.h (DL_CALLER_DECL, DL_CALLER RETURN_ADDRESS): Define.
(struct dlfcn_hook): New type.
(_dlfcn_hook): New extern decl.
(__dlopen, __dlclose, __dlsym, __dlerror, __dladdr, __dladdr1,
__dlinfo, __dlmopen, __libc_dlsym_private,
__libc_register_dl_open_hook, __libc_register_dlfcn_hook): New
prototypes.
(__dlvsym): Use DL_CALLER_DECL.
* include/libc-symbols.h: Define libdl_hidden_proto and friends.
* malloc/arena.c (_dl_open_hook): Extern decl.
(ptmalloc_init): Don't call _dl_addr when dlopened from statically
linked programs but don't use brk for them either.
2004-10-18 23:17:46 +00:00
|
|
|
|
/* In case this libc copy is in a non-default namespace, never use brk.
|
|
|
|
|
Likewise if dlopened from statically linked program. */
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
|
Dl_info di;
|
|
|
|
|
struct link_map *l;
|
Update.
2004-10-18 Jakub Jelinek <jakub@redhat.com>
* elf/dl-libc.c (__libc_dlsym_private, __libc_register_dl_open_hook):
New functions.
(__libc_dlopen_mode): Call __libc_register_dl_open_hook and
__libc_register_dlfcn_hook.
* dlfcn/Makefile (routines, elide-routines.os): Set.
Add rules to build and test tststatic2.
* dlfcn/tststatic2.c: New test.
* dlfcn/modstatic2.c: New test module.
* dlfcn/dladdr.c: Call _dlfcn_hook from libdl.so if not NULL.
Define __ prefixed routine in libc.a and in libdl.a just call it.
* dlfcn/dladdr1.c: Likewise.
* dlfcn/dlclose.c: Likewise.
* dlfcn/dlerror.c: Likewise.
* dlfcn/dlinfo.c: Likewise.
* dlfcn/dlmopen.c: Likewise.
* dlfcn/dlopen.c: Likewise.
* dlfcn/dlopenold.c: Likewise.
* dlfcn/dlsym.c: Likewise.
* dlfcn/dlvsym.c: Likewise.
* dlfcn/sdladdr.c: New file.
* dlfcn/sdladdr1.c: New file.
* dlfcn/sdlclose.c: New file.
* dlfcn/sdlerror.c: New file.
* dlfcn/sdlinfo.c: New file.
* dlfcn/sdlopen.c: New file.
* dlfcn/sdlsym.c: New file.
* dlfcn/sdlvsym.c: New file.
* dlfcn/Versions (libdl): Export _dlfcn_hook@GLIBC_PRIVATE.
* include/dlfcn.h (DL_CALLER_DECL, DL_CALLER RETURN_ADDRESS): Define.
(struct dlfcn_hook): New type.
(_dlfcn_hook): New extern decl.
(__dlopen, __dlclose, __dlsym, __dlerror, __dladdr, __dladdr1,
__dlinfo, __dlmopen, __libc_dlsym_private,
__libc_register_dl_open_hook, __libc_register_dlfcn_hook): New
prototypes.
(__dlvsym): Use DL_CALLER_DECL.
* include/libc-symbols.h: Define libdl_hidden_proto and friends.
* malloc/arena.c (_dl_open_hook): Extern decl.
(ptmalloc_init): Don't call _dl_addr when dlopened from statically
linked programs but don't use brk for them either.
2004-10-18 23:17:46 +00:00
|
|
|
|
|
|
|
|
|
if (_dl_open_hook != NULL
|
|
|
|
|
|| (_dl_addr (ptmalloc_init, &di, &l, NULL) != 0
|
|
|
|
|
&& l->l_ns != LM_ID_BASE))
|
[BZ #77]
Update.
Add support for namespaces in the dynamic linker.
* dlfcn/Makefile (libdl-routines): Add dlmopen.
* dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen.
* dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM.
Declare dlmopen. Document RTLD_DI_LMID.
* dlfcn/dlinfo.c: Handle RTLD_DI_LMID.
* dlfcn/dlmopen.c: New file.
* dlfcn/dlopen.c: Pass new parameter to _dl_open.
* dlfcn/dlopenold.c: Likewise.
* elf/dl-addr.c: Adjust for removal of GL(dl_loaded).
* elf/dl-caller.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-conflict.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/do-lookup.h: Likewise.
* elf/rtld.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
* elf/dl-depsc: Likewise. Add new parameter to _dl_map_object.
* elf/dl-fini.c: Call destructors in all namespaces.
* elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of
GL(dl_loaded).
* elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal
of GL(dl_loaded).
* elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second
time. Reuse the one from the main namespace in all others.
Pass new parameter to _dl_new_object.
Adjust for removal of GL(dl_loaded).
* elf/dl-object.c: Take new parameter. Use it to initialize l_ns.
Adjust for removal of GL(dl_loaded).
* elf/dl-open.c (_dl_open): Take new parameter.
Adjust for removal of GL(dl_loaded).
* elf/dl-support.c: Replace global _dl_loaded etc variables with
_dl_ns variable.
* include/dlfcn.h: Adjust prototype of _dl_open.
Define __LM_ID_CALLER.
* include/link.h: Add l_real, l_ns, and l_direct_opencount elements.
* sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is
using TLS we need memory appropriate to the number of namespaces.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded,
_dl_nloaded, _dl_global_scope, _dl_main_searchlist, and
_dl_global_scope_alloc with _dl_ns element. Define DL_NNS.
Adjust prototypes of _dl_map_object and member in rtld_global_ro.
* malloc/malloc.c: Include <dlfcn.h>.
* malloc/arena.c (ptmalloc_init): If libc is not in primary namespace,
never use brk.
* elf/Makefile: Add rules to build and run tst-dlmopen1 and
tst-dlmopen2.
* elf/tst-dlmopen1.c: New file.
* elf/tst-dlmopen1mod.c: New file.
* elf/tst-dlmopen2.c: New file.
* elf/dl-close.c: Improve reference counting by tracking direct loads.
* elf/dl-lookup.c (add_dependency): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise.
* elf/rtld.c (dl_main): Likewise.
2004-09-09 GOTO Masanori <gotom@debian.or.jp>
[BZ #77]
* elf/dl-close.c: Count down l_opencount to check not only for
l_reldeps, but also l_initfini.
2004-10-13 Ulrich Drepper <drepper@redhat.com>
2004-10-14 02:08:23 +00:00
|
|
|
|
__morecore = __failing_morecore;
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
|
mutex_init(&list_lock);
|
|
|
|
|
tsd_key_create(&arena_key, NULL);
|
|
|
|
|
tsd_setspecific(arena_key, (Void_t *)&main_arena);
|
|
|
|
|
thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_unlock_all2);
|
|
|
|
|
#ifndef NO_THREADS
|
2002-12-06 11:15:07 +00:00
|
|
|
|
# ifndef NO_STARTER
|
2002-01-29 07:54:51 +00:00
|
|
|
|
__malloc_hook = save_malloc_hook;
|
2002-12-06 11:15:07 +00:00
|
|
|
|
__memalign_hook = save_memalign_hook;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
__free_hook = save_free_hook;
|
2002-12-06 11:15:07 +00:00
|
|
|
|
# else
|
|
|
|
|
# undef NO_STARTER
|
|
|
|
|
# endif
|
2002-01-29 07:54:51 +00:00
|
|
|
|
#endif
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
secure = __libc_enable_secure;
|
|
|
|
|
s = NULL;
|
2002-12-27 00:37:06 +00:00
|
|
|
|
if (__builtin_expect (_environ != NULL, 1))
|
|
|
|
|
{
|
|
|
|
|
char **runp = _environ;
|
|
|
|
|
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:
|
2005-03-08 00:44:05 +00:00
|
|
|
|
if (! secure)
|
|
|
|
|
{
|
|
|
|
|
if (memcmp (envline, "TOP_PAD_", 8) == 0)
|
|
|
|
|
mALLOPt(M_TOP_PAD, atoi(&envline[9]));
|
|
|
|
|
else if (memcmp (envline, "PERTURB_", 8) == 0)
|
|
|
|
|
mALLOPt(M_PERTURB, atoi(&envline[9]));
|
|
|
|
|
}
|
2002-12-27 00:37:06 +00:00
|
|
|
|
break;
|
|
|
|
|
case 9:
|
|
|
|
|
if (! secure && memcmp (envline, "MMAP_MAX_", 9) == 0)
|
|
|
|
|
mALLOPt(M_MMAP_MAX, atoi(&envline[10]));
|
|
|
|
|
break;
|
|
|
|
|
case 15:
|
|
|
|
|
if (! secure)
|
|
|
|
|
{
|
|
|
|
|
if (memcmp (envline, "TRIM_THRESHOLD_", 15) == 0)
|
|
|
|
|
mALLOPt(M_TRIM_THRESHOLD, atoi(&envline[16]));
|
|
|
|
|
else if (memcmp (envline, "MMAP_THRESHOLD_", 15) == 0)
|
|
|
|
|
mALLOPt(M_MMAP_THRESHOLD, atoi(&envline[16]));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
|
#else
|
|
|
|
|
if (! secure)
|
|
|
|
|
{
|
|
|
|
|
if((s = getenv("MALLOC_TRIM_THRESHOLD_")))
|
|
|
|
|
mALLOPt(M_TRIM_THRESHOLD, atoi(s));
|
|
|
|
|
if((s = getenv("MALLOC_TOP_PAD_")))
|
|
|
|
|
mALLOPt(M_TOP_PAD, atoi(s));
|
2005-03-08 00:44:05 +00:00
|
|
|
|
if((s = getenv("MALLOC_PERTURB_")))
|
|
|
|
|
mALLOPt(M_PERTURB, atoi(s));
|
2002-01-29 07:54:51 +00:00
|
|
|
|
if((s = getenv("MALLOC_MMAP_THRESHOLD_")))
|
|
|
|
|
mALLOPt(M_MMAP_THRESHOLD, atoi(s));
|
|
|
|
|
if((s = getenv("MALLOC_MMAP_MAX_")))
|
|
|
|
|
mALLOPt(M_MMAP_MAX, atoi(s));
|
|
|
|
|
}
|
|
|
|
|
s = getenv("MALLOC_CHECK_");
|
|
|
|
|
#endif
|
2004-12-22 20:10:10 +00:00
|
|
|
|
if(s) {
|
|
|
|
|
if(s[0]) mALLOPt(M_CHECK_ACTION, (int)(s[0] - '0'));
|
2004-09-28 18:25:52 +00:00
|
|
|
|
if (check_action != 0)
|
|
|
|
|
__malloc_check_init();
|
2002-01-29 07:54:51 +00:00
|
|
|
|
}
|
|
|
|
|
if(__malloc_initialize_hook != NULL)
|
|
|
|
|
(*__malloc_initialize_hook)();
|
|
|
|
|
__malloc_initialized = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Managing heaps and arenas (for concurrent threads) */
|
|
|
|
|
|
|
|
|
|
#if USE_ARENAS
|
|
|
|
|
|
|
|
|
|
#if MALLOC_DEBUG > 1
|
|
|
|
|
|
|
|
|
|
/* Print the complete contents of a single heap to stderr. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
#if __STD_C
|
|
|
|
|
dump_heap(heap_info *heap)
|
|
|
|
|
#else
|
|
|
|
|
dump_heap(heap) heap_info *heap;
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
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, "\n");
|
|
|
|
|
p = next_chunk(p);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* MALLOC_DEBUG > 1 */
|
|
|
|
|
|
2004-10-04 02:27:39 +00:00
|
|
|
|
/* If consecutive mmap (0, HEAP_MAX_SIZE << 1, ...) calls return decreasing
|
|
|
|
|
addresses as opposed to increasing, new_heap would badly fragment the
|
|
|
|
|
address space. In that case remember the second HEAP_MAX_SIZE part
|
|
|
|
|
aligned to HEAP_MAX_SIZE from last mmap (0, HEAP_MAX_SIZE << 1, ...)
|
|
|
|
|
call (if it is already aligned) and try to reuse it next time. We need
|
|
|
|
|
no locking for it, as kernel ensures the atomicity for us - worst case
|
|
|
|
|
we'll call mmap (addr, HEAP_MAX_SIZE, ...) for some value of addr in
|
|
|
|
|
multiple threads, but only one will succeed. */
|
|
|
|
|
static char *aligned_heap_area;
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
|
/* Create a new heap. size is automatically rounded up to a multiple
|
|
|
|
|
of the page size. */
|
|
|
|
|
|
|
|
|
|
static heap_info *
|
|
|
|
|
internal_function
|
|
|
|
|
#if __STD_C
|
|
|
|
|
new_heap(size_t size, size_t top_pad)
|
|
|
|
|
#else
|
|
|
|
|
new_heap(size, top_pad) size_t size, top_pad;
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
size_t page_mask = malloc_getpagesize - 1;
|
|
|
|
|
char *p1, *p2;
|
|
|
|
|
unsigned long ul;
|
|
|
|
|
heap_info *h;
|
|
|
|
|
|
|
|
|
|
if(size+top_pad < HEAP_MIN_SIZE)
|
|
|
|
|
size = HEAP_MIN_SIZE;
|
|
|
|
|
else if(size+top_pad <= HEAP_MAX_SIZE)
|
|
|
|
|
size += top_pad;
|
|
|
|
|
else if(size > HEAP_MAX_SIZE)
|
|
|
|
|
return 0;
|
|
|
|
|
else
|
|
|
|
|
size = HEAP_MAX_SIZE;
|
|
|
|
|
size = (size + page_mask) & ~page_mask;
|
|
|
|
|
|
|
|
|
|
/* A memory region aligned to a multiple of HEAP_MAX_SIZE is needed.
|
|
|
|
|
No swap space needs to be reserved for the following large
|
|
|
|
|
mapping (on Linux, this is the case for all non-writable mappings
|
|
|
|
|
anyway). */
|
2004-10-04 02:27:39 +00:00
|
|
|
|
p2 = MAP_FAILED;
|
|
|
|
|
if(aligned_heap_area) {
|
|
|
|
|
p2 = (char *)MMAP(aligned_heap_area, HEAP_MAX_SIZE, PROT_NONE,
|
|
|
|
|
MAP_PRIVATE|MAP_NORESERVE);
|
|
|
|
|
aligned_heap_area = NULL;
|
|
|
|
|
if (p2 != MAP_FAILED && ((unsigned long)p2 & (HEAP_MAX_SIZE-1))) {
|
2002-01-29 07:54:51 +00:00
|
|
|
|
munmap(p2, HEAP_MAX_SIZE);
|
2004-10-04 02:27:39 +00:00
|
|
|
|
p2 = MAP_FAILED;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(p2 == MAP_FAILED) {
|
|
|
|
|
p1 = (char *)MMAP(0, HEAP_MAX_SIZE<<1, PROT_NONE,
|
|
|
|
|
MAP_PRIVATE|MAP_NORESERVE);
|
|
|
|
|
if(p1 != MAP_FAILED) {
|
|
|
|
|
p2 = (char *)(((unsigned long)p1 + (HEAP_MAX_SIZE-1))
|
|
|
|
|
& ~(HEAP_MAX_SIZE-1));
|
|
|
|
|
ul = p2 - p1;
|
|
|
|
|
if (ul)
|
|
|
|
|
munmap(p1, ul);
|
|
|
|
|
else
|
|
|
|
|
aligned_heap_area = p2 + HEAP_MAX_SIZE;
|
|
|
|
|
munmap(p2 + HEAP_MAX_SIZE, HEAP_MAX_SIZE - ul);
|
|
|
|
|
} else {
|
|
|
|
|
/* Try to take the chance that an allocation of only HEAP_MAX_SIZE
|
|
|
|
|
is already aligned. */
|
|
|
|
|
p2 = (char *)MMAP(0, HEAP_MAX_SIZE, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE);
|
|
|
|
|
if(p2 == MAP_FAILED)
|
|
|
|
|
return 0;
|
|
|
|
|
if((unsigned long)p2 & (HEAP_MAX_SIZE-1)) {
|
|
|
|
|
munmap(p2, HEAP_MAX_SIZE);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(mprotect(p2, size, PROT_READ|PROT_WRITE) != 0) {
|
|
|
|
|
munmap(p2, HEAP_MAX_SIZE);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
h = (heap_info *)p2;
|
|
|
|
|
h->size = size;
|
|
|
|
|
THREAD_STAT(stat_n_heaps++);
|
|
|
|
|
return h;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Grow or shrink a heap. size is automatically rounded up to a
|
|
|
|
|
multiple of the page size if it is positive. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
#if __STD_C
|
|
|
|
|
grow_heap(heap_info *h, long diff)
|
|
|
|
|
#else
|
|
|
|
|
grow_heap(h, diff) heap_info *h; long diff;
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
size_t page_mask = malloc_getpagesize - 1;
|
|
|
|
|
long new_size;
|
|
|
|
|
|
|
|
|
|
if(diff >= 0) {
|
|
|
|
|
diff = (diff + page_mask) & ~page_mask;
|
|
|
|
|
new_size = (long)h->size + diff;
|
2004-12-22 20:10:10 +00:00
|
|
|
|
if(new_size > HEAP_MAX_SIZE)
|
2002-01-29 07:54:51 +00:00
|
|
|
|
return -1;
|
2004-12-22 20:10:10 +00:00
|
|
|
|
if(mprotect((char *)h + h->size, diff, PROT_READ|PROT_WRITE) != 0)
|
|
|
|
|
return -2;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
} else {
|
|
|
|
|
new_size = (long)h->size + diff;
|
|
|
|
|
if(new_size < (long)sizeof(*h))
|
|
|
|
|
return -1;
|
|
|
|
|
/* Try to re-map the extra heap space freshly to save memory, and
|
|
|
|
|
make it inaccessible. */
|
2004-12-22 20:10:10 +00:00
|
|
|
|
if((char *)MMAP((char *)h + new_size, -diff, PROT_NONE,
|
|
|
|
|
MAP_PRIVATE|MAP_FIXED) == (char *) MAP_FAILED)
|
|
|
|
|
return -2;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
/*fprintf(stderr, "shrink %p %08lx\n", h, new_size);*/
|
|
|
|
|
}
|
|
|
|
|
h->size = new_size;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Delete a heap. */
|
|
|
|
|
|
2004-10-04 02:27:39 +00:00
|
|
|
|
#define delete_heap(heap) \
|
|
|
|
|
do { \
|
|
|
|
|
if ((char *)(heap) + HEAP_MAX_SIZE == aligned_heap_area) \
|
|
|
|
|
aligned_heap_area = NULL; \
|
|
|
|
|
munmap((char*)(heap), HEAP_MAX_SIZE); \
|
|
|
|
|
} while (0)
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
internal_function
|
|
|
|
|
#if __STD_C
|
|
|
|
|
heap_trim(heap_info *heap, size_t pad)
|
|
|
|
|
#else
|
|
|
|
|
heap_trim(heap, pad) heap_info *heap; size_t pad;
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
mstate ar_ptr = heap->ar_ptr;
|
|
|
|
|
unsigned long pagesz = mp_.pagesize;
|
|
|
|
|
mchunkptr top_chunk = top(ar_ptr), p, bck, fwd;
|
|
|
|
|
heap_info *prev_heap;
|
|
|
|
|
long new_size, top_size, extra;
|
|
|
|
|
|
|
|
|
|
/* Can this heap go away completely? */
|
|
|
|
|
while(top_chunk == chunk_at_offset(heap, sizeof(*heap))) {
|
|
|
|
|
prev_heap = heap->prev;
|
|
|
|
|
p = chunk_at_offset(prev_heap, prev_heap->size - (MINSIZE-2*SIZE_SZ));
|
|
|
|
|
assert(p->size == (0|PREV_INUSE)); /* must be fencepost */
|
|
|
|
|
p = prev_chunk(p);
|
|
|
|
|
new_size = chunksize(p) + (MINSIZE-2*SIZE_SZ);
|
|
|
|
|
assert(new_size>0 && new_size<(long)(2*MINSIZE));
|
|
|
|
|
if(!prev_inuse(p))
|
|
|
|
|
new_size += p->prev_size;
|
|
|
|
|
assert(new_size>0 && new_size<HEAP_MAX_SIZE);
|
|
|
|
|
if(new_size + (HEAP_MAX_SIZE - prev_heap->size) < pad + MINSIZE + pagesz)
|
|
|
|
|
break;
|
|
|
|
|
ar_ptr->system_mem -= heap->size;
|
|
|
|
|
arena_mem -= heap->size;
|
|
|
|
|
delete_heap(heap);
|
|
|
|
|
heap = prev_heap;
|
|
|
|
|
if(!prev_inuse(p)) { /* consolidate backward */
|
|
|
|
|
p = prev_chunk(p);
|
|
|
|
|
unlink(p, bck, fwd);
|
|
|
|
|
}
|
|
|
|
|
assert(((unsigned long)((char*)p + new_size) & (pagesz-1)) == 0);
|
|
|
|
|
assert( ((char*)p + new_size) == ((char*)heap + heap->size) );
|
|
|
|
|
top(ar_ptr) = top_chunk = p;
|
|
|
|
|
set_head(top_chunk, new_size | PREV_INUSE);
|
|
|
|
|
/*check_chunk(ar_ptr, top_chunk);*/
|
|
|
|
|
}
|
|
|
|
|
top_size = chunksize(top_chunk);
|
|
|
|
|
extra = ((top_size - pad - MINSIZE + (pagesz-1))/pagesz - 1) * pagesz;
|
|
|
|
|
if(extra < (long)pagesz)
|
|
|
|
|
return 0;
|
|
|
|
|
/* Try to shrink. */
|
|
|
|
|
if(grow_heap(heap, -extra) != 0)
|
|
|
|
|
return 0;
|
|
|
|
|
ar_ptr->system_mem -= extra;
|
|
|
|
|
arena_mem -= extra;
|
|
|
|
|
|
|
|
|
|
/* Success. Adjust top accordingly. */
|
|
|
|
|
set_head(top_chunk, (top_size - extra) | PREV_INUSE);
|
|
|
|
|
/*check_chunk(ar_ptr, top_chunk);*/
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2005-10-12 20:49:06 +00:00
|
|
|
|
/* Create a new arena with initial size "size". */
|
|
|
|
|
|
|
|
|
|
static mstate
|
|
|
|
|
_int_new_arena(size_t size)
|
|
|
|
|
{
|
|
|
|
|
mstate a;
|
|
|
|
|
heap_info *h;
|
|
|
|
|
char *ptr;
|
|
|
|
|
unsigned long misalign;
|
|
|
|
|
|
|
|
|
|
h = new_heap(size + (sizeof(*h) + sizeof(*a) + MALLOC_ALIGNMENT),
|
|
|
|
|
mp_.top_pad);
|
|
|
|
|
if(!h) {
|
|
|
|
|
/* Maybe size is too large to fit in a single heap. So, just try
|
|
|
|
|
to create a minimally-sized arena and let _int_malloc() attempt
|
|
|
|
|
to deal with the large request via mmap_chunk(). */
|
|
|
|
|
h = new_heap(sizeof(*h) + sizeof(*a) + MALLOC_ALIGNMENT, mp_.top_pad);
|
|
|
|
|
if(!h)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
a = h->ar_ptr = (mstate)(h+1);
|
|
|
|
|
malloc_init_state(a);
|
|
|
|
|
/*a->next = NULL;*/
|
|
|
|
|
a->system_mem = a->max_system_mem = h->size;
|
|
|
|
|
arena_mem += h->size;
|
|
|
|
|
#ifdef NO_THREADS
|
|
|
|
|
if((unsigned long)(mp_.mmapped_mem + arena_mem + main_arena.system_mem) >
|
|
|
|
|
mp_.max_total_mem)
|
|
|
|
|
mp_.max_total_mem = mp_.mmapped_mem + arena_mem + main_arena.system_mem;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Set up the top chunk, with proper alignment. */
|
|
|
|
|
ptr = (char *)(a + 1);
|
|
|
|
|
misalign = (unsigned long)chunk2mem(ptr) & MALLOC_ALIGN_MASK;
|
|
|
|
|
if (misalign > 0)
|
|
|
|
|
ptr += MALLOC_ALIGNMENT - misalign;
|
|
|
|
|
top(a) = (mchunkptr)ptr;
|
|
|
|
|
set_head(top(a), (((char*)h + h->size) - ptr) | PREV_INUSE);
|
|
|
|
|
|
|
|
|
|
return a;
|
|
|
|
|
}
|
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
|
static mstate
|
|
|
|
|
internal_function
|
|
|
|
|
#if __STD_C
|
|
|
|
|
arena_get2(mstate a_tsd, size_t size)
|
|
|
|
|
#else
|
|
|
|
|
arena_get2(a_tsd, size) mstate a_tsd; size_t size;
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
mstate a;
|
|
|
|
|
|
|
|
|
|
if(!a_tsd)
|
|
|
|
|
a = a_tsd = &main_arena;
|
|
|
|
|
else {
|
|
|
|
|
a = a_tsd->next;
|
|
|
|
|
if(!a) {
|
|
|
|
|
/* This can only happen while initializing the new arena. */
|
|
|
|
|
(void)mutex_lock(&main_arena.mutex);
|
|
|
|
|
THREAD_STAT(++(main_arena.stat_lock_wait));
|
|
|
|
|
return &main_arena;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check the global, circularly linked list for available arenas. */
|
2004-12-10 11:42:45 +00:00
|
|
|
|
bool retried = false;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
repeat:
|
|
|
|
|
do {
|
|
|
|
|
if(!mutex_trylock(&a->mutex)) {
|
2004-12-10 11:42:45 +00:00
|
|
|
|
if (retried)
|
|
|
|
|
(void)mutex_unlock(&list_lock);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
THREAD_STAT(++(a->stat_lock_loop));
|
|
|
|
|
tsd_setspecific(arena_key, (Void_t *)a);
|
|
|
|
|
return a;
|
|
|
|
|
}
|
|
|
|
|
a = a->next;
|
|
|
|
|
} while(a != a_tsd);
|
|
|
|
|
|
|
|
|
|
/* If not even the list_lock can be obtained, try again. This can
|
|
|
|
|
happen during `atfork', or for example on systems where thread
|
|
|
|
|
creation makes it temporarily impossible to obtain _any_
|
|
|
|
|
locks. */
|
2004-12-10 11:42:45 +00:00
|
|
|
|
if(!retried && mutex_trylock(&list_lock)) {
|
|
|
|
|
/* We will block to not run in a busy loop. */
|
|
|
|
|
(void)mutex_lock(&list_lock);
|
|
|
|
|
|
|
|
|
|
/* Since we blocked there might be an arena available now. */
|
|
|
|
|
retried = true;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
a = a_tsd;
|
|
|
|
|
goto repeat;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Nothing immediately available, so generate a new arena. */
|
|
|
|
|
a = _int_new_arena(size);
|
2004-12-10 11:42:45 +00:00
|
|
|
|
if(a)
|
|
|
|
|
{
|
|
|
|
|
tsd_setspecific(arena_key, (Void_t *)a);
|
|
|
|
|
mutex_init(&a->mutex);
|
|
|
|
|
mutex_lock(&a->mutex); /* remember result */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
2004-12-10 11:42:45 +00:00
|
|
|
|
/* Add the new arena to the global list. */
|
|
|
|
|
a->next = main_arena.next;
|
|
|
|
|
atomic_write_barrier ();
|
|
|
|
|
main_arena.next = a;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
2004-12-10 11:42:45 +00:00
|
|
|
|
THREAD_STAT(++(a->stat_lock_loop));
|
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
|
(void)mutex_unlock(&list_lock);
|
|
|
|
|
|
|
|
|
|
return a;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* USE_ARENAS */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Local variables:
|
|
|
|
|
* c-basic-offset: 2
|
|
|
|
|
* End:
|
|
|
|
|
*/
|