From 014966443ac044ca9d53b6bcec6678b9360cba78 Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Wed, 22 Jan 2014 01:03:00 +0100 Subject: Fix thread destruction Releasing a thread reference uses a mutex, which means the kernel resources used for synchronization must be available until late during the destruction process. For simplicity, merge __pthread_thread_dealloc into __pthread_thread_terminate. * Makefile (libpthread-routines): Remove pt-thread-dealloc. * pthread/pt-create.c (__pthread_create_internal): Remove call to __pthread_thread_dealloc. * pthread/pt-exit.c (__pthread_exit): Likewise. * pthread/pt-internal.h (__pthread_thread_dealloc): Remove declaration. (__pthread_thread_terminate): Update description. * sysdeps/mach/pt-thread-dealloc.c: Remove file. * sysdeps/mach/pt-thread-terminate.c (__pthread_thread_terminate): Destroy the wake up port. --- pthread/pt-exit.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'pthread/pt-exit.c') diff --git a/pthread/pt-exit.c b/pthread/pt-exit.c index ea61732..6d827db 100644 --- a/pthread/pt-exit.c +++ b/pthread/pt-exit.c @@ -98,15 +98,11 @@ __pthread_exit (void *status) /* Destroy any signal state. */ __pthread_sigstate_destroy (self); - /* Kernel resources may be used to implement synchronization objects, - release them late. */ - __pthread_thread_dealloc (self); - /* Self terminating requires TLS, so defer the release of the TCB until the thread structure is reused. */ - /* Terminate the kernel thread, release the stack and drop the - self reference. */ + /* Release kernel resources, including the kernel thread and the stack, + and drop the self reference. */ __pthread_thread_terminate (self); /* NOTREACHED */ -- cgit v1.2.3