overhaul pthread cancellation

[musl] / src / thread / sem_timedwait.c

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index 4f45c17..db05b41 100644 (file)
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -21,19 +21,16 @@ int sem_timedwait(sem_t *sem, const struct timespec *at)
        a_inc(sem->__val+1);
        pthread_cleanup_push(cleanup, sem->__val+1)
 
-       CANCELPT_BEGIN;
        for (;;) {
                r = 0;
                if (!sem_trywait(sem)) break;
-               r = __timedwait(sem->__val, 0, CLOCK_REALTIME, at, 0);
+               r = __timedwait_cp(sem->__val, 0, CLOCK_REALTIME, at, 0);
                if (r) {
                        errno = r;
                        r = -1;
                        break;
                }
-               CANCELPT_TRY;
        }
-       CANCELPT_END;
 
        pthread_cleanup_pop(1);