From 03bbc0809832cfc64ebef984c1dae5d64c95bfca Mon Sep 17 00:00:00 2001 From: christos Date: Tue, 5 Mar 2019 01:35:52 +0000 Subject: 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. --- lib/libpthread/pthread_tsd.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'lib/libpthread/pthread_tsd.c') 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 -__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 @@ -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; + } +} -- cgit