From 7a57d5b78f15da77f5b5cab14c8c347883b2a343 Mon Sep 17 00:00:00 2001 From: Carl Shapiro Date: Thu, 29 Jul 2010 15:24:08 -0700 Subject: [PATCH] Re-enable the concurrent GC. Change-Id: I1ddee8491788bb60371cdbadf25b53c65e012e0e --- vm/Init.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vm/Init.c b/vm/Init.c index 4616114c7..d73bec789 100644 --- a/vm/Init.c +++ b/vm/Init.c @@ -997,8 +997,7 @@ static int dvmProcessOptions(int argc, const char* const argv[], else if (strcmp(argv[i] + 5, "nopostverify") == 0) gDvm.postVerify = false; else if (strcmp(argv[i] + 5, "concurrent") == 0) - /* FIXME: temp workaround - disable */ - gDvm.concurrentMarkSweep = false; + gDvm.concurrentMarkSweep = true; else if (strcmp(argv[i] + 5, "noconcurrent") == 0) gDvm.concurrentMarkSweep = false; else if (strcmp(argv[i] + 5, "verifycardtable") == 0) @@ -1057,8 +1056,7 @@ static void setCommandLineDefaults() gDvm.heapSizeMax = 16 * 1024 * 1024; // Spec says 75% physical mem gDvm.stackSize = kDefaultStackSize; - /* FIXME: temp workaround - default to false */ - gDvm.concurrentMarkSweep = false; + gDvm.concurrentMarkSweep = true; /* gDvm.jdwpSuspend = true; */ -- 2.11.0