X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_rwlock_timedwrlock.c;h=aa2fd199ad0977cd7e55c183a86fea27f853dae2;hp=484808e8062f7e7a4691c78369046521aaee1a40;hb=97c5b5a87c3d9df54278e1073d6177f77536bd32;hpb=ec381af90208a5675183202cf05078eac208edfb

diff --git a/src/thread/pthread_rwlock_timedwrlock.c b/src/thread/pthread_rwlock_timedwrlock.c
index 484808e8..aa2fd199 100644
--- a/src/thread/pthread_rwlock_timedwrlock.c
+++ b/src/thread/pthread_rwlock_timedwrlock.c
@@ -2,16 +2,15 @@
 
 int pthread_rwlock_timedwrlock(pthread_rwlock_t *rw, const struct timespec *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, 0, 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;
 }