archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

thread_pthread.c (gvl_destroy): make no-op on GVL bits

Browse source 
It's possible for another thread to take vm->gvl.lock
during gvl_release at the end of thread_start_func_2
during VM shutdown, at least.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-07-30 05:51:01 +00:00
parent 4514362948
commit 95cae74817
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
thread_pthread.c
View file

@ -208,9 +208,16 @@ gvl_init(rb_vm_t *vm)
static void static void
gvl_destroy(rb_vm_t *vm) gvl_destroy(rb_vm_t *vm)
{ {
rb_native_cond_destroy(&vm->gvl.switch_wait_cond); /*
rb_native_cond_destroy(&vm->gvl.switch_cond); * only called once at VM shutdown (not atfork), another thread
rb_native_mutex_destroy(&vm->gvl.lock); * may still grab vm->gvl.lock when calling gvl_release at
* the end of thread_start_func_2
*/
if (0) {
rb_native_cond_destroy(&vm->gvl.switch_wait_cond);
rb_native_cond_destroy(&vm->gvl.switch_cond);
rb_native_mutex_destroy(&vm->gvl.lock);
}
clear_thread_cache_altstack(); clear_thread_cache_altstack();
} }