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/dl-close.c (_dl_close_worker): When removing object from

Browse Source 
global scope, wait for all lookups to finish afterwards.
	* elf/dl-open.c (add_to_global): When global scope array must
	grow, allocate a new one and free old array only after all
	lookups finish.
	* elf/dl-runtime.c (_dl_fixup): Protect using global scope.
	(_dl_lookup_symbol_x): Likewise.
	* elf/dl-support.c: Define _dl_wait_lookup_done.
	* sysdeps/generic/ldsodefs.h (struct rtld_global): Add
	_dl_wait_lookup_done.
This commit is contained in:
Ulrich Drepper
2007-05-19 07:08:23 +00:00
parent 2acd01acb1
commit df94b6412e
14 changed files with 204 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
elf/dl-runtime.c
View File

@ -26,6 +26,8 @@
#include <ldsodefs.h>
#include <sysdep-cancel.h>
#include "dynamic-link.h"
#include <tls.h>
#if (!defined ELF_MACHINE_NO_RELA && !defined ELF_MACHINE_PLT_REL) \
|| ELF_MACHINE_NO_REL
@ -97,10 +99,15 @@ _dl_fixup (
not necessary for objects which cannot be unloaded or when
we are not using any threads (yet). */
int flags = DL_LOOKUP_ADD_DEPENDENCY;
if (l->l_type == lt_loaded && !RTLD_SINGLE_THREAD_P)
if (!RTLD_SINGLE_THREAD_P)
{
__rtld_mrlock_lock (l->l_scope_lock);
flags |= DL_LOOKUP_SCOPE_LOCK;
THREAD_GSCOPE_SET_FLAG ();
if (l->l_type == lt_loaded)
{
__rtld_mrlock_lock (l->l_scope_lock);
flags |= DL_LOOKUP_SCOPE_LOCK;
}
}
result = _dl_lookup_symbol_x (strtab + sym->st_name, l, &sym, l->l_scope,
@ -109,6 +116,10 @@ _dl_fixup (
if ((flags & DL_LOOKUP_SCOPE_LOCK) != 0)
__rtld_mrlock_unlock (l->l_scope_lock);
/* We are done with the global scope. */
if (!RTLD_SINGLE_THREAD_P)
THREAD_GSCOPE_RESET_FLAG ();
/* Currently result contains the base load address (or link map)
of the object that defines sym. Now add in the symbol
offset. */
@ -191,10 +202,15 @@ _dl_profile_fixup (
not necessary for objects which cannot be unloaded or when
we are not using any threads (yet). */
int flags = DL_LOOKUP_ADD_DEPENDENCY;
if (l->l_type == lt_loaded && !RTLD_SINGLE_THREAD_P)
if (!RTLD_SINGLE_THREAD_P)
{
__rtld_mrlock_lock (l->l_scope_lock);
flags |= DL_LOOKUP_SCOPE_LOCK;
THREAD_GSCOPE_SET_FLAG ();
if (l->l_type == lt_loaded)
{
__rtld_mrlock_lock (l->l_scope_lock);
flags |= DL_LOOKUP_SCOPE_LOCK;
}
}
result = _dl_lookup_symbol_x (strtab + refsym->st_name, l,
@ -204,6 +220,10 @@ _dl_profile_fixup (
if ((flags & DL_LOOKUP_SCOPE_LOCK) != 0)
__rtld_mrlock_unlock (l->l_scope_lock);
/* We are done with the global scope. */
if (!RTLD_SINGLE_THREAD_P)
THREAD_GSCOPE_RESET_FLAG ();
/* Currently result contains the base load address (or link map)
of the object that defines sym. Now add in the symbol
offset. */