Permalink
Browse files

Allow `mrb_objspace_each_objects()` to break iteration; ref #3359

  • Loading branch information...
matz committed Apr 20, 2017
1 parent edd9fc6 commit 62dae09bf6e2ac965ec7384100f56f40737cbd6f
Showing with 13 additions and 8 deletions.
  1. +3 −1 include/mruby/gc.h
  2. +8 −6 mrbgems/mruby-objectspace/src/mruby_objectspace.c
  3. +2 −1 src/gc.c
View
@@ -17,7 +17,9 @@ MRB_BEGIN_DECL
struct mrb_state;
typedef void (mrb_each_object_callback)(struct mrb_state *mrb, struct RBasic *obj, void *data);
#define MRB_EACH_OBJ_OK 0
#define MRB_EACH_OBJ_BREAK 1
typedef int (mrb_each_object_callback)(struct mrb_state *mrb, struct RBasic *obj, void *data);
void mrb_objspace_each_objects(struct mrb_state *mrb, mrb_each_object_callback *callback, void *data);
MRB_API void mrb_free_context(struct mrb_state *mrb, struct mrb_context *c);
@@ -9,7 +9,7 @@ struct os_count_struct {
mrb_int counts[MRB_TT_MAXDEFINE+1];
};
static void
static int
os_count_object_type(mrb_state *mrb, struct RBasic *obj, void *data)
{
struct os_count_struct *obj_count;
@@ -23,6 +23,7 @@ os_count_object_type(mrb_state *mrb, struct RBasic *obj, void *data)
else {
obj_count->counts[obj->tt]++;
}
return MRB_EACH_OBJ_OK;
}
/*
@@ -109,35 +110,36 @@ struct os_each_object_data {
mrb_int count;
};
static void
static int
os_each_object_cb(mrb_state *mrb, struct RBasic *obj, void *ud)
{
struct os_each_object_data *d = (struct os_each_object_data*)ud;
/* filter dead objects */
if (mrb_object_dead_p(mrb, obj)) {
return;
return MRB_EACH_OBJ_OK;
}
/* filter internal objects */
switch (obj->tt) {
case MRB_TT_ENV:
case MRB_TT_ICLASS:
return;
return MRB_EACH_OBJ_OK;
default:
break;
}
/* filter half baked (or internal) objects */
if (!obj->c) return;
if (!obj->c) return MRB_EACH_OBJ_OK;
/* filter class kind if target module defined */
if (d->target_module && !mrb_obj_is_kind_of(mrb, mrb_obj_value(obj), d->target_module)) {
return;
return MRB_EACH_OBJ_OK;
}
mrb_yield(mrb, d->block, mrb_obj_value(obj));
++d->count;
return MRB_EACH_OBJ_OK;
}
/*
View
@@ -1498,7 +1498,8 @@ gc_each_objects(mrb_state *mrb, mrb_gc *gc, mrb_each_object_callback *callback,
p = objects(page);
pend = p + MRB_HEAP_PAGE_SIZE;
for (;p < pend; p++) {
(*callback)(mrb, &p->as.basic, data);
if ((*callback)(mrb, &p->as.basic, data) == MRB_EACH_OBJ_BREAK)
break;
}
page = page->next;

0 comments on commit 62dae09

Please sign in to comment.