From 639bcf251e549f634da9a3e7ef8528eb2ec12505 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 16 Feb 2019 11:44:07 -0500 Subject: introduce namespace-safe rwlock aliases; use in pthread_key_create commit 84d061d5a31c9c773e29e1e2b1ffe8cb9557bc58 inadvertently introduced namespace violations by using the pthread-namespace rwlock functions in pthread_key_create, which is in turn used for C11 tss. fix that and possible future uses of rwlocks elsewhere. --- src/thread/pthread_key_create.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/thread/pthread_key_create.c') diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c index da1fb116..dc20cc3f 100644 --- a/src/thread/pthread_key_create.c +++ b/src/thread/pthread_key_create.c @@ -32,16 +32,16 @@ int __pthread_key_create(pthread_key_t *k, void (*dtor)(void *)) /* Purely a sentinel value since null means slot is free. */ if (!dtor) dtor = nodtor; - pthread_rwlock_wrlock(&key_lock); + __pthread_rwlock_wrlock(&key_lock); do { if (!keys[j]) { keys[next_key = *k = j] = dtor; - pthread_rwlock_unlock(&key_lock); + __pthread_rwlock_unlock(&key_lock); return 0; } } while ((j=(j+1)%PTHREAD_KEYS_MAX) != next_key); - pthread_rwlock_unlock(&key_lock); + __pthread_rwlock_unlock(&key_lock); return EAGAIN; } @@ -57,9 +57,9 @@ int __pthread_key_delete(pthread_key_t k) __tl_unlock(); __restore_sigs(&set); - pthread_rwlock_wrlock(&key_lock); + __pthread_rwlock_wrlock(&key_lock); keys[k] = 0; - pthread_rwlock_unlock(&key_lock); + __pthread_rwlock_unlock(&key_lock); return 0; } @@ -69,19 +69,19 @@ void __pthread_tsd_run_dtors() pthread_t self = __pthread_self(); int i, j; for (j=0; self->tsd_used && jtsd_used = 0; for (i=0; itsd[i]; void (*dtor)(void *) = keys[i]; self->tsd[i] = 0; if (val && dtor && dtor != nodtor) { - pthread_rwlock_unlock(&key_lock); + __pthread_rwlock_unlock(&key_lock); dtor(val); - pthread_rwlock_rdlock(&key_lock); + __pthread_rwlock_rdlock(&key_lock); } } - pthread_rwlock_unlock(&key_lock); + __pthread_rwlock_unlock(&key_lock); } } -- cgit 1.4.1