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

8166461: Deprecate UseAutoGCSelectPolicy

Browse source 
Reviewed-by: kbarrett, ehelin
This commit is contained in:
Sangheon Kim 2016-10-17 21:21:53 -07:00
parent f860133cc4
commit fb49622c7e
2 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -372,6 +372,7 @@ static SpecialFlag const special_jvm_flags[] = {
// -------------- Deprecated Flags -------------- // -------------- Deprecated Flags --------------
// --- Non-alias flags - sorted by obsolete_in then expired_in: // --- Non-alias flags - sorted by obsolete_in then expired_in:
{ "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, { "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() },
{ "UseAutoGCSelectPolicy", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
{ "UseParNewGC", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) }, { "UseParNewGC", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
{ "ConvertSleepToYield", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) }, { "ConvertSleepToYield", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) },
{ "ConvertYieldToSleep", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) }, { "ConvertYieldToSleep", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) },
@ -1801,11 +1802,15 @@ bool Arguments::gc_selected() {
void Arguments::select_gc_ergonomically() { void Arguments::select_gc_ergonomically() {
#if INCLUDE_ALL_GCS #if INCLUDE_ALL_GCS
if (os::is_server_class_machine()) { if (os::is_server_class_machine()) {
if (should_auto_select_low_pause_collector()) { if (!UseAutoGCSelectPolicy) {
FLAG_SET_ERGO_IF_DEFAULT(bool, UseConcMarkSweepGC, true); FLAG_SET_ERGO_IF_DEFAULT(bool, UseG1GC, true);
FLAG_SET_ERGO_IF_DEFAULT(bool, UseParNewGC, true);
} else { } else {
FLAG_SET_ERGO_IF_DEFAULT(bool, UseG1GC, true); if (should_auto_select_low_pause_collector()) {
FLAG_SET_ERGO_IF_DEFAULT(bool, UseConcMarkSweepGC, true);
FLAG_SET_ERGO_IF_DEFAULT(bool, UseParNewGC, true);
} else {
FLAG_SET_ERGO_IF_DEFAULT(bool, UseParallelGC, true);
}
} }
} else { } else {
FLAG_SET_ERGO_IF_DEFAULT(bool, UseSerialGC, true); FLAG_SET_ERGO_IF_DEFAULT(bool, UseSerialGC, true);

46
hotspot/test/gc/startup_warnings/TestUseAutoGCSelectPolicy.java Normal file
View file

@ -0,0 +1,46 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test TestUseAutoGCSelectPolicy
* @key gc
* @bug 8166461
* @summary Test that UseAutoGCSelectPolicy does print a warning message
* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
public class TestUseAutoGCSelectPolicy {
public static void main(String args[]) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseAutoGCSelectPolicy", "-version");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("deprecated");
output.shouldNotContain("error");
output.shouldHaveExitValue(0);
}
}