mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
c0f62c5678
Update. Add support for namespaces in the dynamic linker. * dlfcn/Makefile (libdl-routines): Add dlmopen. * dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen. * dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM. Declare dlmopen. Document RTLD_DI_LMID. * dlfcn/dlinfo.c: Handle RTLD_DI_LMID. * dlfcn/dlmopen.c: New file. * dlfcn/dlopen.c: Pass new parameter to _dl_open. * dlfcn/dlopenold.c: Likewise. * elf/dl-addr.c: Adjust for removal of GL(dl_loaded). * elf/dl-caller.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-conflict.c: Likewise. * elf/dl-debug.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-version.c: Likewise. * elf/do-lookup.h: Likewise. * elf/rtld.c: Likewise. * sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise. * elf/dl-depsc: Likewise. Add new parameter to _dl_map_object. * elf/dl-fini.c: Call destructors in all namespaces. * elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of GL(dl_loaded). * elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal of GL(dl_loaded). * elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second time. Reuse the one from the main namespace in all others. Pass new parameter to _dl_new_object. Adjust for removal of GL(dl_loaded). * elf/dl-object.c: Take new parameter. Use it to initialize l_ns. Adjust for removal of GL(dl_loaded). * elf/dl-open.c (_dl_open): Take new parameter. Adjust for removal of GL(dl_loaded). * elf/dl-support.c: Replace global _dl_loaded etc variables with _dl_ns variable. * include/dlfcn.h: Adjust prototype of _dl_open. Define __LM_ID_CALLER. * include/link.h: Add l_real, l_ns, and l_direct_opencount elements. * sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is using TLS we need memory appropriate to the number of namespaces. * sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded, _dl_nloaded, _dl_global_scope, _dl_main_searchlist, and _dl_global_scope_alloc with _dl_ns element. Define DL_NNS. Adjust prototypes of _dl_map_object and member in rtld_global_ro. * malloc/malloc.c: Include <dlfcn.h>. * malloc/arena.c (ptmalloc_init): If libc is not in primary namespace, never use brk. * elf/Makefile: Add rules to build and run tst-dlmopen1 and tst-dlmopen2. * elf/tst-dlmopen1.c: New file. * elf/tst-dlmopen1mod.c: New file. * elf/tst-dlmopen2.c: New file. * elf/dl-close.c: Improve reference counting by tracking direct loads. * elf/dl-lookup.c (add_dependency): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. * elf/rtld.c (dl_main): Likewise. 2004-09-09 GOTO Masanori <gotom@debian.or.jp> [BZ #77] * elf/dl-close.c: Count down l_opencount to check not only for l_reldeps, but also l_initfini. 2004-10-13 Ulrich Drepper <drepper@redhat.com>
80 lines
3.0 KiB
C
80 lines
3.0 KiB
C
#ifndef _DLFCN_H
|
|
#include <dlfcn/dlfcn.h>
|
|
#include <link.h> /* For ElfW. */
|
|
|
|
/* Internally used flag. */
|
|
#define __RTLD_DLOPEN 0x80000000
|
|
#define __RTLD_SPROF 0x40000000
|
|
#define __RTLD_OPENEXEC 0x20000000
|
|
#define __RTLD_CALLMAP 0x10000000
|
|
|
|
#define __LM_ID_CALLER -2
|
|
|
|
/* Now define the internal interfaces. */
|
|
extern void *__dlvsym (void *__handle, __const char *__name,
|
|
__const char *__version);
|
|
|
|
#define __libc_dlopen(name) __libc_dlopen_mode (name, RTLD_LAZY)
|
|
extern void *__libc_dlopen_mode (__const char *__name, int __mode);
|
|
extern void *__libc_dlsym (void *__map, __const char *__name);
|
|
extern int __libc_dlclose (void *__map);
|
|
libc_hidden_proto (__libc_dlopen_mode)
|
|
libc_hidden_proto (__libc_dlsym)
|
|
libc_hidden_proto (__libc_dlclose)
|
|
|
|
/* Locate shared object containing the given address. */
|
|
#ifdef ElfW
|
|
extern int _dl_addr (const void *address, Dl_info *info,
|
|
struct link_map **mapp, const ElfW(Sym) **symbolp)
|
|
internal_function;
|
|
libc_hidden_proto (_dl_addr)
|
|
#endif
|
|
|
|
/* Open the shared object NAME, relocate it, and run its initializer if it
|
|
hasn't already been run. MODE is as for `dlopen' (see <dlfcn.h>). If
|
|
the object is already opened, returns its existing map. */
|
|
extern void *_dl_open (const char *name, int mode, const void *caller,
|
|
Lmid_t nsid)
|
|
internal_function;
|
|
libc_hidden_proto (_dl_open)
|
|
|
|
/* Close an object previously opened by _dl_open. */
|
|
extern void _dl_close (void *map)
|
|
internal_function;
|
|
libc_hidden_proto (_dl_close)
|
|
|
|
/* Look up NAME in shared object HANDLE (which may be RTLD_DEFAULT or
|
|
RTLD_NEXT). WHO is the calling function, for RTLD_NEXT. Returns
|
|
the symbol value, which may be NULL. */
|
|
extern void *_dl_sym (void *handle, const char *name, void *who)
|
|
internal_function;
|
|
|
|
/* Look up version VERSION of symbol NAME in shared object HANDLE
|
|
(which may be RTLD_DEFAULT or RTLD_NEXT). WHO is the calling
|
|
function, for RTLD_NEXT. Returns the symbol value, which may be
|
|
NULL. */
|
|
extern void *_dl_vsym (void *handle, const char *name, const char *version,
|
|
void *who)
|
|
internal_function;
|
|
|
|
/* Call OPERATE, catching errors from `dl_signal_error'. If there is no
|
|
error, *ERRSTRING is set to null. If there is an error, *ERRSTRING is
|
|
set to a string constructed from the strings passed to _dl_signal_error,
|
|
and the error code passed is the return value and *OBJNAME is set to
|
|
the object name which experienced the problems. ERRSTRING if nonzero
|
|
points to a malloc'ed string which the caller has to free after use.
|
|
ARGS is passed as argument to OPERATE. */
|
|
extern int _dl_catch_error (const char **objname, const char **errstring,
|
|
void (*operate) (void *),
|
|
void *args)
|
|
internal_function;
|
|
|
|
/* Helper function for <dlfcn.h> functions. Runs the OPERATE function via
|
|
_dl_catch_error. Returns zero for success, nonzero for failure; and
|
|
arranges for `dlerror' to return the error details.
|
|
ARGS is passed as argument to OPERATE. */
|
|
extern int _dlerror_run (void (*operate) (void *), void *args)
|
|
internal_function;
|
|
|
|
#endif
|