X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fsem_timedwait.c;h=58d3ebfefc8896258a29620cb750de947aa7e5aa;hb=ef137da6428c342baabd3bcf9b5e91f75acefa64;hp=1d4b3e2c161534d33189f59b58743851013abfb9;hpb=88c4e720317845a8e01aee03f142ba82674cd23d;p=musl

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index 1d4b3e2c..58d3ebfe 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -6,18 +6,21 @@ static void cleanup(void *p)
 	a_dec(p);
 }
 
-int sem_timedwait(sem_t *sem, const struct timespec *at)
+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();
+
 	while (sem_trywait(sem)) {
 		int r;
-		if (at && at->tv_nsec >= 1000000000UL) {
-			errno = EINVAL;
-			return -1;
-		}
 		a_inc(sem->__val+1);
 		a_cas(sem->__val, 0, -1);
-		pthread_cleanup_push(cleanup, sem->__val+1);
-		r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, 0);
+		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) {
 			errno = r;