summaryrefslogtreecommitdiff
path: root/ractor.c
diff options
context:
space:
mode:
authorKoichi Sasada <ko1@atdot.net>2023-03-03 03:24:59 +0900
committerKoichi Sasada <ko1@atdot.net>2023-03-03 10:19:37 +0900
commit941d36d195691949afe2ce464b0d0aa20208e637 (patch)
treea2bb7e7ffc2929ad762d0a7227491acf6bb2d654 /ractor.c
parentddd3c92bf6555de8fc89fe81ed3d00d2f4a88275 (diff)
downloadruby-941d36d195691949afe2ce464b0d0aa20208e637.tar.gz
fix timing bug
passing will and closing notification can conflict and `Ractor::Selector#empty?` can return wrong answer. This patch fix it. ``` s = Ractor::Selector.new s.add Ractor.new{10} s.add Ractor.new{20} r, v = s.wait vs = [] vs << v r, v = s.wait vs << v [*vs.sort, s.empty?] #=> "[10, 20, false]" (expected "[10, 20, true]") ```
Diffstat (limited to 'ractor.c')
-rw-r--r--ractor.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/ractor.c b/ractor.c
index b586432fb6..d025e5d42a 100644
--- a/ractor.c
+++ b/ractor.c
@@ -518,6 +518,7 @@ basket_type_name(enum rb_ractor_basket_type type)
case basket_type_deleted: return "deleted";
case basket_type_reserved: return "reserved";
case basket_type_take_basket: return "take_basket";
+ case basket_type_yielding: return "yielding";
}
VM_ASSERT(0);
return NULL;
@@ -1532,7 +1533,7 @@ ractor_selector_wait_i(st_data_t key, st_data_t val, st_data_t dat)
int ret;
if (!basket_none_p(tb)) {
- RUBY_DEBUG_LOG("already taken:%s", basket_type_name(tb->type));
+ RUBY_DEBUG_LOG("already taken:%s", basket_type_name(tb->type.e));
return ST_STOP;
}
@@ -1546,7 +1547,7 @@ ractor_selector_wait_i(st_data_t key, st_data_t val, st_data_t dat)
ret = ST_STOP;
}
else {
- RUBY_DEBUG_LOG("has will, but already taken");
+ RUBY_DEBUG_LOG("has will, but already taken (%s)", basket_type_name(tb->type.e));
ret = ST_CONTINUE;
}
}
@@ -1558,7 +1559,7 @@ ractor_selector_wait_i(st_data_t key, st_data_t val, st_data_t dat)
ret = ST_STOP;
}
else {
- RUBY_DEBUG_LOG("closed, but already taken");
+ RUBY_DEBUG_LOG("closed, but already taken (%s)", basket_type_name(tb->type.e));
ret = ST_CONTINUE;
}
}
@@ -1644,8 +1645,8 @@ ractor_selector_wait(rb_execution_context_t *ec, VALUE selv, VALUE do_receivev,
retry_waiting:
while (1) {
if (!basket_none_p(tb)) {
- RUBY_DEBUG_LOG("taken:%s from r:%u", basket_type_name(tb->type),
- rb_ractor_id(RACTOR_PTR(tb->sender)));
+ RUBY_DEBUG_LOG("taken:%s from r:%u", basket_type_name(tb->type.e),
+ tb->sender ? rb_ractor_id(RACTOR_PTR(tb->sender)) : 0);
break;
}
if (do_receive && !ractor_queue_empty_p(cr, rq)) {
@@ -1687,11 +1688,16 @@ ractor_selector_wait(rb_execution_context_t *ec, VALUE selv, VALUE do_receivev,
case basket_type_yielding:
rb_bug("unreachable");
case basket_type_deleted: {
+ ractor_selector_remove(ec, selv, taken_basket.sender);
+
rb_ractor_t *r = RACTOR_PTR(taken_basket.sender);
- if (!ractor_take_will_lock(r, &taken_basket)) {
+ if (ractor_take_will_lock(r, &taken_basket)) {
+ RUBY_DEBUG_LOG("has_will");
+ }
+ else {
+ RUBY_DEBUG_LOG("no will");
// rb_raise(rb_eRactorClosedError, "The outgoing-port is already closed");
// remove and retry wait
- ractor_selector_remove(ec, selv, taken_basket.sender);
goto retry;
}
break;
@@ -1704,6 +1710,8 @@ ractor_selector_wait(rb_execution_context_t *ec, VALUE selv, VALUE do_receivev,
break;
}
+ RUBY_DEBUG_LOG("taken_basket:%s", basket_type_name(taken_basket.type.e));
+
ret_v = ractor_basket_accept(&taken_basket);
ret_r = taken_basket.sender;
success:
@@ -1768,6 +1776,7 @@ ractor_close_outgoing(rb_execution_context_t *ec, rb_ractor_t *r)
if (RUBY_ATOMIC_CAS(tb->type.atomic, basket_type_yielding, basket_type_deleted) != basket_type_yielding) {
rb_bug("unreachable");
}
+ RUBY_DEBUG_LOG("set delete for r:%u", rb_ractor_id(RACTOR_PTR(b.sender)));
}
if (b.p.take.config) {