diff --git a/ChangeLog b/ChangeLog index 5092137b5e..44810c2bad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Dec 6 15:24:30 2013 Koichi Sasada + + * gc.c (gc_start_internal, rb_gc): do not need + heap_pages_free_unused_pages() here. + It was done in after_sweep(). + + * gc.c (rb_gc): The reason is now GPR_FLAG_CAPI. + Fri Dec 6 14:05:19 2013 Aman Gupta * gc.c (gc_start_internal): GC.start() now accepts two optional diff --git a/gc.c b/gc.c index fc4048943d..11abde8b2f 100644 --- a/gc.c +++ b/gc.c @@ -5039,7 +5039,6 @@ gc_start_internal(int argc, VALUE *argv, VALUE self) garbage_collect(objspace, full_mark, immediate_sweep, GPR_FLAG_METHOD); if (!finalizing) finalize_deferred(objspace); - heap_pages_free_unused_pages(objspace); return Qnil; } @@ -5055,9 +5054,8 @@ void rb_gc(void) { rb_objspace_t *objspace = &rb_objspace; - garbage_collect(objspace, TRUE, TRUE, GPR_FLAG_METHOD); + garbage_collect(objspace, TRUE, TRUE, GPR_FLAG_CAPI); if (!finalizing) finalize_deferred(objspace); - heap_pages_free_unused_pages(objspace); } int