projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gcc wrapper improvement: leave libgcc dir in the library path
[musl]
/
src
/
thread
/
cancellation.c
diff --git
a/src/thread/cancellation.c
b/src/thread/cancellation.c
index
e35ba82
..
9b21764
100644
(file)
--- a/
src/thread/cancellation.c
+++ b/
src/thread/cancellation.c
@@
-1,22
+1,20
@@
#include "pthread_impl.h"
#include "pthread_impl.h"
-
void __pthread_register_cancel
(struct __ptcb *cb)
+
static void dummy
(struct __ptcb *cb)
{
{
- struct pthread *self = pthread_self();
- cb->__next = self->cancelbuf;
- self->cancelbuf = cb;
}
}
+weak_alias(dummy, __do_cleanup_push);
+weak_alias(dummy, __do_cleanup_pop);
-#define pthread_self __pthread_self
-
-void __pthread_unregister_cancel(struct __ptcb *cb)
+void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
{
{
- struct pthread *self = pthread_self();
- self->cancelbuf = self->cancelbuf->__next;
+ cb->__f = f;
+ cb->__x = x;
+ __do_cleanup_push(cb);
}
}
-void _
_pthread_unwind_next(struct __ptcb *cb
)
+void _
pthread_cleanup_pop(struct __ptcb *cb, int run
)
{
{
-
if (cb->__next) longjmp((void *)cb->__next->__jb, 1
);
-
pthread_exit(PTHREAD_CANCELLED
);
+
__do_cleanup_pop(cb
);
+
if (run) cb->__f(cb->__x
);
}
}