commit 069387a60cb2b72e116cc38b32e14403f092df8f
author Mathieu Chartier <mathieuc@google.com> Mon Jun 18 12:01:01 2012 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Jun 18 15:19:28 2012 -0700
tree 787c123093daa5e79ab8d5c25ed18856dd6d0724
parent 83c26f9c7ee42b0037d2679f6f37dd28a3f13af7

Enable / disable CMS runtime options.

Enable or disable CMS by doing -Xgc:noconcurrent or Xgc:concurrent. Defaults to enabled.

Change-Id: Ib18687ba6aa6534323531d761133ce410c69f426

src/heap.cc

diff --git a/src/heap.cc b/src/heap.cc
index 1303d7d..7261670 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -914,8 +914,11 @@
 }
 
 void Heap::RequestConcurrentGC() {
-  // Make sure that our Daemon threads are started
-  if (requesting_gc_ || !Runtime::Current()->IsFinishedStarting() || Runtime::Current()->IsShuttingDown()) {
+  // Make sure that we can do a concurrent GC.
+  if (requesting_gc_ ||
+      !Runtime::Current()->IsFinishedStarting() ||
+      Runtime::Current()->IsShuttingDown() ||
+      !Runtime::Current()->IsConcurrentGcEnabled()) {
     return;
   }