diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-14 22:52:01 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-14 22:52:01 +0000 |
| commit | 8ecd3b7114d6c0b81c0165dd0defa8f3df261d0b (patch) | |
| tree | ecd56edd9dd6babb3cb0a1e2f97fb565a31911a0 /thread.c | |
| parent | 95f251b4650a6338591be21ba7a1f14cd3d7c6be (diff) | |
| download | ruby-8ecd3b7114d6c0b81c0165dd0defa8f3df261d0b.tar.gz | |
* thread.c (thread_start_func_2): don't interrupt when last thread exit
unless main thread is already exited. Otherwise main thread could be
wrongly interrupted when it uses rb_thread_call_without_gvl(). Patch
by Takehiro Kubo. [Bug #11237][ruby-dev:49044][GH-898]
* test/-ext-/gvl/test_last_thread.rb: new test for the above fix.
* ext/-test-/gvl/call_without_gvl/call_without_gvl.c: new ext for the
above test.
* ext/-test-/gvl/call_without_gvl/extconf.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
| -rw-r--r-- | thread.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -629,7 +629,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s /* delete self other than main thread from living_threads */ rb_vm_living_threads_remove(th->vm, th); - if (rb_thread_alone()) { + if (main_th->status == THREAD_KILLED && rb_thread_alone()) { /* I'm last thread. wake up main thread from rb_thread_terminate_all */ rb_threadptr_interrupt(main_th); } |