X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2F__timedwait.c;h=e15e2d0a87d7fb3ace45a1bbc165a0a023fed034;hb=730bee725a770b543181424b52203dd1634ab5d1;hp=988eb70ddf93294417442ed9878b7101cf5994d4;hpb=cc832d8a31e674c3d8ee7168e4a613b5bf8124e0;p=musl

diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c
index 988eb70d..e15e2d0a 100644
--- a/src/thread/__timedwait.c
+++ b/src/thread/__timedwait.c
@@ -1,24 +1,48 @@
+#include <pthread.h>
 #include <time.h>
 #include <errno.h>
 #include "futex.h"
-#define SYSCALL_RETURN_ERRNO
 #include "syscall.h"
-#include <stdio.h>
-int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespec *at, int priv)
+
+static int do_wait(volatile int *addr, int val, clockid_t clk, const struct timespec *at, int cp, int priv)
 {
-	int r;
-	struct timespec to;
-	if (at) {
-		clock_gettime(clk, &to);
-		to.tv_sec = at->tv_sec - to.tv_sec;
-		if ((to.tv_nsec = at->tv_nsec - to.tv_nsec) < 0) {
-			to.tv_sec--;
-			to.tv_nsec += 1000000000;
-		}
-		if (to.tv_sec < 0) return ETIMEDOUT;
+	int r, flag = 0;
+	struct timespec to, *top=0;
+
+	if (!at) goto notimeout;
+	if (at->tv_nsec >= 1000000000UL)
+		return EINVAL;
+	if (clk == CLOCK_REALTIME || clk == CLOCK_MONOTONIC) {
+		if (clk == CLOCK_REALTIME) flag = FUTEX_CLOCK_REALTIME;
+		if (cp) r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT_BITSET|flag, val, at, 0, -1);
+		else r = -__syscall(SYS_futex, addr, FUTEX_WAIT_BITSET|flag, val, at, 0, -1);
+		if (r != EINVAL && r != ENOSYS) goto done;
+	}
+	if (clock_gettime(clk, &to)) return EINVAL;
+	to.tv_sec = at->tv_sec - to.tv_sec;
+	if ((to.tv_nsec = at->tv_nsec - to.tv_nsec) < 0) {
+		to.tv_sec--;
+		to.tv_nsec += 1000000000;
 	}
-	if (priv) priv = 128; priv=0;
-	r = syscall4(__NR_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0);
-	if (r == ETIMEDOUT) return r;
+	if (to.tv_sec < 0) return ETIMEDOUT;
+	top = &to;
+notimeout:
+	if (cp) r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT, val, top);
+	else r = -__syscall(SYS_futex, addr, FUTEX_WAIT, val, top);
+done:
+	if (r == EINTR || r == EINVAL || r == ETIMEDOUT) return r;
 	return 0;
 }
+
+int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespec *at, void (*cleanup)(void *), void *arg, int priv)
+{
+	int r;
+	if (cleanup) {
+		pthread_cleanup_push(cleanup, arg);
+		r = do_wait(addr, val, clk, at, 1, priv);
+		pthread_cleanup_pop(0);
+	} else {
+		r = do_wait(addr, val, clk, at, 0, priv);
+	}
+	return r;
+}