diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2015-02-20 19:35:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-20 19:35:57 +0000 |
| commit | a53cfc8d2e8fd61cea630f3a5f1dab701edcb53c (patch) | |
| tree | 82cbc379cec84be9cc6672d6a4026036c3f35dd0 /runtime | |
| parent | 146a13d789af7246328c7af838e2ba52a7cd7bdd (diff) | |
| parent | f360ad091bdc1484db2e4e0f0492f620402dbf58 (diff) | |
| download | art-a53cfc8d2e8fd61cea630f3a5f1dab701edcb53c.tar.gz art-a53cfc8d2e8fd61cea630f3a5f1dab701edcb53c.tar.bz2 art-a53cfc8d2e8fd61cea630f3a5f1dab701edcb53c.zip | |
Merge "Make UseTLAB a bool flag."
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/parsed_options.cc | 1 | ||||
| -rw-r--r-- | runtime/runtime.cc | 2 | ||||
| -rw-r--r-- | runtime/runtime_options.def | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index a5df892e29..daa4373816 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -141,6 +141,7 @@ std::unique_ptr<RuntimeParser> ParsedOptions::MakeParser(bool ignore_unrecognize .Define("-XX:LowMemoryMode") .IntoKey(M::LowMemoryMode) .Define("-XX:UseTLAB") + .WithValue(true) .IntoKey(M::UseTLAB) .Define({"-XX:EnableHSpaceCompactForOOM", "-XX:DisableHSpaceCompactForOOM"}) .WithValues({true, false}) diff --git a/runtime/runtime.cc b/runtime/runtime.cc index c6e858bdd4..0ccc97c153 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -787,7 +787,7 @@ bool Runtime::Init(const RuntimeOptions& raw_options, bool ignore_unrecognized) runtime_options.GetOrDefault(Opt::LongPauseLogThreshold), runtime_options.GetOrDefault(Opt::LongGCLogThreshold), runtime_options.Exists(Opt::IgnoreMaxFootprint), - runtime_options.Exists(Opt::UseTLAB), + runtime_options.GetOrDefault(Opt::UseTLAB), xgc_option.verify_pre_gc_heap_, xgc_option.verify_pre_sweeping_heap_, xgc_option.verify_post_gc_heap_, diff --git a/runtime/runtime_options.def b/runtime/runtime_options.def index 022a2a5e9b..1bdc980a18 100644 --- a/runtime/runtime_options.def +++ b/runtime/runtime_options.def @@ -61,7 +61,7 @@ RUNTIME_OPTIONS_KEY (MillisecondsToNanoseconds, \ RUNTIME_OPTIONS_KEY (Unit, DumpGCPerformanceOnShutdown) RUNTIME_OPTIONS_KEY (Unit, IgnoreMaxFootprint) RUNTIME_OPTIONS_KEY (Unit, LowMemoryMode) -RUNTIME_OPTIONS_KEY (Unit, UseTLAB) +RUNTIME_OPTIONS_KEY (bool, UseTLAB, false) RUNTIME_OPTIONS_KEY (bool, EnableHSpaceCompactForOOM, true) RUNTIME_OPTIONS_KEY (MillisecondsToNanoseconds, \ HSpaceCompactForOOMMinIntervalsMs,\ |