From 0f875ef27a4842d2e7c857b3c7eedbf8c8cf873f Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 14 Jan 2014 15:49:54 -0800 Subject: Revert accidental default collector type change. Default collector type had been changed to generational semi-space by default by accident. Change-Id: I060b3f292261b8bb258ca2a350e26a328340c49c --- runtime/runtime.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'runtime/runtime.cc') diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 3cdf289..2af569a 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -401,8 +401,7 @@ Runtime::ParsedOptions* Runtime::ParsedOptions::Create(const Options& options, b // Only the main GC thread, no workers. parsed->conc_gc_threads_ = 0; // Default is CMS which is Sticky + Partial + Full CMS GC. - // parsed->collector_type_ = gc::kCollectorTypeCMS; - parsed->collector_type_ = gc::kCollectorTypeGSS; + parsed->collector_type_ = gc::kCollectorTypeCMS; // If background_collector_type_ is kCollectorTypeNone, it defaults to the collector_type_ after // parsing options. parsed->background_collector_type_ = gc::kCollectorTypeNone; -- cgit v1.1