diff options
| -rw-r--r-- | include/mruby/khash.h | 4 | ||||
| -rw-r--r-- | src/gc.c | 11 | ||||
| -rw-r--r-- | src/print.c | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/include/mruby/khash.h b/include/mruby/khash.h index ad03b1fad..dc298baf1 100644 --- a/include/mruby/khash.h +++ b/include/mruby/khash.h @@ -45,7 +45,7 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; /* declare struct kh_xxx and kh_xxx_funcs - name: ash name + name: hash name khkey_t: key data type khval_t: value data type kh_is_map: (not implemented / not used in RiteVM) @@ -77,7 +77,7 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; /* define kh_xxx_funcs - name: ash name + name: hash name khkey_t: key data type khval_t: value data type kh_is_map: (not implemented / not used in RiteVM) @@ -782,7 +782,7 @@ incremental_sweep_phase(mrb_state *mrb, size_t limit) } } else { - if (!is_minor_gc(mrb)) + if (!is_generational(mrb)) paint_partial_white(mrb, &p->as.basic); /* next gc target */ dead_slot = 0; } @@ -865,11 +865,10 @@ clear_all_old(mrb_state *mrb) if (is_major_gc(mrb)) { advance_phase(mrb, GC_STATE_NONE); } - else { - mrb->is_generational_gc_mode = FALSE; - prepare_incremental_sweep(mrb); - advance_phase(mrb, GC_STATE_NONE); - } + + mrb->is_generational_gc_mode = FALSE; + prepare_incremental_sweep(mrb); + advance_phase(mrb, GC_STATE_NONE); mrb->variable_gray_list = mrb->gray_list = NULL; mrb->is_generational_gc_mode = origin_mode; } diff --git a/src/print.c b/src/print.c index 3b762e05f..58297ea83 100644 --- a/src/print.c +++ b/src/print.c @@ -59,13 +59,13 @@ mrb_init_print(mrb_state *mrb) void mrb_show_version(mrb_state *mrb) { - printf("mruby - Embeddable Ruby Copyright (c) 2010-2012 mruby developers\n"); + printf("mruby - Embeddable Ruby Copyright (c) 2010-2013 mruby developers\n"); } void mrb_show_copyright(mrb_state *mrb) { - printf("mruby - Copyright (c) 2010-2012 mruby developers\n"); + printf("mruby - Copyright (c) 2010-2013 mruby developers\n"); } #else void |