mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00:00
* malloc/malloc.c (_int_free): Second argument is now mchunkptr.
Change all callers. (_int_realloc): Likewise. All _int_* functions are now static. * malloc/hooks.c: Change all callers to _int_free and _int_realloc. * malloc/arena.c: Likewise. * include/malloc.h: Remove now unnecessary declarations of the _int_* functions.
This commit is contained in:
Ulrich Drepper
parent
7dddb4bd1e
commit
78ac92ad8d
@ -1,5 +1,14 @@
|
||||
2009-02-07 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* malloc/malloc.c (_int_free): Second argument is now mchunkptr.
|
||||
Change all callers.
|
||||
(_int_realloc): Likewise.
|
||||
All _int_* functions are now static.
|
||||
* malloc/hooks.c: Change all callers to _int_free and _int_realloc.
|
||||
* malloc/arena.c: Likewise.
|
||||
* include/malloc.h: Remove now unnecessary declarations of the _int_*
|
||||
functions.
|
||||
|
||||
* sunrpc/rpc_common.c: We cannot move _null_auth into .rodata that
|
||||
easily.
|
||||
|
||||
|
||||
@ -8,20 +8,7 @@
|
||||
/* Nonzero if the malloc is already initialized. */
|
||||
extern int __malloc_initialized attribute_hidden;
|
||||
|
||||
/* Internal routines, operating on "arenas". */
|
||||
struct malloc_state;
|
||||
typedef struct malloc_state *mstate;
|
||||
|
||||
extern __malloc_ptr_t _int_malloc (mstate __m, size_t __size) attribute_hidden;
|
||||
extern void _int_free (mstate __m, __malloc_ptr_t __ptr)
|
||||
attribute_hidden;
|
||||
extern __malloc_ptr_t _int_realloc (mstate __m,
|
||||
__malloc_ptr_t __ptr,
|
||||
size_t __size) attribute_hidden;
|
||||
extern __malloc_ptr_t _int_memalign (mstate __m, size_t __alignment,
|
||||
size_t __size)
|
||||
attribute_hidden;
|
||||
extern __malloc_ptr_t _int_valloc (mstate __m, size_t __size)
|
||||
attribute_hidden;
|
||||
|
||||
#endif
|
||||
|
||||
@ -223,7 +223,7 @@ free_atfork(Void_t* mem, const Void_t *caller)
|
||||
tsd_getspecific(arena_key, vptr);
|
||||
if(vptr != ATFORK_ARENA_PTR)
|
||||
(void)mutex_lock(&ar_ptr->mutex);
|
||||
_int_free(ar_ptr, mem);
|
||||
_int_free(ar_ptr, p);
|
||||
if(vptr != ATFORK_ARENA_PTR)
|
||||
(void)mutex_unlock(&ar_ptr->mutex);
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* Malloc implementation for multiple threads without lock contention.
|
||||
Copyright (C) 2001-2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
Copyright (C) 2001-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Wolfram Gloger <wg@malloc.de>, 2001.
|
||||
|
||||
@ -293,7 +293,7 @@ free_check(mem, caller) Void_t* mem; const Void_t *caller;
|
||||
#if 0 /* Erase freed memory. */
|
||||
memset(mem, 0, chunksize(p) - (SIZE_SZ+1));
|
||||
#endif
|
||||
_int_free(&main_arena, mem);
|
||||
_int_free(&main_arena, p);
|
||||
(void)mutex_unlock(&main_arena.mutex);
|
||||
}
|
||||
|
||||
@ -305,8 +305,7 @@ realloc_check(oldmem, bytes, caller)
|
||||
Void_t* oldmem; size_t bytes; const Void_t *caller;
|
||||
#endif
|
||||
{
|
||||
mchunkptr oldp;
|
||||
INTERNAL_SIZE_T nb, oldsize;
|
||||
INTERNAL_SIZE_T nb;
|
||||
Void_t* newmem = 0;
|
||||
unsigned char *magic_p;
|
||||
|
||||
@ -320,13 +319,13 @@ realloc_check(oldmem, bytes, caller)
|
||||
return NULL;
|
||||
}
|
||||
(void)mutex_lock(&main_arena.mutex);
|
||||
oldp = mem2chunk_check(oldmem, &magic_p);
|
||||
const mchunkptr oldp = mem2chunk_check(oldmem, &magic_p);
|
||||
(void)mutex_unlock(&main_arena.mutex);
|
||||
if(!oldp) {
|
||||
malloc_printerr(check_action, "realloc(): invalid pointer", oldmem);
|
||||
return malloc_check(bytes, NULL);
|
||||
}
|
||||
oldsize = chunksize(oldp);
|
||||
const INTERNAL_SIZE_T oldsize = chunksize(oldp);
|
||||
|
||||
checked_request2size(bytes+1, nb);
|
||||
(void)mutex_lock(&main_arena.mutex);
|
||||
@ -356,7 +355,7 @@ realloc_check(oldmem, bytes, caller)
|
||||
} else {
|
||||
#endif /* HAVE_MMAP */
|
||||
if (top_check() >= 0)
|
||||
newmem = _int_realloc(&main_arena, oldmem, bytes+1);
|
||||
newmem = _int_realloc(&main_arena, oldp, bytes+1);
|
||||
#if 0 /* Erase freed memory. */
|
||||
if(newmem)
|
||||
newp = mem2chunk(newmem);
|
||||
@ -470,7 +469,7 @@ free_starter(mem, caller) Void_t* mem; const Void_t *caller;
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
_int_free(&main_arena, mem);
|
||||
_int_free(&main_arena, p);
|
||||
}
|
||||
|
||||
# endif /* !defiend NO_STARTER */
|
||||
|
||||
@ -1581,11 +1581,11 @@ typedef struct malloc_chunk* mchunkptr;
|
||||
|
||||
#if __STD_C
|
||||
|
||||
Void_t* _int_malloc(mstate, size_t);
|
||||
void _int_free(mstate, Void_t*);
|
||||
Void_t* _int_realloc(mstate, Void_t*, size_t);
|
||||
Void_t* _int_memalign(mstate, size_t, size_t);
|
||||
Void_t* _int_valloc(mstate, size_t);
|
||||
static Void_t* _int_malloc(mstate, size_t);
|
||||
static void _int_free(mstate, mchunkptr);
|
||||
static Void_t* _int_realloc(mstate, mchunkptr, size_t);
|
||||
static Void_t* _int_memalign(mstate, size_t, size_t);
|
||||
static Void_t* _int_valloc(mstate, size_t);
|
||||
static Void_t* _int_pvalloc(mstate, size_t);
|
||||
/*static Void_t* cALLOc(size_t, size_t);*/
|
||||
#ifndef _LIBC
|
||||
@ -1632,12 +1632,12 @@ static void free_atfork(Void_t* mem, const Void_t *caller);
|
||||
|
||||
#else
|
||||
|
||||
Void_t* _int_malloc();
|
||||
void _int_free();
|
||||
Void_t* _int_realloc();
|
||||
Void_t* _int_memalign();
|
||||
Void_t* _int_valloc();
|
||||
Void_t* _int_pvalloc();
|
||||
static Void_t* _int_malloc();
|
||||
static void _int_free();
|
||||
static Void_t* _int_realloc();
|
||||
static Void_t* _int_memalign();
|
||||
static Void_t* _int_valloc();
|
||||
static Void_t* _int_pvalloc();
|
||||
/*static Void_t* cALLOc();*/
|
||||
static Void_t** _int_icalloc();
|
||||
static Void_t** _int_icomalloc();
|
||||
@ -3084,7 +3084,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
|
||||
set_head(chunk_at_offset(old_top, old_size), (2*SIZE_SZ)|PREV_INUSE);
|
||||
set_foot(chunk_at_offset(old_top, old_size), (2*SIZE_SZ));
|
||||
set_head(old_top, old_size|PREV_INUSE|NON_MAIN_ARENA);
|
||||
_int_free(av, chunk2mem(old_top));
|
||||
_int_free(av, old_top);
|
||||
} else {
|
||||
set_head(old_top, (old_size + 2*SIZE_SZ)|PREV_INUSE);
|
||||
set_foot(old_top, (old_size + 2*SIZE_SZ));
|
||||
@ -3323,7 +3323,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
|
||||
|
||||
/* If possible, release the rest. */
|
||||
if (old_size >= MINSIZE) {
|
||||
_int_free(av, chunk2mem(old_top));
|
||||
_int_free(av, old_top);
|
||||
}
|
||||
|
||||
}
|
||||
@ -3622,7 +3622,7 @@ public_fREe(Void_t* mem)
|
||||
#else
|
||||
(void)mutex_lock(&ar_ptr->mutex);
|
||||
#endif
|
||||
_int_free(ar_ptr, mem);
|
||||
_int_free(ar_ptr, p);
|
||||
(void)mutex_unlock(&ar_ptr->mutex);
|
||||
}
|
||||
#ifdef libc_hidden_def
|
||||
@ -3635,9 +3635,6 @@ public_rEALLOc(Void_t* oldmem, size_t bytes)
|
||||
mstate ar_ptr;
|
||||
INTERNAL_SIZE_T nb; /* padded request size */
|
||||
|
||||
mchunkptr oldp; /* chunk corresponding to oldmem */
|
||||
INTERNAL_SIZE_T oldsize; /* its size */
|
||||
|
||||
Void_t* newp; /* chunk to return */
|
||||
|
||||
__malloc_ptr_t (*hook) (__malloc_ptr_t, size_t, __const __malloc_ptr_t) =
|
||||
@ -3652,8 +3649,10 @@ public_rEALLOc(Void_t* oldmem, size_t bytes)
|
||||
/* realloc of null is supposed to be same as malloc */
|
||||
if (oldmem == 0) return public_mALLOc(bytes);
|
||||
|
||||
oldp = mem2chunk(oldmem);
|
||||
oldsize = chunksize(oldp);
|
||||
/* chunk corresponding to oldmem */
|
||||
const mchunkptr oldp = mem2chunk(oldmem);
|
||||
/* its size */
|
||||
const INTERNAL_SIZE_T oldsize = chunksize(oldp);
|
||||
|
||||
/* Little security check which won't hurt performance: the
|
||||
allocator never wrapps around at the end of the address space.
|
||||
@ -3705,7 +3704,7 @@ public_rEALLOc(Void_t* oldmem, size_t bytes)
|
||||
tsd_setspecific(arena_key, (Void_t *)ar_ptr);
|
||||
#endif
|
||||
|
||||
newp = _int_realloc(ar_ptr, oldmem, bytes);
|
||||
newp = _int_realloc(ar_ptr, oldp, bytes);
|
||||
|
||||
(void)mutex_unlock(&ar_ptr->mutex);
|
||||
assert(!newp || chunk_is_mmapped(mem2chunk(newp)) ||
|
||||
@ -3728,7 +3727,7 @@ public_rEALLOc(Void_t* oldmem, size_t bytes)
|
||||
#else
|
||||
(void)mutex_lock(&ar_ptr->mutex);
|
||||
#endif
|
||||
_int_free(ar_ptr, oldmem);
|
||||
_int_free(ar_ptr, oldp);
|
||||
(void)mutex_unlock(&ar_ptr->mutex);
|
||||
}
|
||||
}
|
||||
@ -4125,7 +4124,7 @@ public_mALLOPt(int p, int v)
|
||||
------------------------------ malloc ------------------------------
|
||||
*/
|
||||
|
||||
Void_t*
|
||||
static Void_t*
|
||||
_int_malloc(mstate av, size_t bytes)
|
||||
{
|
||||
INTERNAL_SIZE_T nb; /* normalized request size */
|
||||
@ -4589,10 +4588,9 @@ _int_malloc(mstate av, size_t bytes)
|
||||
------------------------------ free ------------------------------
|
||||
*/
|
||||
|
||||
void
|
||||
_int_free(mstate av, Void_t* mem)
|
||||
static void
|
||||
_int_free(mstate av, mchunkptr p)
|
||||
{
|
||||
mchunkptr p; /* chunk corresponding to mem */
|
||||
INTERNAL_SIZE_T size; /* its size */
|
||||
mfastbinptr* fb; /* associated fastbin */
|
||||
mchunkptr nextchunk; /* next contiguous chunk */
|
||||
@ -4604,7 +4602,6 @@ _int_free(mstate av, Void_t* mem)
|
||||
|
||||
const char *errstr = NULL;
|
||||
|
||||
p = mem2chunk(mem);
|
||||
size = chunksize(p);
|
||||
|
||||
/* Little security check which won't hurt performance: the
|
||||
@ -4616,7 +4613,7 @@ _int_free(mstate av, Void_t* mem)
|
||||
{
|
||||
errstr = "free(): invalid pointer";
|
||||
errout:
|
||||
malloc_printerr (check_action, errstr, mem);
|
||||
malloc_printerr (check_action, errstr, chunk2mem(p));
|
||||
return;
|
||||
}
|
||||
/* We know that each chunk is at least MINSIZE bytes in size. */
|
||||
@ -4663,7 +4660,7 @@ _int_free(mstate av, Void_t* mem)
|
||||
}
|
||||
|
||||
if (__builtin_expect (perturb_byte, 0))
|
||||
free_perturb (mem, size - SIZE_SZ);
|
||||
free_perturb (chunk2mem(p), size - SIZE_SZ);
|
||||
|
||||
p->fd = *fb;
|
||||
*fb = p;
|
||||
@ -4707,7 +4704,7 @@ _int_free(mstate av, Void_t* mem)
|
||||
}
|
||||
|
||||
if (__builtin_expect (perturb_byte, 0))
|
||||
free_perturb (mem, size - SIZE_SZ);
|
||||
free_perturb (chunk2mem(p), size - SIZE_SZ);
|
||||
|
||||
/* consolidate backward */
|
||||
if (!prev_inuse(p)) {
|
||||
@ -4943,13 +4940,10 @@ static void malloc_consolidate(av) mstate av;
|
||||
*/
|
||||
|
||||
Void_t*
|
||||
_int_realloc(mstate av, Void_t* oldmem, size_t bytes)
|
||||
_int_realloc(mstate av, mchunkptr oldp, size_t bytes)
|
||||
{
|
||||
INTERNAL_SIZE_T nb; /* padded request size */
|
||||
|
||||
mchunkptr oldp; /* chunk corresponding to oldmem */
|
||||
INTERNAL_SIZE_T oldsize; /* its size */
|
||||
|
||||
mchunkptr newp; /* chunk to return */
|
||||
INTERNAL_SIZE_T newsize; /* its size */
|
||||
Void_t* newmem; /* corresponding user mem */
|
||||
@ -4972,15 +4966,15 @@ _int_realloc(mstate av, Void_t* oldmem, size_t bytes)
|
||||
|
||||
checked_request2size(bytes, nb);
|
||||
|
||||
oldp = mem2chunk(oldmem);
|
||||
oldsize = chunksize(oldp);
|
||||
/* oldmem size */
|
||||
const INTERNAL_SIZE_T oldsize = chunksize(oldp);
|
||||
|
||||
/* Simple tests for old block integrity. */
|
||||
if (__builtin_expect (misaligned_chunk (oldp), 0))
|
||||
{
|
||||
errstr = "realloc(): invalid pointer";
|
||||
errout:
|
||||
malloc_printerr (check_action, errstr, oldmem);
|
||||
malloc_printerr (check_action, errstr, chunk2mem(oldp));
|
||||
return NULL;
|
||||
}
|
||||
if (__builtin_expect (oldp->size <= 2 * SIZE_SZ, 0)
|
||||
@ -5054,7 +5048,7 @@ _int_realloc(mstate av, Void_t* oldmem, size_t bytes)
|
||||
*/
|
||||
|
||||
copysize = oldsize - SIZE_SZ;
|
||||
s = (INTERNAL_SIZE_T*)(oldmem);
|
||||
s = (INTERNAL_SIZE_T*)(chunk2mem(oldp));
|
||||
d = (INTERNAL_SIZE_T*)(newmem);
|
||||
ncopies = copysize / sizeof(INTERNAL_SIZE_T);
|
||||
assert(ncopies >= 3);
|
||||
@ -5080,7 +5074,7 @@ _int_realloc(mstate av, Void_t* oldmem, size_t bytes)
|
||||
}
|
||||
}
|
||||
|
||||
_int_free(av, oldmem);
|
||||
_int_free(av, oldp);
|
||||
check_inuse_chunk(av, newp);
|
||||
return chunk2mem(newp);
|
||||
}
|
||||
@ -5104,7 +5098,7 @@ _int_realloc(mstate av, Void_t* oldmem, size_t bytes)
|
||||
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
||||
/* Mark remainder as inuse so free() won't complain */
|
||||
set_inuse_bit_at_offset(remainder, remainder_size);
|
||||
_int_free(av, chunk2mem(remainder));
|
||||
_int_free(av, remainder);
|
||||
}
|
||||
|
||||
check_inuse_chunk(av, newp);
|
||||
@ -5129,7 +5123,7 @@ _int_realloc(mstate av, Void_t* oldmem, size_t bytes)
|
||||
|
||||
/* don't need to remap if still within same page */
|
||||
if (oldsize == newsize - offset)
|
||||
return oldmem;
|
||||
return chunk2mem(oldp);
|
||||
|
||||
cp = (char*)mremap((char*)oldp - offset, oldsize + offset, newsize, 1);
|
||||
|
||||
@ -5157,13 +5151,13 @@ _int_realloc(mstate av, Void_t* oldmem, size_t bytes)
|
||||
|
||||
/* Note the extra SIZE_SZ overhead. */
|
||||
if ((unsigned long)(oldsize) >= (unsigned long)(nb + SIZE_SZ))
|
||||
newmem = oldmem; /* do nothing */
|
||||
newmem = chunk2mem(oldp); /* do nothing */
|
||||
else {
|
||||
/* Must alloc, copy, free. */
|
||||
newmem = _int_malloc(av, nb - MALLOC_ALIGN_MASK);
|
||||
if (newmem != 0) {
|
||||
MALLOC_COPY(newmem, oldmem, oldsize - 2*SIZE_SZ);
|
||||
_int_free(av, oldmem);
|
||||
MALLOC_COPY(newmem, chunk2mem(oldp), oldsize - 2*SIZE_SZ);
|
||||
_int_free(av, oldp);
|
||||
}
|
||||
}
|
||||
return newmem;
|
||||
@ -5181,7 +5175,7 @@ _int_realloc(mstate av, Void_t* oldmem, size_t bytes)
|
||||
------------------------------ memalign ------------------------------
|
||||
*/
|
||||
|
||||
Void_t*
|
||||
static Void_t*
|
||||
_int_memalign(mstate av, size_t alignment, size_t bytes)
|
||||
{
|
||||
INTERNAL_SIZE_T nb; /* padded request size */
|
||||
@ -5257,7 +5251,7 @@ _int_memalign(mstate av, size_t alignment, size_t bytes)
|
||||
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
||||
set_inuse_bit_at_offset(newp, newsize);
|
||||
set_head_size(p, leadsize | (av != &main_arena ? NON_MAIN_ARENA : 0));
|
||||
_int_free(av, chunk2mem(p));
|
||||
_int_free(av, p);
|
||||
p = newp;
|
||||
|
||||
assert (newsize >= nb &&
|
||||
@ -5273,7 +5267,7 @@ _int_memalign(mstate av, size_t alignment, size_t bytes)
|
||||
set_head(remainder, remainder_size | PREV_INUSE |
|
||||
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
||||
set_head_size(p, nb);
|
||||
_int_free(av, chunk2mem(remainder));
|
||||
_int_free(av, remainder);
|
||||
}
|
||||
}
|
||||
|
||||
@ -5514,7 +5508,7 @@ mstate av; size_t n_elements; size_t* sizes; int opts; Void_t* chunks[];
|
||||
------------------------------ valloc ------------------------------
|
||||
*/
|
||||
|
||||
Void_t*
|
||||
static Void_t*
|
||||
#if __STD_C
|
||||
_int_valloc(mstate av, size_t bytes)
|
||||
#else
|
||||
@ -5531,7 +5525,7 @@ _int_valloc(av, bytes) mstate av; size_t bytes;
|
||||
*/
|
||||
|
||||
|
||||
Void_t*
|
||||
static Void_t*
|
||||
#if __STD_C
|
||||
_int_pvalloc(mstate av, size_t bytes)
|
||||
#else
|
||||
|
||||
Loading…
Reference in New Issue
Block a user