Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 20536:73d61cd3f8e9
Merge
author | asaha |
---|---|
date | Wed, 08 Oct 2014 14:13:23 -0700 |
parents | 8cb56c8cb30d 8ba0078861d4 |
children | f10fe402dfb1 |
comparison
equal
deleted
inserted
replaced
20535:8956e19bdffb | 20536:73d61cd3f8e9 |
---|---|
1644 if (ParallelGCThreads == 0) { | 1644 if (ParallelGCThreads == 0) { |
1645 FLAG_SET_DEFAULT(ParallelGCThreads, | 1645 FLAG_SET_DEFAULT(ParallelGCThreads, |
1646 Abstract_VM_Version::parallel_worker_threads()); | 1646 Abstract_VM_Version::parallel_worker_threads()); |
1647 } | 1647 } |
1648 | 1648 |
1649 #if INCLUDE_ALL_GCS | |
1650 if (G1ConcRefinementThreads == 0) { | |
1651 FLAG_SET_DEFAULT(G1ConcRefinementThreads, ParallelGCThreads); | |
1652 } | |
1653 #endif | |
1654 | |
1649 // MarkStackSize will be set (if it hasn't been set by the user) | 1655 // MarkStackSize will be set (if it hasn't been set by the user) |
1650 // when concurrent marking is initialized. | 1656 // when concurrent marking is initialized. |
1651 // Its value will be based upon the number of parallel marking threads. | 1657 // Its value will be based upon the number of parallel marking threads. |
1652 // But we do set the maximum mark stack size here. | 1658 // But we do set the maximum mark stack size here. |
1653 if (FLAG_IS_DEFAULT(MarkStackSizeMax)) { | 1659 if (FLAG_IS_DEFAULT(MarkStackSizeMax)) { |