lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

malloc: Inline _int_free

Browse Source 
Inline _int_free since it is a small function and only really used by
__libc_free.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Wilco Dijkstra
2025-03-31 11:24:58 +00:00
parent b0cb99bef5
commit 69da24fbc5
2 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
malloc/malloc-check.c
View File

@ -235,7 +235,7 @@ free_check (void *mem)
{ {
/* Mark the chunk as belonging to the library again. */ /* Mark the chunk as belonging to the library again. */
(void)tag_region (chunk2mem (p), memsize (p)); (void)tag_region (chunk2mem (p), memsize (p));
_int_free (&main_arena, p, 1); _int_free_chunk (&main_arena, p, chunksize (p), 1);
__libc_lock_unlock (main_arena.mutex); __libc_lock_unlock (main_arena.mutex);
} }
__set_errno (err); __set_errno (err);

38
malloc/malloc.c
View File

@ -1086,7 +1086,6 @@ typedef struct malloc_chunk* mchunkptr;
/* Internal routines. */ /* Internal routines. */
static void* _int_malloc(mstate, size_t); static void* _int_malloc(mstate, size_t);
static void _int_free (mstate, mchunkptr, int);
static void _int_free_check (mstate, mchunkptr, INTERNAL_SIZE_T); static void _int_free_check (mstate, mchunkptr, INTERNAL_SIZE_T);
static void _int_free_chunk (mstate, mchunkptr, INTERNAL_SIZE_T, int); static void _int_free_chunk (mstate, mchunkptr, INTERNAL_SIZE_T, int);
static void _int_free_merge_chunk (mstate, mchunkptr, INTERNAL_SIZE_T); static void _int_free_merge_chunk (mstate, mchunkptr, INTERNAL_SIZE_T);
@ -1273,7 +1272,6 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
sysmalloc: Returns untagged memory. sysmalloc: Returns untagged memory.
_int_malloc: Returns untagged memory. _int_malloc: Returns untagged memory.
_int_free: Takes untagged memory.
_int_memalign: Returns untagged memory. _int_memalign: Returns untagged memory.
_int_memalign: Returns untagged memory. _int_memalign: Returns untagged memory.
_mid_memalign: Returns tagged memory. _mid_memalign: Returns tagged memory.
@ -3163,7 +3161,7 @@ tcache_put (mchunkptr chunk, size_t tc_idx)
{ {
tcache_entry *e = (tcache_entry *) chunk2mem (chunk); tcache_entry *e = (tcache_entry *) chunk2mem (chunk);
/* Mark this chunk as "in the tcache" so the test in _int_free will /* Mark this chunk as "in the tcache" so the test in __libc_free will
detect a double free. */ detect a double free. */
e->key = tcache_key; e->key = tcache_key;
@ -3452,7 +3450,6 @@ libc_hidden_def (__libc_malloc)
void void
__libc_free (void *mem) __libc_free (void *mem)
{ {
mstate ar_ptr;
mchunkptr p; /* chunk corresponding to mem */ mchunkptr p; /* chunk corresponding to mem */
if (mem == NULL) /* free(0) has no effect */ if (mem == NULL) /* free(0) has no effect */
@ -3470,8 +3467,16 @@ __libc_free (void *mem)
/* Mark the chunk as belonging to the library again. */ /* Mark the chunk as belonging to the library again. */
tag_region (chunk2mem (p), memsize (p)); tag_region (chunk2mem (p), memsize (p));
ar_ptr = arena_for_chunk (p); INTERNAL_SIZE_T size = chunksize (p);
_int_free (ar_ptr, p, 0);
_int_free_check (arena_for_chunk (p), p, size);
#if USE_TCACHE
if (tcache_free (p, size))
return;
#endif
_int_free_chunk (arena_for_chunk (p), p, size, 0);
} }
libc_hidden_def (__libc_free) libc_hidden_def (__libc_free)
@ -4700,27 +4705,6 @@ _int_free_chunk (mstate av, mchunkptr p, INTERNAL_SIZE_T size, int have_lock)
} }
} }
/* Free chunk P to its arena AV. HAVE_LOCK indicates where the arena for
P has already been locked. It will perform sanity check, then try the
fast path to free into tcache. If the attempt not success, free the
chunk to arena. */
static __always_inline void
_int_free (mstate av, mchunkptr p, int have_lock)
{
INTERNAL_SIZE_T size; /* its size */
size = chunksize (p);
_int_free_check (av, p, size);
#if USE_TCACHE
if (tcache_free (p, size))
return;
#endif
_int_free_chunk (av, p, size, have_lock);
}
/* Try to merge chunk P of SIZE bytes with its neighbors. Put the /* Try to merge chunk P of SIZE bytes with its neighbors. Put the
resulting chunk on the appropriate bin list. P must not be on a resulting chunk on the appropriate bin list. P must not be on a
bin list yet, and it can be in use. */ bin list yet, and it can be in use. */