20fe49b93a
Change type of l_idx to int. * elf/dl-close.c: Basically rewrite. Do not use l_opencount to determine whether a DSO has to be unloaded. Instead compute this in this function. * elf/dl-deps.c: No need to manipulate l_opencount anymore. * elf/dl-lookup.c: Likewise. * elf/rtld.c: Likewise * elf/dl-open.c: Likewise. Use l_init_called to determine whether object was just loaded. * elf/dl-fini.c: Bump l_direct_opencount instead of l_opencount. * elf/dl-load.c (_dl_map_object_from_fd): Do not recognize DSO which is about to be unloaded as a match. (_dl_map_object): Likewise. * elf/do-lookup.h (do_lookup_x): Do not look into DSO which is about to be unloaded. * elf/circleload1.c: Don't use l_opencount anymore. * elf/neededtest.c: Likewise. * elf/neededtest2.c: Likewise. * elf/neededtest3.c: Likewise. * elf/neededtest4.c: Likewise. * elf/unload.c: Likewise. * elf/unload2.c: Likewise. * elf/loadtest.c: Likewise. * elf/rtld.c: Preloading errors are now never fatal. 2005-03-08 Jakub Jelinek <jakub@redhat.com> * elf/Makefile: Add rules to build and run unload5 test. * elf/unload5.c: New file. 2005-03-08 Jakub Jelinek <jakub@redhat.com> * elf/Makefile: Add rules to build and run unload4 test. * elf/unload4.c: New file. * elf/unload4mod1.c: New file. * elf/unload4mod2.c: New file. * elf/unload4mod3.c: New file. * elf/unload4mod4.c: New file.
201 lines
4.8 KiB
C
201 lines
4.8 KiB
C
#include <assert.h>
|
|
#include <dlfcn.h>
|
|
#include <errno.h>
|
|
#include <error.h>
|
|
#include <mcheck.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
|
|
/* How many load/unload operations do we do. */
|
|
#define TEST_ROUNDS 1000
|
|
|
|
|
|
static struct
|
|
{
|
|
/* Name of the module. */
|
|
const char *name;
|
|
/* The handle. */
|
|
void *handle;
|
|
} testobjs[] =
|
|
{
|
|
{ "testobj1.so", NULL },
|
|
{ "testobj2.so", NULL },
|
|
{ "testobj3.so", NULL },
|
|
{ "testobj4.so", NULL },
|
|
{ "testobj5.so", NULL },
|
|
{ "testobj6.so", NULL },
|
|
};
|
|
#define NOBJS (sizeof (testobjs) / sizeof (testobjs[0]))
|
|
|
|
|
|
static const struct
|
|
{
|
|
/* Name of a function to call. */
|
|
const char *fname;
|
|
/* Index in status and handle array. */
|
|
int index;
|
|
/* Options while loading the module. */
|
|
int options;
|
|
} tests[] =
|
|
{
|
|
{ "obj1func2", 0, RTLD_LAZY },
|
|
{ "obj1func1", 0, RTLD_LAZY | RTLD_GLOBAL },
|
|
{ "obj1func1", 0, RTLD_NOW, },
|
|
{ "obj1func2", 0, RTLD_NOW | RTLD_GLOBAL },
|
|
{ "obj2func2", 1, RTLD_LAZY },
|
|
{ "obj2func1", 1, RTLD_LAZY | RTLD_GLOBAL, },
|
|
{ "obj2func1", 1, RTLD_NOW, },
|
|
{ "obj2func2", 1, RTLD_NOW | RTLD_GLOBAL },
|
|
{ "obj3func2", 2, RTLD_LAZY },
|
|
{ "obj3func1", 2, RTLD_LAZY | RTLD_GLOBAL },
|
|
{ "obj3func1", 2, RTLD_NOW },
|
|
{ "obj3func2", 2, RTLD_NOW | RTLD_GLOBAL },
|
|
{ "obj4func2", 3, RTLD_LAZY },
|
|
{ "obj4func1", 3, RTLD_LAZY | RTLD_GLOBAL },
|
|
{ "obj4func1", 3, RTLD_NOW },
|
|
{ "obj4func2", 3, RTLD_NOW | RTLD_GLOBAL },
|
|
{ "obj5func2", 4, RTLD_LAZY },
|
|
{ "obj5func1", 4, RTLD_LAZY | RTLD_GLOBAL },
|
|
{ "obj5func1", 4, RTLD_NOW },
|
|
{ "obj5func2", 4, RTLD_NOW | RTLD_GLOBAL },
|
|
{ "obj6func2", 5, RTLD_LAZY },
|
|
{ "obj6func1", 5, RTLD_LAZY | RTLD_GLOBAL },
|
|
{ "obj6func1", 5, RTLD_NOW },
|
|
{ "obj6func2", 5, RTLD_NOW | RTLD_GLOBAL },
|
|
};
|
|
#define NTESTS (sizeof (tests) / sizeof (tests[0]))
|
|
|
|
|
|
#include <include/link.h>
|
|
|
|
#define OUT \
|
|
for (map = _r_debug.r_map; map != NULL; map = map->l_next) \
|
|
if (map->l_type == lt_loaded) \
|
|
printf ("name = \"%s\", direct_opencount = %d\n", \
|
|
map->l_name, (int) map->l_direct_opencount); \
|
|
fflush (stdout)
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
int debug = argc > 1 && argv[1][0] != '\0';
|
|
int count = TEST_ROUNDS;
|
|
int result = 0;
|
|
struct link_map *map;
|
|
|
|
mtrace ();
|
|
|
|
/* Just a seed. */
|
|
srandom (TEST_ROUNDS);
|
|
|
|
if (debug)
|
|
{
|
|
puts ("in the beginning");
|
|
OUT;
|
|
}
|
|
|
|
while (count--)
|
|
{
|
|
int nr = random () % NTESTS;
|
|
int index = tests[nr].index;
|
|
|
|
printf ("%4d: %4d: ", count + 1, nr);
|
|
fflush (stdout);
|
|
|
|
if (testobjs[index].handle == NULL)
|
|
{
|
|
int (*fct) (int);
|
|
|
|
/* Load the object. */
|
|
testobjs[index].handle = dlopen (testobjs[index].name,
|
|
tests[nr].options);
|
|
if (testobjs[index].handle == NULL)
|
|
error (EXIT_FAILURE, 0, "cannot load `%s': %s",
|
|
testobjs[index].name, dlerror ());
|
|
|
|
/* Test the function call. */
|
|
fct = dlsym (testobjs[index].handle, tests[nr].fname);
|
|
if (fct == NULL)
|
|
error (EXIT_FAILURE, 0,
|
|
"cannot get function `%s' from shared object `%s': %s",
|
|
tests[nr].fname, testobjs[index].name, dlerror ());
|
|
|
|
fct (10);
|
|
|
|
printf ("successfully loaded `%s', handle %p\n",
|
|
testobjs[index].name, testobjs[index].handle);
|
|
}
|
|
else
|
|
{
|
|
if (dlclose (testobjs[index].handle) != 0)
|
|
{
|
|
printf ("failed to close %s\n", testobjs[index].name);
|
|
result = 1;
|
|
}
|
|
else
|
|
printf ("successfully unloaded `%s', handle %p\n",
|
|
testobjs[index].name, testobjs[index].handle);
|
|
|
|
testobjs[index].handle = NULL;
|
|
|
|
if (testobjs[0].handle == NULL
|
|
&& testobjs[1].handle == NULL
|
|
&& testobjs[5].handle == NULL)
|
|
{
|
|
/* In this case none of the objects above should be
|
|
present. */
|
|
for (map = _r_debug.r_map; map != NULL; map = map->l_next)
|
|
if (map->l_type == lt_loaded
|
|
&& (strstr (map->l_name, testobjs[0].name) != NULL
|
|
|| strstr (map->l_name, testobjs[1].name) != NULL
|
|
|| strstr (map->l_name, testobjs[5].name) != NULL))
|
|
{
|
|
printf ("`%s' is still loaded\n", map->l_name);
|
|
result = 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (debug)
|
|
OUT;
|
|
}
|
|
|
|
/* Unload all loaded modules. */
|
|
for (count = 0; count < (int) NOBJS; ++count)
|
|
if (testobjs[count].handle != NULL)
|
|
{
|
|
printf ("\nclose: %s: l_initfini = %p, l_versions = %p\n",
|
|
testobjs[count].name,
|
|
((struct link_map *) testobjs[count].handle)->l_initfini,
|
|
((struct link_map *) testobjs[count].handle)->l_versions);
|
|
|
|
if (dlclose (testobjs[count].handle) != 0)
|
|
{
|
|
printf ("failed to close %s\n", testobjs[count].name);
|
|
result = 1;
|
|
}
|
|
}
|
|
|
|
/* Check whether all files are unloaded. */
|
|
for (map = _r_debug.r_map; map != NULL; map = map->l_next)
|
|
if (map->l_type == lt_loaded)
|
|
{
|
|
printf ("name = \"%s\", direct_opencount = %d\n",
|
|
map->l_name, (int) map->l_direct_opencount);
|
|
result = 1;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
extern int foo (int a);
|
|
int
|
|
foo (int a)
|
|
{
|
|
return a - 1;
|
|
}
|