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

8067460: G1: TestResourceManagementFlagWithCommercialBuild.java failed on embedded platform

Browse source 
Added extension point to detect unsupported options

Reviewed-by: dholmes, bdelsart
This commit is contained in:
Alexander Harlap 2015-02-04 13:14:27 -05:00
parent 00d9c7a2d1
commit 3e2dcfd880
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,18 +57,6 @@
#define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp"
#define DEFAULT_JAVA_LAUNCHER "generic"
// Disable options not supported in this release, with a warning if they
// were explicitly requested on the command-line
#define UNSUPPORTED_OPTION(opt, description) \
do { \
if (opt) { \
if (FLAG_IS_CMDLINE(opt)) { \
warning(description " is disabled in this release."); \
} \
FLAG_SET_DEFAULT(opt, false); \
} \
} while(0)
#define UNSUPPORTED_GC_OPTION(gc) \
do { \
if (gc) { \
@ -3854,6 +3842,8 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
#endif
#endif
ArgumentsExt::report_unsupported_options();
#ifndef PRODUCT
if (TraceBytecodesAt != 0) {
TraceBytecodes = true;

12
hotspot/src/share/vm/runtime/arguments.hpp
View file

@ -632,4 +632,16 @@ bool Arguments::check_gc_consistency_ergo() {
return check_gc_consistency_user();
}
// Disable options not supported in this release, with a warning if they
// were explicitly requested on the command-line
#define UNSUPPORTED_OPTION(opt, description) \
do { \
if (opt) { \
if (FLAG_IS_CMDLINE(opt)) { \
warning(description " is disabled in this release."); \
} \
FLAG_SET_DEFAULT(opt, false); \
} \
} while(0)
#endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP

1
hotspot/src/share/vm/runtime/arguments_ext.hpp
View file

@ -37,6 +37,7 @@ public:
// 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() { }
};
void ArgumentsExt::select_gc_ergonomically() {