From 6e7ecacc1169f634e028f523da3e660f9ee6a7b6 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 25 Jun 2013 12:40:50 +0000 Subject: merge revision(s) 41325: [Backport #8554] * gc.c: Fixup around GC by MALLOC. Add allocate size to malloc_increase before GC for updating limit in after_gc_sweep. Reset malloc_increase into garbage_collect() for preventing GC again soon. this backport patch is written by nari. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@41624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 91023f06dd..607f3d96a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Jun 25 21:38:48 2013 NAKAMURA Usaku + + * gc.c: Fixup around GC by MALLOC. + Add allocate size to malloc_increase before GC + for updating limit in after_gc_sweep. + Reset malloc_increase into garbage_collect() + for preventing GC again soon. + this backport patch is written by nari. + Wed Jun 5 12:38:14 2013 Nobuyoshi Nakada * win32/win32.c (setup_overlapped, finish_overlapped): extract from -- cgit v1.2.3