admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1406 from Fleurer/gc-mark-gray-list

Browse Source 
introduce gc_mark_gray_list(), and cleanup redundant code with it
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-07-24 07:15:20 -07:00
parent 2b6606f5e4 7bfdcace52
commit 342bb66d6a
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby.h
+2 -2
View File
@@ -134,8 +134,8 @@ typedef struct mrb_state {
enum gc_state gc_state; /* state of gc */
int current_white_part; /* make white object by white_part */
struct RBasic *gray_list; /* list of gray objects */
struct RBasic *variable_gray_list; /* list of objects to be traversed atomically */
struct RBasic *gray_list; /* list of gray objects to be traversed incrementally */
struct RBasic *atomic_gray_list; /* list of objects to be traversed atomically */
size_t gc_live_after_mark;
size_t gc_threshold;
int gc_interval_ratio;
src/gc.c
+21 -19
View File
@@ -664,7 +664,7 @@ root_scan_phase(mrb_state *mrb)
if (!is_minor_gc(mrb)) {
mrb->gray_list = NULL;
mrb->variable_gray_list = NULL;
mrb->atomic_gray_list = NULL;
}
mrb_gc_mark_gv(mrb);
@@ -774,6 +774,20 @@ gc_gray_mark(mrb_state *mrb, struct RBasic *obj)
return children;
}
static void
gc_mark_gray_list(mrb_state *mrb, struct RBasic **gray_list) {
struct RBasic *obj;
while ((obj = *gray_list)) {
if (is_gray(obj)) {
gc_mark_children(mrb, obj);
}
*gray_list = obj->gcnext;
}
}
static size_t
incremental_marking_phase(mrb_state *mrb, size_t limit)
{
@@ -790,21 +804,9 @@ static void
final_marking_phase(mrb_state *mrb)
{
mark_context_stack(mrb, mrb->root_c);
while (mrb->gray_list) {
if (is_gray(mrb->gray_list))
gc_mark_children(mrb, mrb->gray_list);
else
mrb->gray_list = mrb->gray_list->gcnext;
}
gc_mark_gray_list(mrb, &mrb->gray_list);
gc_mark_gray_list(mrb, &mrb->atomic_gray_list);
gc_assert(mrb->gray_list == NULL);
mrb->gray_list = mrb->variable_gray_list;
mrb->variable_gray_list = NULL;
while (mrb->gray_list) {
if (is_gray(mrb->gray_list))
gc_mark_children(mrb, mrb->gray_list);
else
mrb->gray_list = mrb->gray_list->gcnext;
}
gc_assert(mrb->gray_list == NULL);
}
@@ -931,7 +933,7 @@ clear_all_old(mrb_state *mrb)
mrb->is_generational_gc_mode = FALSE;
prepare_incremental_sweep(mrb);
incremental_gc_until(mrb, GC_STATE_NONE);
mrb->variable_gray_list = mrb->gray_list = NULL;
mrb->atomic_gray_list = mrb->gray_list = NULL;
mrb->is_generational_gc_mode = origin_mode;
}
@@ -1062,8 +1064,8 @@ mrb_write_barrier(mrb_state *mrb, struct RBasic *obj)
gc_assert(!is_dead(mrb, obj));
gc_assert(is_generational(mrb) || mrb->gc_state != GC_STATE_NONE);
paint_gray(obj);
obj->gcnext = mrb->variable_gray_list;
mrb->variable_gray_list = obj;
obj->gcnext = mrb->atomic_gray_list;
mrb->atomic_gray_list = obj;
}
/*
@@ -1370,7 +1372,7 @@ test_mrb_write_barrier(void)
mrb_write_barrier(mrb, obj);
gc_assert(is_gray(obj));
gc_assert(mrb->variable_gray_list == obj);
gc_assert(mrb->atomic_gray_list == obj);
puts(" fail with gray");