archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Jon Masamitsu 2013-01-10 07:32:32 -08:00
commit be38ea68e5
1 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -1454,9 +1454,14 @@ void Arguments::set_parallel_gc_flags() {
// If no heap maximum was requested explicitly, use some reasonable fraction // If no heap maximum was requested explicitly, use some reasonable fraction
// of the physical memory, up to a maximum of 1GB. // of the physical memory, up to a maximum of 1GB.
if (UseParallelGC) {
FLAG_SET_DEFAULT(ParallelGCThreads, FLAG_SET_DEFAULT(ParallelGCThreads,
Abstract_VM_Version::parallel_worker_threads()); Abstract_VM_Version::parallel_worker_threads());
if (ParallelGCThreads == 0) {
jio_fprintf(defaultStream::error_stream(),
"The Parallel GC can not be combined with -XX:ParallelGCThreads=0\n");
vm_exit(1);
}
// If InitialSurvivorRatio or MinSurvivorRatio were not specified, but the // If InitialSurvivorRatio or MinSurvivorRatio were not specified, but the
// SurvivorRatio has been set, reset their default values to SurvivorRatio + // SurvivorRatio has been set, reset their default values to SurvivorRatio +
@ -1480,7 +1485,6 @@ void Arguments::set_parallel_gc_flags() {
} }
} }
} }
}
void Arguments::set_g1_gc_flags() { void Arguments::set_g1_gc_flags() {
assert(UseG1GC, "Error"); assert(UseG1GC, "Error");