X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fsem_timedwait.c;h=64b4342ca2212ef0744440e705c6b6bf1e3692c5;hp=11a017005fc09df08502833431506b2f4e51795f;hb=bdd893377fe65519fae90948cd8f3c635757eaba;hpb=b470030f839a375e5030ec9d44903ef7581c15a2

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index 11a01700..64b4342c 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -1,26 +1,23 @@
 #include <semaphore.h>
 #include "pthread_impl.h"
 
-int sem_timedwait(sem_t *sem, const struct timespec *at)
+static void cleanup(void *p)
 {
-	int val;
+	a_dec(p);
+}
 
-	for (;;) {
-		if (a_fetch_add(sem->__val, -1) > 0) return 0;
-		val = a_fetch_add(sem->__val, 1)+1;
-		if (val==1) __wake(sem->__val, 1, 0);
-		if (at && at->tv_nsec >= 1000000000UL) {
-			errno = EINVAL;
-			return -1;
-		}
-		CANCELPT_BEGIN;
-		if (val <= 0 && __timedwait(sem->__val, val, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
-			errno = ETIMEDOUT;
-			CANCELPT_TRY;
-			CANCELPT_END;
+int sem_timedwait(sem_t *sem, const struct timespec *at)
+{
+	while (sem_trywait(sem)) {
+		int r;
+		a_inc(sem->__val+1);
+		a_cas(sem->__val, 0, -1);
+		r = __timedwait(sem->__val, -1, CLOCK_REALTIME, at, cleanup, sem->__val+1, 0);
+		a_dec(sem->__val+1);
+		if (r) {
+			errno = r;
 			return -1;
 		}
-		CANCELPT_TRY;
-		CANCELPT_END;
 	}
+	return 0;
 }