From f0a435c18725318eae1bfb3dfd15c457f511d814 Mon Sep 17 00:00:00 2001 From: nari Date: Wed, 24 Oct 2012 03:55:46 +0000 Subject: * gc.c (free_object_aquire): rename to match the behavior of this function. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ gc.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b3319a0f5..53f6dc3a1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 24 11:57:24 2012 Narihiro Nakamura + + * gc.c (free_object_aquire): rename to match the behavior of this + function. + Wed Oct 24 11:55:19 2012 Koichi Sasada * ext/objspace/objspace.c (reachable_object_from_i): change data diff --git a/gc.c b/gc.c index e7a851997e..28feabcc9e 100644 --- a/gc.c +++ b/gc.c @@ -360,7 +360,7 @@ static void init_mark_stack(mark_stack_t *stack); static VALUE lazy_sweep_enable(void); static int garbage_collect(rb_objspace_t *); -static int gc_lazy_sweep(rb_objspace_t *); +static int free_object_aquire(rb_objspace_t *); static void mark_tbl(rb_objspace_t *, st_table *); static void rest_sweep(rb_objspace_t *); static void gc_mark_stacked_objects(rb_objspace_t *); @@ -666,7 +666,7 @@ newobj(VALUE klass, VALUE flags) } if (UNLIKELY(!has_free_object)) { - if (!gc_lazy_sweep(objspace)) { + if (!free_object_aquire(objspace)) { during_gc = 0; rb_memerror(); } @@ -2044,7 +2044,7 @@ rest_sweep(rb_objspace_t *objspace) static void gc_marks(rb_objspace_t *objspace); static int -gc_lazy_sweep(rb_objspace_t *objspace) +free_object_aquire(rb_objspace_t *objspace) { int res; -- cgit v1.2.3