diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-04-19 23:09:14 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-04-19 23:09:14 -0400 |
| commit | a6054e3c94aa0491d7366e4b05ae0d73f661bfe2 (patch) | |
| tree | 3bd70a00d9ebdd29893c3e25ae5d22ff8e66551c | |
| parent | 4f24994920cf3c8a9a6f60d4573a7673a3095b02 (diff) | |
| download | musl-a6054e3c94aa0491d7366e4b05ae0d73f661bfe2.tar.gz musl-a6054e3c94aa0491d7366e4b05ae0d73f661bfe2.tar.xz musl-a6054e3c94aa0491d7366e4b05ae0d73f661bfe2.zip | |
move some more code out of pthread_create.c
this also de-uglifies the dummy function aliasing a bit.
| -rw-r--r-- | src/thread/pthread_create.c | 8 | ||||
| -rw-r--r-- | src/thread/pthread_key_create.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 6f790f5c..0d2c17bb 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -5,11 +5,7 @@ static void dummy_0() } weak_alias(dummy_0, __rsyscall_lock); weak_alias(dummy_0, __rsyscall_unlock); - -static void dummy_1(pthread_t self) -{ -} -weak_alias(dummy_1, __pthread_tsd_run_dtors); +weak_alias(dummy_0, __pthread_tsd_run_dtors); #ifdef __pthread_unwind_next #undef __pthread_unwind_next @@ -28,7 +24,7 @@ void __pthread_unwind_next(struct __ptcb *cb) LOCK(&self->exitlock); - __pthread_tsd_run_dtors(self); + __pthread_tsd_run_dtors(); /* Mark this thread dead before decrementing count */ self->dead = 1; diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c index fa8a6541..c9ca48ab 100644 --- a/src/thread/pthread_key_create.c +++ b/src/thread/pthread_key_create.c @@ -31,8 +31,9 @@ int pthread_key_delete(pthread_key_t k) return 0; } -void __pthread_tsd_run_dtors(pthread_t self) +void __pthread_tsd_run_dtors() { + pthread_t self = __pthread_self(); int i, j, not_finished = self->tsd_used; for (j=0; not_finished && j<PTHREAD_DESTRUCTOR_ITERATIONS; j++) { not_finished = 0; |