X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fcancellation.c;h=ab7eebcc02a43e5fc75b315acb98ac7f5b137f8f;hp=e35ba8245d2e38b277b8214939cf003f895a4fa6;hb=af3330d7648627816fbc82aa3247419e8a528230;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01

diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index e35ba824..ab7eebcc 100644
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -1,22 +1,23 @@
 #include "pthread_impl.h"
 
-void __pthread_register_cancel(struct __ptcb *cb)
+void __do_cleanup_push();
+void __do_cleanup_pop();
+
+void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 {
-	struct pthread *self = pthread_self();
-	cb->__next = self->cancelbuf;
-	self->cancelbuf = cb;
+	cb->__f = f;
+	cb->__x = x;
+	__do_cleanup_push(cb, f, x);
 }
 
-#define pthread_self __pthread_self
-
-void __pthread_unregister_cancel(struct __ptcb *cb)
+void _pthread_cleanup_pop(struct __ptcb *cb, int run)
 {
-	struct pthread *self = pthread_self();
-	self->cancelbuf = self->cancelbuf->__next;
+	__do_cleanup_pop(cb, run);
+	if (run) cb->__f(cb->__x);
 }
 
-void __pthread_unwind_next(struct __ptcb *cb)
+static void dummy()
 {
-	if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
-	pthread_exit(PTHREAD_CANCELLED);
 }
+weak_alias(dummy, __do_cleanup_push);
+weak_alias(dummy, __do_cleanup_pop);