1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ractor.yield should raise if out-port is closed

Browse Source 
Ractor.yield should raise Ractor::ClosedError if current Ractor's
outgoing-port is closed.
This commit is contained in:
Koichi Sasada 2020-09-25 11:39:15 +09:00
parent 5286526346
commit d247dedade
Notes: git 2020-09-25 12:54:23 +09:00 
Merged: https://github.com/ruby/ruby/pull/3578
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bootstraptest/test_ractor.rb
View File

@ -225,6 +225,27 @@ assert_equal 'ok', %q{
end end
} }
# Ractor.yield raises Ractor::ClosedError when outgoing port is closed.
assert_equal 'ok', %q{
r = Ractor.new Ractor.current do |main|
Ractor.recv
main << true
Ractor.yield 1
end
r.close_outgoing
r << true
Ractor.recv
begin
r.take
rescue Ractor::ClosedError
'ok'
else
'ng'
end
}
# Raise Ractor::ClosedError when try to send into a ractor with closed incoming port # Raise Ractor::ClosedError when try to send into a ractor with closed incoming port
assert_equal 'ok', %q{ assert_equal 'ok', %q{
r = Ractor.new { Ractor.recv } r = Ractor.new { Ractor.recv }

8
ractor.c
View File

@ -832,6 +832,10 @@ ractor_try_yield(rb_execution_context_t *ec, rb_ractor_t *cr, struct rb_ractor_b
ASSERT_ractor_unlocking(cr); ASSERT_ractor_unlocking(cr);
VM_ASSERT(basket->type != basket_type_none); VM_ASSERT(basket->type != basket_type_none);
if (cr->outgoing_port_closed) {
rb_raise(rb_eRactorClosedError, "The outgoing-port is already closed");
}
rb_ractor_t *r; rb_ractor_t *r;
retry_shift: retry_shift:
@ -1017,6 +1021,10 @@ ractor_select(rb_execution_context_t *ec, const VALUE *rs, int alen, VALUE yield
cr->wait.wakeup_status = wakeup_by_retry; cr->wait.wakeup_status = wakeup_by_retry;
goto skip_sleep; goto skip_sleep;
} }
else if (cr->outgoing_port_closed) {
cr->wait.wakeup_status = wakeup_by_close;
goto skip_sleep;
}
break; break;
} }
} }