diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | gc.c | 33 |
2 files changed, 38 insertions, 7 deletions
@@ -1,3 +1,15 @@ +Sun Jul 6 21:00:11 2014 Koichi Sasada <[email protected]> + + * gc.c: rename is_dead_object() to is_dying_object(). + This function is not opposite against is_live_object() + because is_dying_object() does *not* check object type. + + * gc.c (is_dying_object): change condition. + + * gc.c (is_live_object): use T_NONE instead of 0. + + * gc.c (rb_objspace_dying_object_p): added. + Sun Jul 6 13:37:27 2014 Koichi Sasada <[email protected]> * gc.c (rb_gc_register_mark_object): change data structure. @@ -2330,22 +2330,34 @@ is_swept_object(rb_objspace_t *objspace, VALUE ptr) } static inline int -is_dead_object(rb_objspace_t *objspace, VALUE ptr) +is_dying_object(rb_objspace_t *objspace, VALUE ptr) { - if (!is_lazy_sweeping(heap_eden) || MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(ptr), ptr)) return FALSE; - if (!is_swept_object(objspace, ptr)) return TRUE; - return FALSE; + if (!is_lazy_sweeping(heap_eden) || + !is_swept_object(objspace, ptr) || + MARKED_IN_BITMAP(GET_HEAP_MARK_BITS(ptr), ptr)) { + + return FALSE; + } + else { + return TRUE; + } } static inline int is_live_object(rb_objspace_t *objspace, VALUE ptr) { switch (BUILTIN_TYPE(ptr)) { - case 0: case T_ZOMBIE: + case T_NONE: + case T_ZOMBIE: return FALSE; } - if (is_dead_object(objspace, ptr)) return FALSE; - return TRUE; + + if (is_dying_object(objspace, ptr)) { + return FALSE; + } + else { + return TRUE; + } } static inline int @@ -2369,6 +2381,13 @@ rb_objspace_markable_object_p(VALUE obj) return is_markable_object(objspace, obj) && is_live_object(objspace, obj); } +int +rb_objspace_dying_object_p(VALUE obj) +{ + rb_objspace_t *objspace = &rb_objspace; + return is_dying_object(objspace, obj); +} + /* * call-seq: * ObjectSpace._id2ref(object_id) -> an_object |