check for kernel support before allowing robust mutex creation

[musl] / src / thread / __timedwait.c

diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c
index 354def2..229db31 100644 (file)
--- a/src/thread/__timedwait.c
+++ b/src/thread/__timedwait.c
@@ -1,21 +1,43 @@
+#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)
+#include "pthread_impl.h"
+
+int __timedwait_cp(volatile int *addr, int val,
+       clockid_t clk, const struct timespec *at, int priv)
 {
-       struct timespec to;
+       int r;
+       struct timespec to, *top=0;
+
+       if (priv) priv = FUTEX_PRIVATE;
+
        if (at) {
-               clock_gettime(clk, &to);
+               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 (priv) priv = 128; priv=0;
-       return syscall4(__NR_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0);
+
+       r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT|priv, val, top);
+       if (r == ENOSYS) r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT, val, top);
+       if (r != EINTR && r != ETIMEDOUT && r != ECANCELED) r = 0;
+
+       return r;
+}
+
+int __timedwait(volatile int *addr, int val,
+       clockid_t clk, const struct timespec *at, int priv)
+{
+       int cs, r;
+       __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+       r = __timedwait_cp(addr, val, clk, at, priv);
+       __pthread_setcancelstate(cs, 0);
+       return r;
 }