From 97da02b2a6acc8e8cd5440413c85df41783ba9e9 Mon Sep 17 00:00:00 2001 From: kosaki Date: Mon, 20 Dec 2010 15:16:41 +0000 Subject: * thread.c (thread_cleanup_func): Don't touch native threading resource at fork. Sadly this is purely bandaid. We need to implement proper fix later. [Bug #4169] [ruby-core:33767] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index ac032ef689..c46a5bc445 100644 --- a/thread.c +++ b/thread.c @@ -391,12 +391,21 @@ thread_cleanup_func_before_exec(void *th_ptr) } static void -thread_cleanup_func(void *th_ptr) +thread_cleanup_func(void *th_ptr, int atfork) { rb_thread_t *th = th_ptr; th->locking_mutex = Qfalse; thread_cleanup_func_before_exec(th_ptr); + + /* + * Unfortunately, we can't release native threading resource at fork + * because libc may have unstable locking state therefore touching + * a threading resource may cause a deadlock. + */ + if (atfork) + return; + native_thread_destroy(th); } @@ -525,7 +534,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s ruby_cleanup(state); } else { - thread_cleanup_func(th); + thread_cleanup_func(th, FALSE); gvl_release(th->vm); } @@ -2780,7 +2789,7 @@ terminate_atfork_i(st_data_t key, st_data_t val, st_data_t current_th) rb_mutex_abandon_all(th->keeping_mutexes); } th->keeping_mutexes = NULL; - thread_cleanup_func(th); + thread_cleanup_func(th, TRUE); } return ST_CONTINUE; } -- cgit v1.2.3