diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-04-16 17:23:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-16 17:23:36 +0000 |
| commit | 73a3fb3d884f14e5de488bc679da4ce5ac7700be (patch) | |
| tree | 23cefb49a93447538480fb567a18f1965794c50b /runtime/parsed_options.cc | |
| parent | 50a4d671268cff5041fb09dcb9f64515dd809e4a (diff) | |
| parent | 10d6886c9ce3ed87431cf10d376a69c23950fa61 (diff) | |
| download | art-73a3fb3d884f14e5de488bc679da4ce5ac7700be.zip art-73a3fb3d884f14e5de488bc679da4ce5ac7700be.tar.gz art-73a3fb3d884f14e5de488bc679da4ce5ac7700be.tar.bz2 | |
Merge "Disable parallel GC by default"
Diffstat (limited to 'runtime/parsed_options.cc')
| -rw-r--r-- | runtime/parsed_options.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index 0758b27..620a4bd 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -442,8 +442,8 @@ bool ParsedOptions::Parse(const RuntimeOptions& options, bool ignore_unrecognize } // Default to number of processors minus one since the main GC thread also does work. - args.SetIfMissing(M::ParallelGCThreads, - static_cast<unsigned int>(sysconf(_SC_NPROCESSORS_CONF) - 1u)); + args.SetIfMissing(M::ParallelGCThreads, gc::Heap::kDefaultEnableParallelGC ? + static_cast<unsigned int>(sysconf(_SC_NPROCESSORS_CONF) - 1u) : 0u); // -Xverbose: { |