From af2471365fedaf89759eb00f87164fbaa0afaa39 Mon Sep 17 00:00:00 2001 From: Koichi Sasada Date: Wed, 21 Oct 2020 22:56:35 +0900 Subject: refactoring rb_ractor_confirm_belonging() rb_ractor_belonging() returns 0 only if it has sharable flag. rb_ractor_confirm_belonging() checks rb_ractor_shareable_p() if the belonging ractor id is different from current ractor id. --- ractor.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ractor.h b/ractor.h index 50c16ff451..e3adeb8d07 100644 --- a/ractor.h +++ b/ractor.h @@ -257,7 +257,7 @@ rb_ractor_setup_belonging(VALUE obj) static inline uint32_t rb_ractor_belonging(VALUE obj) { - if (rb_ractor_shareable_p(obj)) { + if (SPECIAL_CONST_P(obj) || RB_OBJ_SHAREABLE_P(obj)) { return 0; } else { @@ -277,8 +277,13 @@ rb_ractor_confirm_belonging(VALUE obj) } } else if (UNLIKELY(id != rb_ractor_current_id())) { - rp(obj); - rb_bug("rb_ractor_confirm_belonging object-ractor id:%u, current-ractor id:%u", id, rb_ractor_current_id()); + if (rb_ractor_shareable_p(obj)) { + // ok + } + else { + rp(obj); + rb_bug("rb_ractor_confirm_belonging object-ractor id:%u, current-ractor id:%u", id, rb_ractor_current_id()); + } } return obj; } -- cgit v1.2.3