X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2F__timedwait.c;h=666093be98516a1c84b2997f075a8dbfcb797b2c;hb=1492bdf53c70f436b0fc2a7238011f9786bf4cd5;hp=0444d39f9002b672daab5f0a6873874d5218fd04;hpb=4717bfec708d264111f70f37850ffc09238c4bd5;p=musl

diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c
index 0444d39f..666093be 100644
--- a/src/thread/__timedwait.c
+++ b/src/thread/__timedwait.c
@@ -3,46 +3,69 @@
 #include <errno.h>
 #include "futex.h"
 #include "syscall.h"
+#include "pthread_impl.h"
 
-static int do_wait(volatile int *addr, int val, clockid_t clk, const struct timespec *at, int cp, int priv)
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
+
+static int __futex4_cp(volatile void *addr, int op, int val, const struct timespec *to)
 {
-	int r, flag = 0;
+	int r;
+#ifdef SYS_futex_time64
+	time_t s = to ? to->tv_sec : 0;
+	long ns = to ? to->tv_nsec : 0;
+	r = -ENOSYS;
+	if (SYS_futex == SYS_futex_time64 || !IS32BIT(s))
+		r = __syscall_cp(SYS_futex_time64, addr, op, val,
+			to ? ((long long[]){s, ns}) : 0);
+	if (SYS_futex == SYS_futex_time64 || r!=-ENOSYS) return r;
+	to = to ? (void *)(long[]){CLAMP(s), ns} : 0;
+#endif
+	r = __syscall_cp(SYS_futex, addr, op, val, to);
+	if (r != -ENOSYS) return r;
+	return __syscall_cp(SYS_futex, addr, op & ~FUTEX_PRIVATE, val, to);
+}
+
+static volatile int dummy = 0;
+weak_alias(dummy, __eintr_valid_flag);
+
+int __timedwait_cp(volatile int *addr, int val,
+	clockid_t clk, const struct timespec *at, int priv)
+{
+	int r;
 	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) 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 = FUTEX_PRIVATE;
+
+	if (at) {
+		if (at->tv_nsec >= 1000000000UL) return EINVAL;
+		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 (to.tv_sec < 0) return ETIMEDOUT;
+		top = &to;
 	}
-	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;
+
+	r = -__futex4_cp(addr, FUTEX_WAIT|priv, val, top);
+	if (r != EINTR && r != ETIMEDOUT && r != ECANCELED) r = 0;
+	/* Mitigate bug in old kernels wrongly reporting EINTR for non-
+	 * interrupting (SA_RESTART) signal handlers. This is only practical
+	 * when NO interrupting signal handlers have been installed, and
+	 * works by sigaction tracking whether that's the case. */
+	if (r == EINTR && !__eintr_valid_flag) r = 0;
+
+	return r;
 }
 
-int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespec *at, void (*cleanup)(void *), void *arg, int priv)
+int __timedwait(volatile int *addr, int val,
+	clockid_t clk, const struct timespec *at, 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);
-	}
+	int cs, r;
+	__pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+	r = __timedwait_cp(addr, val, clk, at, priv);
+	__pthread_setcancelstate(cs, 0);
 	return r;
 }