From 5aa527fadee91ef03e4a3acb173b8da5f56a43ac Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 29 Oct 2013 07:49:43 +0000 Subject: [PATCH] * gc.c (vm_malloc_increase): decrease it more carefully. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ gc.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0c0e39352..293a066e09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Oct 29 16:49:03 2013 Koichi Sasada + + * gc.c (vm_malloc_increase): decrease it more carefully. + Tue Oct 29 16:24:52 2013 Koichi Sasada * gc.c (heap_page_resurrect): return a page in tomb heap even if diff --git a/gc.c b/gc.c index f3f6d62c4b..157a0856e5 100644 --- a/gc.c +++ b/gc.c @@ -5022,12 +5022,12 @@ vm_malloc_increase(rb_objspace_t *objspace, size_t new_size, size_t old_size, in } else { size_t sub = old_size - new_size; - if (sub > 0) { - if (malloc_increase > sub) { - ATOMIC_SIZE_SUB(malloc_increase, sub); - } - else { - malloc_increase = 0; + if (sub != 0) { + retry_sub:; + { + size_t old_increase = malloc_increase; + size_t new_increase = old_increase > sub ? old_increase - sub : 0; + if (ATOMIC_SIZE_CAS(malloc_increase, old_increase, new_increase) != old_increase) goto retry_sub; } } }