diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | elf/Makefile | 5 | ||||
| -rw-r--r-- | elf/dl-close.c | 8 | ||||
| -rw-r--r-- | elf/tst-tls6.c | 90 |
4 files changed, 108 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 4f13100202..cb746f6f80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2002-02-13 Ulrich Drepper <drepper@redhat.com> + * elf/dl-close.c (_dl_close): When closing an object using TLS + either decrement dl_tls_max_dtv_idx or set dl_tls_dtv_gaps to + true. Increment dl_tls_generation only if we closed any TLS-using + object. + * elf/tst-tls6.c: New file. + * elf/Makefile: Add rules to build and run tst-tls6. + * po/da.po: Update from translation team. * locale/categories.def: Fix typo [PR libc/2948]. diff --git a/elf/Makefile b/elf/Makefile index 4ef1614c06..1a0338a600 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -119,7 +119,7 @@ tests = loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ $(tests-nodlopen-$(have-z-nodlopen)) neededtest neededtest2 \ neededtest3 neededtest4 unload2 lateglobal initfirst global \ restest2 next dblload dblunload reldep5 reldep6 tst-tls1 tst-tls2 \ - tst-tls3 tst-tls4 tst-tls5 + tst-tls3 tst-tls4 tst-tls5 tst-tls6 test-srcs = tst-pathopt tests-vis-yes = vismain tests-nodelete-yes = nodelete @@ -448,3 +448,6 @@ $(objpfx)tst-tls4.out: $(objpfx)tst-tlsmod2.so $(objpfx)tst-tls5: $(libdl) $(objpfx)tst-tls5.out: $(objpfx)tst-tlsmod2.so + +$(objpfx)tst-tls6: $(libdl) +$(objpfx)tst-tls6.out: $(objpfx)tst-tlsmod2.so diff --git a/elf/dl-close.c b/elf/dl-close.c index 8eefb351b2..7e7547de99 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -228,6 +228,11 @@ _dl_close (void *_map) listp->slotinfo[idx].map = NULL; any_tls = true; + + if (imap->l_tls_modid == GL(dl_tls_max_dtv_idx)) + --GL(dl_tls_max_dtv_idx); + else + GL(dl_tls_dtv_gaps) = true; } #endif @@ -307,7 +312,8 @@ _dl_close (void *_map) #ifdef USE_TLS /* If we removed any object which uses TLS bumnp the generation counter. */ - ++GL(dl_tls_generation); + if (any_tls) + ++GL(dl_tls_generation); #endif /* Notify the debugger those objects are finalized and gone. */ diff --git a/elf/tst-tls6.c b/elf/tst-tls6.c new file mode 100644 index 0000000000..2c015efebb --- /dev/null +++ b/elf/tst-tls6.c @@ -0,0 +1,90 @@ +#include <dlfcn.h> +#include <stdio.h> +#include <stdlib.h> + +#include <link.h> +#include <tls.h> + + +#define TEST_FUNCTION do_test () +static int +do_test (void) +{ +#ifdef USE_TLS + static const char modname[] = "tst-tlsmod2.so"; + int result = 0; + int *foop; + int *foop2; + int (*fp) (int, int *); + void *h; + int i; + int modid = -1; + + for (i = 0; i < 10; ++i) + { + h = dlopen (modname, RTLD_LAZY); + if (h == NULL) + { + printf ("cannot open '%s': %s\n", modname, dlerror ()); + exit (1); + } + + /* Dirty test code here: we peek into a private data structure. + We make sure that the module gets assigned the same ID every + time. The value of the first round is used. */ + if (modid == -1) + modid = ((struct link_map *) h)->l_tls_modid; + else if (((struct link_map *) h)->l_tls_modid != modid) + { + printf ("round %d: modid now %d, initially %d\n", + i, ((struct link_map *) h)->l_tls_modid, modid); + result = 1; + } + + foop = dlsym (h, "foo"); + if (foop == NULL) + { + printf ("cannot get symbol 'foo': %s\n", dlerror ()); + exit (1); + } + + *foop = 42 + i; + + fp = dlsym (h, "in_dso"); + if (fp == NULL) + { + printf ("cannot get symbol 'in_dso': %s\n", dlerror ()); + exit (1); + } + + result |= fp (42 + i, foop); + + foop2 = dlsym (h, "foo"); + if (foop2 == NULL) + { + printf ("cannot get symbol 'foo' the second time: %s\n", dlerror ()); + exit (1); + } + + if (foop != foop2) + { + puts ("address of 'foo' different the second time"); + result = 1; + } + else if (*foop != 16) + { + puts ("foo != 16"); + result = 1; + } + + dlclose (h); + } + + return result; +#else + return 0; +#endif +} + + +#include "../test-skeleton.c" |