kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* gc.c (gc_mark_maybe): added. check `is_pointer_to_heap()' and

Browse source 
type is not T_ZOMBE.
* gc.c: use `gc_mark_maybe()'. T_ZOMBIE objects should not be pushed
  to the mark stack.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2013-06-17 02:54:25 +00:00
parent c3e68ef04f
commit 17be9e9719
2 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Jun 17 11:50:29 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (gc_mark_maybe): added. check `is_pointer_to_heap()' and
type is not T_ZOMBE.
* gc.c: use `gc_mark_maybe()'. T_ZOMBIE objects should not be pushed
to the mark stack.
Mon Jun 17 07:56:24 2013 Tanaka Akira <akr@fsij.org> Mon Jun 17 07:56:24 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (bary_small_lshift): Renamed from bdigs_small_lshift. * bignum.c (bary_small_lshift): Renamed from bdigs_small_lshift.

49
gc.c
View file

@ -488,6 +488,10 @@ static void mark_tbl(rb_objspace_t *, st_table *);
static void rest_sweep(rb_objspace_t *); static void rest_sweep(rb_objspace_t *);
static void gc_mark_stacked_objects(rb_objspace_t *); static void gc_mark_stacked_objects(rb_objspace_t *);
static void gc_mark(rb_objspace_t *objspace, VALUE ptr);
static void gc_mark_maybe(rb_objspace_t *objspace, VALUE ptr);
static void gc_mark_children(rb_objspace_t *objspace, VALUE ptr);
static double getrusage_time(void); static double getrusage_time(void);
static inline void gc_prof_timer_start(rb_objspace_t *, int reason); static inline void gc_prof_timer_start(rb_objspace_t *, int reason);
static inline void gc_prof_timer_stop(rb_objspace_t *); static inline void gc_prof_timer_stop(rb_objspace_t *);
@ -1008,9 +1012,6 @@ rb_objspace_data_type_name(VALUE obj)
} }
} }
static void gc_mark(rb_objspace_t *objspace, VALUE ptr);
static void gc_mark_children(rb_objspace_t *objspace, VALUE ptr);
static inline int static inline int
is_pointer_to_heap(rb_objspace_t *objspace, void *ptr) is_pointer_to_heap(rb_objspace_t *objspace, void *ptr)
{ {
@ -2693,10 +2694,7 @@ mark_locations_array(rb_objspace_t *objspace, register VALUE *x, register long n
VALUE v; VALUE v;
while (n--) { while (n--) {
v = *x; v = *x;
(void)VALGRIND_MAKE_MEM_DEFINED(&v, sizeof(v)); gc_mark_maybe(objspace, v);
if (is_pointer_to_heap(objspace, (void *)v)) {
gc_mark(objspace, v);
}
x++; x++;
} }
} }
@ -2914,12 +2912,20 @@ rb_mark_tbl(st_table *tbl)
mark_tbl(&rb_objspace, tbl); mark_tbl(&rb_objspace, tbl);
} }
static void
gc_mark_maybe(rb_objspace_t *objspace, VALUE obj)
{
(void)VALGRIND_MAKE_MEM_DEFINED(&obj, sizeof(obj));
if (is_pointer_to_heap(objspace, (void *)obj) &&
BUILTIN_TYPE(obj) != T_ZOMBIE) {
gc_mark(objspace, obj);
}
}
void void
rb_gc_mark_maybe(VALUE obj) rb_gc_mark_maybe(VALUE obj)
{ {
if (is_pointer_to_heap(&rb_objspace, (void *)obj)) { gc_mark_maybe(&rb_objspace, obj);
gc_mark(&rb_objspace, obj);
}
} }
static int static int
@ -2940,13 +2946,12 @@ gc_mark_ptr(rb_objspace_t *objspace, VALUE ptr)
} }
static int static int
markable_object_p(rb_objspace_t *objspace, VALUE ptr) markable_object_p(rb_objspace_t *objspace, VALUE obj)
{ {
register RVALUE *obj = RANY(ptr); if (rb_special_const_p(obj)) return 0; /* special const not marked */
if (RBASIC(obj)->flags == 0) return 0; /* free cell */
if (rb_special_const_p(ptr)) return 0; /* special const not marked */ if (RGENGC_CHECK_MODE && BUILTIN_TYPE(obj) == T_ZOMBIE)
if (obj->as.basic.flags == 0) return 0 ; /* free cell */ rb_bug("markable_object_p: %p is T_ZOMBIE", (void *)obj);
return 1; return 1;
} }
@ -3253,15 +3258,9 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
goto again; goto again;
default: /* unlisted NODE */ default: /* unlisted NODE */
if (is_pointer_to_heap(objspace, obj->as.node.u1.node)) { gc_mark_maybe(objspace, (VALUE)obj->as.node.u1.node);
gc_mark(objspace, (VALUE)obj->as.node.u1.node); gc_mark_maybe(objspace, (VALUE)obj->as.node.u2.node);
} gc_mark_maybe(objspace, (VALUE)obj->as.node.u3.node);
if (is_pointer_to_heap(objspace, obj->as.node.u2.node)) {
gc_mark(objspace, (VALUE)obj->as.node.u2.node);
}
if (is_pointer_to_heap(objspace, obj->as.node.u3.node)) {
gc_mark(objspace, (VALUE)obj->as.node.u3.node);
}
} }
return; /* no need to mark class. */ return; /* no need to mark class. */
} }