Refactor OpCtx, fix write barrier for buffer in read ops

digital-fabric · Sep 12, 2024 · d3b5cc3 · d3b5cc3
1 parent a9a4953
commit d3b5cc3
Showing 1 changed file with 47 additions and 34 deletions.
diff --git a/ext/iou/op_ctx.c b/ext/iou/op_ctx.c
@@ -2,16 +2,29 @@
 
 VALUE cOpCtx;
 
+inline int is_read_op_p(OpCtx_t *ctx) {
+  switch (ctx->type) {
+    case OP_read:
+      return 1;
+    default:
+      return 0;
+  }
+}
+
 static void OpCtx_mark(void *ptr) {
   OpCtx_t *ctx = ptr;
   rb_gc_mark_movable(ctx->spec);
   rb_gc_mark_movable(ctx->proc);
+  if (is_read_op_p(ctx))
+    rb_gc_mark_movable(ctx->data.rd.buffer);
 }
 
 static void OpCtx_compact(void *ptr) {
   OpCtx_t *ctx = ptr;
   ctx->spec = rb_gc_location(ctx->spec);
   ctx->proc = rb_gc_location(ctx->proc);
+  if (is_read_op_p(ctx))
+    ctx->data.rd.buffer = rb_gc_location(ctx->data.rd.buffer);
 }
 
 static size_t OpCtx_size(const void *ptr) {
@@ -25,48 +38,48 @@ static const rb_data_type_t OpCtx_type = {
 };
 
 static VALUE OpCtx_allocate(VALUE klass) {
-  OpCtx_t *osd = ALLOC(OpCtx_t);
+  OpCtx_t *ctx = ALLOC(OpCtx_t);
 
-  return TypedData_Wrap_Struct(klass, &OpCtx_type, osd);
+  return TypedData_Wrap_Struct(klass, &OpCtx_type, ctx);
 }
 
 VALUE OpCtx_initialize(VALUE self, VALUE spec, VALUE proc) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  RB_OBJ_WRITE(self, &osd->spec, spec);
-  RB_OBJ_WRITE(self, &osd->proc, proc);
-  memset(&osd->data, 0, sizeof(osd->data));
-  osd->stop_signal = 0;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  RB_OBJ_WRITE(self, &ctx->spec, spec);
+  RB_OBJ_WRITE(self, &ctx->proc, proc);
+  memset(&ctx->data, 0, sizeof(ctx->data));
+  ctx->stop_signal = 0;
   return self;
 }
 
 VALUE OpCtx_spec(VALUE self) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  return osd->spec;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  return ctx->spec;
 }
 
 inline enum op_type OpCtx_type_get(VALUE self) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  return osd->type;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  return ctx->type;
 }
 
 inline void OpCtx_type_set(VALUE self, enum op_type type) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  osd->type = type;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  ctx->type = type;
 }
 
 inline VALUE OpCtx_spec_get(VALUE self) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  return osd->spec;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  return ctx->spec;
 }
 
 inline VALUE OpCtx_proc_get(VALUE self) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  return osd->proc;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  return ctx->proc;
 }
 
 struct __kernel_timespec *OpCtx_ts_get(VALUE self) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  return &osd->data.ts;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  return &ctx->data.ts;
 }
 
 inline struct __kernel_timespec double_to_timespec(double value) {
@@ -83,36 +96,36 @@ inline struct __kernel_timespec value_to_timespec(VALUE value) {
 }
 
 inline void OpCtx_ts_set(VALUE self, VALUE value) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  osd->data.ts = value_to_timespec(value);
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  ctx->data.ts = value_to_timespec(value);
 }
 
 inline struct sa_data *OpCtx_sa_get(VALUE self) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  return &osd->data.sa;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  return &ctx->data.sa;
 }
 
 inline struct read_data *OpCtx_rd_get(VALUE self) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  return &osd->data.rd;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  return &ctx->data.rd;
 }
 
 inline void OpCtx_rd_set(VALUE self, VALUE buffer, int buffer_offset, unsigned bg_id, int utf8_encoding) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  osd->data.rd.buffer = buffer;
-  osd->data.rd.buffer_offset = buffer_offset;
-  osd->data.rd.bg_id = bg_id;
-  osd->data.rd.utf8_encoding = utf8_encoding;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  RB_OBJ_WRITE(self, &ctx->data.rd.buffer, buffer);
+  ctx->data.rd.buffer_offset = buffer_offset;
+  ctx->data.rd.bg_id = bg_id;
+  ctx->data.rd.utf8_encoding = utf8_encoding;
 }
 
 inline int OpCtx_stop_signal_p(VALUE self) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  return osd->stop_signal;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  return ctx->stop_signal;
 }
 
 inline void OpCtx_stop_signal_set(VALUE self) {
-  OpCtx_t *osd = RTYPEDDATA_DATA(self);
-  osd->stop_signal = 1;
+  OpCtx_t *ctx = RTYPEDDATA_DATA(self);
+  ctx->stop_signal = 1;
 }
 
 void Init_OpCtx(void) {