diff options
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/ChangeLog | 3 | ||||
| -rw-r--r-- | libpthread/pthread/pt-detach.c | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/libpthread/ChangeLog b/libpthread/ChangeLog index 7bd9ee7..35565d5 100644 --- a/libpthread/ChangeLog +++ b/libpthread/ChangeLog @@ -15,6 +15,9 @@ * pthread/pt-join.c (pthread_join): Call __pthread_thread_halt before destroying the thread. When destroying the thread, call __pthread_thread_dealloc on it. + * pthread/pt-detach.c (pthread_detach): If destroying the thread, + call __pthread_thread_halt before deallocating the stack. In this + case, also call __pthread_thread_dealloc on the tcb. * pthread/pt-exit.c (pthread_exit): Call __pthread_dealloc only if the thread is detached and then as the last thing we do before calling __pthread_thread_halt. diff --git a/libpthread/pthread/pt-detach.c b/libpthread/pthread/pt-detach.c index 42a8408..1e42c45 100644 --- a/libpthread/pthread/pt-detach.c +++ b/libpthread/pthread/pt-detach.c @@ -58,10 +58,20 @@ pthread_detach (pthread_t thread) __pthread_mutex_unlock (&pthread->state_lock); + /* Make sure the thread is not running before we remove its + stack. (The only possibility is that it is in a call to + __pthread_thread_halt itself, but that is enough to cause a + sigsegv.) */ + __pthread_thread_halt (pthread); + + /* Destroy the stack, the kernel resources and the control + block. */ assert (pthread->stack); __pthread_stack_dealloc (pthread->stackaddr, pthread->stacksize); pthread->stack = 0; + __pthread_thread_dealloc (pthread); + __pthread_dealloc (pthread); break; |