X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fsem_timedwait.c;h=8132eb1bf7a276d9b2dd2c9c978bbc0f0b29b7f4;hb=9c738dc183f44de40d263e4ff8dc540915a41aed;hp=e6c2495af75aaf2205b07068d0eea6ee43e8511b;hpb=9fe28f703d44ff1ddecdca945bfb5fc87de5e8ad;p=musl

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index e6c2495a..8132eb1b 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -1,18 +1,31 @@
 #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);
+}
+
+int sem_timedwait(sem_t *restrict sem, const struct timespec *restrict at)
+{
+	pthread_testcancel();
+
+	if (!sem_trywait(sem)) return 0;
+
+	int spins = 100;
+	while (spins-- && sem->__val[0] <= 0 && !sem->__val[1]) a_spin();
 
-	for (;;) {
-		if (a_fetch_add(sem->__val, -1) > 0) return 0;
-		val = a_fetch_add(sem->__val, 1)+1;
-		CANCELPT_BEGIN;
-		if (val <= 0 && __timedwait(sem->__val, val, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
-			errno = ETIMEDOUT;
+	while (sem_trywait(sem)) {
+		int r;
+		a_inc(sem->__val+1);
+		a_cas(sem->__val, 0, -1);
+		pthread_cleanup_push(cleanup, (void *)(sem->__val+1));
+		r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, sem->__val[2]);
+		pthread_cleanup_pop(1);
+		if (r && r != EINTR) {
+			errno = r;
 			return -1;
 		}
-		CANCELPT_END;
 	}
+	return 0;
 }