From d56460c939c94a6c547abe8238f442b8de10bfbd Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 12 Nov 2015 15:50:26 -0500 Subject: unify static and dynamic linked implementations of thread-local storage this both allows removal of some of the main remaining uses of the SHARED macro and clears one obstacle to static-linked dlopen support, which may be added at some point in the future. specialized single-TLS-module versions of __copy_tls and __reset_tls are removed and replaced with code adapted from their dynamic-linked versions, capable of operating on a whole chain of TLS modules, and use of the dynamic linker's DSO chain (which contains large struct dso objects) by these functions is replaced with a new chain of struct tls_module objects containing only the information needed for implementing TLS. this may also yield some performance benefit initializing TLS for a new thread when a large number of modules without TLS have been loaded, since since there is no need to walk structures for modules without TLS. --- src/env/__reset_tls.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'src/env/__reset_tls.c') diff --git a/src/env/__reset_tls.c b/src/env/__reset_tls.c index bd61f311..677e57f5 100644 --- a/src/env/__reset_tls.c +++ b/src/env/__reset_tls.c @@ -1,21 +1,16 @@ -#ifndef SHARED - #include #include "pthread_impl.h" - -extern struct tls_image { - void *image; - size_t len, size, align; -} __static_tls; - -#define T __static_tls +#include "libc.h" void __reset_tls() { - if (!T.size) return; pthread_t self = __pthread_self(); - memcpy(self->dtv[1], T.image, T.len); - memset((char *)self->dtv[1]+T.len, 0, T.size-T.len); + struct tls_module *p; + size_t i, n = (size_t)self->dtv[0]; + if (n) for (p=libc.tls_head, i=1; i<=n; i++, p=p->next) { + if (!self->dtv[i]) continue; + memcpy(self->dtv[i], p->image, p->len); + memset((char *)self->dtv[i]+p->len, 0, + p->size - p->len); + } } - -#endif -- cgit v1.2.1