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-create.c | 1 - pthread/pt-exit.c | 8 ++------ pthread/pt-internal.h | 6 ++---- 3 files changed, 4 insertions(+), 11 deletions(-) (limited to 'pthread') diff --git a/pthread/pt-create.c b/pthread/pt-create.c index 99d1b47..5358b08 100644 --- a/pthread/pt-create.c +++ b/pthread/pt-create.c @@ -217,7 +217,6 @@ __pthread_create_internal (struct __pthread **thread, pthread->tcb = NULL; failed_thread_tls_alloc: #endif /* ENABLE_TLS */ - __pthread_thread_dealloc (pthread); __pthread_thread_terminate (pthread); /* __pthread_thread_terminate has taken care of deallocating the stack and 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 */ diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h index 9747f1f..7465761 100644 --- a/pthread/pt-internal.h +++ b/pthread/pt-internal.h @@ -245,14 +245,12 @@ extern int __pthread_setup (struct __pthread *__restrict thread, resources) for THREAD; it must not be placed on the run queue. */ extern int __pthread_thread_alloc (struct __pthread *thread); -/* Deallocate any kernel resources associated with THREAD. */ -extern void __pthread_thread_dealloc (struct __pthread *thread); - /* Start THREAD making it eligible to run. */ extern int __pthread_thread_start (struct __pthread *thread); /* Terminate the kernel thread associated with THREAD, and deallocate its - stack. In addition, THREAD loses one reference. + stack as well as any other kernel resource associated with it. + In addition, THREAD looses one reference. This function can be called by any thread, including the target thread. Since some resources that are destroyed along the kernel thread are -- cgit v1.2.3