commit 80de7a684be3c320e9e1d3bf8c9d145fe7c2f7c3
author Mathieu Chartier <mathieuc@google.com> Tue Nov 27 17:21:50 2012 -0800
committer Mathieu Chartier <mathieuc@google.com> Tue Nov 27 17:24:10 2012 -0800
tree 22d0ab827b1ac05af03feb5b14b13ac033e4e40d
parent af1b89281fd1f86efeb791b61f5a3f2031c70312

Fix clear growth limit not working.

Fixed clear growth limit not working. I suspect this was causing
the amazon app out of memory error. Fixed the out of memory message
misattributing the reason for out of memory to being fragmentation.
Added more info to the out of memory exception message.

Change-Id: I28ad42968af27468ca43368620232cf22b5f4f13

src/heap.cc

diff --git a/src/heap.cc b/src/heap.cc
index 472031b..13f6ee8 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -145,6 +145,7 @@
       is_gc_running_(false),
       last_gc_type_(kGcTypeNone),
       enforce_heap_growth_rate_(false),
+      capacity_(capacity),
       growth_limit_(growth_limit),
       max_allowed_footprint_(initial_size),
       concurrent_start_size_(128 * KB),
@@ -521,18 +522,26 @@
 
     return obj;
   }
+  std::ostringstream oss;
   int64_t total_bytes_free = GetFreeMemory();
-  size_t max_contiguous_allocation = 0;
-  // TODO: C++0x auto
-  for (Spaces::const_iterator it = spaces_.begin(); it != spaces_.end(); ++it) {
-    if ((*it)->IsAllocSpace()) {
-      (*it)->AsAllocSpace()->Walk(MSpaceChunkCallback, &max_contiguous_allocation);
+  uint64_t alloc_space_size = alloc_space_->GetNumBytesAllocated();
+  uint64_t large_object_size = large_object_space_->GetNumObjectsAllocated();
+  oss << "Failed to allocate a " << byte_count << " byte allocation with " << total_bytes_free
+      << " free bytes; allocation space size " << alloc_space_size
+      << "; large object space size " << large_object_size;
+  // If the allocation failed due to fragmentation, print out the largest continuous allocation.
+  if (total_bytes_free >= byte_count) {
+    size_t max_contiguous_allocation = 0;
+    // TODO: C++0x auto
+    for (Spaces::const_iterator it = spaces_.begin(); it != spaces_.end(); ++it) {
+      if ((*it)->IsAllocSpace()) {
+        (*it)->AsAllocSpace()->Walk(MSpaceChunkCallback, &max_contiguous_allocation);
+      }
     }
+    oss << "; failed due to fragmentation (largest possible contiguous allocation "
+        <<  max_contiguous_allocation << " bytes)";
   }
-
-  std::string msg(StringPrintf("Failed to allocate a %zd-byte %s (%lld total bytes free; largest possible contiguous allocation %zd bytes)",
-                               byte_count, PrettyDescriptor(c).c_str(), total_bytes_free, max_contiguous_allocation));
-  self->ThrowOutOfMemoryError(msg.c_str());
+  self->ThrowOutOfMemoryError(oss.str().c_str());
   return NULL;
 }
 
@@ -1515,6 +1524,7 @@
 }
 
 void Heap::ClearGrowthLimit() {
+  growth_limit_ = capacity_;
   alloc_space_->ClearGrowthLimit();
 }
 

src/heap.h

diff --git a/src/heap.h b/src/heap.h
index a302405..68ee923 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -438,6 +438,7 @@
   const bool enforce_heap_growth_rate_;
 
   // Maximum size that the heap can reach.
+  size_t capacity_;
   size_t growth_limit_;
   size_t max_allowed_footprint_;