From 265abce7fbd67e3bfdabba30ba8a2a394120cf29 Mon Sep 17 00:00:00 2001 From: Harold Seigel Date: Thu, 20 Dec 2018 08:43:23 -0500 Subject: [PATCH] 8205505: Expire and remove remaining support for commercial features Remove the unneeded options and their tests and update the JCMD documentation. Reviewed-by: dholmes, coleenp, erikj --- make/nb_native/nbproject/configurations.xml | 22 ---------- .../share/classfile/systemDictionary.cpp | 1 - src/hotspot/share/runtime/arguments.cpp | 6 --- src/hotspot/share/runtime/arguments_ext.hpp | 40 ------------------- .../share/services/diagnosticCommand.hpp | 1 - .../share/services/diagnosticCommand_ext.hpp | 30 -------------- 6 files changed, 100 deletions(-) delete mode 100644 src/hotspot/share/runtime/arguments_ext.hpp delete mode 100644 src/hotspot/share/services/diagnosticCommand_ext.hpp diff --git a/make/nb_native/nbproject/configurations.xml b/make/nb_native/nbproject/configurations.xml index 161c34f05b4..263756d71d3 100644 --- a/make/nb_native/nbproject/configurations.xml +++ b/make/nb_native/nbproject/configurations.xml @@ -2538,7 +2538,6 @@ arguments.cpp arguments.hpp arguments_ext.cpp - arguments_ext.hpp atomic.hpp basicLock.cpp basicLock.hpp @@ -2702,7 +2701,6 @@ diagnosticArgument.hpp diagnosticCommand.cpp diagnosticCommand.hpp - diagnosticCommand_ext.hpp diagnosticFramework.cpp diagnosticFramework.hpp dtraceAttacher.cpp @@ -13687,11 +13685,6 @@ tool="1" flavor2="0"> - - - - - - - - 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 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) { UNSUPPORTED_OPTION(AllocateHeapAt); #endif - ArgumentsExt::report_unsupported_options(); - #ifndef PRODUCT if (TraceBytecodesAt != 0) { TraceBytecodes = true; diff --git a/src/hotspot/share/runtime/arguments_ext.hpp b/src/hotspot/share/runtime/arguments_ext.hpp deleted file mode 100644 index 743af71ea7d..00000000000 --- a/src/hotspot/share/runtime/arguments_ext.hpp +++ /dev/null @@ -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 diff --git a/src/hotspot/share/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp index 45bb2a32107..a52bbbb3ee0 100644 --- a/src/hotspot/share/services/diagnosticCommand.hpp +++ b/src/hotspot/share/services/diagnosticCommand.hpp @@ -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" diff --git a/src/hotspot/share/services/diagnosticCommand_ext.hpp b/src/hotspot/share/services/diagnosticCommand_ext.hpp deleted file mode 100644 index b571655380b..00000000000 --- a/src/hotspot/share/services/diagnosticCommand_ext.hpp +++ /dev/null @@ -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