2002-01-29 07:54:51 +00:00
|
|
|
/* Malloc implementation for multiple threads without lock contention.
|
2009-02-07 22:01:49 +00:00
|
|
|
Copyright (C) 2001-2006, 2007, 2008, 2009 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. */
|
|
|
|
|
|
|
|
/* What to do if the standard debugging hooks are in place and a
|
|
|
|
corrupt pointer is detected: do nothing (0), print an error message
|
|
|
|
(1), or call abort() (2). */
|
|
|
|
|
|
|
|
/* Hooks for debugging versions. The initial hooks just call the
|
|
|
|
initialization routine, then do the normal work. */
|
|
|
|
|
|
|
|
static Void_t*
|
|
|
|
#if __STD_C
|
|
|
|
malloc_hook_ini(size_t sz, const __malloc_ptr_t caller)
|
|
|
|
#else
|
|
|
|
malloc_hook_ini(sz, caller)
|
|
|
|
size_t sz; const __malloc_ptr_t caller;
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
__malloc_hook = NULL;
|
|
|
|
ptmalloc_init();
|
|
|
|
return public_mALLOc(sz);
|
|
|
|
}
|
|
|
|
|
|
|
|
static Void_t*
|
|
|
|
#if __STD_C
|
|
|
|
realloc_hook_ini(Void_t* ptr, size_t sz, const __malloc_ptr_t caller)
|
|
|
|
#else
|
|
|
|
realloc_hook_ini(ptr, sz, caller)
|
|
|
|
Void_t* ptr; size_t sz; const __malloc_ptr_t caller;
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
__malloc_hook = NULL;
|
|
|
|
__realloc_hook = NULL;
|
|
|
|
ptmalloc_init();
|
|
|
|
return public_rEALLOc(ptr, sz);
|
|
|
|
}
|
|
|
|
|
|
|
|
static Void_t*
|
|
|
|
#if __STD_C
|
|
|
|
memalign_hook_ini(size_t alignment, size_t sz, const __malloc_ptr_t caller)
|
|
|
|
#else
|
|
|
|
memalign_hook_ini(alignment, sz, caller)
|
|
|
|
size_t alignment; size_t sz; const __malloc_ptr_t caller;
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
__memalign_hook = NULL;
|
|
|
|
ptmalloc_init();
|
|
|
|
return public_mEMALIGn(alignment, sz);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Whether we are using malloc checking. */
|
|
|
|
static int using_malloc_checking;
|
|
|
|
|
|
|
|
/* A flag that is set by malloc_set_state, to signal that malloc checking
|
|
|
|
must not be enabled on the request from the user (via the MALLOC_CHECK_
|
|
|
|
environment variable). It is reset by __malloc_check_init to tell
|
|
|
|
malloc_set_state that the user has requested malloc checking.
|
|
|
|
|
|
|
|
The purpose of this flag is to make sure that malloc checking is not
|
|
|
|
enabled when the heap to be restored was constructed without malloc
|
|
|
|
checking, and thus does not contain the required magic bytes.
|
|
|
|
Otherwise the heap would be corrupted by calls to free and realloc. If
|
|
|
|
it turns out that the heap was created with malloc checking and the
|
|
|
|
user has requested it malloc_set_state just calls __malloc_check_init
|
|
|
|
again to enable it. On the other hand, reusing such a heap without
|
|
|
|
further malloc checking is safe. */
|
|
|
|
static int disallow_malloc_check;
|
|
|
|
|
|
|
|
/* Activate a standard set of debugging hooks. */
|
|
|
|
void
|
|
|
|
__malloc_check_init()
|
|
|
|
{
|
|
|
|
if (disallow_malloc_check) {
|
|
|
|
disallow_malloc_check = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
using_malloc_checking = 1;
|
|
|
|
__malloc_hook = malloc_check;
|
|
|
|
__free_hook = free_check;
|
|
|
|
__realloc_hook = realloc_check;
|
|
|
|
__memalign_hook = memalign_check;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* A simple, standard set of debugging hooks. Overhead is `only' one
|
|
|
|
byte per chunk; still this will catch most cases of double frees or
|
|
|
|
overruns. The goal here is to avoid obscure crashes due to invalid
|
|
|
|
usage, unlike in the MALLOC_DEBUG code. */
|
|
|
|
|
|
|
|
#define MAGICBYTE(p) ( ( ((size_t)p >> 3) ^ ((size_t)p >> 11)) & 0xFF )
|
|
|
|
|
|
|
|
/* Instrument a chunk with overrun detector byte(s) and convert it
|
|
|
|
into a user pointer with requested size sz. */
|
|
|
|
|
|
|
|
static Void_t*
|
|
|
|
internal_function
|
|
|
|
#if __STD_C
|
|
|
|
mem2mem_check(Void_t *ptr, size_t sz)
|
|
|
|
#else
|
|
|
|
mem2mem_check(ptr, sz) Void_t *ptr; size_t sz;
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
mchunkptr p;
|
|
|
|
unsigned char* m_ptr = (unsigned char*)BOUNDED_N(ptr, sz);
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (!ptr)
|
|
|
|
return ptr;
|
|
|
|
p = mem2chunk(ptr);
|
|
|
|
for(i = chunksize(p) - (chunk_is_mmapped(p) ? 2*SIZE_SZ+1 : SIZE_SZ+1);
|
|
|
|
i > sz;
|
|
|
|
i -= 0xFF) {
|
|
|
|
if(i-sz < 0x100) {
|
|
|
|
m_ptr[i] = (unsigned char)(i-sz);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
m_ptr[i] = 0xFF;
|
|
|
|
}
|
|
|
|
m_ptr[sz] = MAGICBYTE(p);
|
|
|
|
return (Void_t*)m_ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert a pointer to be free()d or realloc()ed to a valid chunk
|
|
|
|
pointer. If the provided pointer is not valid, return NULL. */
|
|
|
|
|
|
|
|
static mchunkptr
|
|
|
|
internal_function
|
|
|
|
#if __STD_C
|
2005-04-27 01:39:11 +00:00
|
|
|
mem2chunk_check(Void_t* mem, unsigned char **magic_p)
|
2002-01-29 07:54:51 +00:00
|
|
|
#else
|
2005-04-27 01:39:11 +00:00
|
|
|
mem2chunk_check(mem, magic_p) Void_t* mem; unsigned char **magic_p;
|
2002-01-29 07:54:51 +00:00
|
|
|
#endif
|
|
|
|
{
|
|
|
|
mchunkptr p;
|
|
|
|
INTERNAL_SIZE_T sz, c;
|
|
|
|
unsigned char magic;
|
|
|
|
|
2003-01-27 18:32:36 +00:00
|
|
|
if(!aligned_OK(mem)) return NULL;
|
2002-01-29 07:54:51 +00:00
|
|
|
p = mem2chunk(mem);
|
2004-12-14 21:18:36 +00:00
|
|
|
if (!chunk_is_mmapped(p)) {
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Must be a chunk in conventional heap memory. */
|
2004-12-14 21:18:36 +00:00
|
|
|
int contig = contiguous(&main_arena);
|
|
|
|
sz = chunksize(p);
|
|
|
|
if((contig &&
|
|
|
|
((char*)p<mp_.sbrk_base ||
|
|
|
|
((char*)p + sz)>=(mp_.sbrk_base+main_arena.system_mem) )) ||
|
2002-01-29 07:54:51 +00:00
|
|
|
sz<MINSIZE || sz&MALLOC_ALIGN_MASK || !inuse(p) ||
|
|
|
|
( !prev_inuse(p) && (p->prev_size&MALLOC_ALIGN_MASK ||
|
2009-11-01 15:27:00 +00:00
|
|
|
(contig && (char*)prev_chunk(p)<mp_.sbrk_base) ||
|
|
|
|
next_chunk(prev_chunk(p))!=p) ))
|
2002-01-29 07:54:51 +00:00
|
|
|
return NULL;
|
|
|
|
magic = MAGICBYTE(p);
|
|
|
|
for(sz += SIZE_SZ-1; (c = ((unsigned char*)p)[sz]) != magic; sz -= c) {
|
|
|
|
if(c<=0 || sz<(c+2*SIZE_SZ)) return NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
unsigned long offset, page_mask = malloc_getpagesize-1;
|
|
|
|
|
|
|
|
/* mmap()ed chunks have MALLOC_ALIGNMENT or higher power-of-two
|
|
|
|
alignment relative to the beginning of a page. Check this
|
|
|
|
first. */
|
|
|
|
offset = (unsigned long)mem & page_mask;
|
|
|
|
if((offset!=MALLOC_ALIGNMENT && offset!=0 && offset!=0x10 &&
|
2009-11-01 15:27:00 +00:00
|
|
|
offset!=0x20 && offset!=0x40 && offset!=0x80 && offset!=0x100 &&
|
|
|
|
offset!=0x200 && offset!=0x400 && offset!=0x800 && offset!=0x1000 &&
|
|
|
|
offset<0x2000) ||
|
2002-01-29 07:54:51 +00:00
|
|
|
!chunk_is_mmapped(p) || (p->size & PREV_INUSE) ||
|
|
|
|
( (((unsigned long)p - p->prev_size) & page_mask) != 0 ) ||
|
|
|
|
( (sz = chunksize(p)), ((p->prev_size + sz) & page_mask) != 0 ) )
|
|
|
|
return NULL;
|
|
|
|
magic = MAGICBYTE(p);
|
|
|
|
for(sz -= 1; (c = ((unsigned char*)p)[sz]) != magic; sz -= c) {
|
|
|
|
if(c<=0 || sz<(c+2*SIZE_SZ)) return NULL;
|
|
|
|
}
|
|
|
|
}
|
2005-04-27 01:39:11 +00:00
|
|
|
((unsigned char*)p)[sz] ^= 0xFF;
|
|
|
|
if (magic_p)
|
|
|
|
*magic_p = (unsigned char *)p + sz;
|
2002-01-29 07:54:51 +00:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for corruption of the top chunk, and try to recover if
|
|
|
|
necessary. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
internal_function
|
|
|
|
#if __STD_C
|
|
|
|
top_check(void)
|
|
|
|
#else
|
|
|
|
top_check()
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
mchunkptr t = top(&main_arena);
|
|
|
|
char* brk, * new_brk;
|
|
|
|
INTERNAL_SIZE_T front_misalign, sbrk_size;
|
|
|
|
unsigned long pagesz = malloc_getpagesize;
|
|
|
|
|
2004-12-14 21:18:36 +00:00
|
|
|
if (t == initial_top(&main_arena) ||
|
|
|
|
(!chunk_is_mmapped(t) &&
|
|
|
|
chunksize(t)>=MINSIZE &&
|
|
|
|
prev_inuse(t) &&
|
|
|
|
(!contiguous(&main_arena) ||
|
|
|
|
(char*)t + chunksize(t) == mp_.sbrk_base + main_arena.system_mem)))
|
|
|
|
return 0;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2004-09-09 21:10:29 +00:00
|
|
|
malloc_printerr (check_action, "malloc: top chunk is corrupt", t);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
/* Try to set up a new top chunk. */
|
|
|
|
brk = MORECORE(0);
|
|
|
|
front_misalign = (unsigned long)chunk2mem(brk) & MALLOC_ALIGN_MASK;
|
|
|
|
if (front_misalign > 0)
|
|
|
|
front_misalign = MALLOC_ALIGNMENT - front_misalign;
|
|
|
|
sbrk_size = front_misalign + mp_.top_pad + MINSIZE;
|
|
|
|
sbrk_size += pagesz - ((unsigned long)(brk + sbrk_size) & (pagesz - 1));
|
|
|
|
new_brk = (char*)(MORECORE (sbrk_size));
|
2005-04-27 01:39:11 +00:00
|
|
|
if (new_brk == (char*)(MORECORE_FAILURE))
|
|
|
|
{
|
|
|
|
MALLOC_FAILURE_ACTION;
|
|
|
|
return -1;
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Call the `morecore' hook if necessary. */
|
2009-04-17 17:55:06 +00:00
|
|
|
void (*hook) (void) = force_reg (__after_morecore_hook);
|
2009-04-16 21:22:16 +00:00
|
|
|
if (hook)
|
|
|
|
(*hook) ();
|
2002-01-29 07:54:51 +00:00
|
|
|
main_arena.system_mem = (new_brk - mp_.sbrk_base) + sbrk_size;
|
|
|
|
|
|
|
|
top(&main_arena) = (mchunkptr)(brk + front_misalign);
|
|
|
|
set_head(top(&main_arena), (sbrk_size - front_misalign) | PREV_INUSE);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Void_t*
|
|
|
|
#if __STD_C
|
|
|
|
malloc_check(size_t sz, const Void_t *caller)
|
|
|
|
#else
|
|
|
|
malloc_check(sz, caller) size_t sz; const Void_t *caller;
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
Void_t *victim;
|
|
|
|
|
2005-04-27 01:39:11 +00:00
|
|
|
if (sz+1 == 0) {
|
|
|
|
MALLOC_FAILURE_ACTION;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
(void)mutex_lock(&main_arena.mutex);
|
|
|
|
victim = (top_check() >= 0) ? _int_malloc(&main_arena, sz+1) : NULL;
|
|
|
|
(void)mutex_unlock(&main_arena.mutex);
|
|
|
|
return mem2mem_check(victim, sz);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
#if __STD_C
|
|
|
|
free_check(Void_t* mem, const Void_t *caller)
|
|
|
|
#else
|
|
|
|
free_check(mem, caller) Void_t* mem; const Void_t *caller;
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
mchunkptr p;
|
|
|
|
|
|
|
|
if(!mem) return;
|
2009-11-01 15:27:00 +00:00
|
|
|
(void)mutex_lock(&main_arena.mutex);
|
2005-04-27 01:39:11 +00:00
|
|
|
p = mem2chunk_check(mem, NULL);
|
2002-01-29 07:54:51 +00:00
|
|
|
if(!p) {
|
2009-11-01 15:27:00 +00:00
|
|
|
(void)mutex_unlock(&main_arena.mutex);
|
|
|
|
|
2004-09-09 17:15:57 +00:00
|
|
|
malloc_printerr(check_action, "free(): invalid pointer", mem);
|
2002-01-29 07:54:51 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#if HAVE_MMAP
|
|
|
|
if (chunk_is_mmapped(p)) {
|
2009-11-01 15:27:00 +00:00
|
|
|
(void)mutex_unlock(&main_arena.mutex);
|
2002-01-29 07:54:51 +00:00
|
|
|
munmap_chunk(p);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if 0 /* Erase freed memory. */
|
|
|
|
memset(mem, 0, chunksize(p) - (SIZE_SZ+1));
|
|
|
|
#endif
|
2009-03-13 23:53:18 +00:00
|
|
|
#ifdef ATOMIC_FASTBINS
|
2009-11-01 15:27:00 +00:00
|
|
|
_int_free(&main_arena, p, 1);
|
2009-03-13 23:53:18 +00:00
|
|
|
#else
|
2009-02-07 22:01:49 +00:00
|
|
|
_int_free(&main_arena, p);
|
2009-03-13 23:53:18 +00:00
|
|
|
#endif
|
2009-11-01 15:27:00 +00:00
|
|
|
(void)mutex_unlock(&main_arena.mutex);
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static Void_t*
|
|
|
|
#if __STD_C
|
|
|
|
realloc_check(Void_t* oldmem, size_t bytes, const Void_t *caller)
|
|
|
|
#else
|
|
|
|
realloc_check(oldmem, bytes, caller)
|
|
|
|
Void_t* oldmem; size_t bytes; const Void_t *caller;
|
|
|
|
#endif
|
|
|
|
{
|
2009-02-07 22:01:49 +00:00
|
|
|
INTERNAL_SIZE_T nb;
|
2002-01-29 07:54:51 +00:00
|
|
|
Void_t* newmem = 0;
|
2005-04-27 01:39:11 +00:00
|
|
|
unsigned char *magic_p;
|
2002-01-29 07:54:51 +00:00
|
|
|
|
2005-04-27 01:39:11 +00:00
|
|
|
if (bytes+1 == 0) {
|
|
|
|
MALLOC_FAILURE_ACTION;
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
if (oldmem == 0) return malloc_check(bytes, NULL);
|
2005-04-27 01:39:11 +00:00
|
|
|
if (bytes == 0) {
|
|
|
|
free_check (oldmem, NULL);
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
(void)mutex_lock(&main_arena.mutex);
|
2009-02-07 22:01:49 +00:00
|
|
|
const mchunkptr oldp = mem2chunk_check(oldmem, &magic_p);
|
2002-01-29 07:54:51 +00:00
|
|
|
(void)mutex_unlock(&main_arena.mutex);
|
|
|
|
if(!oldp) {
|
2004-09-09 17:15:57 +00:00
|
|
|
malloc_printerr(check_action, "realloc(): invalid pointer", oldmem);
|
2002-01-29 07:54:51 +00:00
|
|
|
return malloc_check(bytes, NULL);
|
|
|
|
}
|
2009-02-07 22:01:49 +00:00
|
|
|
const INTERNAL_SIZE_T oldsize = chunksize(oldp);
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
checked_request2size(bytes+1, nb);
|
|
|
|
(void)mutex_lock(&main_arena.mutex);
|
|
|
|
|
|
|
|
#if HAVE_MMAP
|
|
|
|
if (chunk_is_mmapped(oldp)) {
|
|
|
|
#if HAVE_MREMAP
|
2002-02-07 05:30:48 +00:00
|
|
|
mchunkptr newp = mremap_chunk(oldp, nb);
|
2002-07-11 15:46:17 +00:00
|
|
|
if(newp)
|
|
|
|
newmem = chunk2mem(newp);
|
|
|
|
else
|
2002-01-29 07:54:51 +00:00
|
|
|
#endif
|
2002-07-11 15:46:17 +00:00
|
|
|
{
|
2002-01-29 07:54:51 +00:00
|
|
|
/* Note the extra SIZE_SZ overhead. */
|
|
|
|
if(oldsize - SIZE_SZ >= nb)
|
|
|
|
newmem = oldmem; /* do nothing */
|
|
|
|
else {
|
2009-11-01 15:27:00 +00:00
|
|
|
/* Must alloc, copy, free. */
|
|
|
|
if (top_check() >= 0)
|
2002-01-29 07:54:51 +00:00
|
|
|
newmem = _int_malloc(&main_arena, bytes+1);
|
2009-11-01 15:27:00 +00:00
|
|
|
if (newmem) {
|
|
|
|
MALLOC_COPY(BOUNDED_N(newmem, bytes+1), oldmem, oldsize - 2*SIZE_SZ);
|
|
|
|
munmap_chunk(oldp);
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
#endif /* HAVE_MMAP */
|
2009-02-07 22:49:34 +00:00
|
|
|
if (top_check() >= 0) {
|
|
|
|
INTERNAL_SIZE_T nb;
|
|
|
|
checked_request2size(bytes + 1, nb);
|
2009-04-08 18:00:34 +00:00
|
|
|
newmem = _int_realloc(&main_arena, oldp, oldsize, nb);
|
2009-02-07 22:49:34 +00:00
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
#if 0 /* Erase freed memory. */
|
|
|
|
if(newmem)
|
|
|
|
newp = mem2chunk(newmem);
|
|
|
|
nb = chunksize(newp);
|
|
|
|
if(oldp<newp || oldp>=chunk_at_offset(newp, nb)) {
|
|
|
|
memset((char*)oldmem + 2*sizeof(mbinptr), 0,
|
2009-11-01 15:27:00 +00:00
|
|
|
oldsize - (2*sizeof(mbinptr)+2*SIZE_SZ+1));
|
2002-01-29 07:54:51 +00:00
|
|
|
} else if(nb > oldsize+SIZE_SZ) {
|
|
|
|
memset((char*)BOUNDED_N(chunk2mem(newp), bytes) + oldsize,
|
|
|
|
0, nb - (oldsize+SIZE_SZ));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#if HAVE_MMAP
|
|
|
|
}
|
|
|
|
#endif
|
2005-04-27 01:39:11 +00:00
|
|
|
|
|
|
|
/* mem2chunk_check changed the magic byte in the old chunk.
|
|
|
|
If newmem is NULL, then the old chunk will still be used though,
|
|
|
|
so we need to invert that change here. */
|
|
|
|
if (newmem == NULL) *magic_p ^= 0xFF;
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
(void)mutex_unlock(&main_arena.mutex);
|
|
|
|
|
|
|
|
return mem2mem_check(newmem, bytes);
|
|
|
|
}
|
|
|
|
|
|
|
|
static Void_t*
|
|
|
|
#if __STD_C
|
|
|
|
memalign_check(size_t alignment, size_t bytes, const Void_t *caller)
|
|
|
|
#else
|
|
|
|
memalign_check(alignment, bytes, caller)
|
|
|
|
size_t alignment; size_t bytes; const Void_t *caller;
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
INTERNAL_SIZE_T nb;
|
|
|
|
Void_t* mem;
|
|
|
|
|
|
|
|
if (alignment <= MALLOC_ALIGNMENT) return malloc_check(bytes, NULL);
|
|
|
|
if (alignment < MINSIZE) alignment = MINSIZE;
|
|
|
|
|
2005-04-27 01:39:11 +00:00
|
|
|
if (bytes+1 == 0) {
|
|
|
|
MALLOC_FAILURE_ACTION;
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
checked_request2size(bytes+1, nb);
|
|
|
|
(void)mutex_lock(&main_arena.mutex);
|
|
|
|
mem = (top_check() >= 0) ? _int_memalign(&main_arena, alignment, bytes+1) :
|
|
|
|
NULL;
|
|
|
|
(void)mutex_unlock(&main_arena.mutex);
|
|
|
|
return mem2mem_check(mem, bytes);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef NO_THREADS
|
|
|
|
|
2002-12-06 11:15:07 +00:00
|
|
|
# ifdef _LIBC
|
[BZ #2510, BZ #2830, BZ #3137, BZ #3313, BZ #3426, BZ #3465, BZ #3480, BZ #3483, BZ #3493, BZ #3514, BZ #3515, BZ #3664, BZ #3673, BZ #3674]
2007-01-11 Jakub Jelinek <jakub@redhat.com>
* sysdeps/i386/soft-fp/sfp-machine.h: Remove.
* sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise.
2007-01-10 Ulrich Drepper <drepper@redhat.com>
* io/fts.c: Make sure fts_cur is always valid after return from
fts_read.
Patch by Miloslav Trmac <mitr@redhat.com>.
2006-10-27 Richard Sandiford <richard@codesourcery.com>
* elf/elf.h (R_MIPS_GLOB_DAT): Define.
(R_MIPS_NUM): Bump by 1.
2007-01-03 Jakub Jelinek <jakub@redhat.com>
* posix/execvp.c: Include alloca.h.
(allocate_scripts_argv): Renamed to...
(scripts_argv): ... this. Don't allocate buffer here nor count
arguments.
(execvp): Use alloca if possible.
* posix/Makefile: Add rules to build and run tst-vfork3 test.
* posix/tst-vfork3.c: New test.
* stdlib/Makefile (tst-strtod3-ENV): Define.
2007-01-02 Ulrich Drepper <drepper@redhat.com>
* posix/getconf.c: Update copyright year.
* nss/getent.c: Likewise.
* iconv/iconvconfig.c: Likewise.
* iconv/iconv_prog.c: Likewise.
* elf/ldconfig.c: Likewise.
* catgets/gencat.c: Likewise.
* csu/version.c: Likewise.
* elf/ldd.bash.in: Likewise.
* elf/sprof.c (print_version): Likewise.
* locale/programs/locale.c: Likewise.
* locale/programs/localedef.c: Likewise.
* nscd/nscd.c (print_version): Likewise.
* debug/xtrace.sh: Likewise.
* malloc/memusage.sh: Likewise.
* malloc/mtrace.pl: Likewise.
* debug/catchsegv.sh: Likewise.
2006-12-24 Ulrich Drepper <drepper@redhat.com>
* malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment
attempts.
2006-12-23 Ulrich Drepper <drepper@redhat.com>
* posix/wordexp.c: Remove some unnecessary tests.
2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp>
* sysdeps/unix/sysv/linux/sh/bits/shm.h: New file.
* nss/getXXbyYY_r.c: Include atomic.h.
(INTERNAL (REENTRANT_NAME)): Write startp after start_fct,
add atomic_write_barrier () in between.
2006-11-28 Jakub Jelinek <jakub@redhat.com>
* elf/dl-support.c: Include dl-procinfo.h.
* sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4,
PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS,
PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X):
Define.
(_dl_string_platform): Use PPC_PLATFORM_* macros instead of
hardcoded constants.
* sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use
PPC_PLATFORM_* macros for array designators.
2006-11-11 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap
names to the beginning.
(_dl_powerpc_platforms): Add "power6x".
* sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease.
(HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP.
(_DL_PLATFORMS_COUNT): Increase.
(_dl_string_platform): Handle power6x case.
* sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP,
PPC_FEATURE_POWER6_EXT): Define.
(PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment.
[-2^31 .. 2^31) range.
* sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME.
* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
Handle relatime mount option.
2006-12-13 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include
kernel-features.h.
2006-12-11 Ulrich Drepper <drepper@redhat.com>
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand
separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3.
[BZ #3664]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize
empty parsed strings.
* stdlib/Makefile (tests): Add tst-strtod2.
* stdlib/tst-strtod2.c: New file.
[BZ #3673]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit
computation.
* stdlib/Makefile (tests): Add tst-atof2.
* stdlib/tst-atof2.c: New file.
[BZ #3674]
* stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value
correctly if removing trailing zero of hex-float.
* stdlib/Makefile (tests): Add tst-atof1.
* stdlib/tst-atof1.c: New file.
* misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest.
Start searching for next comma at p rather than rest.
* misc/Makefile (tests): Add tst-mntent2.
* misc/tst-mntent2.c: New test.
2006-12-08 Ulrich Drepper <drepper@redhat.com>
* malloc/memusage.c: Handle realloc with new size of zero and
non-NULL pointer correctly.
(me): Really write first record twice.
(struct entry): Make format bi-arch safe.
(dest): Write out more realloc statistics.
* malloc/memusagestat.c (struct entry): Make format bi-arch safe.
2006-12-05 Jakub Jelinek <jakub@redhat.com>
* nis/nis_subr.c (nis_getnames): Revert last change.
2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/sys/io.h: Removed.
2006-11-30 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/i386/i686/memcmp.S: Use jump table as the base of
jump table entries.
2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost
`clone' function to ensure proper unwinding stop of gdb.
* sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise.
2006-12-01 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd.init: Remove obsolete and commented-out -S option
handling.
2006-11-23 Jakub Jelinek <jakub@redhat.com>
[BZ #3514]
* manual/string.texi (strncmp): Fix pastos from wcscmp description.
[BZ #3515]
* manual/string.texi (strtok): Remove duplicate paragraph.
2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with
libgcc not supporting `rflags' unwinding (register # >= 17).
2006-11-30 Jakub Jelinek <jakub@redhat.com>
* sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc
succeeded.
2006-11-29 Daniel Jacobowitz <dan@codesourcery.com>
Jakub Jelinek <jakub@redhat.com>
Jan Kratochvil <jan.kratochvil@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct
unwind information.
* sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for
'restore_rt' even in the 'signal' directory.
* sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list.
malloc crashed. Don't allocate memory unnecessarily in each
loop.
2006-10-21 Jakub Jelinek <jakub@redhat.com>
* resolv/mapv4v6addr.h (map_v4v6_address): Fix last change.
2006-11-20 Ulrich Drepper <drepper@redhat.com>
* resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit.
2006-11-18 Bruno Haible <bruno@clisp.org>
* sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke
__sysconf only after having tried to call getgroups32.
2006-11-19 Ulrich Drepper <drepper@redhat.com>
* nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style
addresses for IPv4 queries if they can be mapped.
2006-11-16 Jakub Jelinek <jakub@redhat.com>
* sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text.
* sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise.
(signmask): Add .size directive.
(othermask): Add .type directive.
2006-11-14 Ulrich Drepper <drepper@redhat.com>
* po/nl.po: Update from translation team.
* timezone/zdump.c: Redo fix for BZ #3137.
2006-11-14 Jakub Jelinek <jakub@redhat.com>
* nss/nss_files/files-alias.c (get_next_alias): Set line back
to first_unused after parsing :include: file.
* timezone/africa: Update from tzdata2006o.
* timezone/antarctica: Likewise.
* timezone/asia: Likewise.
* timezone/australasia: Likewise.
* timezone/backward: Likewise.
* timezone/europe: Likewise.
* timezone/iso3166.tab: Likewise.
* timezone/northamerica: Likewise.
* timezone/southamerica: Likewise.
* timezone/zone.tab: Likewise.
* time/tzfile.c (__tzfile_read): Extend to handle new file format
on machines with 64-bit time_t.
* timezone/checktab.awk: Update from tzcode2006o.
* timezone/ialloc.c: Likewise.
* timezone/private.h: Likewise.
* timezone/scheck.c: Likewise.
* timezone/tzfile.h: Likewise.
* timezone/tzselect.ksh: Likewise.
* timezone/zdump.c: Likewise.
* timezone/zic.c: Likewise.
[BZ #3483]
* elf/ldconfig.c (main): Call setlocale and textdomain.
Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
[BZ #3480]
* manual/argp.texi: Fix typos.
* manual/charset.texi: Likewise.
* manual/errno.texi: Likewise.
* manual/filesys.texi: Likewise.
* manual/lang.texi: Likewise.
* manual/maint.texi: Likewise.
* manual/memory.texi: Likewise.
* manual/message.texi: Likewise.
* manual/resource.texi: Likewise.
* manual/search.texi: Likewise.
* manual/signal.texi: Likewise.
* manual/startup.texi: Likewise.
* manual/stdio.texi: Likewise.
* manual/sysinfo.texi: Likewise.
* manual/syslog.texi: Likewise.
* manual/time.texi: Likewise.
Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
[BZ #3465]
* sunrpc/clnt_raw.c: Minimal message improvements.
* sunrpc/pm_getmaps.c: Likewise.
* nis/nss_nisplus/nisplus-publickey.c: Likewise.
* nis/nis_print_group_entry.c: Likewise.
* locale/programs/repertoire.c: Likewise.
* locale/programs/charmap.c: Likewise.
* malloc/memusage.sh: Likewise.
* elf/dl-deps.c: Likewise.
* locale/programs/ld-collate.c: Likewise.
* libio/vswprintf.c: Likewise.
* malloc/memusagestat.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/rpc_main.c: Likewise.
* nscd/cache.c: Likewise.
* locale/programs/repertoire.c: Unify output messages.
* locale/programs/charmap.c: Likewise.
* locale/programs/ld-ctype.c: Likewise.
* locale/programs/ld-monetary.c: Likewise.
* locale/programs/ld-numeric.c: Likewise.
* locale/programs/ld-time.c: Likewise.
* elf/ldconfig.c: Likewise.
* nscd/selinux.c: Likewise.
* elf/cache.c: Likewise.
Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
2006-11-10 Jakub Jelinek <jakub@redhat.com>
* string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization
if N is one bigger than return value.
* string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1
and l1 last arguments, if buf is defined, verify the return value
equals to strlen (buf) and verify no byte beyond passed length
is modified.
2006-11-10 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.
* sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev):
Use __new_sys_siglist instead of _sys_siglist_internal as
second macro argument.
(_old_sys_siglist): Use declare_symbol_alias macro instead of
strong_alias.
2006-11-09 Ulrich Drepper <drepper@redhat.com>
[BZ #3493]
* posix/unistd.h (sysconf): Remove const attribute.
* sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for
temporary or deprecated addresses.
Patch by Sridhar Samudrala <sri@us.ibm.com>.
* string/Makefile (tests): Add tst-strxfrm2.
* string/tst-strxfrm2.c: New file.
2006-10-09 Jakub Jelinek <jakub@redhat.com>
* elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0
rather than r->r_brk.
* string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal
optimization even if needed > n.
2006-11-07 Jakub Jelinek <jakub@redhat.com>
* include/libc-symbols.h (declare_symbol): Rename to...
(declare_symbol_alias): ... this. Add ORIGINAL argument, imply
strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes
.size directive.
* sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias
changes.
* sysdeps/gnu/siglist.c: Likewise.
2006-11-03 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/powerpc/fpu/bits/mathinline.h
[__LIBC_INTERNAL_MATH_INLINES]: Moved to ...
* sysdeps/powerpc/fpu/math_private.h: ...here. New file.
2006-11-05 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word):
Update handling of cache descriptor 0x49 for new models.
* sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word):
Likewise.
2006-11-02 Ulrich Drepper <drepper@redhat.com>
* configure.in: Work around ld --help change and avoid -z relro
test completely if the architecture doesn't care about security.
2006-11-01 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.
2006-10-31 Ulrich Drepper <drepper@redhat.com>
* stdlib/atexit.c (atexit): Don't mark as hidden when used to
generate compatibility version.
2006-10-29 Ulrich Drepper <drepper@redhat.com>
* configure.in: Relax -z relro requirement a bit.
* po/sv.po: Update from translation team.
2006-10-29 Jakub Jelinek <jakub@redhat.com>
* elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P.
* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise.
* elf/dl-close.c (_dl_close_worker): Likewise.
* elf/dl-open.c (_dl_open_worker): Likewise.
* sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define.
* configure.in: Require assembler support for visibility, compiler
support for visibility and aliases, linker support for various -z
options.
* Makeconfig: Remove conditional code which now is unnecessary.
* config.h.in: Likewise.
* config.make.in: Likewise.
* dlfcn/Makefile: Likewise.
* elf/Makefile: Likewise.
* elf/dl-load.c: Likewise.
* elf/rtld.c: Likewise.
* include/libc-symbols.h: Likewise.
* include/stdio.h: Likewise.
* io/Makefile: Likewise.
* io/fstat.c: Likewise.
* io/fstat64.c: Likewise.
* io/fstatat.c: Likewise.
* io/fstatat64.c: Likewise.
* io/lstat.c: Likewise.
* io/lstat64.c: Likewise.
* io/mknod.c: Likewise.
* io/mknodat.c: Likewise.
* io/stat.c: Likewise.
* io/stat64.c: Likewise.
* libio/stdio.c: Likewise.
* nscd/Makefile: Likewise.
* stdlib/Makefile: Likewise.
* stdlib/atexit.c: Likewise.
* sysdeps/generic/ldsodefs.h: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/i386/sysdep.h: Likewise.
* sysdeps/i386/i686/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise.
* Makerules: USE_TLS support is now default.
* tls.make.c: Likewise.
* csu/Versions: Likewise.
* csu/libc-start.c: Likewise.
* csu/libc-tls.c: Likewise.
* csu/version.c: Likewise.
* dlfcn/dlinfo.c: Likewise.
* elf/dl-addr.c: Likewise.
* elf/dl-cache.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-iteratephdr.c: Likewise.
* elf/dl-load.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-reloc.c: Likewise.
* elf/dl-support.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-sysdep.c: Likewise.
* elf/dl-tls.c: Likewise.
* elf/ldconfig.c: Likewise.
* elf/rtld.c: Likewise.
* elf/tst-tls-dlinfo.c: Likewise.
* elf/tst-tls1.c: Likewise.
* elf/tst-tls10.h: Likewise.
* elf/tst-tls14.c: Likewise.
* elf/tst-tls2.c: Likewise.
* elf/tst-tls3.c: Likewise.
* elf/tst-tls4.c: Likewise.
* elf/tst-tls5.c: Likewise.
* elf/tst-tls6.c: Likewise.
* elf/tst-tls7.c: Likewise.
* elf/tst-tls8.c: Likewise.
* elf/tst-tls9.c: Likewise.
* elf/tst-tlsmod1.c: Likewise.
* elf/tst-tlsmod13.c: Likewise.
* elf/tst-tlsmod13a.c: Likewise.
* elf/tst-tlsmod14a.c: Likewise.
* elf/tst-tlsmod2.c: Likewise.
* elf/tst-tlsmod3.c: Likewise.
* elf/tst-tlsmod4.c: Likewise.
* elf/tst-tlsmod5.c: Likewise.
* elf/tst-tlsmod6.c: Likewise.
* include/errno.h: Likewise.
* include/link.h: Likewise.
* include/tls.h: Likewise.
* locale/global-locale.c: Likewise.
* locale/localeinfo.h: Likewise.
* malloc/arena.c: Likewise.
* malloc/hooks.c: Likewise.
* malloc/malloc.c: Likewise.
* resolv/Versions: Likewise.
* sysdeps/alpha/dl-machine.h: Likewise.
* sysdeps/alpha/libc-tls.c: Likewise.
* sysdeps/generic/ldsodefs.h: Likewise.
* sysdeps/generic/tls.h: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/ia64/dl-machine.h: Likewise.
* sysdeps/ia64/libc-tls.c: Likewise.
* sysdeps/mach/hurd/fork.c: Likewise.
* sysdeps/mach/hurd/i386/tls.h: Likewise.
* sysdeps/powerpc/powerpc32/dl-machine.c: Likwise.
* sysdeps/powerpc/powerpc32/dl-machine.h: Likewise.
* sysdeps/powerpc/powerpc64/dl-machine.h: Likewise.
* sysdeps/s390/libc-tls.c: Likewise.
* sysdeps/s390/s390-32/dl-machine.h: Likewise.
* sysdeps/s390/s390-64/dl-machine.h: Likewise.
* sysdeps/sh/dl-machine.h: Likewise.
* sysdeps/sparc/sparc32/dl-machine.h: Likewise.
* sysdeps/sparc/sparc64/dl-machine.h: Likewise.
* sysdeps/x86_64/dl-machine.h: Likewise.
[BZ #3426]
* stdlib/stdlib.h: Adjust comment for canonicalize_file_name to
reality.
2006-10-27 Jakub Jelinek <jakub@redhat.com>
* elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope
argument.
(_dl_lookup_symbol_x): Adjust caller.
* sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove
_ns_global_scope.
* elf/rtld.c (dl_main): Don't initialize _ns_global_scope.
* elf/dl-libc.c: Revert l_scope name changes.
* elf/dl-load.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/rtld.c: Likewise.
* elf/dl-close.c (_dl_close): Likewise.
* elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P,
always use __rtld_mrlock_{change,done}. Always free old scope list
here if not l_scope_mem.
* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name
change. Never free scope list here. Just __rtld_mrlock_lock before
the lookup and __rtld_mrlock_unlock it after the lookup.
* elf/dl-sym.c: Likewise.
* include/link.h (struct r_scoperec): Remove.
(struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem
with l_scope_mem and l_scoperec_lock with l_scope_lock.
2006-10-25 Ulrich Drepper <drepper@redhat.com>
* sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* configure.in: Disable building profile libraries by default.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to
_dl_lookup_symbol_x code.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
* elf/dl-runtime.c: Include sysdep-cancel.h.
(_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and
scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_*
instead of catomic_* macros.
* elf/dl-sym.c: Include sysdep-cancel.h.
(do_sym): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
* elf/dl-close.c: Include sysdep-cancel.h.
(_dl_close): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
* elf/dl-open.c: Include sysdep-cancel.h.
(dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only
if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
[BZ #3313]
* malloc/malloc.c (malloc_consolidate): Set maxfb to address of last
fastbin rather than end of fastbin array.
2006-10-18 Ulrich Drepper <drepper@redhat.com>
* sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct
body macro.
* sysdeps/x86_64/bits/atomic.h
(__arch_c_compare_and_exchange_val_64_acq): Add missing casts.
(catomic_decrement): Use correct body macro.
2006-10-17 Jakub Jelinek <jakub@redhat.com>
* include/atomic.h: Add a unique prefix to all local variables
in macros.
* csu/tst-atomic.c (do_test): Test also catomic_* macros.
2006-10-14 Ulrich Drepper <drepper@redhat.com>
* resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated.
[BZ #3313]
* malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to
determine highest fast bin to consolidate, always look into all of
them.
(do_check_malloc_state): Only require for empty bins for large
sizes in main arena.
* libio/stdio.h: Add more __wur attributes.
2006-11-12 Andreas Jaeger <aj@suse.de>
[BZ #2510]
* manual/search.texi (Hash Search Function): Clarify.
(Array Search Function): Clarify.
2006-11-12 Joseph Myers <joseph@codesourcery.com>
[BZ #2830]
* math/atest-exp.c (main): Cast hex value to mp_limb_t before
shifting.
* math/atest-exp2.c (read_mpn_hex): Likewise.
* math/atest-sincos.c (main): Likewise.
* sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait.
* sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait.
* sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for
version GLIBC_2.6.
* Versions.def: Add GLIBC_2.6 for libc.
* sysdeps/i386/i486/bits/atomic.h: Add catomic_* support.
2006-10-11 Jakub Jelinek <jakub@redhat.com>
* malloc/malloc.c (_int_malloc): Remove unused any_larger variable.
* nis/nis_defaults.c (__nis_default_access): Don't call getenv twice.
* nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv.
* sysdeps/generic/unsecvars.h: Add NIS_PATH.
2006-10-11 Ulrich Drepper <drepper@redhat.com>
* include/atomic.c: Define catomic_* operations.
* sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems.
* stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*.
* malloc/memusage.c: Likewise.
* gmon/mcount.c: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-profile.c: Likewise.
* elf/dl-sym.c: Likewise.
* elf/dl-runtime.c: Likewise.
* elf/dl-fptr.c: Likewise.
* resolv/res_libc.c: Likewise.
2006-10-10 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast.
* sysdeps/mach/hurd/futimes.c: Likewise.
* sysdeps/mach/hurd/lutimes.c: Likewise.
2006-10-09 Ulrich Drepper <drepper@redhat.com>
Jakub Jelinek <jakub@redhat.com>
Implement reference counting of scope records.
* elf/dl-close.c (_dl_close): Remove all scopes from removed objects
from the list in objects which remain. Always allocate new scope
record.
* elf/dl-open.c (dl_open_worker): When growing array for scopes,
don't resize, allocate a new one.
* elf/dl-runtime.c: Update reference counters before using a scope
array.
* elf/dl-sym.c: Likewise.
* elf/dl-libc.c: Adjust for l_scope name change.
* elf/dl-load.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/rtld.c: Likewise.
* include/link.h: Include <rtld-lowlevel.h>. Define struct
r_scoperec. Replace r_scope with pointer to r_scoperec structure.
Add l_scoperec_lock.
* sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>.
* sysdeps/generic/rtld-lowlevel.h: New file.
* include/atomic.h: Rename atomic_and to atomic_and_val and
atomic_or to atomic_or_val. Define new macros atomic_and and
atomic_or which do not return values.
* sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or.
Various cleanups.
* sysdeps/i386/i486/bits/atomic.h: Likewise.
* po/sv.po: Update from translation team.
2006-10-07 Ulrich Drepper <drepper@redhat.com>
* Versions.def: Add GLIBC_2.6 to libpthread.
* include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use.
(versioned_symbol): Likewise.
(compat_symbol): Likewise.
* po/tr.po: Update from translation team.
* nis/Banner: Removed. It's been integral part forever and the
author info is incomplete anyway.
* libio/Banner: Likewise.
2006-10-06 Ulrich Drepper <drepper@redhat.com>
* version.h (VERSION): Bump to 2.5.90 for new development tree.
2007-01-11 21:51:07 +00:00
|
|
|
# if USE___THREAD || !defined SHARED
|
2002-12-06 11:15:07 +00:00
|
|
|
/* These routines are never needed in this configuration. */
|
|
|
|
# define NO_STARTER
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
|
|
|
|
# ifdef NO_STARTER
|
|
|
|
# undef NO_STARTER
|
|
|
|
# else
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
/* The following hooks are used when the global initialization in
|
|
|
|
ptmalloc_init() hasn't completed yet. */
|
|
|
|
|
|
|
|
static Void_t*
|
|
|
|
#if __STD_C
|
|
|
|
malloc_starter(size_t sz, const Void_t *caller)
|
|
|
|
#else
|
|
|
|
malloc_starter(sz, caller) size_t sz; const Void_t *caller;
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
Void_t* victim;
|
|
|
|
|
|
|
|
victim = _int_malloc(&main_arena, sz);
|
|
|
|
|
|
|
|
return victim ? BOUNDED_N(victim, sz) : 0;
|
|
|
|
}
|
|
|
|
|
2002-12-06 11:15:07 +00:00
|
|
|
static Void_t*
|
|
|
|
#if __STD_C
|
|
|
|
memalign_starter(size_t align, size_t sz, const Void_t *caller)
|
|
|
|
#else
|
|
|
|
memalign_starter(align, sz, caller) size_t align, sz; const Void_t *caller;
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
Void_t* victim;
|
|
|
|
|
|
|
|
victim = _int_memalign(&main_arena, align, sz);
|
|
|
|
|
|
|
|
return victim ? BOUNDED_N(victim, sz) : 0;
|
|
|
|
}
|
|
|
|
|
2002-01-29 07:54:51 +00:00
|
|
|
static void
|
|
|
|
#if __STD_C
|
|
|
|
free_starter(Void_t* mem, const Void_t *caller)
|
|
|
|
#else
|
|
|
|
free_starter(mem, caller) Void_t* mem; const Void_t *caller;
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
mchunkptr p;
|
|
|
|
|
|
|
|
if(!mem) return;
|
|
|
|
p = mem2chunk(mem);
|
|
|
|
#if HAVE_MMAP
|
|
|
|
if (chunk_is_mmapped(p)) {
|
|
|
|
munmap_chunk(p);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2009-03-13 23:53:18 +00:00
|
|
|
#ifdef ATOMIC_FASTBINS
|
|
|
|
_int_free(&main_arena, p, 1);
|
|
|
|
#else
|
2009-02-07 22:01:49 +00:00
|
|
|
_int_free(&main_arena, p);
|
2009-03-13 23:53:18 +00:00
|
|
|
#endif
|
2002-01-29 07:54:51 +00:00
|
|
|
}
|
|
|
|
|
2002-12-06 11:15:07 +00:00
|
|
|
# endif /* !defiend NO_STARTER */
|
2002-01-29 07:54:51 +00:00
|
|
|
#endif /* NO_THREADS */
|
|
|
|
|
|
|
|
|
|
|
|
/* Get/set state: malloc_get_state() records the current state of all
|
|
|
|
malloc variables (_except_ for the actual heap contents and `hook'
|
|
|
|
function pointers) in a system dependent, opaque data structure.
|
|
|
|
This data structure is dynamically allocated and can be free()d
|
|
|
|
after use. malloc_set_state() restores the state of all malloc
|
|
|
|
variables to the previously obtained state. This is especially
|
|
|
|
useful when using this malloc as part of a shared library, and when
|
|
|
|
the heap contents are saved/restored via some other method. The
|
|
|
|
primary example for this is GNU Emacs with its `dumping' procedure.
|
|
|
|
`Hook' function pointers are never saved or restored by these
|
|
|
|
functions, with two exceptions: If malloc checking was in use when
|
|
|
|
malloc_get_state() was called, then malloc_set_state() calls
|
|
|
|
__malloc_check_init() if possible; if malloc checking was not in
|
|
|
|
use in the recorded state but the user requested malloc checking,
|
|
|
|
then the hooks are reset to 0. */
|
|
|
|
|
|
|
|
#define MALLOC_STATE_MAGIC 0x444c4541l
|
2009-04-08 18:00:34 +00:00
|
|
|
#define MALLOC_STATE_VERSION (0*0x100l + 4l) /* major*0x100 + minor */
|
2002-01-29 07:54:51 +00:00
|
|
|
|
|
|
|
struct malloc_save_state {
|
|
|
|
long magic;
|
|
|
|
long version;
|
|
|
|
mbinptr av[NBINS * 2 + 2];
|
|
|
|
char* sbrk_base;
|
|
|
|
int sbrked_mem_bytes;
|
|
|
|
unsigned long trim_threshold;
|
|
|
|
unsigned long top_pad;
|
|
|
|
unsigned int n_mmaps_max;
|
|
|
|
unsigned long mmap_threshold;
|
|
|
|
int check_action;
|
|
|
|
unsigned long max_sbrked_mem;
|
|
|
|
unsigned long max_total_mem;
|
|
|
|
unsigned int n_mmaps;
|
|
|
|
unsigned int max_n_mmaps;
|
|
|
|
unsigned long mmapped_mem;
|
|
|
|
unsigned long max_mmapped_mem;
|
|
|
|
int using_malloc_checking;
|
2009-04-08 18:00:34 +00:00
|
|
|
unsigned long max_fast;
|
|
|
|
unsigned long arena_test;
|
|
|
|
unsigned long arena_max;
|
|
|
|
unsigned long narenas;
|
2002-01-29 07:54:51 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
Void_t*
|
|
|
|
public_gET_STATe(void)
|
|
|
|
{
|
|
|
|
struct malloc_save_state* ms;
|
|
|
|
int i;
|
|
|
|
mbinptr b;
|
|
|
|
|
|
|
|
ms = (struct malloc_save_state*)public_mALLOc(sizeof(*ms));
|
|
|
|
if (!ms)
|
|
|
|
return 0;
|
|
|
|
(void)mutex_lock(&main_arena.mutex);
|
|
|
|
malloc_consolidate(&main_arena);
|
|
|
|
ms->magic = MALLOC_STATE_MAGIC;
|
|
|
|
ms->version = MALLOC_STATE_VERSION;
|
|
|
|
ms->av[0] = 0;
|
|
|
|
ms->av[1] = 0; /* used to be binblocks, now no longer used */
|
|
|
|
ms->av[2] = top(&main_arena);
|
|
|
|
ms->av[3] = 0; /* used to be undefined */
|
|
|
|
for(i=1; i<NBINS; i++) {
|
|
|
|
b = bin_at(&main_arena, i);
|
|
|
|
if(first(b) == b)
|
|
|
|
ms->av[2*i+2] = ms->av[2*i+3] = 0; /* empty bin */
|
|
|
|
else {
|
|
|
|
ms->av[2*i+2] = first(b);
|
|
|
|
ms->av[2*i+3] = last(b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ms->sbrk_base = mp_.sbrk_base;
|
|
|
|
ms->sbrked_mem_bytes = main_arena.system_mem;
|
|
|
|
ms->trim_threshold = mp_.trim_threshold;
|
|
|
|
ms->top_pad = mp_.top_pad;
|
|
|
|
ms->n_mmaps_max = mp_.n_mmaps_max;
|
|
|
|
ms->mmap_threshold = mp_.mmap_threshold;
|
|
|
|
ms->check_action = check_action;
|
|
|
|
ms->max_sbrked_mem = main_arena.max_system_mem;
|
|
|
|
#ifdef NO_THREADS
|
2002-07-11 15:46:17 +00:00
|
|
|
ms->max_total_mem = mp_.max_total_mem;
|
2002-01-29 07:54:51 +00:00
|
|
|
#else
|
|
|
|
ms->max_total_mem = 0;
|
|
|
|
#endif
|
|
|
|
ms->n_mmaps = mp_.n_mmaps;
|
|
|
|
ms->max_n_mmaps = mp_.max_n_mmaps;
|
|
|
|
ms->mmapped_mem = mp_.mmapped_mem;
|
|
|
|
ms->max_mmapped_mem = mp_.max_mmapped_mem;
|
|
|
|
ms->using_malloc_checking = using_malloc_checking;
|
2009-04-08 18:00:34 +00:00
|
|
|
ms->max_fast = get_max_fast();
|
|
|
|
#ifdef PER_THREAD
|
|
|
|
ms->arena_test = mp_.arena_test;
|
|
|
|
ms->arena_max = mp_.arena_max;
|
|
|
|
ms->narenas = narenas;
|
|
|
|
#endif
|
2002-01-29 07:54:51 +00:00
|
|
|
(void)mutex_unlock(&main_arena.mutex);
|
|
|
|
return (Void_t*)ms;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
public_sET_STATe(Void_t* msptr)
|
|
|
|
{
|
|
|
|
struct malloc_save_state* ms = (struct malloc_save_state*)msptr;
|
2002-08-25 04:51:08 +00:00
|
|
|
size_t i;
|
2002-01-29 07:54:51 +00:00
|
|
|
mbinptr b;
|
|
|
|
|
|
|
|
disallow_malloc_check = 1;
|
|
|
|
ptmalloc_init();
|
|
|
|
if(ms->magic != MALLOC_STATE_MAGIC) return -1;
|
|
|
|
/* Must fail if the major version is too high. */
|
|
|
|
if((ms->version & ~0xffl) > (MALLOC_STATE_VERSION & ~0xffl)) return -2;
|
|
|
|
(void)mutex_lock(&main_arena.mutex);
|
|
|
|
/* There are no fastchunks. */
|
|
|
|
clear_fastchunks(&main_arena);
|
2009-04-08 18:00:34 +00:00
|
|
|
if (ms->version >= 4)
|
|
|
|
set_max_fast(ms->max_fast);
|
|
|
|
else
|
|
|
|
set_max_fast(64); /* 64 used to be the value we always used. */
|
2002-01-29 07:54:51 +00:00
|
|
|
for (i=0; i<NFASTBINS; ++i)
|
2009-03-13 23:53:18 +00:00
|
|
|
fastbin (&main_arena, i) = 0;
|
2002-01-29 07:54:51 +00:00
|
|
|
for (i=0; i<BINMAPSIZE; ++i)
|
|
|
|
main_arena.binmap[i] = 0;
|
|
|
|
top(&main_arena) = ms->av[2];
|
|
|
|
main_arena.last_remainder = 0;
|
|
|
|
for(i=1; i<NBINS; i++) {
|
|
|
|
b = bin_at(&main_arena, i);
|
|
|
|
if(ms->av[2*i+2] == 0) {
|
|
|
|
assert(ms->av[2*i+3] == 0);
|
|
|
|
first(b) = last(b) = b;
|
|
|
|
} else {
|
2007-05-21 16:13:18 +00:00
|
|
|
if(ms->version >= 3 &&
|
|
|
|
(i<NSMALLBINS || (largebin_index(chunksize(ms->av[2*i+2]))==i &&
|
|
|
|
largebin_index(chunksize(ms->av[2*i+3]))==i))) {
|
2002-01-29 07:54:51 +00:00
|
|
|
first(b) = ms->av[2*i+2];
|
|
|
|
last(b) = ms->av[2*i+3];
|
|
|
|
/* Make sure the links to the bins within the heap are correct. */
|
|
|
|
first(b)->bk = b;
|
|
|
|
last(b)->fd = b;
|
|
|
|
/* Set bit in binblocks. */
|
|
|
|
mark_bin(&main_arena, i);
|
|
|
|
} else {
|
|
|
|
/* Oops, index computation from chunksize must have changed.
|
2009-11-01 15:27:00 +00:00
|
|
|
Link the whole list into unsorted_chunks. */
|
2002-01-29 07:54:51 +00:00
|
|
|
first(b) = last(b) = b;
|
|
|
|
b = unsorted_chunks(&main_arena);
|
|
|
|
ms->av[2*i+2]->bk = b;
|
|
|
|
ms->av[2*i+3]->fd = b->fd;
|
|
|
|
b->fd->bk = ms->av[2*i+3];
|
|
|
|
b->fd = ms->av[2*i+2];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-05-21 16:13:18 +00:00
|
|
|
if (ms->version < 3) {
|
|
|
|
/* Clear fd_nextsize and bk_nextsize fields. */
|
|
|
|
b = unsorted_chunks(&main_arena)->fd;
|
|
|
|
while (b != unsorted_chunks(&main_arena)) {
|
|
|
|
if (!in_smallbin_range(chunksize(b))) {
|
|
|
|
b->fd_nextsize = NULL;
|
|
|
|
b->bk_nextsize = NULL;
|
|
|
|
}
|
|
|
|
b = b->fd;
|
|
|
|
}
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
mp_.sbrk_base = ms->sbrk_base;
|
|
|
|
main_arena.system_mem = ms->sbrked_mem_bytes;
|
|
|
|
mp_.trim_threshold = ms->trim_threshold;
|
|
|
|
mp_.top_pad = ms->top_pad;
|
|
|
|
mp_.n_mmaps_max = ms->n_mmaps_max;
|
|
|
|
mp_.mmap_threshold = ms->mmap_threshold;
|
|
|
|
check_action = ms->check_action;
|
|
|
|
main_arena.max_system_mem = ms->max_sbrked_mem;
|
|
|
|
#ifdef NO_THREADS
|
|
|
|
mp_.max_total_mem = ms->max_total_mem;
|
|
|
|
#endif
|
|
|
|
mp_.n_mmaps = ms->n_mmaps;
|
|
|
|
mp_.max_n_mmaps = ms->max_n_mmaps;
|
|
|
|
mp_.mmapped_mem = ms->mmapped_mem;
|
|
|
|
mp_.max_mmapped_mem = ms->max_mmapped_mem;
|
|
|
|
/* add version-dependent code here */
|
|
|
|
if (ms->version >= 1) {
|
|
|
|
/* Check whether it is safe to enable malloc checking, or whether
|
|
|
|
it is necessary to disable it. */
|
|
|
|
if (ms->using_malloc_checking && !using_malloc_checking &&
|
2009-11-01 15:27:00 +00:00
|
|
|
!disallow_malloc_check)
|
2002-01-29 07:54:51 +00:00
|
|
|
__malloc_check_init ();
|
|
|
|
else if (!ms->using_malloc_checking && using_malloc_checking) {
|
2009-04-16 21:22:16 +00:00
|
|
|
__malloc_hook = NULL;
|
|
|
|
__free_hook = NULL;
|
|
|
|
__realloc_hook = NULL;
|
|
|
|
__memalign_hook = NULL;
|
2002-01-29 07:54:51 +00:00
|
|
|
using_malloc_checking = 0;
|
|
|
|
}
|
|
|
|
}
|
2009-04-08 18:00:34 +00:00
|
|
|
if (ms->version >= 4) {
|
|
|
|
#ifdef PER_THREAD
|
|
|
|
mp_.arena_test = ms->arena_test;
|
|
|
|
mp_.arena_max = ms->arena_max;
|
|
|
|
narenas = ms->narenas;
|
|
|
|
#endif
|
|
|
|
}
|
2002-01-29 07:54:51 +00:00
|
|
|
check_malloc_state(&main_arena);
|
|
|
|
|
|
|
|
(void)mutex_unlock(&main_arena.mutex);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Local variables:
|
|
|
|
* c-basic-offset: 2
|
|
|
|
* End:
|
|
|
|
*/
|