diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-18 15:27:41 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-18 15:27:41 +0000 |
commit | d767adf99017e24a7e3804891bf94fb6820aee4d (patch) | |
tree | de024df0b827639b0943eec71918de520e4c0234 | |
parent | a0a1d0f268994610932c2ae51df9d8f759591b01 (diff) | |
download | ruby-d767adf99017e24a7e3804891bf94fb6820aee4d.tar.gz |
* gc.c (garbage_collect_body): lazy_sweep setting should work
without USE_RGENGC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gc.c | 12 |
2 files changed, 10 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Thu Dec 19 00:26:11 2013 Koichi Sasada <ko1@atdot.net> + + * gc.c (garbage_collect_body): lazy_sweep setting should work + without USE_RGENGC. + Wed Dec 18 23:31:04 2013 Koichi Sasada <ko1@atdot.net> * gc.c (gc_profile_dump_major_reason): fix this function because major_reason @@ -4966,9 +4966,11 @@ garbage_collect_body(rb_objspace_t *objspace, int full_mark, int immediate_sweep reason |= GPR_FLAG_MAJOR_BY_STRESS; immediate_sweep = !(flag & 0x02); } - -#if USE_RGENGC else { + if (!GC_ENABLE_LAZY_SWEEP || objspace->flags.dont_lazy_sweep) { + immediate_sweep = TRUE; + } +#if USE_RGENGC if (full_mark) { reason |= GPR_FLAG_MAJOR_BY_NOFREE; } @@ -4982,12 +4984,8 @@ garbage_collect_body(rb_objspace_t *objspace, int full_mark, int immediate_sweep if (objspace->rgengc.old_object_count > objspace->rgengc.old_object_limit) { reason |= GPR_FLAG_MAJOR_BY_OLDGEN; } - - if (!GC_ENABLE_LAZY_SWEEP || objspace->flags.dont_lazy_sweep) { - immediate_sweep = TRUE; - } - } #endif + } if (immediate_sweep) reason |= GPR_FLAG_IMMEDIATE_SWEEP; full_mark = (reason & GPR_FLAG_MAJOR_MASK) ? TRUE : FALSE; |