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.

diff --git a/src/include/pthread.h b/src/include/pthread.h
index d93ac3a..7167d3e 100644 (file)
--- a/src/include/pthread.h
+++ b/src/include/pthread.h
@@ -18,5 +18,12 @@ hidden int __private_cond_signal(pthread_cond_t *, int);
 hidden int __pthread_cond_timedwait(pthread_cond_t *restrict, pthread_mutex_t *restrict, const struct timespec *restrict);
 hidden int __pthread_key_create(pthread_key_t *, void (*)(void *));
 hidden int __pthread_key_delete(pthread_key_t);
+hidden int __pthread_rwlock_rdlock(pthread_rwlock_t *);
+hidden int __pthread_rwlock_tryrdlock(pthread_rwlock_t *);
+hidden int __pthread_rwlock_timedrdlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict);
+hidden int __pthread_rwlock_wrlock(pthread_rwlock_t *);
+hidden int __pthread_rwlock_trywrlock(pthread_rwlock_t *);
+hidden int __pthread_rwlock_timedwrlock(pthread_rwlock_t *__restrict, const struct timespec *__restrict);
+hidden int __pthread_rwlock_unlock(pthread_rwlock_t *);
 
 #endif

diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c
index da1fb11..dc20cc3 100644 (file)
--- 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 && j<PTHREAD_DESTRUCTOR_ITERATIONS; j++) {
-               pthread_rwlock_rdlock(&key_lock);
+               __pthread_rwlock_rdlock(&key_lock);
                self->tsd_used = 0;
                for (i=0; i<PTHREAD_KEYS_MAX; i++) {
                        void *val = self->tsd[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);
        }
 }
 

diff --git a/src/thread/pthread_rwlock_rdlock.c b/src/thread/pthread_rwlock_rdlock.c
index 0800d21..8546c07 100644 (file)
--- a/src/thread/pthread_rwlock_rdlock.c
+++ b/src/thread/pthread_rwlock_rdlock.c
@@ -1,6 +1,8 @@
 #include "pthread_impl.h"
 
-int pthread_rwlock_rdlock(pthread_rwlock_t *rw)
+int __pthread_rwlock_rdlock(pthread_rwlock_t *rw)
 {
-       return pthread_rwlock_timedrdlock(rw, 0);
+       return __pthread_rwlock_timedrdlock(rw, 0);
 }
+
+weak_alias(__pthread_rwlock_rdlock, pthread_rwlock_rdlock);

diff --git a/src/thread/pthread_rwlock_timedrdlock.c b/src/thread/pthread_rwlock_timedrdlock.c
index 0d5d0d6..8cdd8ec 100644 (file)
--- a/src/thread/pthread_rwlock_timedrdlock.c
+++ b/src/thread/pthread_rwlock_timedrdlock.c
@@ -1,6 +1,6 @@
 #include "pthread_impl.h"
 
-int pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
+int __pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
 {
        int r, t;
 
@@ -10,7 +10,7 @@ int pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct times
        int spins = 100;
        while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
 
-       while ((r=pthread_rwlock_tryrdlock(rw))==EBUSY) {
+       while ((r=__pthread_rwlock_tryrdlock(rw))==EBUSY) {
                if (!(r=rw->_rw_lock) || (r&0x7fffffff)!=0x7fffffff) continue;
                t = r | 0x80000000;
                a_inc(&rw->_rw_waiters);
@@ -21,3 +21,5 @@ int pthread_rwlock_timedrdlock(pthread_rwlock_t *restrict rw, const struct times
        }
        return r;
 }
+
+weak_alias(__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock);

diff --git a/src/thread/pthread_rwlock_timedwrlock.c b/src/thread/pthread_rwlock_timedwrlock.c
index 7f26dad..d77706e 100644 (file)
--- a/src/thread/pthread_rwlock_timedwrlock.c
+++ b/src/thread/pthread_rwlock_timedwrlock.c
@@ -1,6 +1,6 @@
 #include "pthread_impl.h"
 
-int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
+int __pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
 {
        int r, t;
        
@@ -10,7 +10,7 @@ int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct times
        int spins = 100;
        while (spins-- && rw->_rw_lock && !rw->_rw_waiters) a_spin();
 
-       while ((r=pthread_rwlock_trywrlock(rw))==EBUSY) {
+       while ((r=__pthread_rwlock_trywrlock(rw))==EBUSY) {
                if (!(r=rw->_rw_lock)) continue;
                t = r | 0x80000000;
                a_inc(&rw->_rw_waiters);
@@ -21,3 +21,5 @@ int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct times
        }
        return r;
 }
+
+weak_alias(__pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock);

diff --git a/src/thread/pthread_rwlock_tryrdlock.c b/src/thread/pthread_rwlock_tryrdlock.c
index fa271fc..c13bc9c 100644 (file)
--- a/src/thread/pthread_rwlock_tryrdlock.c
+++ b/src/thread/pthread_rwlock_tryrdlock.c
@@ -1,6 +1,6 @@
 #include "pthread_impl.h"
 
-int pthread_rwlock_tryrdlock(pthread_rwlock_t *rw)
+int __pthread_rwlock_tryrdlock(pthread_rwlock_t *rw)
 {
        int val, cnt;
        do {
@@ -11,3 +11,5 @@ int pthread_rwlock_tryrdlock(pthread_rwlock_t *rw)
        } while (a_cas(&rw->_rw_lock, val, val+1) != val);
        return 0;
 }
+
+weak_alias(__pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock);

diff --git a/src/thread/pthread_rwlock_trywrlock.c b/src/thread/pthread_rwlock_trywrlock.c
index bb3d3a9..64d9d31 100644 (file)
--- a/src/thread/pthread_rwlock_trywrlock.c
+++ b/src/thread/pthread_rwlock_trywrlock.c
@@ -1,7 +1,9 @@
 #include "pthread_impl.h"
 
-int pthread_rwlock_trywrlock(pthread_rwlock_t *rw)
+int __pthread_rwlock_trywrlock(pthread_rwlock_t *rw)
 {
        if (a_cas(&rw->_rw_lock, 0, 0x7fffffff)) return EBUSY;
        return 0;
 }
+
+weak_alias(__pthread_rwlock_trywrlock, pthread_rwlock_trywrlock);

diff --git a/src/thread/pthread_rwlock_unlock.c b/src/thread/pthread_rwlock_unlock.c
index 7b5eec8..9ae27ad 100644 (file)
--- a/src/thread/pthread_rwlock_unlock.c
+++ b/src/thread/pthread_rwlock_unlock.c
@@ -1,6 +1,6 @@
 #include "pthread_impl.h"
 
-int pthread_rwlock_unlock(pthread_rwlock_t *rw)
+int __pthread_rwlock_unlock(pthread_rwlock_t *rw)
 {
        int val, cnt, waiters, new, priv = rw->_rw_shared^128;
 
@@ -16,3 +16,5 @@ int pthread_rwlock_unlock(pthread_rwlock_t *rw)
 
        return 0;
 }
+
+weak_alias(__pthread_rwlock_unlock, pthread_rwlock_unlock);

diff --git a/src/thread/pthread_rwlock_wrlock.c b/src/thread/pthread_rwlock_wrlock.c
index 7f33535..46a3b3a 100644 (file)
--- a/src/thread/pthread_rwlock_wrlock.c
+++ b/src/thread/pthread_rwlock_wrlock.c
@@ -1,6 +1,8 @@
 #include "pthread_impl.h"
 
-int pthread_rwlock_wrlock(pthread_rwlock_t *rw)
+int __pthread_rwlock_wrlock(pthread_rwlock_t *rw)
 {
-       return pthread_rwlock_timedwrlock(rw, 0);
+       return __pthread_rwlock_timedwrlock(rw, 0);
 }
+
+weak_alias(__pthread_rwlock_wrlock, pthread_rwlock_wrlock);