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

elf, nptl: Resolve recursive lock implementation early

Browse Source 
If libpthread is included in libc, it is not necessary to delay
initialization of the lock/unlock function pointers until libpthread
is loaded.  This eliminates two unprotected function pointers
from _rtld_global and removes some initialization code from
libpthread.

Tested-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer
2021-05-10 10:31:41 +02:00
parent a64af8c9b6
commit d6163dfd38
7 changed files with 120 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
elf/rtld.c
View File

@ -857,6 +857,14 @@ rtld_lock_default_unlock_recursive (void *lock)
__rtld_lock_default_unlock_recursive (lock);
}
#endif
#if PTHREAD_IN_LIBC
/* Dummy implementation. See __rtld_mutex_init. */
static int
rtld_mutex_dummy (pthread_mutex_t *lock)
{
return 0;
}
#endif
static void
@ -1148,6 +1156,10 @@ dl_main (const ElfW(Phdr) *phdr,
GL(dl_rtld_lock_recursive) = rtld_lock_default_lock_recursive;
GL(dl_rtld_unlock_recursive) = rtld_lock_default_unlock_recursive;
#endif
#if PTHREAD_IN_LIBC
___rtld_mutex_lock = rtld_mutex_dummy;
___rtld_mutex_unlock = rtld_mutex_dummy;
#endif
/* The explicit initialization here is cheaper than processing the reloc
in the _rtld_local definition's initializer. */
@ -2363,6 +2375,9 @@ dl_main (const ElfW(Phdr) *phdr,
loader. */
__rtld_malloc_init_real (main_map);
/* Likewise for the locking implementation. */
__rtld_mutex_init ();
/* Mark all the objects so we know they have been already relocated. */
for (struct link_map *l = main_map; l != NULL; l = l->l_next)
{
@ -2468,6 +2483,9 @@ dl_main (const ElfW(Phdr) *phdr,
at this point. */
__rtld_malloc_init_real (main_map);
/* Likewise for the locking implementation. */
__rtld_mutex_init ();
RTLD_TIMING_VAR (start);
rtld_timer_start (&start);