overhaul pthread cancellation

[musl] / src / thread / __timedwait.c

diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c
index 28b777b..b1d3af2 100644 (file)
--- a/src/thread/__timedwait.c
+++ b/src/thread/__timedwait.c
@@ -2,7 +2,7 @@
 #include <errno.h>
 #include "futex.h"
 #include "syscall.h"
-#include <stdio.h>
+
 int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespec *at, int priv)
 {
        int r;
@@ -17,7 +17,7 @@ int __timedwait(volatile int *addr, int val, clockid_t clk, const struct timespe
                if (to.tv_sec < 0) return ETIMEDOUT;
        }
        if (priv) priv = 128; priv=0;
-       r = -__syscall(__NR_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0);
-       if (r == ETIMEDOUT) return r;
+       r = -__syscall(SYS_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0);
+       if (r == ETIMEDOUT || r == EINTR) return r;
        return 0;
 }