mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-01-21 21:52:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rich Felker 2011-02-13 19:58:30 -05:00
parent 50e26f09eb
commit 1a9a2ff7b0
3 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/limits.h
View File

@ -23,7 +23,8 @@
/* Implementation choices... */
#define PTHREAD_KEYS_MAX 1024
#define PTHREAD_STACK_MIN (2*PAGE_SIZE)
#define PTHREAD_STACK_MIN PAGE_SIZE
#define PTHREAD_DESTRUCTOR_ITERATIONS 4
/* Arbitrary numbers... */

10
src/thread/cancellation.c
View File

@ -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);
}

63
src/thread/pthread_create.c
View File

@ -1,6 +1,38 @@
#include "pthread_impl.h"
#define pthread_self __pthread_self
void __pthread_unwind_next(struct __ptcb *cb)
{
int i, j, not_finished;
pthread_t self;
if (cb->__next) longjmp((void *)cb->__next->__jb, 1);
self = pthread_self();
if (self->cancel) self->result = PTHREAD_CANCELLED;
if (!a_fetch_add(&libc.threads_minus_1, -1))
exit(0);
LOCK(&self->exitlock);
not_finished = self->tsd_used;
for (j=0; not_finished && j<PTHREAD_DESTRUCTOR_ITERATIONS; j++) {
not_finished = 0;
for (i=0; i<PTHREAD_KEYS_MAX; i++) {
if (self->tsd[i] && libc.tsd_keys[i]) {
void *tmp = self->tsd[i];
self->tsd[i] = 0;
libc.tsd_keys[i](tmp);
not_finished = 1;
}
}
}
if (self->detached && self->map_base)
__unmapself(self->map_base, self->map_size);
__syscall_exit(0);
}
static void docancel(struct pthread *self)
{
@ -10,13 +42,21 @@ static void docancel(struct pthread *self)
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
{
struct pthread *self = pthread_self();
struct pthread *self = __pthread_self();
self->cancel = 1;
if (self->canceldisable || (!self->cancelasync && !self->cancelpoint))
return;
docancel(self);
}
static void cancelpt(int x)
{
struct pthread *self = __pthread_self();
if (self->canceldisable) return;
self->cancelpoint = x;
if (self->cancel) docancel(self);
}
/* "rsyscall" is a mechanism by which a thread can synchronously force all
* other threads to perform an arbitrary syscall. It is necessary to work
* around the non-conformant implementation of setuid() et al on Linux,
@ -50,7 +90,7 @@ static int rsyscall(int nr, long a, long b, long c, long d, long e, long f)
{
int i, ret;
sigset_t set = { 0 };
struct pthread *self = pthread_self();
struct pthread *self = __pthread_self();
sigaddset(&set, SIGSYSCALL);
LOCK(&rs.lock);
@ -90,14 +130,6 @@ static int rsyscall(int nr, long a, long b, long c, long d, long e, long f)
return ret;
}
static void cancelpt(int x)
{
struct pthread *self = pthread_self();
if (self->canceldisable) return;
self->cancelpoint = x;
if (self->cancel) docancel(self);
}
static void init_threads()
{
struct sigaction sa = { .sa_flags = SA_SIGINFO | SA_RESTART };
@ -120,8 +152,6 @@ static int start(void *p)
return 0;
}
#undef pthread_self
#define CLONE_MAGIC 0x7d0f00
int __clone(int (*)(void *), void *, int, void *, pid_t *, void *, pid_t *);
@ -187,3 +217,10 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
*res = new;
return 0;
}
void pthread_exit(void *result)
{
struct pthread *self = pthread_self();
self->result = result;
docancel(self);
}