From 55e3e8871dd15e504ff775f465e91cb127734d8e Mon Sep 17 00:00:00 2001
From: Joel Dice <git@seibutsu.mailsnare.net>
Date: Thu, 31 Jan 2008 17:50:38 -0700
Subject: [PATCH] trigger major GCs more aggressively under low memory
 conditions

---
 src/heap.cpp | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/heap.cpp b/src/heap.cpp
index 66207d309a..837a04d2a4 100644
--- a/src/heap.cpp
+++ b/src/heap.cpp
@@ -495,6 +495,7 @@ class Context {
     client(0),
     count(0),
     limit(limit),
+    lowMemoryThreshold(limit / 2),
     lock(0),
 
     ageMap(&gen1, max(1, log(TenureThreshold)), 1, 0, false),
@@ -564,6 +565,7 @@ class Context {
 
   unsigned count;
   unsigned limit;
+  unsigned lowMemoryThreshold;
 
   System::Mutex* lock;
   
@@ -668,13 +670,19 @@ oversizedGen2(Context* c)
     and c->gen2.position() < (c->gen2.capacity() / 4);
 }
 
+inline unsigned
+memoryNeeded(Context* c)
+{
+  return c->count
+    + ((c->gen1.footprint(minimumNextGen1Capacity(c))
+        + c->gen2.footprint(minimumNextGen2Capacity(c))) * BytesPerWord)
+    + LowMemoryPaddingInBytes;
+}
+
 inline bool
 lowMemory(Context* c)
 {
-  return ((c->gen1.footprint(minimumNextGen1Capacity(c))
-           + c->gen2.footprint(minimumNextGen2Capacity(c))) * BytesPerWord)
-    + LowMemoryPaddingInBytes
-    > c->limit - c->count;
+  return memoryNeeded(c) > c->lowMemoryThreshold;
 }
 
 inline void
@@ -1557,6 +1565,25 @@ collect(Context* c)
     then = c->system->now();
   }
 
+  unsigned count = memoryNeeded(c);
+  if (count > c->lowMemoryThreshold) {
+    if (Verbose) {
+      fprintf(stderr, "increase low memory threshold from %d to %d\n",
+              c->lowMemoryThreshold,
+              avg(c->limit, c->lowMemoryThreshold));
+    }
+
+    c->lowMemoryThreshold = avg(c->limit, c->lowMemoryThreshold);
+  } else if (count + (count / 16) < c->lowMemoryThreshold) {
+    if (Verbose) {
+      fprintf(stderr, "decrease low memory threshold from %d to %d\n",
+              c->lowMemoryThreshold,
+              avg(count, c->lowMemoryThreshold));
+    }
+
+    c->lowMemoryThreshold = avg(count, c->lowMemoryThreshold);
+  }
+
   initNextGen1(c);
 
   if (c->mode == Heap::MajorCollection) {