overhaul pthread cancellation

[musl] / src / thread / sem_timedwait.c

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index e660436..db05b41 100644 (file)
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -1,18 +1,38 @@
 #include <semaphore.h>
 #include "pthread_impl.h"
 
+static void cleanup(void *p)
+{
+       a_dec(p);
+}
+
 int sem_timedwait(sem_t *sem, const struct timespec *at)
 {
-       int val;
+       int r;
+
+       if (a_fetch_add(sem->__val, -1) > 0) return 0;
+       a_inc(sem->__val);
+
+       if (at && at->tv_nsec >= 1000000000UL) {
+               errno = EINVAL;
+               return -1;
+       }
+
+       a_inc(sem->__val+1);
+       pthread_cleanup_push(cleanup, sem->__val+1)
 
        for (;;) {
-               if (a_fetch_add(sem->__val, -1) > 0) return 0;
-               val = a_fetch_add(sem->__val, 1);
-               CANCELPT_BEGIN;
-               if (val <= 0 && __timedwait(sem->__val, val, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
-                       errno = ETIMEDOUT;
-                       return -1;
+               r = 0;
+               if (!sem_trywait(sem)) break;
+               r = __timedwait_cp(sem->__val, 0, CLOCK_REALTIME, at, 0);
+               if (r) {
+                       errno = r;
+                       r = -1;
+                       break;
                }
-               CANCELPT_END;
        }
+
+       pthread_cleanup_pop(1);
+
+       return r;
 }