lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Simplify __malloc_initialized

Browse Source 
Now that mcheck no longer needs to check __malloc_initialized (and no
other third party hook can since the symbol is not exported), make the
variable boolean and static so that it is used strictly within malloc.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Siddhesh Poyarekar
2021-07-22 18:38:04 +05:30
parent c142eb253f
commit cc35896ea3
3 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
malloc/arena.c
View File

@ -97,7 +97,7 @@ static mstate free_list;
__libc_lock_define_initialized (static, list_lock);
/* Already initialized? */
int __malloc_initialized = -1;
static bool __malloc_initialized = false;
/**************************************************************************/
@ -143,7 +143,7 @@ int __malloc_initialized = -1;
void
__malloc_fork_lock_parent (void)
{
if (__malloc_initialized < 1)
if (!__malloc_initialized)
return;
/* We do not acquire free_list_lock here because we completely
@ -163,7 +163,7 @@ __malloc_fork_lock_parent (void)
void
__malloc_fork_unlock_parent (void)
{
if (__malloc_initialized < 1)
if (!__malloc_initialized)
return;
for (mstate ar_ptr = &main_arena;; )
@ -179,7 +179,7 @@ __malloc_fork_unlock_parent (void)
void
__malloc_fork_unlock_child (void)
{
if (__malloc_initialized < 1)
if (!__malloc_initialized)
return;
/* Push all arenas to the free list, except thread_arena, which is
@ -286,10 +286,10 @@ static void tcache_key_initialize (void);
static void
ptmalloc_init (void)
{
if (__malloc_initialized >= 0)
if (__malloc_initialized)
return;
__malloc_initialized = 0;
__malloc_initialized = true;
#if USE_TCACHE
tcache_key_initialize ();