diff options
| author | fleuria <[email protected]> | 2013-07-24 18:18:09 +0800 |
|---|---|---|
| committer | fleuria <[email protected]> | 2013-07-24 18:22:53 +0800 |
| commit | 2591922ec29681d60debe23ce99237cf6ec98b18 (patch) | |
| tree | 6be1d35328fca2953e8ffb7fe96a81a48d7cd35d | |
| parent | 88eb0f54e9f484ded22c8aca6a33351217d824e0 (diff) | |
| download | mruby-2591922ec29681d60debe23ce99237cf6ec98b18.tar.gz mruby-2591922ec29681d60debe23ce99237cf6ec98b18.zip | |
rename variable_gray_list to atomic_gray_list
| -rw-r--r-- | include/mruby.h | 4 | ||||
| -rw-r--r-- | src/gc.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/mruby.h b/include/mruby.h index 85b464b8e..ba9bbf58d 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -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; @@ -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); @@ -805,7 +805,7 @@ final_marking_phase(mrb_state *mrb) { mark_context_stack(mrb, mrb->root_c); gc_mark_gray_list(mrb, &mrb->gray_list); - gc_mark_gray_list(mrb, &mrb->variable_gray_list); + gc_mark_gray_list(mrb, &mrb->atomic_gray_list); gc_assert(mrb->gray_list == NULL); gc_assert(mrb->gray_list == NULL); } @@ -933,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; } @@ -1064,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; } /* @@ -1372,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"); |
