From 5cb55eca6fac360c94fd5fa54566609dfc3db45c Mon Sep 17 00:00:00 2001
From: nari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 23 Mar 2009 05:58:15 +0000
Subject: * gc.c (init_heap): set default to heap slots length   if
 HEAP_OBJ_LIMIT is larger than HEAP_MIN_SLOTS. [Bug #1310]  
 (set_heaps_increment): increment next_heaps_length if   next_heaps_length and
 heaps_used are same.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 gc.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'gc.c')

diff --git a/gc.c b/gc.c
index 835ef5d3b2..56215bb6ea 100644
--- a/gc.c
+++ b/gc.c
@@ -922,6 +922,10 @@ init_heap(rb_objspace_t *objspace)
 
     add = HEAP_MIN_SLOTS / HEAP_OBJ_LIMIT;
 
+    if (!add) {
+        add = 1;
+    }
+
     if ((heaps_used + add) > heaps_length) {
     	allocate_heaps(objspace, heaps_used + add);
     }
@@ -938,6 +942,11 @@ static void
 set_heaps_increment(rb_objspace_t *objspace)
 {
     size_t next_heaps_length = (size_t)(heaps_used * 1.8);
+
+    if (next_heaps_length == heaps_used) {
+        next_heaps_length++;
+    }
+
     heaps_inc = next_heaps_length - heaps_used;
 
     if (next_heaps_length > heaps_length) {
-- 
cgit v1.2.3