diff options
author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-01-14 22:05:29 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-14 22:05:29 +0000 |
commit | 4289116517f765df84820bf753fbf891986f40ca (patch) | |
tree | 9848617f37fbe418e59af21a5c204e7b2669a0cc /runtime/runtime.cc | |
parent | 89b7ab4cc6e5372bb4dabcc06a907fc333eca3f6 (diff) | |
parent | 6f4ffe41649f1e6381e8cda087ad3749206806e5 (diff) | |
download | art-4289116517f765df84820bf753fbf891986f40ca.zip art-4289116517f765df84820bf753fbf891986f40ca.tar.gz art-4289116517f765df84820bf753fbf891986f40ca.tar.bz2 |
Merge "Improve the generational mode."
Diffstat (limited to 'runtime/runtime.cc')
-rw-r--r-- | runtime/runtime.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 91d9b94..3cdf289 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -367,6 +367,8 @@ static gc::CollectorType ParseCollectorType(const std::string& option) { collector_type = gc::kCollectorTypeCMS; } else if (gc_options[i] == "SS") { collector_type = gc::kCollectorTypeSS; + } else if (gc_options[i] == "GSS") { + collector_type = gc::kCollectorTypeGSS; } else { LOG(WARNING) << "Ignoring unknown -Xgc option: " << gc_options[i]; return gc::kCollectorTypeNone; @@ -399,7 +401,8 @@ 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::kCollectorTypeCMS; + parsed->collector_type_ = gc::kCollectorTypeGSS; // If background_collector_type_ is kCollectorTypeNone, it defaults to the collector_type_ after // parsing options. parsed->background_collector_type_ = gc::kCollectorTypeNone; |