commit 8160bc08fce08c81820bcd9699d3cffd8135ed90
author Mathieu Chartier <mathieuc@google.com> Tue Mar 31 23:40:11 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 31 23:40:12 2015 +0000
tree a8f6f50c35520957188958952fa17935f2624dc6
parent bf143069fc5b7526ea79d4283293878a2ebe99ee
parent faed9950572632ffaac69e70c0b1ab90496c98f3

Merge "Only GC the first time we call PreZygoteFork"

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 51cf558..7e967f9 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -2056,7 +2056,11 @@
 }
 
 void Heap::PreZygoteFork() {
-  CollectGarbageInternal(collector::kGcTypeFull, kGcCauseBackground, false);
+  if (!HasZygoteSpace()) {
+    // We still want to GC in case there is some unreachable non moving objects that could cause a
+    // suboptimal bin packing when we compact the zygote space.
+    CollectGarbageInternal(collector::kGcTypeFull, kGcCauseBackground, false);
+  }
   Thread* self = Thread::Current();
   MutexLock mu(self, zygote_creation_lock_);
   // Try to see if we have any Zygote spaces.
@@ -2125,7 +2129,7 @@
     // Update the end and write out image.
     non_moving_space_->SetEnd(target_space.End());
     non_moving_space_->SetLimit(target_space.Limit());
-    VLOG(heap) << "Zygote space size " << non_moving_space_->Size() << " bytes";
+    VLOG(heap) << "Create zygote space with size=" << non_moving_space_->Size() << " bytes";
   }
   // Change the collector to the post zygote one.
   ChangeCollector(foreground_collector_type_);