archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Calvin Cheung 2015-04-23 14:09:59 -07:00
commit 22611f6936
43 changed files with 405 additions and 689 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1560,12 +1560,15 @@ void Arguments::select_gc_ergonomically() {
} else {
FLAG_SET_ERGO(bool, UseParallelGC, true);
}
} else {
FLAG_SET_ERGO(bool, UseSerialGC, true);
}
}
void Arguments::select_gc() {
if (!gc_selected()) {
select_gc_ergonomically();
guarantee(gc_selected(), "No GC selected");
}
}
@ -2091,10 +2094,8 @@ bool Arguments::check_gc_consistency() {
}
if (UseParNewGC && !UseConcMarkSweepGC) {
// !UseConcMarkSweepGC means that we are using serial old gc. Unfortunately we don't
// set up UseSerialGC properly, so that can't be used in the check here.
jio_fprintf(defaultStream::error_stream(),
"It is not possible to combine the ParNew young collector with the Serial old collector.\n");
"It is not possible to combine the ParNew young collector with any collector other than CMS.\n");
return false;
}