From c2fa024e0220aca6e2437e56df2abf1a2368cbdf Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Mon, 7 Dec 2020 16:01:35 +0900 Subject: [PATCH] fix Thread's interrupt and Ractor#take issue Thread's interrupt set Ractor's wakeup_status as interrupted, but the status remains next Ractor communication API. This patch makes to ignore the previous interrupt state. [Bug #17366] Also this patch solves the Thread#kill and Ractor#take issues. --- bootstraptest/test_ractor.rb | 20 ++++++++++++++++++++ ractor.c | 6 ++++-- thread.c | 3 +++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/bootstraptest/test_ractor.rb b/bootstraptest/test_ractor.rb index a960d9d00f..d3ff65ae21 100644 --- a/bootstraptest/test_ractor.rb +++ b/bootstraptest/test_ractor.rb @@ -229,6 +229,26 @@ assert_equal 'ok', %q{ end } +# Can mix with Thread#interrupt and Ractor#take [Bug #17366] +assert_equal 'err', %q{ + Ractor.new{ + t = Thread.current + begin + Thread.new{ t.raise "err" }.join + rescue => e + e.message + end + }.take +} + +# Killed Ractor's thread yields nil +assert_equal 'nil', %q{ + Ractor.new{ + t = Thread.current + Thread.new{ t.kill }.join + }.take.inspect #=> nil +} + # Ractor.yield raises Ractor::ClosedError when outgoing port is closed. assert_equal 'ok', %q{ r = Ractor.new Ractor.current do |main| diff --git a/ractor.c b/ractor.c index 72e1e091ea..7d4404c92f 100644 --- a/ractor.c +++ b/ractor.c @@ -627,8 +627,8 @@ ractor_receive(rb_execution_context_t *ec, rb_ractor_t *r) { if (ractor_queue_empty_p(r, &r->incoming_queue)) { VM_ASSERT(r->wait.status == wait_none); - VM_ASSERT(r->wait.wakeup_status == wakeup_none); r->wait.status = wait_receiving; + r->wait.wakeup_status = wakeup_none; ractor_sleep(ec, r); @@ -887,8 +887,8 @@ ractor_select(rb_execution_context_t *ec, const VALUE *rs, int alen, VALUE yield RACTOR_LOCK(cr); { VM_ASSERT(cr->wait.status == wait_none); - VM_ASSERT(cr->wait.wakeup_status == wakeup_none); cr->wait.status = wait_status; + cr->wait.wakeup_status == wakeup_none; } RACTOR_UNLOCK(cr); @@ -1331,6 +1331,8 @@ ractor_yield_atexit(rb_execution_context_t *ec, rb_ractor_t *cr, VALUE v, bool e VM_ASSERT(cr->wait.status == wait_none); cr->wait.status = wait_yielding; + cr->wait.wakeup_status = wakeup_none; + VM_ASSERT(cr->yield_atexit == false); cr->yield_atexit = true; } diff --git a/thread.c b/thread.c index 7fcbf9d67b..e910615b84 100644 --- a/thread.c +++ b/thread.c @@ -825,6 +825,9 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start) errinfo = th->ec->errinfo; if (state == TAG_FATAL) { + if (th->invoke_type == thread_invoke_type_ractor_proc) { + rb_ractor_atexit(th->ec, Qnil); + } /* fatal error within this thread, need to stop whole script */ } else if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {