lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-09-01 05:02:03 +03:00
Code Activity

* elf/dl-lookup.c (_dl_debug_bindings): Remove unised symbol_scope

Browse Source 
argument.
	(_dl_lookup_symbol_x): Adjust caller.

	* sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove
	_ns_global_scope.
	* elf/rtld.c (dl_main): Don't initialize _ns_global_scope.

	* elf/dl-libc.c: Revert l_scope name changes.
	* elf/dl-load.c: Likewise.
	* elf/dl-object.c: Likewise.
	* elf/rtld.c: Likewise.
	* elf/dl-close.c (_dl_close): Likewise.
	* elf/dl-open.c (dl_open_worker): Likewise.  If not SINGLE_THREAD_P,
	always use __rtld_mrlock_{change,done}.  Always free old scope list
	here if not l_scope_mem.
	* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name
	change.  Never free scope list here.  Just __rtld_mrlock_lock before
	the lookup and __rtld_mrlock_unlock it after the lookup.
	* elf/dl-sym.c: Likewise.
	* include/link.h (struct r_scoperec): Remove.
	(struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem
	with l_scope_mem and l_scoperec_lock with l_scope_lock.
This commit is contained in:
Ulrich Drepper
2006-10-27 15:54:20 +00:00
parent ee96ce2fca
commit c0a777e8d0
25 changed files with 229 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/link.h
View File

@@ -75,18 +75,6 @@ struct r_search_path_struct
};
/* Structure for a scope. Each such data structure has a lock. The
lock allows many readers. It can be invalidated by setting bit 31
which means that no more lockers are allowe */
struct r_scoperec
{
bool remove_after_use;
bool notify;
int nusers;
struct r_scope_elem *scope[0];
};
/* Structure describing a loaded shared object. The `l_next' and `l_prev'
members form a chain of all the shared objects loaded at startup.
@@ -226,27 +214,14 @@ struct link_map
ElfW(Addr) l_text_end;
/* Default array for 'l_scope'. */
union
{
struct r_scoperec l_scoperec_mem;
struct
{
struct r_scoperec scoperec_struct;
/* XXX This number should be increased once the scope memory
handling has been tested. */
struct r_scope_elem *scope_elems[4];
#define NINIT_SCOPE_ELEMS(map) \
(sizeof ((map)->l_scope_realmem.scope_elems) \
/ sizeof ((map)->l_scope_realmem.scope_elems[0]))
} l_scope_realmem;
};
struct r_scope_elem *l_scope_mem[4];
/* Size of array allocated for 'l_scope'. */
size_t l_scope_max;
/* This is an array defining the lookup scope for this link map.
There are initially at most three different scope lists. */
struct r_scoperec *l_scoperec;
struct r_scope_elem **l_scope;
/* We need to protect using the SCOPEREC. */
__rtld_mrlock_define (, l_scoperec_lock)
__rtld_mrlock_define (, l_scope_lock)
/* A similar array, this time only with the local scope. This is
used occasionally. */