reorganize thread exit code, make pthread_exit call cancellation handlers (pt2)

[musl] / src / thread / cancellation.c

diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index e35ba82..ac1af30 100644 (file)
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -7,16 +7,8 @@ void __pthread_register_cancel(struct __ptcb *cb)
        self->cancelbuf = cb;
 }
 
        self->cancelbuf = cb;
 }
 

-#define pthread_self __pthread_self
-

 void __pthread_unregister_cancel(struct __ptcb *cb)
 {
 void __pthread_unregister_cancel(struct __ptcb *cb)
 {

-       struct pthread *self = pthread_self();
+       struct pthread *self = __pthread_self();

        self->cancelbuf = self->cancelbuf->__next;
 }
        self->cancelbuf = self->cancelbuf->__next;
 }

-
-void __pthread_unwind_next(struct __ptcb *cb)
-{
-       if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
-       pthread_exit(PTHREAD_CANCELLED);
-}