Skip to content

Commit

Permalink
change rb_ractor_queue to ring buffer
Browse files Browse the repository at this point in the history
  • Loading branch information
tompng authored and ko1 committed Oct 12, 2020
1 parent c6652f2 commit e8d03c9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
20 changes: 11 additions & 9 deletions ractor.c
Expand Up @@ -159,8 +159,9 @@ static void
ractor_queue_mark(struct rb_ractor_queue *rq)
{
for (int i=0; i<rq->cnt; i++) {
rb_gc_mark(rq->baskets[i].v);
rb_gc_mark(rq->baskets[i].sender);
int idx = (rq->start + i) % rq->size;
rb_gc_mark(rq->baskets[idx].v);
rb_gc_mark(rq->baskets[idx].sender);
}
}

Expand Down Expand Up @@ -293,6 +294,7 @@ ractor_queue_setup(struct rb_ractor_queue *rq)
{
rq->size = 2;
rq->cnt = 0;
rq->start = 0;
rq->baskets = malloc(sizeof(struct rb_ractor_basket) * rq->size);
}

Expand All @@ -311,12 +313,9 @@ ractor_queue_deq(rb_ractor_t *r, struct rb_ractor_queue *rq, struct rb_ractor_ba
RACTOR_LOCK(r);
{
if (!ractor_queue_empty_p(r, rq)) {
// TODO: use good Queue data structure
*basket = rq->baskets[0];
*basket = rq->baskets[rq->start];
rq->cnt--;
for (int i=0; i<rq->cnt; i++) {
rq->baskets[i] = rq->baskets[i+1];
}
rq->start = (rq->start + 1) % rq->size;
b = true;
}
else {
Expand All @@ -334,10 +333,13 @@ ractor_queue_enq(rb_ractor_t *r, struct rb_ractor_queue *rq, struct rb_ractor_ba
ASSERT_ractor_locking(r);

if (rq->size <= rq->cnt) {
rq->baskets = realloc(rq->baskets, sizeof(struct rb_ractor_basket) * rq->size * 2);
for (int i=rq->size - rq->start; i<rq->cnt; i++) {
rq->baskets[i + rq->start] = rq->baskets[i + rq->start - rq->size];
}
rq->size *= 2;
rq->baskets = realloc(rq->baskets, sizeof(struct rb_ractor_basket) * rq->size);
}
rq->baskets[rq->cnt++] = *basket;
rq->baskets[(rq->start + rq->cnt++) % rq->size] = *basket;
// fprintf(stderr, "%s %p->cnt:%d\n", __func__, rq, rq->cnt);
}

Expand Down
1 change: 1 addition & 0 deletions ractor.h
Expand Up @@ -25,6 +25,7 @@ struct rb_ractor_basket {

struct rb_ractor_queue {
struct rb_ractor_basket *baskets;
int start;
int cnt;
int size;
};
Expand Down

0 comments on commit e8d03c9

Please sign in to comment.