From ae3fba3defe4ed89f6b20b720860824178f77f52 Mon Sep 17 00:00:00 2001 From: Dave Mitchell Date: Sun, 14 Jan 2007 12:43:39 +0000 Subject: [PATCH] further refinement to #29796 (cleanup veto) p4raw-id: //depot/perl@29805 --- ext/threads/threads.xs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/ext/threads/threads.xs b/ext/threads/threads.xs index 1f42ce4..4fc60db 100755 --- a/ext/threads/threads.xs +++ b/ext/threads/threads.xs @@ -202,11 +202,6 @@ S_ithread_free(pTHX_ ithread *thread) thread->prev->next = thread->next; thread->next = NULL; thread->prev = NULL; - - /* after decrementing this thread count and unlocking the MUTEX, this - * thread must not make any further use of MY_POOL, as it may be freed - */ - MY_POOL.total_threads--; MUTEX_UNLOCK(&MY_POOL.create_destruct_mutex); /* Thread is now disowned */ @@ -231,6 +226,16 @@ S_ithread_free(pTHX_ ithread *thread) */ aTHX = MY_POOL.main_thread.interp; PerlMemShared_free(thread); + + /* total_threads >= 1 is used to veto cleanup by the main thread, + * should it happen to exit while other threads still exist. + * Decrement this as the very last thing in the thread's existence, + * otherwise MY_POOL and global state such as PL_op_mutex may get + * freed while we're still using it + */ + MUTEX_LOCK(&MY_POOL.create_destruct_mutex); + MY_POOL.total_threads--; + MUTEX_UNLOCK(&MY_POOL.create_destruct_mutex); } @@ -272,7 +277,10 @@ S_exit_warning(pTHX) return (veto_cleanup); } -/* Called on exit from main thread */ +/* Called from perl_destruct() in each thread. If it's the main thread, + * stop it from freeing everything if there are other threads still + * running */ + int Perl_ithread_hook(pTHX) { -- 2.7.4