simplify unified timed wait code, drop support for newer method

[musl] / src / thread / __timedwait.c

diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c
index b38ea99..302273a 100644 (file)
--- a/src/thread/__timedwait.c
+++ b/src/thread/__timedwait.c
@@ -1,23 +1,45 @@
+#include <pthread.h>
 #include <time.h>
 #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)
+
+static int do_wait(volatile int *addr, int val,
+       clockid_t clk, const struct timespec *at, int priv)
 {
        int r;
-       struct timespec to;
+       struct timespec to, *top=0;
+
        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;
-       r = __syscall(__NR_futex, (long)addr, FUTEX_WAIT | priv, val, at ? (long)&to : 0);
-       if (r == ETIMEDOUT) return r;
+
+       r = -__syscall_cp(SYS_futex, addr, FUTEX_WAIT, val, top);
+       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, cs;
+
+       if (!cleanup) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+       pthread_cleanup_push(cleanup, arg);
+
+       r = do_wait(addr, val, clk, at, priv);
+
+       pthread_cleanup_pop(0);
+       if (!cleanup) pthread_setcancelstate(cs, 0);
+
+       return r;
+}