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

ractor_queue_enq/deq doesn't need rq param

Browse Source 
`rq` is always `r`'s queue.
This commit is contained in:
Koichi Sasada 2023-02-15 14:49:13 +09:00
parent 413120e581
commit 1f936d654a
Notes: git 2023-02-15 06:43:10 +00:00 
Merged: https://github.com/ruby/ruby/pull/7306
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ractor.c
View File

@ -380,9 +380,10 @@ ractor_queue_empty_p(rb_ractor_t *r, struct rb_ractor_queue *rq)
} }
static bool static bool
ractor_queue_deq(rb_ractor_t *r, struct rb_ractor_queue *rq, struct rb_ractor_basket *basket) ractor_queue_deq(rb_ractor_t *r, struct rb_ractor_basket *basket)
{ {
bool found = false; bool found = false;
struct rb_ractor_queue *rq = &r->sync.incoming_queue;
RACTOR_LOCK(r); RACTOR_LOCK(r);
{ {
@ -407,10 +408,12 @@ ractor_queue_deq(rb_ractor_t *r, struct rb_ractor_queue *rq, struct rb_ractor_ba
} }
static void static void
ractor_queue_enq(rb_ractor_t *r, struct rb_ractor_queue *rq, struct rb_ractor_basket *basket) ractor_queue_enq(rb_ractor_t *r, struct rb_ractor_basket *basket)
{ {
ASSERT_ractor_locking(r); ASSERT_ractor_locking(r);
struct rb_ractor_queue *rq = &r->sync.incoming_queue;
if (rq->size <= rq->cnt) { if (rq->size <= rq->cnt) {
rq->baskets = realloc(rq->baskets, sizeof(struct rb_ractor_basket) * rq->size * 2); rq->baskets = realloc(rq->baskets, sizeof(struct rb_ractor_basket) * rq->size * 2);
for (int i=rq->size - rq->start; i<rq->cnt; i++) { for (int i=rq->size - rq->start; i<rq->cnt; i++) {
@ -480,12 +483,11 @@ ractor_recursive_receive_if(rb_ractor_t *r)
static VALUE static VALUE
ractor_try_receive(rb_execution_context_t *ec, rb_ractor_t *r) ractor_try_receive(rb_execution_context_t *ec, rb_ractor_t *r)
{ {
struct rb_ractor_queue *rq = &r->sync.incoming_queue;
struct rb_ractor_basket basket; struct rb_ractor_basket basket;
ractor_recursive_receive_if(r); ractor_recursive_receive_if(r);
if (ractor_queue_deq(r, rq, &basket) == false) { if (ractor_queue_deq(r, &basket) == false) {
if (r->sync.incoming_port_closed) { if (r->sync.incoming_port_closed) {
rb_raise(rb_eRactorClosedError, "The incoming port is already closed"); rb_raise(rb_eRactorClosedError, "The incoming port is already closed");
} }
@ -900,7 +902,6 @@ static void
ractor_send_basket(rb_execution_context_t *ec, rb_ractor_t *r, struct rb_ractor_basket *b) ractor_send_basket(rb_execution_context_t *ec, rb_ractor_t *r, struct rb_ractor_basket *b)
{ {
bool closed = false; bool closed = false;
struct rb_ractor_queue *rq = &r->sync.incoming_queue;
RACTOR_LOCK(r); RACTOR_LOCK(r);
{ {
@ -908,7 +909,7 @@ ractor_send_basket(rb_execution_context_t *ec, rb_ractor_t *r, struct rb_ractor_
closed = true; closed = true;
} }
else { else {
ractor_queue_enq(r, rq, b); ractor_queue_enq(r, b);
if (ractor_wakeup(r, wait_receiving, wakeup_by_send)) { if (ractor_wakeup(r, wait_receiving, wakeup_by_send)) {
RUBY_DEBUG_LOG("wakeup"); RUBY_DEBUG_LOG("wakeup");
} }