rework langinfo code for ABI compat and for use by time code

[musl] / src / thread / pthread_rwlock_timedwrlock.c

diff --git a/src/thread/pthread_rwlock_timedwrlock.c b/src/thread/pthread_rwlock_timedwrlock.c
index 9682774..339a167 100644 (file)
--- a/src/thread/pthread_rwlock_timedwrlock.c
+++ b/src/thread/pthread_rwlock_timedwrlock.c
@@ -1,17 +1,16 @@
 #include "pthread_impl.h"
 
-int pthread_rwlock_timedwrlock(pthread_rwlock_t *rw, const struct timespec *at)
+int pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct timespec *restrict at)
 {
-       int nr, *p, w=0;
-       while (pthread_rwlock_trywrlock(rw)==EAGAIN) {
-               if (!w) a_inc(&rw->_rw_waiters), w++;
-               if ((nr=rw->_rw_readers)) p = &rw->_rw_readers;
-               else nr=1, p = &rw->_rw_wrlock;
-               if (__timedwait(p, nr, CLOCK_REALTIME, at, 0)==ETIMEDOUT) {
-                       if (w) a_dec(&rw->_rw_waiters);
-                       return ETIMEDOUT;
-               }
+       int r, t;
+       while ((r=pthread_rwlock_trywrlock(rw))==EBUSY) {
+               if (!(r=rw->_rw_lock)) continue;
+               t = r | 0x80000000;
+               a_inc(&rw->_rw_waiters);
+               a_cas(&rw->_rw_lock, r, t);
+               r = __timedwait(&rw->_rw_lock, t, CLOCK_REALTIME, at, 0, 0, 0);
+               a_dec(&rw->_rw_waiters);
+               if (r && r != EINTR) return r;
        }
-       if (w) a_dec(&rw->_rw_waiters);
-       return 0;
+       return r;
 }