diff options
| author | christos <christos@NetBSD.org> | 2019-03-05 01:35:52 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2019-03-05 01:35:52 +0000 |
| commit | 03bbc0809832cfc64ebef984c1dae5d64c95bfca (patch) | |
| tree | 11c70e20854dd6c80f39bb8826532c3af2e9134b /lib/libpthread | |
| parent | 9dc824f400679beae5c68745c5200ca0478a7c3d (diff) | |
Transfer all the keys that were created in the libc stub implementation
to the pthread tsd implementation when the main thread is created.
This corrects a problem where a process created keys before libpthread
was loaded (either from the libc constructor or because libpthread
was dlopened later). This fixes a problem with jemalloc which creates
keys in the constructor.
Diffstat (limited to 'lib/libpthread')
| -rw-r--r-- | lib/libpthread/pthread.c | 5 | ||||
| -rw-r--r-- | lib/libpthread/pthread_int.h | 4 | ||||
| -rw-r--r-- | lib/libpthread/pthread_tsd.c | 25 |
3 files changed, 29 insertions, 5 deletions
diff --git a/lib/libpthread/pthread.c b/lib/libpthread/pthread.c index 56c060a9c35..47add900ee6 100644 --- a/lib/libpthread/pthread.c +++ b/lib/libpthread/pthread.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread.c,v 1.152 2018/08/19 02:10:42 kamil Exp $ */ +/* $NetBSD: pthread.c,v 1.153 2019/03/05 01:35:52 christos Exp $ */ /*- * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: pthread.c,v 1.152 2018/08/19 02:10:42 kamil Exp $"); +__RCSID("$NetBSD: pthread.c,v 1.153 2019/03/05 01:35:52 christos Exp $"); #define __EXPOSE_STACK 1 @@ -1330,6 +1330,7 @@ pthread__initmainstack(void) break; } } + pthread__copy_tsd(pthread__main); } /* diff --git a/lib/libpthread/pthread_int.h b/lib/libpthread/pthread_int.h index 4a5e958393d..c364e7f638d 100644 --- a/lib/libpthread/pthread_int.h +++ b/lib/libpthread/pthread_int.h @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_int.h,v 1.94 2017/07/02 16:41:32 joerg Exp $ */ +/* $NetBSD: pthread_int.h,v 1.95 2019/03/05 01:35:52 christos Exp $ */ /*- * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -290,6 +290,8 @@ pthread__self(void) void *pthread_tsd_init(size_t *) PTHREAD_HIDE; void pthread__destroy_tsd(pthread_t) PTHREAD_HIDE; +void pthread__copy_tsd(pthread_t) PTHREAD_HIDE; + __dead void pthread__assertfunc(const char *, int, const char *, const char *) PTHREAD_HIDE; void pthread__errorfunc(const char *, int, const char *, const char *) diff --git a/lib/libpthread/pthread_tsd.c b/lib/libpthread/pthread_tsd.c index b395957aeed..666cbab85f1 100644 --- a/lib/libpthread/pthread_tsd.c +++ b/lib/libpthread/pthread_tsd.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_tsd.c,v 1.16 2017/07/09 20:21:08 christos Exp $ */ +/* $NetBSD: pthread_tsd.c,v 1.17 2019/03/05 01:35:52 christos Exp $ */ /*- * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: pthread_tsd.c,v 1.16 2017/07/09 20:21:08 christos Exp $"); +__RCSID("$NetBSD: pthread_tsd.c,v 1.17 2019/03/05 01:35:52 christos Exp $"); /* Functions and structures dealing with thread-specific data */ #include <errno.h> @@ -39,6 +39,7 @@ __RCSID("$NetBSD: pthread_tsd.c,v 1.16 2017/07/09 20:21:08 christos Exp $"); #include "pthread.h" #include "pthread_int.h" #include "reentrant.h" +#include "tsd.h" int pthread_keys_max; static pthread_mutex_t tsd_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -362,3 +363,23 @@ pthread__destroy_tsd(pthread_t self) self->pt_havespecific = 0; pthread_mutex_lock(&self->pt_lock); } + +void +pthread__copy_tsd(pthread_t self) +{ + for (size_t key = 0; key < TSD_KEYS_MAX; key++) { + + if (__libc_tsd[key].tsd_inuse == 0) + continue; + + pthread__assert(pthread__tsd_destructors[key] == NULL); + pthread__tsd_destructors[key] = __libc_tsd[key].tsd_dtor ? + __libc_tsd[key].tsd_dtor : null_destructor; + nextkey = (key + 1) % pthread_keys_max; + + self->pt_havespecific = 1; + struct pt_specific *pt = &self->pt_specific[key]; + pt->pts_value = __libc_tsd[key].tsd_val; + __libc_tsd[key].tsd_inuse = 0; + } +} |
