for c11 mtx and cnd functions, use externally consistent type names

[musl] / src / thread / __timedwait.c

diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c
index d6f1233..d2079c8 100644 (file)
--- a/src/thread/__timedwait.c
+++ b/src/thread/__timedwait.c
@@ -3,19 +3,22 @@
 #include <errno.h>
 #include "futex.h"
 #include "syscall.h"
+#include "pthread_impl.h"
 
-int __timedwait(volatile int *addr, int val,
-       clockid_t clk, const struct timespec *at,
-       void (*cleanup)(void *), void *arg, int priv)
+int __pthread_setcancelstate(int, int *);
+int __clock_gettime(clockid_t, struct timespec *);
+
+int __timedwait_cp(volatile int *addr, int val,
+       clockid_t clk, const struct timespec *at, int priv)
 {
-       int r, cs;
+       int r;
        struct timespec to, *top=0;
 
-       if (priv) priv = 128;
+       if (priv) priv = FUTEX_PRIVATE;
 
        if (at) {
                if (at->tv_nsec >= 1000000000UL) return EINVAL;
-               if (clock_gettime(clk, &to)) 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--;
@@ -25,15 +28,19 @@ int __timedwait(volatile int *addr, int val,
                top = &to;
        }
 
-       if (!cleanup) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
-       pthread_cleanup_push(cleanup, arg);
-
        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 = 0;
+       if (r != EINTR && r != ETIMEDOUT && r != ECANCELED) r = 0;
 
-       pthread_cleanup_pop(0);
-       if (!cleanup) pthread_setcancelstate(cs, 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;
 }