From 1a9a2ff7b0daf99100db53440a0b18b2801566ca Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 13 Feb 2011 19:58:30 -0500 Subject: reorganize thread exit code, make pthread_exit call cancellation handlers (pt2) --- src/thread/cancellation.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/thread/cancellation.c') diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c index e35ba824..ac1af30a 100644 --- a/src/thread/cancellation.c +++ b/src/thread/cancellation.c @@ -7,16 +7,8 @@ void __pthread_register_cancel(struct __ptcb *cb) self->cancelbuf = cb; } -#define pthread_self __pthread_self - void __pthread_unregister_cancel(struct __ptcb *cb) { - struct pthread *self = pthread_self(); + struct pthread *self = __pthread_self(); 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); -} -- cgit v1.2.1