diff options
author | tarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-25 16:20:39 +0000 |
---|---|---|
committer | tarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-25 16:20:39 +0000 |
commit | b0993c733f9e18a0068dd47b4507f233bb447b82 (patch) | |
tree | cb94dc9525c24f9388e3598ae1ecae2727892a3f | |
parent | 3f44f7f24c1b5e65ba08ac201de23aaa91a8b3b5 (diff) | |
download | ruby-b0993c733f9e18a0068dd47b4507f233bb447b82.tar.gz |
* gc.c (is_before_sweep): Add new helper function that check the object
is before sweep?
* gc.c (rb_gc_force_recycle): Have to clear mark bit if object's slot
already ready to mainor sweep.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | gc.c | 19 |
2 files changed, 26 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Wed Jun 26 01:18:13 2013 Masaya Tarui <tarui@ruby-lang.org> + + * gc.c (is_before_sweep): Add new helper function that check the object + is before sweep? + * gc.c (rb_gc_force_recycle): Have to clear mark bit if object's slot + already ready to mainor sweep. + Wed Jun 26 01:17:29 2013 Tanaka Akira <akr@fsij.org> * bignum.c (bigsub_int): Fix a buffer over read. @@ -603,6 +603,22 @@ RVALUE_PROMOTE(VALUE obj) #endif } +static inline int +is_before_sweep(VALUE obj) +{ + struct heaps_slot *slot; + rb_objspace_t *objspace = &rb_objspace; + if (is_lazy_sweeping(objspace)) { + slot = objspace->heap.sweep_slots; + while (slot) { + if(slot->header == GET_HEAP_HEADER(obj)) + return TRUE; + slot = slot->next; + } + } + return FALSE; +} + static inline void RVALUE_DEMOTE(VALUE obj) { @@ -3971,6 +3987,9 @@ rb_gc_force_recycle(VALUE p) #if USE_RGENGC CLEAR_IN_BITMAP(GET_HEAP_REMEMBERSET_BITS(p), p); CLEAR_IN_BITMAP(GET_HEAP_OLDGEN_BITS(p), p); + if(!is_before_sweep(p)){ + CLEAR_IN_BITMAP(GET_HEAP_MARK_BITS(p), p); + } #endif objspace->total_freed_object_num++; |