diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-01-14 15:49:54 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-01-14 15:51:15 -0800 |
| commit | 0f875ef27a4842d2e7c857b3c7eedbf8c8cf873f (patch) | |
| tree | 97ec8ba6b3aca750a07b4376b54d0a6d1ea92bd4 /runtime/runtime.cc | |
| parent | 4289116517f765df84820bf753fbf891986f40ca (diff) | |
| download | art-0f875ef27a4842d2e7c857b3c7eedbf8c8cf873f.zip art-0f875ef27a4842d2e7c857b3c7eedbf8c8cf873f.tar.gz art-0f875ef27a4842d2e7c857b3c7eedbf8c8cf873f.tar.bz2 | |
Revert accidental default collector type change.
Default collector type had been changed to generational semi-space
by default by accident.
Change-Id: I060b3f292261b8bb258ca2a350e26a328340c49c
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 3 |
1 files changed, 1 insertions, 2 deletions
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; |