1.1 --- a/src/share/vm/runtime/globals.hpp Fri Feb 03 14:04:59 2012 -0500 1.2 +++ b/src/share/vm/runtime/globals.hpp Fri Feb 03 12:08:55 2012 -0800 1.3 @@ -26,6 +26,17 @@ 1.4 #define SHARE_VM_RUNTIME_GLOBALS_HPP 1.5 1.6 #include "utilities/debug.hpp" 1.7 + 1.8 +// use this for flags that are true per default in the tiered build 1.9 +// but false in non-tiered builds, and vice versa 1.10 +#ifdef TIERED 1.11 +#define trueInTiered true 1.12 +#define falseInTiered false 1.13 +#else 1.14 +#define trueInTiered false 1.15 +#define falseInTiered true 1.16 +#endif 1.17 + 1.18 #ifdef TARGET_ARCH_x86 1.19 # include "globals_x86.hpp" 1.20 #endif 1.21 @@ -353,16 +364,6 @@ 1.22 #define falseInProduct true 1.23 #endif 1.24 1.25 -// use this for flags that are true per default in the tiered build 1.26 -// but false in non-tiered builds, and vice versa 1.27 -#ifdef TIERED 1.28 -#define trueInTiered true 1.29 -#define falseInTiered false 1.30 -#else 1.31 -#define trueInTiered false 1.32 -#define falseInTiered true 1.33 -#endif 1.34 - 1.35 #ifdef JAVASE_EMBEDDED 1.36 #define falseInEmbedded false 1.37 #else 1.38 @@ -658,6 +659,12 @@ 1.39 develop(bool, SpecialArraysEquals, true, \ 1.40 "special version of Arrays.equals(char[],char[])") \ 1.41 \ 1.42 + product(bool, CriticalJNINatives, true, \ 1.43 + "check for critical JNI entry points") \ 1.44 + \ 1.45 + notproduct(bool, StressCriticalJNINatives, false, \ 1.46 + "Exercise register saving code in critical natives") \ 1.47 + \ 1.48 product(bool, UseSSE42Intrinsics, false, \ 1.49 "SSE4.2 versions of intrinsics") \ 1.50 \ 1.51 @@ -735,8 +742,11 @@ 1.52 product(bool, MaxFDLimit, true, \ 1.53 "Bump the number of file descriptors to max in solaris.") \ 1.54 \ 1.55 - notproduct(bool, LogEvents, trueInDebug, \ 1.56 - "Enable Event log") \ 1.57 + diagnostic(bool, LogEvents, true, \ 1.58 + "Enable the various ring buffer event logs") \ 1.59 + \ 1.60 + diagnostic(intx, LogEventsBufferEntries, 10, \ 1.61 + "Enable the various ring buffer event logs") \ 1.62 \ 1.63 product(bool, BytecodeVerificationRemote, true, \ 1.64 "Enables the Java bytecode verifier for remote classes") \