mirror of
https://sourceware.org/git/glibc.git
synced 2025-11-03 20:53:13 +03: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>
81 lines
1.6 KiB
C
81 lines
1.6 KiB
C
#include <dlfcn.h>
|
|
#include <stdio.h>
|
|
#include <gnu/lib-names.h>
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
void *h = dlopen (LIBC_SO, RTLD_LAZY|RTLD_NOLOAD);
|
|
if (h == NULL)
|
|
{
|
|
printf ("cannot get handle for %s: %s\n", LIBC_SO, dlerror ());
|
|
return 1;
|
|
}
|
|
|
|
Lmid_t ns = -10;
|
|
if (dlinfo (h, RTLD_DI_LMID, &ns) != 0)
|
|
{
|
|
printf ("dlinfo for %s in %s failed: %s\n",
|
|
LIBC_SO, __func__, dlerror ());
|
|
return 1;
|
|
}
|
|
|
|
if (ns != LM_ID_BASE)
|
|
{
|
|
printf ("namespace for %s not LM_ID_BASE\n", LIBC_SO);
|
|
return 1;
|
|
}
|
|
|
|
if (dlclose (h) != 0)
|
|
{
|
|
printf ("dlclose for %s in %s failed: %s\n",
|
|
LIBC_SO, __func__, dlerror ());
|
|
return 1;
|
|
}
|
|
|
|
h = dlmopen (LM_ID_NEWLM, "$ORIGIN/tst-dlmopen1mod.so", RTLD_LAZY);
|
|
if (h == NULL)
|
|
{
|
|
printf ("cannot get handle for %s: %s\n",
|
|
"tst-dlmopen1mod.so", dlerror ());
|
|
return 1;
|
|
}
|
|
|
|
ns = -10;
|
|
if (dlinfo (h, RTLD_DI_LMID, &ns) != 0)
|
|
{
|
|
printf ("dlinfo for %s in %s failed: %s\n",
|
|
"tst-dlmopen1mod.so", __func__, dlerror ());
|
|
return 1;
|
|
}
|
|
|
|
if (ns == LM_ID_BASE)
|
|
{
|
|
printf ("namespace for %s is LM_ID_BASE\n", LIBC_SO);
|
|
return 1;
|
|
}
|
|
|
|
int (*fct) (Lmid_t) = dlsym (h, "foo");
|
|
if (fct == NULL)
|
|
{
|
|
printf ("could not find %s: %s\n", "foo", dlerror ());
|
|
return 1;
|
|
}
|
|
|
|
if (fct (ns) != 0)
|
|
return 1;
|
|
|
|
if (dlclose (h) != 0)
|
|
{
|
|
printf ("dlclose for %s in %s failed: %s\n",
|
|
LIBC_SO, __func__, dlerror ());
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|