weak_alias(dummy_0, __synccall_unlock);
weak_alias(dummy_0, __pthread_tsd_run_dtors);
-void __pthread_do_unwind(struct __ptcb *cb)
+void pthread_exit(void *result)
{
pthread_t self = pthread_self();
int n;
- if (cb->__next) {
- self->cancelbuf = cb->__next->__next;
- longjmp((void *)cb->__next->__jb, 1);
+ self->result = result;
+
+ while (self->cancelbuf) {
+ void (*f)(void *) = self->cancelbuf->__f;
+ void *x = self->cancelbuf->__x;
+ self->cancelbuf = self->cancelbuf->__next;
+ f(x);
}
__pthread_tsd_run_dtors();
__syscall(SYS_exit, 0);
}
-void __pthread_do_register(struct __ptcb *cb)
+void __do_cleanup_push(struct __ptcb *cb)
{
struct pthread *self = pthread_self();
cb->__next = self->cancelbuf;
self->cancelbuf = cb;
}
-void __pthread_do_unregister(struct __ptcb *cb)
+void __do_cleanup_pop(struct __ptcb *cb)
{
- struct pthread *self = __pthread_self();
- self->cancelbuf = self->cancelbuf->__next;
+ __pthread_self()->cancelbuf = cb->__next;
}
static int start(void *p)
size = guard + ROUND(attr->_a_stacksize + DEFAULT_STACK_SIZE);
}
size += __pthread_tsd_size;
- map = mmap(0, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANON, -1, 0);
- if (!map) return EAGAIN;
+ map = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
+ if (map == MAP_FAILED) return EAGAIN;
if (guard) mprotect(map, guard, PROT_NONE);
tsd = map + size - __pthread_tsd_size;
new->tsd = (void *)tsd;
if (attr) new->detached = attr->_a_detach;
new->unblock_cancel = self->cancel;
+ new->canary = self->canary ^ (uintptr_t)&new;
stack = (void *)new;
__synccall_lock();
*res = new;
return 0;
}
-
-void pthread_exit(void *result)
-{
- struct pthread *self = pthread_self();
- struct __ptcb cb = { .__next = self->cancelbuf };
- self->result = result;
- __pthread_do_unwind(&cb);
-}