1.1 --- a/src/share/vm/runtime/globals.hpp Tue Nov 29 17:00:46 2011 -0500
1.2 +++ b/src/share/vm/runtime/globals.hpp Wed Nov 30 12:48:52 2011 -0500
1.3 @@ -373,7 +373,7 @@
1.4 // The type "ccstr" is an alias for "const char*" and is used
1.5 // only in this file, because the macrology requires single-token type names.
1.6
1.7 -// Note: Diagnostic options are not meant for VM tuning or for product modes.
1.8 +// Note: Diagnostic options not meant for VM tuning or for product modes.
1.9 // They are to be used for VM quality assurance or field diagnosis
1.10 // of VM bugs. They are hidden so that users will not be encouraged to
1.11 // try them as if they were VM ordinary execution options. However, they
1.12 @@ -383,12 +383,6 @@
1.13 // option, you must first specify +UnlockDiagnosticVMOptions.
1.14 // (This master switch also affects the behavior of -Xprintflags.)
1.15 //
1.16 -//
1.17 -// commercial flags support features for which Oracle charges a fee for
1.18 -// production use, though they're free for development and/or evaluation.
1.19 -// There's no enforcement mechanism in Hotspot other than that
1.20 -// -XX:+UnlockCommercialVMOptions must first be specified in order to use them.
1.21 -//
1.22 // experimental flags are in support of features that are not
1.23 // part of the officially supported product, but are available
1.24 // for experimenting with. They could, for example, be performance
1.25 @@ -434,7 +428,7 @@
1.26 // Note that when there is a need to support develop flags to be writeable,
1.27 // it can be done in the same way as product_rw.
1.28
1.29 -#define RUNTIME_FLAGS(develop, develop_pd, product, product_pd, commercial, diagnostic, experimental, notproduct, manageable, product_rw, lp64_product) \
1.30 +#define RUNTIME_FLAGS(develop, develop_pd, product, product_pd, diagnostic, experimental, notproduct, manageable, product_rw, lp64_product) \
1.31 \
1.32 lp64_product(bool, UseCompressedOops, false, \
1.33 "Use 32-bit object references in 64-bit VM. " \
1.34 @@ -468,20 +462,15 @@
1.35 develop(bool, CleanChunkPoolAsync, falseInEmbedded, \
1.36 "Whether to clean the chunk pool asynchronously") \
1.37 \
1.38 - /* Temporary: See 6948537 */ \
1.39 + /* Temporary: See 6948537 */ \
1.40 experimental(bool, UseMemSetInBOT, true, \
1.41 "(Unstable) uses memset in BOT updates in GC code") \
1.42 \
1.43 - commercial(bool, UnlockCommercialVMOptions, false, \
1.44 - "Enable normal processing of flags relating to commercial " \
1.45 - "features") \
1.46 - \
1.47 diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug, \
1.48 "Enable normal processing of flags relating to field diagnostics")\
1.49 \
1.50 experimental(bool, UnlockExperimentalVMOptions, false, \
1.51 - "Enable normal processing of flags relating to experimental " \
1.52 - "features") \
1.53 + "Enable normal processing of flags relating to experimental features")\
1.54 \
1.55 product(bool, JavaMonitorsInStackTrace, true, \
1.56 "Print info. about Java monitor locks when the stacks are dumped")\
1.57 @@ -589,8 +578,7 @@
1.58 "Verify stack of each thread when it is entering a runtime call") \
1.59 \
1.60 diagnostic(bool, ForceUnreachable, false, \
1.61 - "Make all non code cache addresses unreachable by forcing use of "\
1.62 - "64-bit literal fixups") \
1.63 + "Make all non code cache addresses to be unreachable with forcing use of 64bit literal fixups") \
1.64 \
1.65 notproduct(bool, StressDerivedPointers, false, \
1.66 "Force scavenge when a derived pointers is detected on stack " \
1.67 @@ -3864,11 +3852,7 @@
1.68 product(bool, UseVMInterruptibleIO, false, \
1.69 "(Unstable, Solaris-specific) Thread interrupt before or with " \
1.70 "EINTR for I/O operations results in OS_INTRPT. The default value"\
1.71 - " of this flag is true for JDK 6 and earlier") \
1.72 - \
1.73 - commercial(bool, FlightRecorder, false, \
1.74 - "Enable Java Flight Recorder")
1.75 -
1.76 + " of this flag is true for JDK 6 and earliers")
1.77
1.78 /*
1.79 * Macros for factoring of globals
1.80 @@ -3877,7 +3861,6 @@
1.81 // Interface macros
1.82 #define DECLARE_PRODUCT_FLAG(type, name, value, doc) extern "C" type name;
1.83 #define DECLARE_PD_PRODUCT_FLAG(type, name, doc) extern "C" type name;
1.84 -#define DECLARE_COMMERCIAL_FLAG(type, name, value, doc) extern "C" type name;
1.85 #define DECLARE_DIAGNOSTIC_FLAG(type, name, value, doc) extern "C" type name;
1.86 #define DECLARE_EXPERIMENTAL_FLAG(type, name, value, doc) extern "C" type name;
1.87 #define DECLARE_MANAGEABLE_FLAG(type, name, value, doc) extern "C" type name;
1.88 @@ -3901,7 +3884,6 @@
1.89 // Implementation macros
1.90 #define MATERIALIZE_PRODUCT_FLAG(type, name, value, doc) type name = value;
1.91 #define MATERIALIZE_PD_PRODUCT_FLAG(type, name, doc) type name = pd_##name;
1.92 -#define MATERIALIZE_COMMERCIAL_FLAG(type, name, value, doc) type name = value;
1.93 #define MATERIALIZE_DIAGNOSTIC_FLAG(type, name, value, doc) type name = value;
1.94 #define MATERIALIZE_EXPERIMENTAL_FLAG(type, name, value, doc) type name = value;
1.95 #define MATERIALIZE_MANAGEABLE_FLAG(type, name, value, doc) type name = value;
1.96 @@ -3921,7 +3903,7 @@
1.97 #define MATERIALIZE_LP64_PRODUCT_FLAG(type, name, value, doc) /* flag is constant */
1.98 #endif // _LP64
1.99
1.100 -RUNTIME_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_COMMERCIAL_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG, DECLARE_LP64_PRODUCT_FLAG)
1.101 +RUNTIME_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG, DECLARE_LP64_PRODUCT_FLAG)
1.102
1.103 RUNTIME_OS_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG)
1.104
