8205505: Expire and remove remaining support for commercial features
Summary: Remove the unneeded options and their tests and update the JCMD documentation.
Reviewed-by: dholmes, coleenp, erikj
--- a/make/nb_native/nbproject/configurations.xml Mon Dec 17 13:47:22 2018 +0100
+++ b/make/nb_native/nbproject/configurations.xml Thu Dec 20 08:43:23 2018 -0500
@@ -2538,7 +2538,6 @@
<in>arguments.cpp</in>
<in>arguments.hpp</in>
<in>arguments_ext.cpp</in>
- <in>arguments_ext.hpp</in>
<in>atomic.hpp</in>
<in>basicLock.cpp</in>
<in>basicLock.hpp</in>
@@ -2702,7 +2701,6 @@
<in>diagnosticArgument.hpp</in>
<in>diagnosticCommand.cpp</in>
<in>diagnosticCommand.hpp</in>
- <in>diagnosticCommand_ext.hpp</in>
<in>diagnosticFramework.cpp</in>
<in>diagnosticFramework.hpp</in>
<in>dtraceAttacher.cpp</in>
@@ -13687,11 +13685,6 @@
tool="1"
flavor2="0">
</item>
- <item path="../../src/hotspot/share/runtime/arguments_ext.hpp"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
<item path="../../src/hotspot/share/runtime/atomic.hpp"
ex="false"
tool="3"
@@ -14497,11 +14490,6 @@
tool="3"
flavor2="0">
</item>
- <item path="../../src/hotspot/share/services/diagnosticCommand_ext.hpp"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
<item path="../../src/hotspot/share/services/diagnosticFramework.cpp"
ex="false"
tool="1"
@@ -27454,11 +27442,6 @@
tool="1"
flavor2="0">
</item>
- <item path="../../src/hotspot/share/runtime/arguments_ext.hpp"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
<item path="../../src/hotspot/share/runtime/atomic.hpp"
ex="false"
tool="3"
@@ -28264,11 +28247,6 @@
tool="3"
flavor2="0">
</item>
- <item path="../../src/hotspot/share/services/diagnosticCommand_ext.hpp"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
<item path="../../src/hotspot/share/services/diagnosticFramework.cpp"
ex="false"
tool="1"
--- a/src/hotspot/share/classfile/systemDictionary.cpp Mon Dec 17 13:47:22 2018 +0100
+++ b/src/hotspot/share/classfile/systemDictionary.cpp Thu Dec 20 08:43:23 2018 -0500
@@ -71,7 +71,6 @@
#include "prims/resolvedMethodTable.hpp"
#include "prims/methodHandles.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/arguments_ext.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/fieldType.hpp"
#include "runtime/handles.inline.hpp"
--- a/src/hotspot/share/runtime/arguments.cpp Mon Dec 17 13:47:22 2018 +0100
+++ b/src/hotspot/share/runtime/arguments.cpp Thu Dec 20 08:43:23 2018 -0500
@@ -41,7 +41,6 @@
#include "oops/oop.inline.hpp"
#include "prims/jvmtiExport.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/arguments_ext.hpp"
#include "runtime/flags/jvmFlag.hpp"
#include "runtime/flags/jvmFlagConstraintList.hpp"
#include "runtime/flags/jvmFlagWriteableList.hpp"
@@ -3544,9 +3543,6 @@
for (int index = 0; index < args->nOptions; index++) {
const JavaVMOption* option = args->options + index;
- if (ArgumentsExt::process_options(option)) {
- continue;
- }
if (match_option(option, "-XX:Flags=", &tail)) {
Arguments::set_jvm_flags_file(tail);
continue;
@@ -3813,8 +3809,6 @@
UNSUPPORTED_OPTION(AllocateHeapAt);
#endif
- ArgumentsExt::report_unsupported_options();
-
#ifndef PRODUCT
if (TraceBytecodesAt != 0) {
TraceBytecodes = true;
--- a/src/hotspot/share/runtime/arguments_ext.hpp Mon Dec 17 13:47:22 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2014, 2017, 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.
- *
- */
-
-#ifndef SHARE_VM_RUNTIME_ARGUMENTS_EXT_HPP
-#define SHARE_VM_RUNTIME_ARGUMENTS_EXT_HPP
-
-#include "memory/allocation.hpp"
-#include "runtime/arguments.hpp"
-
-class ArgumentsExt: AllStatic {
-public:
- // The argument processing extension. Returns true if there is
- // no additional parsing needed in Arguments::parse() for the option.
- // Otherwise returns false.
- static inline bool process_options(const JavaVMOption *option) { return false; }
- static inline void report_unsupported_options() { }
-};
-
-#endif // SHARE_VM_RUNTIME_ARGUMENTS_EXT_HPP
--- a/src/hotspot/share/services/diagnosticCommand.hpp Mon Dec 17 13:47:22 2018 +0100
+++ b/src/hotspot/share/services/diagnosticCommand.hpp Thu Dec 20 08:43:23 2018 -0500
@@ -34,7 +34,6 @@
#include "runtime/vmThread.hpp"
#include "services/diagnosticArgument.hpp"
#include "services/diagnosticCommand.hpp"
-#include "services/diagnosticCommand_ext.hpp"
#include "services/diagnosticFramework.hpp"
#include "utilities/macros.hpp"
#include "utilities/ostream.hpp"
--- a/src/hotspot/share/services/diagnosticCommand_ext.hpp Mon Dec 17 13:47:22 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2012, 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.
- *
- */
-
-#ifndef SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_EXT_HPP
-#define SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_EXT_HPP
-
-#undef HAVE_EXTRA_DCMD
-
-#endif // SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_HPP