diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-20 15:16:41 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-20 15:16:41 +0000 |
commit | 97da02b2a6acc8e8cd5440413c85df41783ba9e9 (patch) | |
tree | 31f67046a9176bfec225ee806b6ff262e8095f96 /thread.c | |
parent | 7503f1934669b2a50ffabe5394148fa8ddb7dfa2 (diff) | |
download | ruby-97da02b2a6acc8e8cd5440413c85df41783ba9e9.tar.gz |
* 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
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -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; } |