Fix the thresholds so that the heap does not grow uncontrollably. This fixes

src/heap.cc

Index: src/heap.cc
===================================================================
--- src/heap.cc	(revision 8902)
+++ src/heap.cc	(working copy)
@@ -62,12 +62,6 @@
 namespace internal {
 
 
-static const intptr_t kMinimumPromotionLimit =
-    2 * (Page::kPageSize > MB ? Page::kPageSize : MB);
-static const intptr_t kMinimumAllocationLimit =
-    8 * (Page::kPageSize > MB ? Page::kPageSize : MB);
-
-
 static Mutex* gc_initializer_mutex = OS::CreateMutex();
 
 
@@ -121,6 +115,8 @@
 #endif  // DEBUG
       old_gen_promotion_limit_(kMinimumPromotionLimit),
       old_gen_allocation_limit_(kMinimumAllocationLimit),
+      old_gen_limit_factor_(1),
+      size_of_old_gen_at_last_old_space_gc_(0),
       external_allocation_limit_(0),
       amount_of_external_allocated_memory_(0),
       amount_of_external_allocated_memory_at_last_global_gc_(0),
@@ -729,15 +725,7 @@
 
     UpdateSurvivalRateTrend(start_new_space_size);
 
-    intptr_t old_gen_size = PromotedSpaceSize();
-    old_gen_promotion_limit_ =
-        old_gen_size +
-        Max(kMinimumPromotionLimit, old_gen_size / 3) +
-        new_space()->Capacity();
-    old_gen_allocation_limit_ =
-        old_gen_size +
-        Max(kMinimumAllocationLimit, old_gen_size / 2) +
-        new_space()->Capacity();
+    size_of_old_gen_at_last_old_space_gc_ = PromotedSpaceSize();
 
     if (high_survival_rate_during_scavenges &&
         IsStableOrIncreasingSurvivalTrend()) {
@@ -747,10 +735,16 @@
       // In this case we aggressively raise old generation memory limits to
       // postpone subsequent mark-sweep collection and thus trade memory
       // space for the mutation speed.
-      old_gen_promotion_limit_ *= 2;
-      old_gen_allocation_limit_ *= 2;
+      old_gen_limit_factor_ = 1;

[Vyacheslav Egorov (Chromium), 2011/08/12 09:11:51]

I think you wanted 2 here.

[Erik Corry, 2011/08/12 09:21:48]

Good point.

+    } else {
+      old_gen_limit_factor_ = 1;
     }
 
+    old_gen_promotion_limit_ =
+        OldGenPromotionLimit(size_of_old_gen_at_last_old_space_gc_);
+    old_gen_allocation_limit_ =
+        OldGenAllocationLimit(size_of_old_gen_at_last_old_space_gc_);
+
     old_gen_exhausted_ = false;
   } else {
     tracer_ = tracer;
@@ -4250,6 +4244,7 @@
          old_gen_promotion_limit_);
   PrintF("old_gen_allocation_limit_ %" V8_PTR_PREFIX "d\n",
          old_gen_allocation_limit_);
+  PrintF("old_gen_limit_factor_ %d\n", old_gen_limit_factor_);
 
   PrintF("\n");
   PrintF("Number of handles : %d\n", HandleScope::NumberOfHandles());