jdk-sandbox: comparison hotspot/src/share/vm/runtime/globals.hpp

equal deleted inserted replaced

-:feba5d4126b8
+:82c7497fbad4
 // string type aliases used only in this file
 typedef const char* ccstr;
 typedef const char* ccstrlist;   // represents string arguments which accumulate
-enum FlagValueOrigin {
-DEFAULT          = 0,
-COMMAND_LINE     = 1,
-ENVIRON_VAR      = 2,
-CONFIG_FILE      = 3,
-MANAGEMENT       = 4,
-ERGONOMIC        = 5,
-ATTACH_ON_DEMAND = 6,
-INTERNAL         = 99
-};
 struct Flag {
-const char *type;
+enum Flags {
-const char *name;
+// value origin
-void*       addr;
+DEFAULT          = 0,
+COMMAND_LINE     = 1,
-NOT_PRODUCT(const char *doc;)
+ENVIRON_VAR      = 2,
+CONFIG_FILE      = 3,
-const char *kind;
+MANAGEMENT       = 4,
-FlagValueOrigin origin;
+ERGONOMIC        = 5,
+ATTACH_ON_DEMAND = 6,
+INTERNAL         = 7,
+LAST_VALUE_ORIGIN = INTERNAL,
+VALUE_ORIGIN_BITS = 4,
+VALUE_ORIGIN_MASK = right_n_bits(VALUE_ORIGIN_BITS),
+// flag kind
+KIND_PRODUCT            = 1 << 4,
+KIND_MANAGEABLE         = 1 << 5,
+KIND_DIAGNOSTIC         = 1 << 6,
+KIND_EXPERIMENTAL       = 1 << 7,
+KIND_NOT_PRODUCT        = 1 << 8,
+KIND_DEVELOP            = 1 << 9,
+KIND_PLATFORM_DEPENDENT = 1 << 10,
+KIND_READ_WRITE         = 1 << 11,
+KIND_C1                 = 1 << 12,
+KIND_C2                 = 1 << 13,
+KIND_ARCH               = 1 << 14,
+KIND_SHARK              = 1 << 15,
+KIND_LP64_PRODUCT       = 1 << 16,
+KIND_COMMERCIAL         = 1 << 17,
+KIND_MASK = ~VALUE_ORIGIN_MASK
+};
+const char* _type;
+const char* _name;
+void* _addr;
+NOT_PRODUCT(const char* _doc;)
+Flags _flags;
 // points to all Flags static array
-static Flag *flags;
+static Flag* flags;
 // number of flags
 static size_t numFlags;
 static Flag* find_flag(const char* name, size_t length, bool allow_locked = false);
 static Flag* fuzzy_match(const char* name, size_t length, bool allow_locked = false);
-bool is_bool() const        { return strcmp(type, "bool") == 0; }
+void check_writable();
-bool get_bool() const       { return *((bool*) addr); }
-void set_bool(bool value)   { *((bool*) addr) = value; }
+bool is_bool() const;
+bool get_bool() const;
-bool is_intx()  const       { return strcmp(type, "intx")  == 0; }
+void set_bool(bool value);
-intx get_intx() const       { return *((intx*) addr); }
-void set_intx(intx value)   { *((intx*) addr) = value; }
+bool is_intx() const;
+intx get_intx() const;
-bool is_uintx() const       { return strcmp(type, "uintx") == 0; }
+void set_intx(intx value);
-uintx get_uintx() const     { return *((uintx*) addr); }
-void set_uintx(uintx value) { *((uintx*) addr) = value; }
+bool is_uintx() const;
+uintx get_uintx() const;
-bool is_uint64_t() const          { return strcmp(type, "uint64_t") == 0; }
+void set_uintx(uintx value);
-uint64_t get_uint64_t() const     { return *((uint64_t*) addr); }
-void set_uint64_t(uint64_t value) { *((uint64_t*) addr) = value; }
+bool is_uint64_t() const;
+uint64_t get_uint64_t() const;
-bool is_double() const        { return strcmp(type, "double") == 0; }
+void set_uint64_t(uint64_t value);
-double get_double() const     { return *((double*) addr); }
-void set_double(double value) { *((double*) addr) = value; }
+bool is_double() const;
+double get_double() const;
-bool is_ccstr() const          { return strcmp(type, "ccstr") == 0 || strcmp(type, "ccstrlist") == 0; }
+void set_double(double value);
-bool ccstr_accumulates() const { return strcmp(type, "ccstrlist") == 0; }
-ccstr get_ccstr() const     { return *((ccstr*) addr); }
+bool is_ccstr() const;
-void set_ccstr(ccstr value) { *((ccstr*) addr) = value; }
+bool ccstr_accumulates() const;
+ccstr get_ccstr() const;
+void set_ccstr(ccstr value);
+Flags get_origin();
+void set_origin(Flags origin);
+bool is_default();
+bool is_ergonomic();
+bool is_command_line();
+bool is_product() const;
+bool is_manageable() const;
+bool is_diagnostic() const;
+bool is_experimental() const;
+bool is_notproduct() const;
+bool is_develop() const;
+bool is_read_write() const;
+bool is_commercial() const;
+bool is_constant_in_binary() const;
 bool is_unlocker() const;
 bool is_unlocked() const;
 bool is_writeable() const;
 bool is_external() const;
 void get_locked_message(char*, int) const;
 void get_locked_message_ext(char*, int) const;
 void print_on(outputStream* st, bool withComments = false );
+void print_kind(outputStream* st);
 void print_as_flag(outputStream* st);
 };
 // debug flags control various aspects of the VM and are global accessible
 class CommandLineFlags {
 public:
 static bool boolAt(char* name, size_t len, bool* value);
 static bool boolAt(char* name, bool* value)      { return boolAt(name, strlen(name), value); }
-static bool boolAtPut(char* name, size_t len, bool* value, FlagValueOrigin origin);
+static bool boolAtPut(char* name, size_t len, bool* value, Flag::Flags origin);
-static bool boolAtPut(char* name, bool* value, FlagValueOrigin origin)   { return boolAtPut(name, strlen(name), value, origin); }
+static bool boolAtPut(char* name, bool* value, Flag::Flags origin)   { return boolAtPut(name, strlen(name), value, origin); }
 static bool intxAt(char* name, size_t len, intx* value);
 static bool intxAt(char* name, intx* value)      { return intxAt(name, strlen(name), value); }
-static bool intxAtPut(char* name, size_t len, intx* value, FlagValueOrigin origin);
+static bool intxAtPut(char* name, size_t len, intx* value, Flag::Flags origin);
-static bool intxAtPut(char* name, intx* value, FlagValueOrigin origin)   { return intxAtPut(name, strlen(name), value, origin); }
+static bool intxAtPut(char* name, intx* value, Flag::Flags origin)   { return intxAtPut(name, strlen(name), value, origin); }
 static bool uintxAt(char* name, size_t len, uintx* value);
 static bool uintxAt(char* name, uintx* value)    { return uintxAt(name, strlen(name), value); }
-static bool uintxAtPut(char* name, size_t len, uintx* value, FlagValueOrigin origin);
+static bool uintxAtPut(char* name, size_t len, uintx* value, Flag::Flags origin);
-static bool uintxAtPut(char* name, uintx* value, FlagValueOrigin origin) { return uintxAtPut(name, strlen(name), value, origin); }
+static bool uintxAtPut(char* name, uintx* value, Flag::Flags origin) { return uintxAtPut(name, strlen(name), value, origin); }
 static bool uint64_tAt(char* name, size_t len, uint64_t* value);
 static bool uint64_tAt(char* name, uint64_t* value) { return uint64_tAt(name, strlen(name), value); }
-static bool uint64_tAtPut(char* name, size_t len, uint64_t* value, FlagValueOrigin origin);
+static bool uint64_tAtPut(char* name, size_t len, uint64_t* value, Flag::Flags origin);
-static bool uint64_tAtPut(char* name, uint64_t* value, FlagValueOrigin origin) { return uint64_tAtPut(name, strlen(name), value, origin); }
+static bool uint64_tAtPut(char* name, uint64_t* value, Flag::Flags origin) { return uint64_tAtPut(name, strlen(name), value, origin); }
 static bool doubleAt(char* name, size_t len, double* value);
 static bool doubleAt(char* name, double* value)    { return doubleAt(name, strlen(name), value); }
-static bool doubleAtPut(char* name, size_t len, double* value, FlagValueOrigin origin);
+static bool doubleAtPut(char* name, size_t len, double* value, Flag::Flags origin);
-static bool doubleAtPut(char* name, double* value, FlagValueOrigin origin) { return doubleAtPut(name, strlen(name), value, origin); }
+static bool doubleAtPut(char* name, double* value, Flag::Flags origin) { return doubleAtPut(name, strlen(name), value, origin); }
 static bool ccstrAt(char* name, size_t len, ccstr* value);
 static bool ccstrAt(char* name, ccstr* value)    { return ccstrAt(name, strlen(name), value); }
-static bool ccstrAtPut(char* name, size_t len, ccstr* value, FlagValueOrigin origin);
+static bool ccstrAtPut(char* name, size_t len, ccstr* value, Flag::Flags origin);
-static bool ccstrAtPut(char* name, ccstr* value, FlagValueOrigin origin) { return ccstrAtPut(name, strlen(name), value, origin); }
+static bool ccstrAtPut(char* name, ccstr* value, Flag::Flags origin) { return ccstrAtPut(name, strlen(name), value, origin); }
 // Returns false if name is not a command line flag.
 static bool wasSetOnCmdline(const char* name, bool* value);
 static void printSetFlags(outputStream* out);
 // it can be done in the same way as product_rw.
 #define RUNTIME_FLAGS(develop, develop_pd, product, product_pd, diagnostic, experimental, notproduct, manageable, product_rw, lp64_product) \
 \
 lp64_product(bool, UseCompressedOops, false,                              \
-"Use 32-bit object references in 64-bit VM  "                   \
+"Use 32-bit object references in 64-bit VM. "                     \
-"lp64_product means flag is always constant in 32 bit VM")      \
+"lp64_product means flag is always constant in 32 bit VM")        \
 \
-lp64_product(bool, UseCompressedKlassPointers, false,                     \
+lp64_product(bool, UseCompressedClassPointers, false,                     \
-"Use 32-bit klass pointers in 64-bit VM  "                      \
+"Use 32-bit class pointers in 64-bit VM. "                        \
-"lp64_product means flag is always constant in 32 bit VM")      \
+"lp64_product means flag is always constant in 32 bit VM")        \
 \
 notproduct(bool, CheckCompressedOops, true,                               \
-"generate checks in encoding/decoding code in debug VM")        \
+"Generate checks in encoding/decoding code in debug VM")          \
 \
 product_pd(uintx, HeapBaseMinAddress,                                     \
-"OS specific low limit for heap base address")                  \
+"OS specific low limit for heap base address")                    \
 \
 diagnostic(bool, PrintCompressedOopsMode, false,                          \
-"Print compressed oops base address and encoding mode")         \
+"Print compressed oops base address and encoding mode")           \
 \
 lp64_product(intx, ObjectAlignmentInBytes, 8,                             \
 "Default object alignment in bytes, 8 is minimum")                \
 \
 product(bool, AssumeMP, false,                                            \
 */                                                                       \
 product(bool, UsePPCLWSYNC, true,                                         \
 "Use lwsync instruction if true, else use slower sync")           \
 \
 develop(bool, CleanChunkPoolAsync, falseInEmbedded,                       \
-"Whether to clean the chunk pool asynchronously")                 \
+"Clean the chunk pool asynchronously")                            \
 \
 /* Temporary: See 6948537 */                                              \
 experimental(bool, UseMemSetInBOT, true,                                  \
 "(Unstable) uses memset in BOT updates in GC code")               \
 \
 diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug,                  \
 "Enable normal processing of flags relating to field diagnostics")\
 \
 experimental(bool, UnlockExperimentalVMOptions, false,                    \
-"Enable normal processing of flags relating to experimental features")\
+"Enable normal processing of flags relating to experimental "     \
+"features")                                                       \
 \
 product(bool, JavaMonitorsInStackTrace, true,                             \
-"Print info. about Java monitor locks when the stacks are dumped")\
+"Print information about Java monitor locks when the stacks are"  \
+"dumped")                                                         \
 \
 product_pd(bool, UseLargePages,                                           \
 "Use large page memory")                                          \
 \
 product_pd(bool, UseLargePagesIndividualAllocation,                       \
 "Allocate large pages individually for better affinity")          \
 \
 develop(bool, LargePagesIndividualAllocationInjectError, false,           \
 "Fail large pages individual allocation")                         \
 \
+product(bool, UseLargePagesInMetaspace, false,                            \
+"Use large page memory in metaspace. "                            \
+"Only used if UseLargePages is enabled.")                         \
+\
 develop(bool, TracePageSizes, false,                                      \
-"Trace page size selection and usage.")                           \
+"Trace page size selection and usage")                            \
 \
 product(bool, UseNUMA, false,                                             \
 "Use NUMA if available")                                          \
 \
 product(bool, UseNUMAInterleaving, false,                                 \
 \
 product(bool, ForceNUMA, false,                                           \
 "Force NUMA optimizations on single-node/UMA systems")            \
 \
 product(uintx, NUMAChunkResizeWeight, 20,                                 \
-"Percentage (0-100) used to weigh the current sample when "      \
+"Percentage (0-100) used to weigh the current sample when "       \
 "computing exponentially decaying average for "                   \
 "AdaptiveNUMAChunkSizing")                                        \
 \
 product(uintx, NUMASpaceResizeRate, 1*G,                                  \
-"Do not reallocate more that this amount per collection")         \
+"Do not reallocate more than this amount per collection")         \
 \
 product(bool, UseAdaptiveNUMAChunkSizing, true,                           \
 "Enable adaptive chunk sizing for NUMA")                          \
 \
 product(bool, NUMAStats, false,                                           \
 "True for register window machines (sparc/ia64)")                 \
 \
 product(intx, UseSSE, 99,                                                 \
 "Highest supported SSE instructions set on x86/x64")              \
 \
-product(bool, UseAES, false,                                               \
+product(bool, UseAES, false,                                              \
 "Control whether AES instructions can be used on x86/x64")        \
 \
 product(uintx, LargePageSizeInBytes, 0,                                   \
-"Large page size (0 to let VM choose the page size")              \
+"Large page size (0 to let VM choose the page size)")             \
 \
 product(uintx, LargePageHeapSizeThreshold, 128*M,                         \
-"Use large pages if max heap is at least this big")               \
+"Use large pages if maximum heap is at least this big")           \
 \
 product(bool, ForceTimeHighResolution, false,                             \
-"Using high time resolution(For Win32 only)")                     \
+"Using high time resolution (for Win32 only)")                    \
 \
 develop(bool, TraceItables, false,                                        \
 "Trace initialization and use of itables")                        \
 \
 develop(bool, TracePcPatching, false,                                     \
 develop(bool, TraceRelocator, false,                                      \
 "Trace the bytecode relocator")                                   \
 \
 develop(bool, TraceLongCompiles, false,                                   \
 "Print out every time compilation is longer than "                \
-"a given threashold")                                             \
+"a given threshold")                                              \
 \
 develop(bool, SafepointALot, false,                                       \
-"Generates a lot of safepoints. Works with "                      \
+"Generate a lot of safepoints. This works with "                  \
 "GuaranteedSafepointInterval")                                    \
 \
 product_pd(bool, BackgroundCompilation,                                   \
 "A thread requesting compilation is not blocked during "          \
 "compilation")                                                    \
 \
 product(bool, PrintVMQWaitTime, false,                                    \
-"Prints out the waiting time in VM operation queue")              \
+"Print out the waiting time in VM operation queue")               \
 \
 develop(bool, NoYieldsInMicrolock, false,                                 \
 "Disable yields in microlock")                                    \
 \
 develop(bool, TraceOopMapGeneration, false,                               \
-"Shows oopmap generation")                                        \
+"Show OopMapGeneration")                                          \
 \
 product(bool, MethodFlushing, true,                                       \
 "Reclamation of zombie and not-entrant methods")                  \
 \
 develop(bool, VerifyStack, false,                                         \
 "Verify stack of each thread when it is entering a runtime call") \
 \
 diagnostic(bool, ForceUnreachable, false,                                 \
-"Make all non code cache addresses to be unreachable with forcing use of 64bit literal fixups") \
+"Make all non code cache addresses to be unreachable by "         \
+"forcing use of 64bit literal fixups")                            \
 \
 notproduct(bool, StressDerivedPointers, false,                            \
-"Force scavenge when a derived pointers is detected on stack "    \
+"Force scavenge when a derived pointer is detected on stack "     \
 "after rtm call")                                                 \
 \
 develop(bool, TraceDerivedPointers, false,                                \
 "Trace traversal of derived pointers on stack")                   \
 \
 \
 product(bool, UseInlineCaches, true,                                      \
 "Use Inline Caches for virtual calls ")                           \
 \
 develop(bool, InlineArrayCopy, true,                                      \
-"inline arraycopy native that is known to be part of "            \
+"Inline arraycopy native that is known to be part of "            \
 "base library DLL")                                               \
 \
 develop(bool, InlineObjectHash, true,                                     \
-"inline Object::hashCode() native that is known to be part "      \
+"Inline Object::hashCode() native that is known to be part "      \
 "of base library DLL")                                            \
 \
 develop(bool, InlineNatives, true,                                        \
-"inline natives that are known to be part of base library DLL")   \
+"Inline natives that are known to be part of base library DLL")   \
 \
 develop(bool, InlineMathNatives, true,                                    \
-"inline SinD, CosD, etc.")                                        \
+"Inline SinD, CosD, etc.")                                        \
 \
 develop(bool, InlineClassNatives, true,                                   \
-"inline Class.isInstance, etc")                                   \
+"Inline Class.isInstance, etc")                                   \
 \
 develop(bool, InlineThreadNatives, true,                                  \
-"inline Thread.currentThread, etc")                               \
+"Inline Thread.currentThread, etc")                               \
 \
 develop(bool, InlineUnsafeOps, true,                                      \
-"inline memory ops (native methods) from sun.misc.Unsafe")        \
+"Inline memory ops (native methods) from sun.misc.Unsafe")        \
 \
 product(bool, CriticalJNINatives, true,                                   \
-"check for critical JNI entry points")                            \
+"Check for critical JNI entry points")                            \
 \
 notproduct(bool, StressCriticalJNINatives, false,                         \
-"Exercise register saving code in critical natives")            \
+"Exercise register saving code in critical natives")              \
 \
 product(bool, UseSSE42Intrinsics, false,                                  \
 "SSE4.2 versions of intrinsics")                                  \
 \
 product(bool, UseAESIntrinsics, false,                                    \
-"use intrinsics for AES versions of crypto")                      \
+"Use intrinsics for AES versions of crypto")                      \
 \
 product(bool, UseCRC32Intrinsics, false,                                  \
 "use intrinsics for java.util.zip.CRC32")                         \
 \
 develop(bool, TraceCallFixup, false,                                      \
-"traces all call fixups")                                         \
+"Trace all call fixups")                                          \
 \
 develop(bool, DeoptimizeALot, false,                                      \
-"deoptimize at every exit from the runtime system")               \
+"Deoptimize at every exit from the runtime system")               \
 \
 notproduct(ccstrlist, DeoptimizeOnlyAt, "",                               \
-"a comma separated list of bcis to deoptimize at")                \
+"A comma separated list of bcis to deoptimize at")                \
 \
 product(bool, DeoptimizeRandom, false,                                    \
-"deoptimize random frames on random exit from the runtime system")\
+"Deoptimize random frames on random exit from the runtime system")\
 \
 notproduct(bool, ZombieALot, false,                                       \
-"creates zombies (non-entrant) at exit from the runt. system")    \
+"Create zombies (non-entrant) at exit from the runtime system")   \
 \
 product(bool, UnlinkSymbolsALot, false,                                   \
-"unlink unreferenced symbols from the symbol table at safepoints")\
+"Unlink unreferenced symbols from the symbol table at safepoints")\
 \
 notproduct(bool, WalkStackALot, false,                                    \
-"trace stack (no print) at every exit from the runtime system")   \
+"Trace stack (no print) at every exit from the runtime system")   \
 \
 product(bool, Debugging, false,                                           \
-"set when executing debug methods in debug.ccp "                  \
+"Set when executing debug methods in debug.cpp "                  \
 "(to prevent triggering assertions)")                             \
 \
 notproduct(bool, StrictSafepointChecks, trueInDebug,                      \
 "Enable strict checks that safepoints cannot happen for threads " \
-"that used No_Safepoint_Verifier")                                \
+"that use No_Safepoint_Verifier")                                 \
 \
 notproduct(bool, VerifyLastFrame, false,                                  \
 "Verify oops on last frame on entry to VM")                       \
 \
 develop(bool, TraceHandleAllocation, false,                               \
-"Prints out warnings when suspicious many handles are allocated") \
+"Print out warnings when suspiciously many handles are allocated")\
 \
 product(bool, UseCompilerSafepoints, true,                                \
 "Stop at safepoints in compiled code")                            \
 \
 product(bool, FailOverToOldVerifier, true,                                \
-"fail over to old verifier when split verifier fails")            \
+"Fail over to old verifier when split verifier fails")            \
 \
 develop(bool, ShowSafepointMsgs, false,                                   \
-"Show msg. about safepoint synch.")                               \
+"Show message about safepoint synchronization")                   \
 \
 product(bool, SafepointTimeout, false,                                    \
 "Time out and warn or fail after SafepointTimeoutDelay "          \
 "milliseconds if failed to reach safepoint")                      \
 \
 \
 product(bool, TraceSuspendWaitFailures, false,                            \
 "Trace external suspend wait failures")                           \
 \
 product(bool, MaxFDLimit, true,                                           \
-"Bump the number of file descriptors to max in solaris.")         \
+"Bump the number of file descriptors to maximum in Solaris")      \
 \
 diagnostic(bool, LogEvents, true,                                         \
-"Enable the various ring buffer event logs")                   \
+"Enable the various ring buffer event logs")                      \
 \
 diagnostic(uintx, LogEventsBufferEntries, 10,                             \
-"Enable the various ring buffer event logs")                   \
+"Number of ring buffer event logs")                               \
 \
 product(bool, BytecodeVerificationRemote, true,                           \
-"Enables the Java bytecode verifier for remote classes")          \
+"Enable the Java bytecode verifier for remote classes")           \
 \
 product(bool, BytecodeVerificationLocal, false,                           \
-"Enables the Java bytecode verifier for local classes")           \
+"Enable the Java bytecode verifier for local classes")            \
 \
 develop(bool, ForceFloatExceptions, trueInDebug,                          \
 "Force exceptions on FP stack under/overflow")                    \
 \
 develop(bool, VerifyStackAtCalls, false,                                  \
 \
 develop(bool, TraceJavaAssertions, false,                                 \
 "Trace java language assertions")                                 \
 \
 notproduct(bool, CheckAssertionStatusDirectives, false,                   \
-"temporary - see javaClasses.cpp")                                \
+"Temporary - see javaClasses.cpp")                                \
 \
 notproduct(bool, PrintMallocFree, false,                                  \
 "Trace calls to C heap malloc/free allocation")                   \
 \
 product(bool, PrintOopAddress, false,                                     \
 notproduct(bool, ZapDeadLocalsOld, false,                                 \
 "Zap dead locals (old version, zaps all frames when "             \
 "entering the VM")                                                \
 \
 notproduct(bool, CheckOopishValues, false,                                \
-"Warn if value contains oop ( requires ZapDeadLocals)")           \
+"Warn if value contains oop (requires ZapDeadLocals)")            \
 \
 develop(bool, UseMallocOnly, false,                                       \
-"use only malloc/free for allocation (no resource area/arena)")   \
+"Use only malloc/free for allocation (no resource area/arena)")   \
 \
 develop(bool, PrintMalloc, false,                                         \
-"print all malloc/free calls")                                    \
+"Print all malloc/free calls")                                    \
 \
 develop(bool, PrintMallocStatistics, false,                               \
-"print malloc/free statistics")                                   \
+"Print malloc/free statistics")                                   \
 \
 develop(bool, ZapResourceArea, trueInDebug,                               \
 "Zap freed resource/arena space with 0xABABABAB")                 \
 \
 notproduct(bool, ZapVMHandleArea, trueInDebug,                            \
 \
 develop(bool, ZapJNIHandleArea, trueInDebug,                              \
 "Zap freed JNI handle space with 0xFEFEFEFE")                     \
 \
 notproduct(bool, ZapStackSegments, trueInDebug,                           \
-"Zap allocated/freed Stack segments with 0xFADFADED")          \
+"Zap allocated/freed stack segments with 0xFADFADED")             \
 \
 develop(bool, ZapUnusedHeapArea, trueInDebug,                             \
 "Zap unused heap space with 0xBAADBABE")                          \
 \
 develop(bool, TraceZapUnusedHeapArea, false,                              \
 \
 develop(bool, ZapFillerObjects, trueInDebug,                              \
 "Zap filler objects with 0xDEAFBABE")                             \
 \
 develop(bool, PrintVMMessages, true,                                      \
-"Print vm messages on console")                                   \
+"Print VM messages on console")                                   \
 \
 product(bool, PrintGCApplicationConcurrentTime, false,                    \
 "Print the time the application has been running")                \
 \
 product(bool, PrintGCApplicationStoppedTime, false,                       \
 "Print the time the application has been stopped")                \
 \
 diagnostic(bool, VerboseVerification, false,                              \
-"Display detailed verification details")                       \
+"Display detailed verification details")                          \
 \
 notproduct(uintx, ErrorHandlerTest, 0,                                    \
-"If > 0, provokes an error after VM initialization; the value"    \
+"If > 0, provokes an error after VM initialization; the value "   \
-"determines which error to provoke.  See test_error_handler()"    \
+"determines which error to provoke. See test_error_handler() "    \
 "in debug.cpp.")                                                  \
 \
 develop(bool, Verbose, false,                                             \
-"Prints additional debugging information from other modes")       \
+"Print additional debugging information from other modes")        \
 \
 develop(bool, PrintMiscellaneous, false,                                  \
-"Prints uncategorized debugging information (requires +Verbose)") \
+"Print uncategorized debugging information (requires +Verbose)")  \
 \
 develop(bool, WizardMode, false,                                          \
-"Prints much more debugging information")                         \
+"Print much more debugging information")                          \
 \
 product(bool, ShowMessageBoxOnError, false,                               \
 "Keep process alive on VM fatal error")                           \
 \
 product(bool, CreateMinidumpOnCrash, false,                               \
 \
 product_pd(bool, UseOSErrorReporting,                                     \
 "Let VM fatal error propagate to the OS (ie. WER on Windows)")    \
 \
 product(bool, SuppressFatalErrorMessage, false,                           \
-"Do NO Fatal Error report [Avoid deadlock]")                      \
+"Report NO fatal error message (avoid deadlock)")                 \
 \
 product(ccstrlist, OnError, "",                                           \
 "Run user-defined commands on fatal error; see VMError.cpp "      \
 "for examples")                                                   \
 \
 product(ccstrlist, OnOutOfMemoryError, "",                                \
 "Run user-defined commands on first java.lang.OutOfMemoryError")  \
 \
 manageable(bool, HeapDumpBeforeFullGC, false,                             \
-"Dump heap to file before any major stop-world GC")               \
+"Dump heap to file before any major stop-the-world GC")           \
 \
 manageable(bool, HeapDumpAfterFullGC, false,                              \
-"Dump heap to file after any major stop-world GC")                \
+"Dump heap to file after any major stop-the-world GC")            \
 \
 manageable(bool, HeapDumpOnOutOfMemoryError, false,                       \
 "Dump heap to file when java.lang.OutOfMemoryError is thrown")    \
 \
 manageable(ccstr, HeapDumpPath, NULL,                                     \
-"When HeapDumpOnOutOfMemoryError is on, the path (filename or"    \
+"When HeapDumpOnOutOfMemoryError is on, the path (filename or "   \
-"directory) of the dump file (defaults to java_pid<pid>.hprof"    \
+"directory) of the dump file (defaults to java_pid<pid>.hprof "   \
 "in the working directory)")                                      \
 \
 develop(uintx, SegmentedHeapDumpThreshold, 2*G,                           \
 "Generate a segmented heap dump (JAVA PROFILE 1.0.2 format) "     \
 "when the heap usage is larger than this")                        \
 \
 develop(bool, BreakAtWarning, false,                                      \
 "Execute breakpoint upon encountering VM warning")                \
 \
 develop(bool, TraceVMOperation, false,                                    \
-"Trace vm operations")                                            \
+"Trace VM operations")                                            \
 \
 develop(bool, UseFakeTimers, false,                                       \
-"Tells whether the VM should use system time or a fake timer")    \
+"Tell whether the VM should use system time or a fake timer")     \
 \
 product(ccstr, NativeMemoryTracking, "off",                               \
 "Native memory tracking options")                                 \
 \
 diagnostic(bool, PrintNMTStatistics, false,                               \
 "Print native memory tracking summary data if it is on")          \
 \
 diagnostic(bool, AutoShutdownNMT, true,                                   \
 "Automatically shutdown native memory tracking under stress "     \
-"situation. When set to false, native memory tracking tries to "  \
+"situations. When set to false, native memory tracking tries to " \
 "stay alive at the expense of JVM performance")                   \
 \
 diagnostic(bool, LogCompilation, false,                                   \
-"Log compilation activity in detail to hotspot.log or LogFile")   \
+"Log compilation activity in detail to LogFile")                  \
 \
 product(bool, PrintCompilation, false,                                    \
 "Print compilations")                                             \
 \
 diagnostic(bool, TraceNMethodInstalls, false,                             \
-"Trace nmethod intallation")                                   \
+"Trace nmethod installation")                                     \
 \
 diagnostic(intx, ScavengeRootsInCode, 2,                                  \
-"0: do not allow scavengable oops in the code cache; "         \
+"0: do not allow scavengable oops in the code cache; "            \
-"1: allow scavenging from the code cache; "                    \
+"1: allow scavenging from the code cache; "                       \
-"2: emit as many constants as the compiler can see")           \
+"2: emit as many constants as the compiler can see")              \
 \
 product(bool, AlwaysRestoreFPU, false,                                    \
 "Restore the FPU control word after every JNI call (expensive)")  \
 \
 diagnostic(bool, PrintCompilation2, false,                                \
 \
 diagnostic(bool, PrintAssembly, false,                                    \
 "Print assembly code (using external disassembler.so)")           \
 \
 diagnostic(ccstr, PrintAssemblyOptions, NULL,                             \
-"Options string passed to disassembler.so")                       \
+"Print options string passed to disassembler.so")                 \
 \
 diagnostic(bool, PrintNMethods, false,                                    \
 "Print assembly code for nmethods when generated")                \
 \
 diagnostic(bool, PrintNativeNMethods, false,                              \
 \
 develop(bool, PrintExceptionHandlers, false,                              \
 "Print exception handler tables for all nmethods when generated") \
 \
 develop(bool, StressCompiledExceptionHandlers, false,                     \
-"Exercise compiled exception handlers")                            \
+"Exercise compiled exception handlers")                           \
 \
 develop(bool, InterceptOSException, false,                                \
-"Starts debugger when an implicit OS (e.g., NULL) "               \
+"Start debugger when an implicit OS (e.g. NULL) "                 \
 "exception happens")                                              \
 \
 product(bool, PrintCodeCache, false,                                      \
 "Print the code cache memory usage when exiting")                 \
 \
 develop(bool, PrintCodeCache2, false,                                     \
-"Print detailed usage info on the code cache when exiting")       \
+"Print detailed usage information on the code cache when exiting")\
 \
 product(bool, PrintCodeCacheOnCompilation, false,                         \
-"Print the code cache memory usage each time a method is compiled") \
+"Print the code cache memory usage each time a method is "        \
+"compiled")                                                       \
 \
 diagnostic(bool, PrintStubCode, false,                                    \
 "Print generated stub code")                                      \
 \
 product(bool, StackTraceInThrowable, true,                                \
 \
 product(bool, OmitStackTraceInFastThrow, true,                            \
 "Omit backtraces for some 'hot' exceptions in optimized code")    \
 \
 product(bool, ProfilerPrintByteCodeStatistics, false,                     \
-"Prints byte code statictics when dumping profiler output")       \
+"Print bytecode statistics when dumping profiler output")         \
 \
 product(bool, ProfilerRecordPC, false,                                    \
-"Collects tick for each 16 byte interval of compiled code")       \
+"Collect ticks for each 16 byte interval of compiled code")       \
 \
 product(bool, ProfileVM, false,                                           \
-"Profiles ticks that fall within VM (either in the VM Thread "    \
+"Profile ticks that fall within VM (either in the VM Thread "     \
 "or VM code called through stubs)")                               \
 \
 product(bool, ProfileIntervals, false,                                    \
-"Prints profiles for each interval (see ProfileIntervalsTicks)")  \
+"Print profiles for each interval (see ProfileIntervalsTicks)")   \
 \
 notproduct(bool, ProfilerCheckIntervals, false,                           \
-"Collect and print info on spacing of profiler ticks")            \
+"Collect and print information on spacing of profiler ticks")     \
 \
 develop(bool, PrintJVMWarnings, false,                                    \
-"Prints warnings for unimplemented JVM functions")                \
+"Print warnings for unimplemented JVM functions")                 \
 \
 product(bool, PrintWarnings, true,                                        \
-"Prints JVM warnings to output stream")                           \
+"Print JVM warnings to output stream")                            \
 \
 notproduct(uintx, WarnOnStalledSpinLock, 0,                               \
-"Prints warnings for stalled SpinLocks")                          \
+"Print warnings for stalled SpinLocks")                           \
 \
 product(bool, RegisterFinalizersAtInit, true,                             \
 "Register finalizable objects at end of Object.<init> or "        \
 "after allocation")                                               \
 \
 develop(bool, RegisterReferences, true,                                   \
-"Tells whether the VM should register soft/weak/final/phantom "   \
+"Tell whether the VM should register soft/weak/final/phantom "    \
 "references")                                                     \
 \
 develop(bool, IgnoreRewrites, false,                                      \
-"Supress rewrites of bytecodes in the oopmap generator. "         \
+"Suppress rewrites of bytecodes in the oopmap generator. "        \
 "This is unsafe!")                                                \
 \
 develop(bool, PrintCodeCacheExtension, false,                             \
 "Print extension of code cache")                                  \
 \
 develop(bool, UsePrivilegedStack, true,                                   \
 "Enable the security JVM functions")                              \
 \
 develop(bool, ProtectionDomainVerification, true,                         \
-"Verifies protection domain before resolution in system "         \
+"Verify protection domain before resolution in system dictionary")\
-"dictionary")                                                     \
 \
 product(bool, ClassUnloading, true,                                       \
 "Do unloading of classes")                                        \
 \
 develop(bool, DisableStartThread, false,                                  \
 \
 develop(bool, MemProfiling, false,                                        \
 "Write memory usage profiling to log file")                       \
 \
 notproduct(bool, PrintSystemDictionaryAtExit, false,                      \
-"Prints the system dictionary at exit")                           \
+"Print the system dictionary at exit")                            \
 \
 experimental(intx, PredictedLoadedClassCount, 0,                          \
-"Experimental: Tune loaded class cache starting size.")           \
+"Experimental: Tune loaded class cache starting size")            \
 \
 diagnostic(bool, UnsyncloadClass, false,                                  \
 "Unstable: VM calls loadClass unsynchronized. Custom "            \
-"class loader  must call VM synchronized for findClass "          \
+"class loader must call VM synchronized for findClass "           \
 "and defineClass.")                                               \
 \
 product(bool, AlwaysLockClassLoader, false,                               \
 "Require the VM to acquire the class loader lock before calling " \
 "loadClass() even for class loaders registering "                 \
 \
 product(bool, MustCallLoadClassInternal, false,                           \
 "Call loadClassInternal() rather than loadClass()")               \
 \
 product_pd(bool, DontYieldALot,                                           \
-"Throw away obvious excess yield calls (for SOLARIS only)")       \
+"Throw away obvious excess yield calls (for Solaris only)")       \
 \
 product_pd(bool, ConvertSleepToYield,                                     \
-"Converts sleep(0) to thread yield "                              \
+"Convert sleep(0) to thread yield "                               \
-"(may be off for SOLARIS to improve GUI)")                        \
+"(may be off for Solaris to improve GUI)")                        \
 \
 product(bool, ConvertYieldToSleep, false,                                 \
-"Converts yield to a sleep of MinSleepInterval to simulate Win32 "\
+"Convert yield to a sleep of MinSleepInterval to simulate Win32 " \
-"behavior (SOLARIS only)")                                        \
+"behavior (Solaris only)")                                        \
 \
 product(bool, UseBoundThreads, true,                                      \
-"Bind user level threads to kernel threads (for SOLARIS only)")   \
+"Bind user level threads to kernel threads (for Solaris only)")   \
 \
 develop(bool, UseDetachedThreads, true,                                   \
 "Use detached threads that are recycled upon termination "        \
-"(for SOLARIS only)")                                             \
+"(for Solaris only)")                                             \
 \
 product(bool, UseLWPSynchronization, true,                                \
 "Use LWP-based instead of libthread-based synchronization "       \
 "(SPARC only)")                                                   \
 \
 product(ccstr, SyncKnobs, NULL,                                           \
 "(Unstable) Various monitor synchronization tunables")            \
 \
 product(intx, EmitSync, 0,                                                \
-"(Unsafe,Unstable) "                                              \
+"(Unsafe, Unstable) "                                             \
-" Controls emission of inline sync fast-path code")               \
+"Control emission of inline sync fast-path code")                 \
 \
 product(intx, MonitorBound, 0, "Bound Monitor population")                \
 \
 product(bool, MonitorInUseLists, false, "Track Monitors for Deflation")   \
 \
-product(intx, SyncFlags, 0, "(Unsafe,Unstable) Experimental Sync flags" ) \
+product(intx, SyncFlags, 0, "(Unsafe, Unstable) Experimental Sync flags") \
 \
-product(intx, SyncVerbose, 0, "(Unstable)" )                              \
+product(intx, SyncVerbose, 0, "(Unstable)")                               \
 \
-product(intx, ClearFPUAtPark, 0, "(Unsafe,Unstable)" )                    \
+product(intx, ClearFPUAtPark, 0, "(Unsafe, Unstable)")                    \
 \
 product(intx, hashCode, 5,                                                \
-"(Unstable) select hashCode generation algorithm" )                \
+"(Unstable) select hashCode generation algorithm")                \
 \
 product(intx, WorkAroundNPTLTimedWaitHang, 1,                             \
-"(Unstable, Linux-specific)"                                       \
+"(Unstable, Linux-specific) "                                     \
-" avoid NPTL-FUTEX hang pthread_cond_timedwait" )                  \
+"avoid NPTL-FUTEX hang pthread_cond_timedwait")                   \
 \
 product(bool, FilterSpuriousWakeups, true,                                \
 "Prevent spurious or premature wakeups from object.wait "         \
 "(Solaris only)")                                                 \
 \
-product(intx, NativeMonitorTimeout, -1, "(Unstable)" )                    \
+product(intx, NativeMonitorTimeout, -1, "(Unstable)")                     \
-product(intx, NativeMonitorFlags, 0, "(Unstable)" )                       \
+\
-product(intx, NativeMonitorSpinLimit, 20, "(Unstable)" )                  \
+product(intx, NativeMonitorFlags, 0, "(Unstable)")                        \
+\
+product(intx, NativeMonitorSpinLimit, 20, "(Unstable)")                   \
 \
 develop(bool, UsePthreads, false,                                         \
 "Use pthread-based instead of libthread-based synchronization "   \
 "(SPARC only)")                                                   \
 \
 product(bool, AdjustConcurrency, false,                                   \
-"call thr_setconcurrency at thread create time to avoid "         \
+"Call thr_setconcurrency at thread creation time to avoid "       \
-"LWP starvation on MP systems (For Solaris Only)")                \
+"LWP starvation on MP systems (for Solaris Only)")                \
 \
 product(bool, ReduceSignalUsage, false,                                   \
 "Reduce the use of OS signals in Java and/or the VM")             \
 \
 develop_pd(bool, ShareVtableStubs,                                        \
 "Share vtable stubs (smaller code but worse branch prediction")   \
 \
 develop(bool, LoadLineNumberTables, true,                                 \
-"Tells whether the class file parser loads line number tables")   \
+"Tell whether the class file parser loads line number tables")    \
 \
 develop(bool, LoadLocalVariableTables, true,                              \
-"Tells whether the class file parser loads local variable tables")\
+"Tell whether the class file parser loads local variable tables") \
 \
 develop(bool, LoadLocalVariableTypeTables, true,                          \
-"Tells whether the class file parser loads local variable type tables")\
+"Tell whether the class file parser loads local variable type"    \
+"tables")                                                         \
 \
 product(bool, AllowUserSignalHandlers, false,                             \
 "Do not complain if the application installs signal handlers "    \
 "(Solaris & Linux only)")                                         \
 \
 product(bool, UseFastJNIAccessors, true,                                  \
 "Use optimized versions of Get<Primitive>Field")                  \
 \
 product(bool, EagerXrunInit, false,                                       \
 "Eagerly initialize -Xrun libraries; allows startup profiling, "  \
-" but not all -Xrun libraries may support the state of the VM at this time") \
+"but not all -Xrun libraries may support the state of the VM "    \
+"at this time")                                                   \
 \
 product(bool, PreserveAllAnnotations, false,                              \
-"Preserve RuntimeInvisibleAnnotations as well as RuntimeVisibleAnnotations") \
+"Preserve RuntimeInvisibleAnnotations as well "                   \
+"as RuntimeVisibleAnnotations")                                   \
 \
 develop(uintx, PreallocatedOutOfMemoryErrorCount, 4,                      \
 "Number of OutOfMemoryErrors preallocated with backtrace")        \
 \
 product(bool, LazyBootClassLoader, true,                                  \
 \
 product(intx, TraceRedefineClasses, 0,                                    \
 "Trace level for JVMTI RedefineClasses")                          \
 \
 develop(bool, StressMethodComparator, false,                              \
-"run the MethodComparator on all loaded methods")                 \
+"Run the MethodComparator on all loaded methods")                 \
 \
 /* change to false by default sometime after Mustang */                   \
 product(bool, VerifyMergedCPBytecodes, true,                              \
 "Verify bytecodes after RedefineClasses constant pool merging")   \
 \
 \
 develop(bool, TraceDependencies, false,                                   \
 "Trace dependencies")                                             \
 \
 develop(bool, VerifyDependencies, trueInDebug,                            \
-"Exercise and verify the compilation dependency mechanism")        \
+"Exercise and verify the compilation dependency mechanism")       \
 \
 develop(bool, TraceNewOopMapGeneration, false,                            \
 "Trace OopMapGeneration")                                         \
 \
 develop(bool, TraceNewOopMapGenerationDetailed, false,                    \
 \
 develop(bool, TraceMonitorMismatch, false,                                \
 "Trace monitor matching failures during OopMapGeneration")        \
 \
 develop(bool, TraceOopMapRewrites, false,                                 \
-"Trace rewritting of method oops during oop map generation")      \
+"Trace rewriting of method oops during oop map generation")       \
 \
 develop(bool, TraceSafepoint, false,                                      \
 "Trace safepoint operations")                                     \
 \
 develop(bool, TraceICBuffer, false,                                       \
 \
 develop(bool, TraceStartupTime, false,                                    \
 "Trace setup time")                                               \
 \
 develop(bool, TraceProtectionDomainVerification, false,                   \
-"Trace protection domain verifcation")                            \
+"Trace protection domain verification")                           \
 \
 develop(bool, TraceClearedExceptions, false,                              \
-"Prints when an exception is forcibly cleared")                   \
+"Print when an exception is forcibly cleared")                    \
 \
 product(bool, TraceClassResolution, false,                                \
 "Trace all constant pool resolutions (for debugging)")            \
 \
 product(bool, TraceBiasedLocking, false,                                  \
 "Trace monitor inflation in JVM")                                 \
 \
 /* gc */                                                                  \
 \
 product(bool, UseSerialGC, false,                                         \
-"Use the serial garbage collector")                               \
+"Use the Serial garbage collector")                               \
 \
 product(bool, UseG1GC, false,                                             \
 "Use the Garbage-First garbage collector")                        \
 \
 product(bool, UseParallelGC, false,                                       \
 \
 product(uintx, HeapFirstMaximumCompactionCount, 3,                        \
 "The collection count for the first maximum compaction")          \
 \
 product(bool, UseMaximumCompactionOnSystemGC, true,                       \
-"In the Parallel Old garbage collector maximum compaction for "   \
+"Use maximum compaction in the Parallel Old garbage collector "   \
-"a system GC")                                                    \
+"for a system GC")                                                \
 \
 product(uintx, ParallelOldDeadWoodLimiterMean, 50,                        \
-"The mean used by the par compact dead wood"                      \
+"The mean used by the parallel compact dead wood "                \
-"limiter (a number between 0-100).")                              \
+"limiter (a number between 0-100)")                               \
 \
 product(uintx, ParallelOldDeadWoodLimiterStdDev, 80,                      \
-"The standard deviation used by the par compact dead wood"        \
+"The standard deviation used by the parallel compact dead wood "  \
-"limiter (a number between 0-100).")                              \
+"limiter (a number between 0-100)")                               \
 \
 product(uintx, ParallelGCThreads, 0,                                      \
 "Number of parallel threads parallel gc will use")                \
 \
 product(bool, UseDynamicNumberOfGCThreads, false,                         \
 "Dynamically choose the number of parallel threads "              \
 "parallel gc will use")                                           \
 \
 diagnostic(bool, ForceDynamicNumberOfGCThreads, false,                    \
-"Force dynamic selection of the number of"                        \
+"Force dynamic selection of the number of "                       \
 "parallel threads parallel gc will use to aid debugging")         \
 \
 product(uintx, HeapSizePerGCThread, ScaleForWordSize(64*M),               \
 "Size of heap (bytes) per GC thread used in calculating the "     \
 "number of GC threads")                                           \
 \
 product(bool, TraceDynamicGCThreads, false,                               \
 "Trace the dynamic GC thread usage")                              \
 \
 develop(bool, ParallelOldGCSplitALot, false,                              \
-"Provoke splitting (copying data from a young gen space to"       \
+"Provoke splitting (copying data from a young gen space to "      \
 "multiple destination spaces)")                                   \
 \
 develop(uintx, ParallelOldGCSplitInterval, 3,                             \
 "How often to provoke splitting a young gen space")               \
 \
 product(uintx, ConcGCThreads, 0,                                          \
 "Number of threads concurrent gc will use")                       \
 \
 product(uintx, YoungPLABSize, 4096,                                       \
-"Size of young gen promotion labs (in HeapWords)")                \
+"Size of young gen promotion LAB's (in HeapWords)")               \
 \
 product(uintx, OldPLABSize, 1024,                                         \
-"Size of old gen promotion labs (in HeapWords)")                  \
+"Size of old gen promotion LAB's (in HeapWords)")                 \
 \
 product(uintx, GCTaskTimeStampEntries, 200,                               \
 "Number of time stamp entries per gc worker thread")              \
 \
 product(bool, AlwaysTenure, false,                                        \
-"Always tenure objects in eden. (ParallelGC only)")               \
+"Always tenure objects in eden (ParallelGC only)")                \
 \
 product(bool, NeverTenure, false,                                         \
-"Never tenure objects in eden, May tenure on overflow "           \
+"Never tenure objects in eden, may tenure on overflow "           \
 "(ParallelGC only)")                                              \
 \
 product(bool, ScavengeBeforeFullGC, true,                                 \
 "Scavenge youngest generation before each full GC, "              \
 "used with UseParallelGC")                                        \
 \
 develop(bool, ScavengeWithObjectsInToSpace, false,                        \
-"Allow scavenges to occur when to_space contains objects.")       \
+"Allow scavenges to occur when to-space contains objects")        \
 \
 product(bool, UseConcMarkSweepGC, false,                                  \
 "Use Concurrent Mark-Sweep GC in the old generation")             \
 \
 product(bool, ExplicitGCInvokesConcurrent, false,                         \
-"A System.gc() request invokes a concurrent collection;"          \
+"A System.gc() request invokes a concurrent collection; "         \
-" (effective only when UseConcMarkSweepGC)")                      \
+"(effective only when UseConcMarkSweepGC)")                       \
 \
 product(bool, ExplicitGCInvokesConcurrentAndUnloadsClasses, false,        \
 "A System.gc() request invokes a concurrent collection and "      \
 "also unloads classes during such a concurrent gc cycle "         \
 "(effective only when UseConcMarkSweepGC)")                       \
 \
 product(bool, GCLockerInvokesConcurrent, false,                           \
-"The exit of a JNI CS necessitating a scavenge also"              \
+"The exit of a JNI critical section necessitating a scavenge, "   \
-" kicks off a bkgrd concurrent collection")                       \
+"also kicks off a background concurrent collection")              \
 \
 product(uintx, GCLockerEdenExpansionPercent, 5,                           \
-"How much the GC can expand the eden by while the GC locker  "    \
+"How much the GC can expand the eden by while the GC locker "     \
 "is active (as a percentage)")                                    \
 \
 diagnostic(intx, GCLockerRetryAllocationCount, 2,                         \
-"Number of times to retry allocations when"                       \
+"Number of times to retry allocations when "                      \
-" blocked by the GC locker")                                      \
+"blocked by the GC locker")                                       \
 \
 develop(bool, UseCMSAdaptiveFreeLists, true,                              \
-"Use Adaptive Free Lists in the CMS generation")                  \
+"Use adaptive free lists in the CMS generation")                  \
 \
 develop(bool, UseAsyncConcMarkSweepGC, true,                              \
 "Use Asynchronous Concurrent Mark-Sweep GC in the old generation")\
 \
 develop(bool, RotateCMSCollectionTypes, false,                            \
 \
 product(bool, UseCMSCollectionPassing, true,                              \
 "Use passing of collection from background to foreground")        \
 \
 product(bool, UseParNewGC, false,                                         \
-"Use parallel threads in the new generation.")                    \
+"Use parallel threads in the new generation")                     \
 \
 product(bool, ParallelGCVerbose, false,                                   \
-"Verbose output for parallel GC.")                                \
+"Verbose output for parallel gc")                                 \
 \
 product(uintx, ParallelGCBufferWastePct, 10,                              \
-"Wasted fraction of parallel allocation buffer.")                 \
+"Wasted fraction of parallel allocation buffer")                  \
 \
 diagnostic(bool, ParallelGCRetainPLAB, false,                             \
-"Retain parallel allocation buffers across scavenges; "        \
+"Retain parallel allocation buffers across scavenges; "           \
-" -- disabled because this currently conflicts with "          \
+"it is disabled because this currently conflicts with "           \
-" parallel card scanning under certain conditions ")           \
+"parallel card scanning under certain conditions.")               \
 \
 product(uintx, TargetPLABWastePct, 10,                                    \
 "Target wasted space in last buffer as percent of overall "       \
 "allocation")                                                     \
 \
 product(uintx, PLABWeight, 75,                                            \
-"Percentage (0-100) used to weight the current sample when"       \
+"Percentage (0-100) used to weigh the current sample when "       \
-"computing exponentially decaying average for ResizePLAB.")       \
+"computing exponentially decaying average for ResizePLAB")        \
 \
 product(bool, ResizePLAB, true,                                           \
-"Dynamically resize (survivor space) promotion labs")             \
+"Dynamically resize (survivor space) promotion LAB's")            \
 \
 product(bool, PrintPLAB, false,                                           \
-"Print (survivor space) promotion labs sizing decisions")         \
+"Print (survivor space) promotion LAB's sizing decisions")        \
 \
 product(intx, ParGCArrayScanChunk, 50,                                    \
-"Scan a subset and push remainder, if array is bigger than this") \
+"Scan a subset of object array and push remainder, if array is "  \
+"bigger than this")                                               \
 \
 product(bool, ParGCUseLocalOverflow, false,                               \
 "Instead of a global overflow list, use local overflow stacks")   \
 \
 product(bool, ParGCTrimOverflow, true,                                    \
-"Eagerly trim the local overflow lists (when ParGCUseLocalOverflow") \
+"Eagerly trim the local overflow lists "                          \
+"(when ParGCUseLocalOverflow)")                                   \
 \
 notproduct(bool, ParGCWorkQueueOverflowALot, false,                       \
-"Whether we should simulate work queue overflow in ParNew")       \
+"Simulate work queue overflow in ParNew")                         \
 \
 notproduct(uintx, ParGCWorkQueueOverflowInterval, 1000,                   \
 "An `interval' counter that determines how frequently "           \
 "we simulate overflow; a smaller number increases frequency")     \
 \
 diagnostic(intx, ParGCCardsPerStrideChunk, 256,                           \
 "The number of cards in each chunk of the parallel chunks used "  \
 "during card table scanning")                                     \
 \
 product(uintx, CMSParPromoteBlocksToClaim, 16,                            \
-"Number of blocks to attempt to claim when refilling CMS LAB for "\
+"Number of blocks to attempt to claim when refilling CMS LAB's "  \
-"parallel GC.")                                                   \
+"for parallel GC")                                                \
 \
 product(uintx, OldPLABWeight, 50,                                         \
-"Percentage (0-100) used to weight the current sample when"       \
+"Percentage (0-100) used to weight the current sample when "      \
-"computing exponentially decaying average for resizing CMSParPromoteBlocksToClaim.") \
+"computing exponentially decaying average for resizing "          \
+"CMSParPromoteBlocksToClaim")                                     \
 \
 product(bool, ResizeOldPLAB, true,                                        \
-"Dynamically resize (old gen) promotion labs")                    \
+"Dynamically resize (old gen) promotion LAB's")                   \
 \
 product(bool, PrintOldPLAB, false,                                        \
-"Print (old gen) promotion labs sizing decisions")                \
+"Print (old gen) promotion LAB's sizing decisions")               \
 \
 product(uintx, CMSOldPLABMin, 16,                                         \
-"Min size of CMS gen promotion lab caches per worker per blksize")\
+"Minimum size of CMS gen promotion LAB caches per worker "        \
+"per block size")                                                 \
 \
 product(uintx, CMSOldPLABMax, 1024,                                       \
-"Max size of CMS gen promotion lab caches per worker per blksize")\
+"Maximum size of CMS gen promotion LAB caches per worker "        \
+"per block size")                                                 \
 \
 product(uintx, CMSOldPLABNumRefills, 4,                                   \
-"Nominal number of refills of CMS gen promotion lab cache"        \
+"Nominal number of refills of CMS gen promotion LAB cache "       \
-" per worker per block size")                                     \
+"per worker per block size")                                      \
 \
 product(bool, CMSOldPLABResizeQuicker, false,                             \
-"Whether to react on-the-fly during a scavenge to a sudden"       \
+"React on-the-fly during a scavenge to a sudden "                 \
-" change in block demand rate")                                   \
+"change in block demand rate")                                    \
 \
 product(uintx, CMSOldPLABToleranceFactor, 4,                              \
-"The tolerance of the phase-change detector for on-the-fly"       \
+"The tolerance of the phase-change detector for on-the-fly "      \
-" PLAB resizing during a scavenge")                               \
+"PLAB resizing during a scavenge")                                \
 \
 product(uintx, CMSOldPLABReactivityFactor, 2,                             \
-"The gain in the feedback loop for on-the-fly PLAB resizing"      \
+"The gain in the feedback loop for on-the-fly PLAB resizing "     \
-" during a scavenge")                                             \
+"during a scavenge")                                              \
 \
 product(bool, AlwaysPreTouch, false,                                      \
-"It forces all freshly committed pages to be pre-touched.")       \
+"Force all freshly committed pages to be pre-touched")            \
 \
 product_pd(uintx, CMSYoungGenPerWorker,                                   \
 "The maximum size of young gen chosen by default per GC worker "  \
 "thread available")                                               \
 \
 product(bool, CMSIncrementalMode, false,                                  \
 "Whether CMS GC should operate in \"incremental\" mode")          \
 \
 product(uintx, CMSIncrementalDutyCycle, 10,                               \
-"CMS incremental mode duty cycle (a percentage, 0-100).  If"      \
+"Percentage (0-100) of CMS incremental mode duty cycle. If "      \
-"CMSIncrementalPacing is enabled, then this is just the initial"  \
+"CMSIncrementalPacing is enabled, then this is just the initial " \
-"value")                                                          \
+"value.")                                                         \
 \
 product(bool, CMSIncrementalPacing, true,                                 \
 "Whether the CMS incremental mode duty cycle should be "          \
 "automatically adjusted")                                         \
 \
 product(uintx, CMSIncrementalDutyCycleMin, 0,                             \
-"Lower bound on the duty cycle when CMSIncrementalPacing is "     \
+"Minimum percentage (0-100) of the CMS incremental duty cycle "   \
-"enabled (a percentage, 0-100)")                                  \
+"used when CMSIncrementalPacing is enabled")                      \
 \
 product(uintx, CMSIncrementalSafetyFactor, 10,                            \
 "Percentage (0-100) used to add conservatism when computing the " \
 "duty cycle")                                                     \
 \
 product(uintx, CMSIncrementalOffset, 0,                                   \
-"Percentage (0-100) by which the CMS incremental mode duty cycle" \
+"Percentage (0-100) by which the CMS incremental mode duty cycle "\
-" is shifted to the right within the period between young GCs")   \
+"is shifted to the right within the period between young GCs")    \
 \
 product(uintx, CMSExpAvgFactor, 50,                                       \
-"Percentage (0-100) used to weight the current sample when"       \
+"Percentage (0-100) used to weigh the current sample when "       \
-"computing exponential averages for CMS statistics.")             \
+"computing exponential averages for CMS statistics")              \
 \
 product(uintx, CMS_FLSWeight, 75,                                         \
-"Percentage (0-100) used to weight the current sample when"       \
+"Percentage (0-100) used to weigh the current sample when "       \
-"computing exponentially decating averages for CMS FLS statistics.") \
+"computing exponentially decaying averages for CMS FLS "          \
+"statistics")                                                     \
 \
 product(uintx, CMS_FLSPadding, 1,                                         \
-"The multiple of deviation from mean to use for buffering"        \
+"The multiple of deviation from mean to use for buffering "       \
-"against volatility in free list demand.")                        \
+"against volatility in free list demand")                         \
 \
 product(uintx, FLSCoalescePolicy, 2,                                      \
-"CMS: Aggression level for coalescing, increasing from 0 to 4")   \
+"CMS: aggressiveness level for coalescing, increasing "           \
+"from 0 to 4")                                                    \
 \
 product(bool, FLSAlwaysCoalesceLarge, false,                              \
-"CMS: Larger free blocks are always available for coalescing")    \
+"CMS: larger free blocks are always available for coalescing")    \
 \
 product(double, FLSLargestBlockCoalesceProximity, 0.99,                   \
-"CMS: the smaller the percentage the greater the coalition force")\
+"CMS: the smaller the percentage the greater the coalescing "     \
+"force")                                                          \
 \
 product(double, CMSSmallCoalSurplusPercent, 1.05,                         \
-"CMS: the factor by which to inflate estimated demand of small"   \
+"CMS: the factor by which to inflate estimated demand of small "  \
-" block sizes to prevent coalescing with an adjoining block")     \
+"block sizes to prevent coalescing with an adjoining block")      \
 \
 product(double, CMSLargeCoalSurplusPercent, 0.95,                         \
-"CMS: the factor by which to inflate estimated demand of large"   \
+"CMS: the factor by which to inflate estimated demand of large "  \
-" block sizes to prevent coalescing with an adjoining block")     \
+"block sizes to prevent coalescing with an adjoining block")      \
 \
 product(double, CMSSmallSplitSurplusPercent, 1.10,                        \
-"CMS: the factor by which to inflate estimated demand of small"   \
+"CMS: the factor by which to inflate estimated demand of small "  \
-" block sizes to prevent splitting to supply demand for smaller"  \
+"block sizes to prevent splitting to supply demand for smaller "  \
-" blocks")                                                        \
+"blocks")                                                         \
 \
 product(double, CMSLargeSplitSurplusPercent, 1.00,                        \
-"CMS: the factor by which to inflate estimated demand of large"   \
+"CMS: the factor by which to inflate estimated demand of large "  \
-" block sizes to prevent splitting to supply demand for smaller"  \
+"block sizes to prevent splitting to supply demand for smaller "  \
-" blocks")                                                        \
+"blocks")                                                         \
 \
 product(bool, CMSExtrapolateSweep, false,                                 \
 "CMS: cushion for block demand during sweep")                     \
 \
 product(uintx, CMS_SweepWeight, 75,                                       \
 "computing exponentially decaying average for inter-sweep "       \
 "duration")                                                       \
 \
 product(uintx, CMS_SweepPadding, 1,                                       \
 "The multiple of deviation from mean to use for buffering "       \
-"against volatility in inter-sweep duration.")                    \
+"against volatility in inter-sweep duration")                     \
 \
 product(uintx, CMS_SweepTimerThresholdMillis, 10,                         \
 "Skip block flux-rate sampling for an epoch unless inter-sweep "  \
-"duration exceeds this threhold in milliseconds")                 \
+"duration exceeds this threshold in milliseconds")                \
 \
 develop(bool, CMSTraceIncrementalMode, false,                             \
 "Trace CMS incremental mode")                                     \
 \
 develop(bool, CMSTraceIncrementalPacing, false,                           \
 \
 product(bool, CMSClassUnloadingEnabled, true,                             \
 "Whether class unloading enabled when using CMS GC")              \
 \
 product(uintx, CMSClassUnloadingMaxInterval, 0,                           \
-"When CMS class unloading is enabled, the maximum CMS cycle count"\
+"When CMS class unloading is enabled, the maximum CMS cycle "     \
-" for which classes may not be unloaded")                         \
+"count for which classes may not be unloaded")                    \
 \
 product(bool, CMSCompactWhenClearAllSoftRefs, true,                       \
-"Compact when asked to collect CMS gen with clear_all_soft_refs") \
+"Compact when asked to collect CMS gen with "                     \
+"clear_all_soft_refs()")                                          \
 \
 product(bool, UseCMSCompactAtFullCollection, true,                        \
-"Use mark sweep compact at full collections")                     \
+"Use Mark-Sweep-Compact algorithm at full collections")           \
 \
 product(uintx, CMSFullGCsBeforeCompaction, 0,                             \
 "Number of CMS full collection done before compaction if > 0")    \
 \
 develop(intx, CMSDictionaryChoice, 0,                                     \
 \
 product(bool, CMSLoopWarn, false,                                         \
 "Warn in case of excessive CMS looping")                          \
 \
 develop(bool, CMSOverflowEarlyRestoration, false,                         \
-"Whether preserved marks should be restored early")               \
+"Restore preserved marks early")                                  \
 \
 product(uintx, MarkStackSize, NOT_LP64(32*K) LP64_ONLY(4*M),              \
 "Size of marking stack")                                          \
 \
 product(uintx, MarkStackSizeMax, NOT_LP64(4*M) LP64_ONLY(512*M),          \
-"Max size of marking stack")                                      \
+"Maximum size of marking stack")                                  \
 \
 notproduct(bool, CMSMarkStackOverflowALot, false,                         \
-"Whether we should simulate frequent marking stack / work queue"  \
+"Simulate frequent marking stack / work queue overflow")          \
-" overflow")                                                      \
 \
 notproduct(uintx, CMSMarkStackOverflowInterval, 1000,                     \
-"An `interval' counter that determines how frequently"            \
+"An \"interval\" counter that determines how frequently "         \
-" we simulate overflow; a smaller number increases frequency")    \
+"to simulate overflow; a smaller number increases frequency")     \
 \
 product(uintx, CMSMaxAbortablePrecleanLoops, 0,                           \
-"(Temporary, subject to experimentation)"                         \
+"(Temporary, subject to experimentation) "                        \
 "Maximum number of abortable preclean iterations, if > 0")        \
 \
 product(intx, CMSMaxAbortablePrecleanTime, 5000,                          \
-"(Temporary, subject to experimentation)"                         \
+"(Temporary, subject to experimentation) "                        \
-"Maximum time in abortable preclean in ms")                       \
+"Maximum time in abortable preclean (in milliseconds)")           \
 \
 product(uintx, CMSAbortablePrecleanMinWorkPerIteration, 100,              \
-"(Temporary, subject to experimentation)"                         \
+"(Temporary, subject to experimentation) "                        \
 "Nominal minimum work per abortable preclean iteration")          \
 \
 manageable(intx, CMSAbortablePrecleanWaitMillis, 100,                     \
-"(Temporary, subject to experimentation)"                         \
+"(Temporary, subject to experimentation) "                        \
-" Time that we sleep between iterations when not given"           \
+"Time that we sleep between iterations when not given "           \
-" enough work per iteration")                                     \
+"enough work per iteration")                                      \
 \
 product(uintx, CMSRescanMultiple, 32,                                     \
 "Size (in cards) of CMS parallel rescan task")                    \
 \
 product(uintx, CMSConcMarkMultiple, 32,                                   \
 \
 product(bool, CMSParallelRemarkEnabled, true,                             \
 "Whether parallel remark enabled (only if ParNewGC)")             \
 \
 product(bool, CMSParallelSurvivorRemarkEnabled, true,                     \
-"Whether parallel remark of survivor space"                       \
+"Whether parallel remark of survivor space "                      \
-" enabled (effective only if CMSParallelRemarkEnabled)")          \
+"enabled (effective only if CMSParallelRemarkEnabled)")           \
 \
 product(bool, CMSPLABRecordAlways, true,                                  \
-"Whether to always record survivor space PLAB bdries"             \
+"Always record survivor space PLAB boundaries (effective only "   \
-" (effective only if CMSParallelSurvivorRemarkEnabled)")          \
+"if CMSParallelSurvivorRemarkEnabled)")                           \
 \
 product(bool, CMSEdenChunksRecordAlways, true,                            \
-"Whether to always record eden chunks used for "                  \
+"Always record eden chunks used for the parallel initial mark "   \
-"the parallel initial mark or remark of eden" )                   \
+"or remark of eden")                                              \
 \
 product(bool, CMSPrintEdenSurvivorChunks, false,                          \
 "Print the eden and the survivor chunks used for the parallel "   \
 "initial mark or remark of the eden/survivor spaces")             \
 \
 product(bool, CMSConcurrentMTEnabled, true,                               \
-"Whether multi-threaded concurrent work enabled (if ParNewGC)")   \
+"Whether multi-threaded concurrent work enabled "                 \
+"(effective only if ParNewGC)")                                   \
 \
 product(bool, CMSPrecleaningEnabled, true,                                \
 "Whether concurrent precleaning enabled")                         \
 \
 product(uintx, CMSPrecleanIter, 3,                                        \
 "Maximum number of precleaning iteration passes")                 \
 \
 product(uintx, CMSPrecleanNumerator, 2,                                   \
-"CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence"  \
+"CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence " \
-" ratio")                                                         \
+"ratio")                                                          \
 \
 product(uintx, CMSPrecleanDenominator, 3,                                 \
-"CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence"  \
+"CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence " \
-" ratio")                                                         \
+"ratio")                                                          \
 \
 product(bool, CMSPrecleanRefLists1, true,                                 \
 "Preclean ref lists during (initial) preclean phase")             \
 \
 product(bool, CMSPrecleanRefLists2, false,                                \
 \
 product(bool, CMSPrecleanSurvivors2, true,                                \
 "Preclean survivors during abortable preclean phase")             \
 \
 product(uintx, CMSPrecleanThreshold, 1000,                                \
-"Don't re-iterate if #dirty cards less than this")                \
+"Do not iterate again if number of dirty cards is less than this")\
 \
 product(bool, CMSCleanOnEnter, true,                                      \
 "Clean-on-enter optimization for reducing number of dirty cards") \
 \
 product(uintx, CMSRemarkVerifyVariant, 1,                                 \
 "Choose variant (1,2) of verification following remark")          \
 \
 product(uintx, CMSScheduleRemarkEdenSizeThreshold, 2*M,                   \
-"If Eden used is below this value, don't try to schedule remark") \
+"If Eden size is below this, do not try to schedule remark")      \
 \
 product(uintx, CMSScheduleRemarkEdenPenetration, 50,                      \
-"The Eden occupancy % at which to try and schedule remark pause") \
+"The Eden occupancy percentage (0-100) at which "                 \
+"to try and schedule remark pause")                               \
 \
 product(uintx, CMSScheduleRemarkSamplingRatio, 5,                         \
-"Start sampling Eden top at least before yg occupancy reaches"    \
+"Start sampling eden top at least before young gen "              \
-" 1/<ratio> of the size at which we plan to schedule remark")     \
+"occupancy reaches 1/<ratio> of the size at which "               \
+"we plan to schedule remark")                                     \
 \
 product(uintx, CMSSamplingGrain, 16*K,                                    \
 "The minimum distance between eden samples for CMS (see above)")  \
 \
 product(bool, CMSScavengeBeforeRemark, false,                             \
 develop(uintx, CMSCheckInterval, 1000,                                    \
 "Interval in milliseconds that CMS thread checks if it "          \
 "should start a collection cycle")                                \
 \
 product(bool, CMSYield, true,                                             \
-"Yield between steps of concurrent mark & sweep")                 \
+"Yield between steps of CMS")                                     \
 \
 product(uintx, CMSBitMapYieldQuantum, 10*M,                               \
-"Bitmap operations should process at most this many bits"         \
+"Bitmap operations should process at most this many bits "        \
 "between yields")                                                 \
 \
 product(bool, CMSDumpAtPromotionFailure, false,                           \
 "Dump useful information about the state of the CMS old "         \
-" generation upon a promotion failure.")                          \
+"generation upon a promotion failure")                            \
 \
 product(bool, CMSPrintChunksInDump, false,                                \
 "In a dump enabled by CMSDumpAtPromotionFailure, include "        \
-" more detailed information about the free chunks.")              \
+"more detailed information about the free chunks")                \
 \
 product(bool, CMSPrintObjectsInDump, false,                               \
 "In a dump enabled by CMSDumpAtPromotionFailure, include "        \
-" more detailed information about the allocated objects.")        \
+"more detailed information about the allocated objects")          \
 \
 diagnostic(bool, FLSVerifyAllHeapReferences, false,                       \
-"Verify that all refs across the FLS boundary "                   \
+"Verify that all references across the FLS boundary "             \
-" are to valid objects")                                          \
+"are to valid objects")                                           \
 \
 diagnostic(bool, FLSVerifyLists, false,                                   \
 "Do lots of (expensive) FreeListSpace verification")              \
 \
 diagnostic(bool, FLSVerifyIndexTable, false,                              \
 \
 develop(bool, FLSVerifyDictionary, false,                                 \
 "Do lots of (expensive) FLS dictionary verification")             \
 \
 develop(bool, VerifyBlockOffsetArray, false,                              \
-"Do (expensive!) block offset array verification")                \
+"Do (expensive) block offset array verification")                 \
 \
 diagnostic(bool, BlockOffsetArrayUseUnallocatedBlock, false,              \
-"Maintain _unallocated_block in BlockOffsetArray"                 \
+"Maintain _unallocated_block in BlockOffsetArray "                \
-" (currently applicable only to CMS collector)")                  \
+"(currently applicable only to CMS collector)")                   \
 \
 develop(bool, TraceCMSState, false,                                       \
 "Trace the state of the CMS collection")                          \
 \
 product(intx, RefDiscoveryPolicy, 0,                                      \
-"Whether reference-based(0) or referent-based(1)")                \
+"Select type of reference discovery policy: "                     \
+"reference-based(0) or referent-based(1)")                        \
 \
 product(bool, ParallelRefProcEnabled, false,                              \
 "Enable parallel reference processing whenever possible")         \
 \
 product(bool, ParallelRefProcBalancingEnabled, true,                      \
 "concurrent GC cycle based on the occupancy of the entire heap, " \
 "not just one of the generations (e.g., G1). A value of 0 "       \
 "denotes 'do constant GC cycles'.")                               \
 \
 product(bool, UseCMSInitiatingOccupancyOnly, false,                       \
-"Only use occupancy as a crierion for starting a CMS collection") \
+"Only use occupancy as a criterion for starting a CMS collection")\
 \
 product(uintx, CMSIsTooFullPercentage, 98,                                \
 "An absolute ceiling above which CMS will always consider the "   \
 "unloading of classes when class unloading is enabled")           \
 \
 "Check if the coalesced range is already in the "                 \
 "free lists as claimed")                                          \
 \
 notproduct(bool, CMSVerifyReturnedBytes, false,                           \
 "Check that all the garbage collected was returned to the "       \
-"free lists.")                                                    \
+"free lists")                                                     \
 \
 notproduct(bool, ScavengeALot, false,                                     \
 "Force scavenge at every Nth exit from the runtime system "       \
 "(N=ScavengeALotInterval)")                                       \
 \
 notproduct(bool, GCALotAtAllSafepoints, false,                            \
 "Enforce ScavengeALot/GCALot at all potential safepoints")        \
 \
 product(bool, PrintPromotionFailure, false,                               \
 "Print additional diagnostic information following "              \
-" promotion failure")                                             \
+"promotion failure")                                              \
 \
 notproduct(bool, PromotionFailureALot, false,                             \
 "Use promotion failure handling on every youngest generation "    \
 "collection")                                                     \
 \
 develop(uintx, PromotionFailureALotCount, 1000,                           \
-"Number of promotion failures occurring at ParGCAllocBuffer"      \
+"Number of promotion failures occurring at ParGCAllocBuffer "     \
 "refill attempts (ParNew) or promotion attempts "                 \
-"(other young collectors) ")                                      \
+"(other young collectors)")                                       \
 \
 develop(uintx, PromotionFailureALotInterval, 5,                           \
 "Total collections between promotion failures alot")              \
 \
 experimental(uintx, WorkStealingSleepMillis, 1,                           \
 \
 experimental(uintx, WorkStealingSpinToYieldRatio, 10,                     \
 "Ratio of hard spins to calls to yield")                          \
 \
 develop(uintx, ObjArrayMarkingStride, 512,                                \
-"Number of ObjArray elements to push onto the marking stack"      \
+"Number of object array elements to push onto the marking stack " \
 "before pushing a continuation entry")                            \
 \
 develop(bool, MetadataAllocationFailALot, false,                          \
 "Fail metadata allocations at intervals controlled by "           \
 "MetadataAllocationFailALotInterval")                             \
 \
 develop(uintx, MetadataAllocationFailALotInterval, 1000,                  \
-"metadata allocation failure alot interval")                      \
+"Metadata allocation failure a lot interval")                     \
-\
-develop(bool, MetaDataDeallocateALot, false,                              \
-"Deallocation bunches of metadata at intervals controlled by "    \
-"MetaDataAllocateALotInterval")                                   \
-\
-develop(uintx, MetaDataDeallocateALotInterval, 100,                       \
-"Metadata deallocation alot interval")                            \
 \
 develop(bool, TraceMetadataChunkAllocation, false,                        \
 "Trace chunk metadata allocations")                               \
 \
 product(bool, TraceMetadataHumongousAllocation, false,                    \
 \
 develop(bool, TraceMetavirtualspaceAllocation, false,                     \
 "Trace virtual space metadata allocations")                       \
 \
 notproduct(bool, ExecuteInternalVMTests, false,                           \
-"Enable execution of internal VM tests.")                         \
+"Enable execution of internal VM tests")                          \
 \
 notproduct(bool, VerboseInternalVMTests, false,                           \
 "Turn on logging for internal VM tests.")                         \
 \
 product_pd(bool, UseTLAB, "Use thread-local object allocation")           \
 \
 product_pd(bool, ResizeTLAB,                                              \
-"Dynamically resize tlab size for threads")                       \
+"Dynamically resize TLAB size for threads")                       \
 \
 product(bool, ZeroTLAB, false,                                            \
 "Zero out the newly created TLAB")                                \
 \
 product(bool, FastTLABRefill, true,                                       \
 \
 product(bool, PrintTLAB, false,                                           \
 "Print various TLAB related information")                         \
 \
 product(bool, TLABStats, true,                                            \
-"Print various TLAB related information")                         \
+"Provide more detailed and expensive TLAB statistics "            \
+"(with PrintTLAB)")                                               \
 \
 EMBEDDED_ONLY(product(bool, LowMemoryProtection, true,                    \
 "Enable LowMemoryProtection"))                                    \
 \
 product_pd(bool, NeverActAsServerClassMachine,                            \
 \
 product(uintx, InitialRAMFraction, 64,                                    \
 "Fraction (1/n) of real memory used for initial heap size")       \
 \
 develop(uintx, MaxVirtMemFraction, 2,                                     \
-"Maximum fraction (1/n) of virtual memory used for ergonomically" \
+"Maximum fraction (1/n) of virtual memory used for ergonomically "\
 "determining maximum heap size")                                  \
 \
 product(bool, UseAutoGCSelectPolicy, false,                               \
 "Use automatic collection selection policy")                      \
 \
 product(uintx, AutoGCSelectPauseMillis, 5000,                             \
-"Automatic GC selection pause threshhold in ms")                  \
+"Automatic GC selection pause threshold in milliseconds")         \
 \
 product(bool, UseAdaptiveSizePolicy, true,                                \
 "Use adaptive generation sizing policies")                        \
 \
 product(bool, UsePSAdaptiveSurvivorSizePolicy, true,                      \
 \
 product(bool, UseAdaptiveGenerationSizePolicyAtMajorCollection, true,     \
 "Use adaptive young-old sizing policies at major collections")    \
 \
 product(bool, UseAdaptiveSizePolicyWithSystemGC, false,                   \
-"Use statistics from System.GC for adaptive size policy")         \
+"Include statistics from System.gc() for adaptive size policy")   \
 \
 product(bool, UseAdaptiveGCBoundary, false,                               \
 "Allow young-old boundary to move")                               \
 \
 develop(bool, TraceAdaptiveGCBoundary, false,                             \
 \
 develop(intx, PSAdaptiveSizePolicyResizeVirtualSpaceAlot, -1,             \
 "Resize the virtual spaces of the young or old generations")      \
 \
 product(uintx, AdaptiveSizeThroughPutPolicy, 0,                           \
-"Policy for changeing generation size for throughput goals")      \
+"Policy for changing generation size for throughput goals")       \
 \
 product(uintx, AdaptiveSizePausePolicy, 0,                                \
 "Policy for changing generation size for pause goals")            \
 \
 develop(bool, PSAdjustTenuredGenForMinorPause, false,                     \
-"Adjust tenured generation to achive a minor pause goal")         \
+"Adjust tenured generation to achieve a minor pause goal")        \
 \
 develop(bool, PSAdjustYoungGenForMajorPause, false,                       \
-"Adjust young generation to achive a major pause goal")           \
+"Adjust young generation to achieve a major pause goal")          \
 \
 product(uintx, AdaptiveSizePolicyInitializingSteps, 20,                   \
 "Number of steps where heuristics is used before data is used")   \
 \
 develop(uintx, AdaptiveSizePolicyReadyThreshold, 5,                       \
 \
 product(uintx, TenuredGenerationSizeSupplementDecay, 2,                   \
 "Decay factor to TenuredGenerationSizeIncrement")                 \
 \
 product(uintx, MaxGCPauseMillis, max_uintx,                               \
-"Adaptive size policy maximum GC pause time goal in msec, "       \
+"Adaptive size policy maximum GC pause time goal in millisecond, "\
-"or (G1 Only) the max. GC time per MMU time slice")               \
+"or (G1 Only) the maximum GC time per MMU time slice")            \
 \
 product(uintx, GCPauseIntervalMillis, 0,                                  \
 "Time slice for MMU specification")                               \
 \
 product(uintx, MaxGCMinorPauseMillis, max_uintx,                          \
-"Adaptive size policy maximum GC minor pause time goal in msec")  \
+"Adaptive size policy maximum GC minor pause time goal "          \
+"in millisecond")                                                 \
 \
 product(uintx, GCTimeRatio, 99,                                           \
 "Adaptive size policy application time to GC time ratio")         \
 \
 product(uintx, AdaptiveSizeDecrementScaleFactor, 4,                       \
 \
 product(uintx, MinSurvivorRatio, 3,                                       \
 "Minimum ratio of young generation/survivor space size")          \
 \
 product(uintx, InitialSurvivorRatio, 8,                                   \
-"Initial ratio of eden/survivor space size")                      \
+"Initial ratio of young generation/survivor space size")          \
 \
 product(uintx, BaseFootPrintEstimate, 256*M,                              \
 "Estimate of footprint other than Java Heap")                     \
 \
 product(bool, UseGCOverheadLimit, true,                                   \
 "Use policy to limit of proportion of time spent in GC "          \
 "before an OutOfMemory error is thrown")                          \
 \
 product(uintx, GCTimeLimit, 98,                                           \
-"Limit of proportion of time spent in GC before an OutOfMemory"   \
+"Limit of the proportion of time spent in GC before "             \
-"error is thrown (used with GCHeapFreeLimit)")                    \
+"an OutOfMemoryError is thrown (used with GCHeapFreeLimit)")      \
 \
 product(uintx, GCHeapFreeLimit, 2,                                        \
 "Minimum percentage of free space after a full GC before an "     \
 "OutOfMemoryError is thrown (used with GCTimeLimit)")             \
 \
 \
 product(intx, PrefetchFieldsAhead, -1,                                    \
 "How many fields ahead to prefetch in oop scan (<= 0 means off)") \
 \
 diagnostic(bool, VerifySilently, false,                                   \
-"Don't print print the verification progress")                    \
+"Do not print the verification progress")                         \
 \
 diagnostic(bool, VerifyDuringStartup, false,                              \
 "Verify memory system before executing any Java code "            \
 "during VM initialization")                                       \
 \
 diagnostic(bool, GCParallelVerificationEnabled, true,                     \
 "Enable parallel memory system verification")                     \
 \
 diagnostic(bool, DeferInitialCardMark, false,                             \
 "When +ReduceInitialCardMarks, explicitly defer any that "        \
-"may arise from new_pre_store_barrier")                          \
+"may arise from new_pre_store_barrier")                           \
 \
 diagnostic(bool, VerifyRememberedSets, false,                             \
 "Verify GC remembered sets")                                      \
 \
 diagnostic(bool, VerifyObjectStartArray, true,                            \
 "Verify GC object start array if verify before/after")            \
 \
 product(bool, DisableExplicitGC, false,                                   \
-"Tells whether calling System.gc() does a full GC")               \
+"Ignore calls to System.gc()")                                    \
 \
 notproduct(bool, CheckMemoryInitialization, false,                        \
-"Checks memory initialization")                                   \
+"Check memory initialization")                                    \
 \
 product(bool, CollectGen0First, false,                                    \
 "Collect youngest generation before each full GC")                \
 \
 diagnostic(bool, BindCMSThreadToCPU, false,                               \
 \
 product(uintx, ProcessDistributionStride, 4,                              \
 "Stride through processors when distributing processes")          \
 \
 product(uintx, CMSCoordinatorYieldSleepCount, 10,                         \
-"number of times the coordinator GC thread will sleep while "     \
+"Number of times the coordinator GC thread will sleep while "     \
 "yielding before giving up and resuming GC")                      \
 \
 product(uintx, CMSYieldSleepCount, 0,                                     \
-"number of times a GC thread (minus the coordinator) "            \
+"Number of times a GC thread (minus the coordinator) "            \
 "will sleep while yielding before giving up and resuming GC")     \
 \
 /* gc tracing */                                                          \
 manageable(bool, PrintGC, false,                                          \
-"Print message at garbage collect")                               \
+"Print message at garbage collection")                            \
 \
 manageable(bool, PrintGCDetails, false,                                   \
-"Print more details at garbage collect")                          \
+"Print more details at garbage collection")                       \
 \
 manageable(bool, PrintGCDateStamps, false,                                \
-"Print date stamps at garbage collect")                           \
+"Print date stamps at garbage collection")                        \
 \
 manageable(bool, PrintGCTimeStamps, false,                                \
-"Print timestamps at garbage collect")                            \
+"Print timestamps at garbage collection")                         \
 \
 product(bool, PrintGCTaskTimeStamps, false,                               \
 "Print timestamps for individual gc worker thread tasks")         \
 \
 develop(intx, ConcGCYieldTimeout, 0,                                      \
-"If non-zero, assert that GC threads yield within this # of ms.") \
+"If non-zero, assert that GC threads yield within this "          \
+"number of milliseconds")                                         \
 \
 notproduct(bool, TraceMarkSweep, false,                                   \
 "Trace mark sweep")                                               \
 \
 product(bool, PrintReferenceGC, false,                                    \
 "Print times spent handling reference objects during GC "         \
-" (enabled only when PrintGCDetails)")                            \
+"(enabled only when PrintGCDetails)")                             \
 \
 develop(bool, TraceReferenceGC, false,                                    \
 "Trace handling of soft/weak/final/phantom references")           \
 \
 develop(bool, TraceFinalizerRegistration, false,                          \
-"Trace registration of final references")                          \
+"Trace registration of final references")                         \
 \
 notproduct(bool, TraceScavenge, false,                                    \
 "Trace scavenge")                                                 \
 \
 product_rw(bool, TraceClassLoading, false,                                \
 \
 product_rw(bool, PrintHeapAtGC, false,                                    \
 "Print heap layout before and after each GC")                     \
 \
 product_rw(bool, PrintHeapAtGCExtended, false,                            \
-"Prints extended information about the layout of the heap "       \
+"Print extended information about the layout of the heap "        \
 "when -XX:+PrintHeapAtGC is set")                                 \
 \
 product(bool, PrintHeapAtSIGBREAK, true,                                  \
 "Print heap layout in response to SIGBREAK")                      \
 \
 \
 diagnostic(bool, TraceGCTaskThread, false,                                \
 "Trace actions of the GC task threads")                           \
 \
 product(bool, PrintParallelOldGCPhaseTimes, false,                        \
-"Print the time taken by each parallel old gc phase."             \
+"Print the time taken by each phase in ParallelOldGC "            \
-"PrintGCDetails must also be enabled.")                           \
+"(PrintGCDetails must also be enabled)")                          \
 \
 develop(bool, TraceParallelOldGCMarkingPhase, false,                      \
-"Trace parallel old gc marking phase")                            \
+"Trace marking phase in ParallelOldGC")                           \
 \
 develop(bool, TraceParallelOldGCSummaryPhase, false,                      \
-"Trace parallel old gc summary phase")                            \
+"Trace summary phase in ParallelOldGC")                           \
 \
 develop(bool, TraceParallelOldGCCompactionPhase, false,                   \
-"Trace parallel old gc compaction phase")                         \
+"Trace compaction phase in ParallelOldGC")                        \
 \
 develop(bool, TraceParallelOldGCDensePrefix, false,                       \
-"Trace parallel old gc dense prefix computation")                 \
+"Trace dense prefix computation for ParallelOldGC")               \
 \
 develop(bool, IgnoreLibthreadGPFault, false,                              \
 "Suppress workaround for libthread GP fault")                     \
 \
 product(bool, PrintJNIGCStalls, false,                                    \
-"Print diagnostic message when GC is stalled"                     \
+"Print diagnostic message when GC is stalled "                    \
 "by JNI critical section")                                        \
 \
 experimental(double, ObjectCountCutOffPercent, 0.5,                       \
 "The percentage of the used heap that the instances of a class "  \
-"must occupy for the class to generate a trace event.")           \
+"must occupy for the class to generate a trace event")            \
 \
 /* GC log rotation setting */                                             \
 \
 product(bool, UseGCLogFileRotation, false,                                \
-"Prevent large gclog file for long running app. "                 \
+"Rotate gclog files (for long running applications). It requires "\
-"Requires -Xloggc:<filename>")                                    \
+"-Xloggc:<filename>")                                             \
 \
 product(uintx, NumberOfGCLogFiles, 0,                                     \
-"Number of gclog files in rotation, "                             \
+"Number of gclog files in rotation "                              \
-"Default: 0, no rotation")                                        \
+"(default: 0, no rotation)")                                      \
 \
 product(uintx, GCLogFileSize, 0,                                          \
-"GC log file size, Default: 0 bytes, no rotation "                \
+"GC log file size (default: 0 bytes, no rotation). "              \
-"Only valid with UseGCLogFileRotation")                           \
+"It requires UseGCLogFileRotation")                               \
 \
 /* JVMTI heap profiling */                                                \
 \
 diagnostic(bool, TraceJVMTIObjectTagging, false,                          \
 "Trace JVMTI object tagging calls")                               \
 \
 develop(bool, GenerateRangeChecks, true,                                  \
 "Generate range checks for array accesses")                       \
 \
 develop_pd(bool, ImplicitNullChecks,                                      \
-"generate code for implicit null checks")                         \
+"Generate code for implicit null checks")                         \
 \
 product(bool, PrintSafepointStatistics, false,                            \
-"print statistics about safepoint synchronization")               \
+"Print statistics about safepoint synchronization")               \
 \
 product(intx, PrintSafepointStatisticsCount, 300,                         \
-"total number of safepoint statistics collected "                 \
+"Total number of safepoint statistics collected "                 \
 "before printing them out")                                       \
 \
 product(intx, PrintSafepointStatisticsTimeout,  -1,                       \
-"print safepoint statistics only when safepoint takes"            \
+"Print safepoint statistics only when safepoint takes "           \
-" more than PrintSafepointSatisticsTimeout in millis")            \
+"more than PrintSafepointSatisticsTimeout in millis")             \
 \
 product(bool, TraceSafepointCleanupTime, false,                           \
-"print the break down of clean up tasks performed during"         \
+"Print the break down of clean up tasks performed during "        \
-" safepoint")                                                     \
+"safepoint")                                                      \
 \
 product(bool, Inline, true,                                               \
-"enable inlining")                                                \
+"Enable inlining")                                                \
 \
 product(bool, ClipInlining, true,                                         \
-"clip inlining if aggregate method exceeds DesiredMethodLimit")   \
+"Clip inlining if aggregate method exceeds DesiredMethodLimit")   \
 \
 develop(bool, UseCHA, true,                                               \
-"enable CHA")                                                     \
+"Enable CHA")                                                     \
 \
 product(bool, UseTypeProfile, true,                                       \
 "Check interpreter profile for historically monomorphic calls")   \
 \
 notproduct(bool, TimeCompiler, false,                                     \
-"time the compiler")                                              \
+"Time the compiler")                                              \
 \
 diagnostic(bool, PrintInlining, false,                                    \
-"prints inlining optimizations")                                  \
+"Print inlining optimizations")                                   \
 \
 product(bool, UsePopCountInstruction, false,                              \
 "Use population count instruction")                               \
 \
 develop(bool, EagerInitialization, false,                                 \
 \
 develop(bool, TraceMethodReplacement, false,                              \
 "Print when methods are replaced do to recompilation")            \
 \
 develop(bool, PrintMethodFlushing, false,                                 \
-"print the nmethods being flushed")                               \
+"Print the nmethods being flushed")                               \
 \
 develop(bool, UseRelocIndex, false,                                       \
-"use an index to speed random access to relocations")              \
+"Use an index to speed random access to relocations")             \
 \
 develop(bool, StressCodeBuffers, false,                                   \
-"Exercise code buffer expansion and other rare state changes")     \
+"Exercise code buffer expansion and other rare state changes")    \
 \
 diagnostic(bool, DebugNonSafepoints, trueInDebug,                         \
-"Generate extra debugging info for non-safepoints in nmethods")    \
+"Generate extra debugging information for non-safepoints in "     \
+"nmethods")                                                       \
 \
 product(bool, PrintVMOptions, false,                                      \
-"Print flags that appeared on the command line")                   \
+"Print flags that appeared on the command line")                  \
 \
 product(bool, IgnoreUnrecognizedVMOptions, false,                         \
-"Ignore unrecognized VM options")                                  \
+"Ignore unrecognized VM options")                                 \
 \
 product(bool, PrintCommandLineFlags, false,                               \
-"Print flags specified on command line or set by ergonomics")      \
+"Print flags specified on command line or set by ergonomics")     \
 \
 product(bool, PrintFlagsInitial, false,                                   \
-"Print all VM flags before argument processing and exit VM")       \
+"Print all VM flags before argument processing and exit VM")      \
 \
 product(bool, PrintFlagsFinal, false,                                     \
-"Print all VM flags after argument and ergonomic processing")      \
+"Print all VM flags after argument and ergonomic processing")     \
 \
 notproduct(bool, PrintFlagsWithComments, false,                           \
-"Print all VM flags with default values and descriptions and exit")\
+"Print all VM flags with default values and descriptions and "    \
+"exit")                                                           \
 \
 diagnostic(bool, SerializeVMOutput, true,                                 \
-"Use a mutex to serialize output to tty and hotspot.log")          \
+"Use a mutex to serialize output to tty and LogFile")             \
 \
 diagnostic(bool, DisplayVMOutput, true,                                   \
-"Display all VM output on the tty, independently of LogVMOutput")  \
+"Display all VM output on the tty, independently of LogVMOutput") \
 \
-diagnostic(bool, LogVMOutput, trueInDebug,                                \
+diagnostic(bool, LogVMOutput, false,                                      \
-"Save VM output to hotspot.log, or to LogFile")                    \
+"Save VM output to LogFile")                                      \
 \
 diagnostic(ccstr, LogFile, NULL,                                          \
-"If LogVMOutput is on, save VM output to this file [hotspot.log]") \
+"If LogVMOutput or LogCompilation is on, save VM output to "      \
+"this file [default: ./hotspot_pid%p.log] (%p replaced with pid)")\
 \
 product(ccstr, ErrorFile, NULL,                                           \
-"If an error occurs, save the error data to this file "            \
+"If an error occurs, save the error data to this file "           \
-"[default: ./hs_err_pid%p.log] (%p replaced with pid)")            \
+"[default: ./hs_err_pid%p.log] (%p replaced with pid)")           \
 \
 product(bool, DisplayVMOutputToStderr, false,                             \
-"If DisplayVMOutput is true, display all VM output to stderr")     \
+"If DisplayVMOutput is true, display all VM output to stderr")    \
 \
 product(bool, DisplayVMOutputToStdout, false,                             \
-"If DisplayVMOutput is true, display all VM output to stdout")     \
+"If DisplayVMOutput is true, display all VM output to stdout")    \
 \
 product(bool, UseHeavyMonitors, false,                                    \
 "use heavyweight instead of lightweight Java monitors")           \
 \
 product(bool, PrintStringTableStatistics, false,                          \
 "print statistics about the StringTable and SymbolTable")         \
+\
+diagnostic(bool, VerifyStringTableAtExit, false,                          \
+"verify StringTable contents at exit")                            \
 \
 notproduct(bool, PrintSymbolTableSizeHistogram, false,                    \
 "print histogram of the symbol table")                            \
 \
 notproduct(bool, ExitVMOnVerifyError, false,                              \
 "Call fatal if this exception is thrown.  Example: "              \
 "java -XX:AbortVMOnException=java.lang.NullPointerException Foo") \
 \
 notproduct(ccstr, AbortVMOnExceptionMessage, NULL,                        \
 "Call fatal if the exception pointed by AbortVMOnException "      \
-"has this message.")                                              \
+"has this message")                                               \
 \
 develop(bool, DebugVtables, false,                                        \
 "add debugging code to vtable dispatch")                          \
 \
 develop(bool, PrintVtables, false,                                        \
 "Inline allocations larger than this in doublewords must go slow")\
 \
 product(bool, AggressiveOpts, false,                                      \
 "Enable aggressive optimizations - see arguments.cpp")            \
 \
+product_pd(uintx, TypeProfileLevel,                                       \
+"=XYZ, with Z: Type profiling of arguments at call; "             \
+"Y: Type profiling of return value at call; "          \
+"X: Type profiling of parameters to methods; "         \
+"X, Y and Z in 0=off ; 1=jsr292 only; 2=all methods")             \
+\
+product(intx, TypeProfileArgsLimit,     2,                                \
+"max number of call arguments to consider for type profiling")    \
+\
+product(intx, TypeProfileParmsLimit,    2,                                \
+"max number of incoming parameters to consider for type profiling"\
+", -1 for all")                                                   \
+\
 /* statistics */                                                          \
 develop(bool, CountCompiledCalls, false,                                  \
-"counts method invocations")                                      \
+"Count method invocations")                                       \
 \
 notproduct(bool, CountRuntimeCalls, false,                                \
-"counts VM runtime calls")                                        \
+"Count VM runtime calls")                                         \
 \
 develop(bool, CountJNICalls, false,                                       \
-"counts jni method invocations")                                  \
+"Count jni method invocations")                                   \
 \
 notproduct(bool, CountJVMCalls, false,                                    \
-"counts jvm method invocations")                                  \
+"Count jvm method invocations")                                   \
 \
 notproduct(bool, CountRemovableExceptions, false,                         \
-"count exceptions that could be replaced by branches due to "     \
+"Count exceptions that could be replaced by branches due to "     \
 "inlining")                                                       \
 \
 notproduct(bool, ICMissHistogram, false,                                  \
-"produce histogram of IC misses")                                 \
+"Produce histogram of IC misses")                                 \
 \
 notproduct(bool, PrintClassStatistics, false,                             \
-"prints class statistics at end of run")                          \
+"Print class statistics at end of run")                           \
 \
 notproduct(bool, PrintMethodStatistics, false,                            \
-"prints method statistics at end of run")                         \
+"Print method statistics at end of run")                          \
 \
 /* interpreter */                                                         \
 develop(bool, ClearInterpreterLocals, false,                              \
 "Always clear local variables of interpreter activations upon "   \
 "entry")                                                          \
 \
 product_pd(bool, RewriteFrequentPairs,                                    \
 "Rewrite frequently used bytecode pairs into a single bytecode")  \
 \
 diagnostic(bool, PrintInterpreter, false,                                 \
-"Prints the generated interpreter code")                          \
+"Print the generated interpreter code")                           \
 \
 product(bool, UseInterpreter, true,                                       \
 "Use interpreter for non-compiled methods")                       \
 \
 develop(bool, UseFastSignatureHandlers, true,                             \
 \
 product(bool, UseFastAccessorMethods, true,                               \
 "Use fast method entry code for accessor methods")                \
 \
 product_pd(bool, UseOnStackReplacement,                                   \
-"Use on stack replacement, calls runtime if invoc. counter "     \
+"Use on stack replacement, calls runtime if invoc. counter "      \
-"overflows in loop")                                             \
+"overflows in loop")                                              \
 \
 notproduct(bool, TraceOnStackReplacement, false,                          \
 "Trace on stack replacement")                                     \
 \
 product_pd(bool, PreferInterpreterNativeStubs,                            \
 \
 develop(bool, TraceFrequencyInlining, false,                              \
 "Trace frequency based inlining")                                 \
 \
 develop_pd(bool, InlineIntrinsics,                                        \
-"Inline intrinsics that can be statically resolved")             \
+"Inline intrinsics that can be statically resolved")              \
 \
 product_pd(bool, ProfileInterpreter,                                      \
-"Profile at the bytecode level during interpretation")           \
+"Profile at the bytecode level during interpretation")            \
 \
 develop(bool, TraceProfileInterpreter, false,                             \
 "Trace profiling at the bytecode level during interpretation. "   \
 "This outputs the profiling information collected to improve "    \
 "jit compilation.")                                               \
 product(intx, ProfileMaturityPercentage, 20,                              \
 "number of method invocations/branches (expressed as % of "       \
 "CompileThreshold) before using the method's profile")            \
 \
 develop(bool, PrintMethodData, false,                                     \
-"Print the results of +ProfileInterpreter at end of run")        \
+"Print the results of +ProfileInterpreter at end of run")         \
 \
 develop(bool, VerifyDataPointer, trueInDebug,                             \
 "Verify the method data pointer during interpreter profiling")    \
 \
 develop(bool, VerifyCompiledCode, false,                                  \
 "Manually make GC thread crash then dump java stack trace;  "     \
 "Test only")                                                      \
 \
 /* compilation */                                                         \
 product(bool, UseCompiler, true,                                          \
-"use compilation")                                                \
+"Use Just-In-Time compilation")                                   \
 \
 develop(bool, TraceCompilationPolicy, false,                              \
 "Trace compilation policy")                                       \
 \
 develop(bool, TimeCompilationPolicy, false,                               \
 "Time the compilation policy")                                    \
 \
 product(bool, UseCounterDecay, true,                                      \
-"adjust recompilation counters")                                 \
+"Adjust recompilation counters")                                  \
 \
 develop(intx, CounterHalfLifeTime,    30,                                 \
-"half-life time of invocation counters (in secs)")                \
+"Half-life time of invocation counters (in seconds)")             \
 \
 develop(intx, CounterDecayMinIntervalLength,   500,                       \
-"Min. ms. between invocation of CounterDecay")                    \
+"The minimum interval (in milliseconds) between invocation of "   \
+"CounterDecay")                                                   \
 \
 product(bool, AlwaysCompileLoopMethods, false,                            \
-"when using recompilation, never interpret methods "              \
+"When using recompilation, never interpret methods "              \
 "containing loops")                                               \
 \
 product(bool, DontCompileHugeMethods, true,                               \
-"don't compile methods > HugeMethodLimit")                        \
+"Do not compile methods > HugeMethodLimit")                       \
 \
 /* Bytecode escape analysis estimation. */                                \
 product(bool, EstimateArgEscape, true,                                    \
 "Analyze bytecodes to estimate escape state of arguments")        \
 \
 product(intx, BCEATraceLevel, 0,                                          \
 "How much tracing to do of bytecode escape analysis estimates")   \
 \
 product(intx, MaxBCEAEstimateLevel, 5,                                    \
-"Maximum number of nested calls that are analyzed by BC EA.")     \
+"Maximum number of nested calls that are analyzed by BC EA")      \
 \
 product(intx, MaxBCEAEstimateSize, 150,                                   \
-"Maximum bytecode size of a method to be analyzed by BC EA.")     \
+"Maximum bytecode size of a method to be analyzed by BC EA")      \
 \
 product(intx,  AllocatePrefetchStyle, 1,                                  \
 "0 = no prefetch, "                                               \
 "1 = prefetch instructions for each allocation, "                 \
 "2 = use TLAB watermark to gate allocation prefetch, "            \
 \
 product(intx,  AllocatePrefetchLines, 3,                                  \
 "Number of lines to prefetch ahead of array allocation pointer")  \
 \
 product(intx,  AllocateInstancePrefetchLines, 1,                          \
-"Number of lines to prefetch ahead of instance allocation pointer") \
+"Number of lines to prefetch ahead of instance allocation "       \
+"pointer")                                                        \
 \
 product(intx,  AllocatePrefetchStepSize, 16,                              \
 "Step size in bytes of sequential prefetch instructions")         \
 \
 product(intx,  AllocatePrefetchInstr, 0,                                  \
 product(intx, SelfDestructTimer, 0,                                       \
 "Will cause VM to terminate after a given time (in minutes) "     \
 "(0 means off)")                                                  \
 \
 product(intx, MaxJavaStackTraceDepth, 1024,                               \
-"Max. no. of lines in the stack trace for Java exceptions "       \
+"The maximum number of lines in the stack trace for Java "        \
-"(0 means all)")                                                  \
+"exceptions (0 means all)")                                       \
 \
 NOT_EMBEDDED(diagnostic(intx, GuaranteedSafepointInterval, 1000,          \
 "Guarantee a safepoint (at least) every so many milliseconds "    \
 "(0 means none)"))                                                \
 \
 "Number of invocations of sweeper to cover all nmethods")         \
 \
 product(intx, NmethodSweepCheckInterval, 5,                               \
 "Compilers wake up every n seconds to possibly sweep nmethods")   \
 \
+product(intx, NmethodSweepActivity, 10,                                   \
+"Removes cold nmethods from code cache if > 0. Higher values "    \
+"result in more aggressive sweeping")                             \
+\
 notproduct(bool, LogSweeper, false,                                       \
-"Keep a ring buffer of sweeper activity")                       \
+"Keep a ring buffer of sweeper activity")                         \
 \
 notproduct(intx, SweeperLogEntries, 1024,                                 \
-"Number of records in the ring buffer of sweeper activity")     \
+"Number of records in the ring buffer of sweeper activity")       \
 \
 notproduct(intx, MemProfilingInterval, 500,                               \
 "Time between each invocation of the MemProfiler")                \
 \
 develop(intx, MallocCatchPtr, -1,                                         \
 product_pd(intx, InlineSmallCode,                                         \
 "Only inline already compiled methods if their code size is "     \
 "less than this")                                                 \
 \
 product(intx, MaxInlineSize, 35,                                          \
-"maximum bytecode size of a method to be inlined")                \
+"The maximum bytecode size of a method to be inlined")            \
 \
 product_pd(intx, FreqInlineSize,                                          \
-"maximum bytecode size of a frequent method to be inlined")       \
+"The maximum bytecode size of a frequent method to be inlined")   \
 \
 product(intx, MaxTrivialSize, 6,                                          \
-"maximum bytecode size of a trivial method to be inlined")        \
+"The maximum bytecode size of a trivial method to be inlined")    \
 \
 product(intx, MinInliningThreshold, 250,                                  \
-"min. invocation count a method needs to have to be inlined")     \
+"The minimum invocation count a method needs to have to be "      \
+"inlined")                                                        \
 \
 develop(intx, MethodHistogramCutoff, 100,                                 \
-"cutoff value for method invoc. histogram (+CountCalls)")         \
+"The cutoff value for method invocation histogram (+CountCalls)") \
 \
 develop(intx, ProfilerNumberOfInterpretedMethods, 25,                     \
-"# of interpreted methods to show in profile")                    \
+"Number of interpreted methods to show in profile")               \
 \
 develop(intx, ProfilerNumberOfCompiledMethods, 25,                        \
-"# of compiled methods to show in profile")                       \
+"Number of compiled methods to show in profile")                  \
 \
 develop(intx, ProfilerNumberOfStubMethods, 25,                            \
-"# of stub methods to show in profile")                           \
+"Number of stub methods to show in profile")                      \
 \
 develop(intx, ProfilerNumberOfRuntimeStubNodes, 25,                       \
-"# of runtime stub nodes to show in profile")                     \
+"Number of runtime stub nodes to show in profile")                \
 \
 product(intx, ProfileIntervalsTicks, 100,                                 \
-"# of ticks between printing of interval profile "                \
+"Number of ticks between printing of interval profile "           \
 "(+ProfileIntervals)")                                            \
 \
 notproduct(intx, ScavengeALotInterval,     1,                             \
 "Interval between which scavenge will occur with +ScavengeALot")  \
 \
 develop(intx, DontYieldALotInterval,    10,                               \
 "Interval between which yields will be dropped (milliseconds)")   \
 \
 develop(intx, MinSleepInterval,     1,                                    \
 "Minimum sleep() interval (milliseconds) when "                   \
-"ConvertSleepToYield is off (used for SOLARIS)")                  \
+"ConvertSleepToYield is off (used for Solaris)")                  \
 \
 develop(intx, ProfilerPCTickThreshold,    15,                             \
 "Number of ticks in a PC buckets to be a hotspot")                \
 \
 notproduct(intx, DeoptimizeALotInterval,     5,                           \
 \
 develop(bool, StressNonEntrant, false,                                    \
 "Mark nmethods non-entrant at registration")                      \
 \
 diagnostic(intx, MallocVerifyInterval,     0,                             \
-"if non-zero, verify C heap after every N calls to "              \
+"If non-zero, verify C heap after every N calls to "              \
 "malloc/realloc/free")                                            \
 \
 diagnostic(intx, MallocVerifyStart,     0,                                \
-"if non-zero, start verifying C heap after Nth call to "          \
+"If non-zero, start verifying C heap after Nth call to "          \
 "malloc/realloc/free")                                            \
 \
 diagnostic(uintx, MallocMaxTestWords,     0,                              \
-"if non-zero, max # of Words that malloc/realloc can allocate "   \
+"If non-zero, maximum number of words that malloc/realloc can "   \
-"(for testing only)")                                             \
+"allocate (for testing only)")                                    \
 \
 product(intx, TypeProfileWidth,     2,                                    \
-"number of receiver types to record in call/cast profile")        \
+"Number of receiver types to record in call/cast profile")        \
 \
 develop(intx, BciProfileWidth,      2,                                    \
-"number of return bci's to record in ret profile")                \
+"Number of return bci's to record in ret profile")                \
 \
 product(intx, PerMethodRecompilationCutoff, 400,                          \
 "After recompiling N times, stay in the interpreter (-1=>'Inf')") \
 \
 product(intx, PerBytecodeRecompilationCutoff, 200,                        \
 \
 product(uintx, TLABWasteTargetPercent, 1,                                 \
 "Percentage of Eden that can be wasted")                          \
 \
 product(uintx, TLABRefillWasteFraction,    64,                            \
-"Max TLAB waste at a refill (internal fragmentation)")            \
+"Maximum TLAB waste at a refill (internal fragmentation)")        \
 \
 product(uintx, TLABWasteIncrement,    4,                                  \
 "Increment allowed waste at slow allocation")                     \
 \
 product(uintx, SurvivorRatio, 8,                                          \
 "Ratio of eden/survivor space size")                              \
 \
 product(uintx, NewRatio, 2,                                               \
-"Ratio of new/old generation sizes")                              \
+"Ratio of old/new generation sizes")                              \
 \
 product_pd(uintx, NewSizeThreadIncrease,                                  \
 "Additional size added to desired new generation size per "       \
 "non-daemon thread (in bytes)")                                   \
 \
 "Initial size of Metaspaces (in bytes)")                          \
 \
 product(uintx, MaxMetaspaceSize, max_uintx,                               \
 "Maximum size of Metaspaces (in bytes)")                          \
 \
-product(uintx, ClassMetaspaceSize, 1*G,                                   \
+product(uintx, CompressedClassSpaceSize, 1*G,                             \
-"Maximum size of InstanceKlass area in Metaspace used for "       \
+"Maximum size of class area in Metaspace when compressed "        \
-"UseCompressedKlassPointers")                                     \
+"class pointers are used")                                        \
 \
 product(uintx, MinHeapFreeRatio,    40,                                   \
-"Min percentage of heap free after GC to avoid expansion")        \
+"The minimum percentage of heap free after GC to avoid expansion."\
+" For most GCs this applies to the old generation. In G1 it"      \
+" applies to the whole heap. Not supported by ParallelGC.")       \
 \
 product(uintx, MaxHeapFreeRatio,    70,                                   \
-"Max percentage of heap free after GC to avoid shrinking")        \
+"The maximum percentage of heap free after GC to avoid shrinking."\
+" For most GCs this applies to the old generation. In G1 it"      \
+" applies to the whole heap. Not supported by ParallelGC.")       \
 \
 product(intx, SoftRefLRUPolicyMSPerMB, 1000,                              \
 "Number of milliseconds per MB of free space in the heap")        \
 \
 product(uintx, MinHeapDeltaBytes, ScaleForWordSize(128*K),                \
-"Min change in heap space due to GC (in bytes)")                  \
+"The minimum change in heap space due to GC (in bytes)")          \
 \
 product(uintx, MinMetaspaceExpansion, ScaleForWordSize(256*K),            \
-"Min expansion of Metaspace (in bytes)")                          \
+"The minimum expansion of Metaspace (in bytes)")                  \
 \
 product(uintx, MinMetaspaceFreeRatio,    40,                              \
-"Min percentage of Metaspace free after GC to avoid expansion")   \
+"The minimum percentage of Metaspace free after GC to avoid "     \
+"expansion")                                                      \
 \
 product(uintx, MaxMetaspaceFreeRatio,    70,                              \
-"Max percentage of Metaspace free after GC to avoid shrinking")   \
+"The maximum percentage of Metaspace free after GC to avoid "     \
+"shrinking")                                                      \
 \
 product(uintx, MaxMetaspaceExpansion, ScaleForWordSize(4*M),              \
-"Max expansion of Metaspace without full GC (in bytes)")          \
+"The maximum expansion of Metaspace without full GC (in bytes)")  \
 \
 product(uintx, QueuedAllocationWarningCount, 0,                           \
 "Number of times an allocation that queues behind a GC "          \
 "will retry before printing a warning")                           \
 \
 \
 product(uintx, TargetSurvivorRatio,    50,                                \
 "Desired percentage of survivor space used after scavenge")       \
 \
 product(uintx, MarkSweepDeadRatio,     5,                                 \
-"Percentage (0-100) of the old gen allowed as dead wood."         \
+"Percentage (0-100) of the old gen allowed as dead wood. "        \
-"Serial mark sweep treats this as both the min and max value."    \
+"Serial mark sweep treats this as both the minimum and maximum "  \
-"CMS uses this value only if it falls back to mark sweep."        \
+"value. "                                                         \
-"Par compact uses a variable scale based on the density of the"   \
+"CMS uses this value only if it falls back to mark sweep. "       \
-"generation and treats this as the max value when the heap is"    \
+"Par compact uses a variable scale based on the density of the "  \
-"either completely full or completely empty.  Par compact also"   \
+"generation and treats this as the maximum value when the heap "  \
-"has a smaller default value; see arguments.cpp.")                \
+"is either completely full or completely empty.  Par compact "    \
+"also has a smaller default value; see arguments.cpp.")           \
 \
 product(uintx, MarkSweepAlwaysCompactCount,     4,                        \
 "How often should we fully compact the heap (ignoring the dead "  \
 "space parameters)")                                              \
 \
 \
 product(intx, PrintFLSCensus, 0,                                          \
 "Census for CMS' FreeListSpace")                                  \
 \
 develop(uintx, GCExpandToAllocateDelayMillis, 0,                          \
-"Delay in ms between expansion and allocation")                   \
+"Delay between expansion and allocation (in milliseconds)")       \
 \
 develop(uintx, GCWorkerDelayMillis, 0,                                    \
-"Delay in ms in scheduling GC workers")                           \
+"Delay in scheduling GC workers (in milliseconds)")               \
 \
 product(intx, DeferThrSuspendLoopCount,     4000,                         \
 "(Unstable) Number of times to iterate in safepoint loop "        \
-" before blocking VM threads ")                                   \
+"before blocking VM threads ")                                    \
 \
 product(intx, DeferPollingPageLoopCount,     -1,                          \
 "(Unsafe,Unstable) Number of iterations in safepoint loop "       \
 "before changing safepoint polling page to RO ")                  \
 \
-product(intx, SafepointSpinBeforeYield, 2000,  "(Unstable)")              \
+product(intx, SafepointSpinBeforeYield, 2000, "(Unstable)")               \
 \
 product(bool, PSChunkLargeArrays, true,                                   \
-"true: process large arrays in chunks")                           \
+"Process large arrays in chunks")                                 \
 \
 product(uintx, GCDrainStackTargetSize, 64,                                \
-"how many entries we'll try to leave on the stack during "        \
+"Number of entries we will try to leave on the stack "            \
-"parallel GC")                                                    \
+"during parallel gc")                                             \
 \
 /* stack parameters */                                                    \
 product_pd(intx, StackYellowPages,                                        \
 "Number of yellow zone (recoverable overflows) pages")            \
 \
 product_pd(intx, StackRedPages,                                           \
 "Number of red zone (unrecoverable overflows) pages")             \
 \
 product_pd(intx, StackShadowPages,                                        \
-"Number of shadow zone (for overflow checking) pages"             \
+"Number of shadow zone (for overflow checking) pages "            \
-" this should exceed the depth of the VM and native call stack")  \
+"this should exceed the depth of the VM and native call stack")   \
 \
 product_pd(intx, ThreadStackSize,                                         \
 "Thread Stack Size (in Kbytes)")                                  \
 \
 product_pd(intx, VMThreadStackSize,                                       \
 \
 product_pd(uintx, ReservedCodeCacheSize,                                  \
 "Reserved code cache size (in bytes) - maximum code cache size")  \
 \
 product(uintx, CodeCacheMinimumFreeSpace, 500*K,                          \
-"When less than X space left, we stop compiling.")                \
+"When less than X space left, we stop compiling")                 \
 \
 product_pd(uintx, CodeCacheExpansionSize,                                 \
 "Code cache expansion size (in bytes)")                           \
 \
 develop_pd(uintx, CodeCacheMinBlockLength,                                \
-"Minimum number of segments in a code cache block.")              \
+"Minimum number of segments in a code cache block")               \
 \
 notproduct(bool, ExitOnFullCodeCache, false,                              \
-"Exit the VM if we fill the code cache.")                         \
+"Exit the VM if we fill the code cache")                          \
 \
 product(bool, UseCodeCacheFlushing, true,                                 \
 "Attempt to clean the code cache before shutting off compiler")   \
-\
-product(intx,  MinCodeCacheFlushingInterval, 30,                          \
-"Min number of seconds between code cache cleaning sessions")     \
-\
-product(uintx,  CodeCacheFlushingMinimumFreeSpace, 1500*K,                \
-"When less than X space left, start code cache cleaning")         \
-\
-product(uintx, CodeCacheFlushingFraction, 2,                              \
-"Fraction of the code cache that is flushed when full")           \
 \
 /* interpreter debugging */                                               \
 develop(intx, BinarySwitchThreshold, 5,                                   \
 "Minimal number of lookupswitch entries for rewriting to binary " \
 "switch")                                                         \
 \
 develop(intx, StopInterpreterAt, 0,                                       \
-"Stops interpreter execution at specified bytecode number")       \
+"Stop interpreter execution at specified bytecode number")        \
 \
 develop(intx, TraceBytecodesAt, 0,                                        \
-"Traces bytecodes starting with specified bytecode number")       \
+"Trace bytecodes starting with specified bytecode number")        \
 \
 /* compiler interface */                                                  \
 develop(intx, CIStart, 0,                                                 \
-"the id of the first compilation to permit")                      \
+"The id of the first compilation to permit")                      \
 \
 develop(intx, CIStop,    -1,                                              \
-"the id of the last compilation to permit")                       \
+"The id of the last compilation to permit")                       \
 \
 develop(intx, CIStartOSR,     0,                                          \
-"the id of the first osr compilation to permit "                  \
+"The id of the first osr compilation to permit "                  \
 "(CICountOSR must be on)")                                        \
 \
 develop(intx, CIStopOSR,    -1,                                           \
-"the id of the last osr compilation to permit "                   \
+"The id of the last osr compilation to permit "                   \
 "(CICountOSR must be on)")                                        \
 \
 develop(intx, CIBreakAtOSR,    -1,                                        \
-"id of osr compilation to break at")                              \
+"The id of osr compilation to break at")                          \
 \
 develop(intx, CIBreakAt,    -1,                                           \
-"id of compilation to break at")                                  \
+"The id of compilation to break at")                              \
 \
 product(ccstrlist, CompileOnly, "",                                       \
 "List of methods (pkg/class.name) to restrict compilation to")    \
 \
 product(ccstr, CompileCommandFile, NULL,                                  \
 product(ccstr, ReplayDataFile, NULL,                                      \
 "File containing compilation replay information"                  \
 "[default: ./replay_pid%p.log] (%p replaced with pid)")           \
 \
 develop(intx, ReplaySuppressInitializers, 2,                              \
-"Controls handling of class initialization during replay"         \
+"Control handling of class initialization during replay: "        \
-"0 - don't do anything special"                                   \
+"0 - don't do anything special; "                                 \
-"1 - treat all class initializers as empty"                       \
+"1 - treat all class initializers as empty; "                     \
-"2 - treat class initializers for application classes as empty"   \
+"2 - treat class initializers for application classes as empty; " \
-"3 - allow all class initializers to run during bootstrap but"    \
+"3 - allow all class initializers to run during bootstrap but "   \
 "    pretend they are empty after starting replay")               \
 \
 develop(bool, ReplayIgnoreInitErrors, false,                              \
 "Ignore exceptions thrown during initialization for replay")      \
 \
 \
 product(intx, ThreadPriorityPolicy, 0,                                    \
 "0 : Normal.                                                     "\
 "    VM chooses priorities that are appropriate for normal       "\
 "    applications. On Solaris NORM_PRIORITY and above are mapped "\
-"    to normal native priority. Java priorities below NORM_PRIORITY"\
+"    to normal native priority. Java priorities below "           \
-"    map to lower native priority values. On Windows applications"\
+"    NORM_PRIORITY map to lower native priority values. On       "\
-"    are allowed to use higher native priorities. However, with  "\
+"    Windows applications are allowed to use higher native       "\
-"    ThreadPriorityPolicy=0, VM will not use the highest possible"\
+"    priorities. However, with ThreadPriorityPolicy=0, VM will   "\
-"    native priority, THREAD_PRIORITY_TIME_CRITICAL, as it may   "\
+"    not use the highest possible native priority,               "\
-"    interfere with system threads. On Linux thread priorities   "\
+"    THREAD_PRIORITY_TIME_CRITICAL, as it may interfere with     "\
-"    are ignored because the OS does not support static priority "\
+"    system threads. On Linux thread priorities are ignored      "\
-"    in SCHED_OTHER scheduling class which is the only choice for"\
+"    because the OS does not support static priority in          "\
+"    SCHED_OTHER scheduling class which is the only choice for   "\
 "    non-root, non-realtime applications.                        "\
 "1 : Aggressive.                                                 "\
 "    Java thread priorities map over to the entire range of      "\
 "    native thread priorities. Higher Java thread priorities map "\
 "    to higher native thread priorities. This policy should be   "\
 "(Solaris only) Give compiler threads an extra quanta")           \
 \
 product(bool, VMThreadHintNoPreempt, false,                               \
 "(Solaris only) Give VM thread an extra quanta")                  \
 \
-product(intx, JavaPriority1_To_OSPriority, -1, "Map Java priorities to OS priorities") \
+product(intx, JavaPriority1_To_OSPriority, -1,                            \
-product(intx, JavaPriority2_To_OSPriority, -1, "Map Java priorities to OS priorities") \
+"Map Java priorities to OS priorities")                           \
-product(intx, JavaPriority3_To_OSPriority, -1, "Map Java priorities to OS priorities") \
+\
-product(intx, JavaPriority4_To_OSPriority, -1, "Map Java priorities to OS priorities") \
+product(intx, JavaPriority2_To_OSPriority, -1,                            \
-product(intx, JavaPriority5_To_OSPriority, -1, "Map Java priorities to OS priorities") \
+"Map Java priorities to OS priorities")                           \
-product(intx, JavaPriority6_To_OSPriority, -1, "Map Java priorities to OS priorities") \
+\
-product(intx, JavaPriority7_To_OSPriority, -1, "Map Java priorities to OS priorities") \
+product(intx, JavaPriority3_To_OSPriority, -1,                            \
-product(intx, JavaPriority8_To_OSPriority, -1, "Map Java priorities to OS priorities") \
+"Map Java priorities to OS priorities")                           \
-product(intx, JavaPriority9_To_OSPriority, -1, "Map Java priorities to OS priorities") \
+\
-product(intx, JavaPriority10_To_OSPriority,-1, "Map Java priorities to OS priorities") \
+product(intx, JavaPriority4_To_OSPriority, -1,                            \
+"Map Java priorities to OS priorities")                           \
+\
+product(intx, JavaPriority5_To_OSPriority, -1,                            \
+"Map Java priorities to OS priorities")                           \
+\
+product(intx, JavaPriority6_To_OSPriority, -1,                            \
+"Map Java priorities to OS priorities")                           \
+\
+product(intx, JavaPriority7_To_OSPriority, -1,                            \
+"Map Java priorities to OS priorities")                           \
+\
+product(intx, JavaPriority8_To_OSPriority, -1,                            \
+"Map Java priorities to OS priorities")                           \
+\
+product(intx, JavaPriority9_To_OSPriority, -1,                            \
+"Map Java priorities to OS priorities")                           \
+\
+product(intx, JavaPriority10_To_OSPriority,-1,                            \
+"Map Java priorities to OS priorities")                           \
 \
 experimental(bool, UseCriticalJavaThreadPriority, false,                  \
 "Java thread priority 10 maps to critical scheduling priority")   \
 \
 experimental(bool, UseCriticalCompilerThreadPriority, false,              \
 /* Background Compilation */                                              \
 develop(intx, LongCompileThreshold,     50,                               \
 "Used with +TraceLongCompiles")                                   \
 \
 product(intx, StarvationMonitorInterval,    200,                          \
-"Pause between each check in ms")                                 \
+"Pause between each check (in milliseconds)")                     \
 \
 /* recompilation */                                                       \
 product_pd(intx, CompileThreshold,                                        \
 "number of interpreted method invocations before (re-)compiling") \
 \
 product_pd(intx, BackEdgeThreshold,                                       \
-"Interpreter Back edge threshold at which an OSR compilation is invoked")\
+"Interpreter Back edge threshold at which an OSR compilation is " \
+"invoked")                                                        \
 \
 product(intx, Tier0InvokeNotifyFreqLog, 7,                                \
-"Interpreter (tier 0) invocation notification frequency.")        \
+"Interpreter (tier 0) invocation notification frequency")         \
 \
 product(intx, Tier2InvokeNotifyFreqLog, 11,                               \
-"C1 without MDO (tier 2) invocation notification frequency.")     \
+"C1 without MDO (tier 2) invocation notification frequency")      \
 \
 product(intx, Tier3InvokeNotifyFreqLog, 10,                               \
 "C1 with MDO profiling (tier 3) invocation notification "         \
-"frequency.")                                                     \
+"frequency")                                                      \
 \
 product(intx, Tier23InlineeNotifyFreqLog, 20,                             \
 "Inlinee invocation (tiers 2 and 3) notification frequency")      \
 \
 product(intx, Tier0BackedgeNotifyFreqLog, 10,                             \
-"Interpreter (tier 0) invocation notification frequency.")        \
+"Interpreter (tier 0) invocation notification frequency")         \
 \
 product(intx, Tier2BackedgeNotifyFreqLog, 14,                             \
-"C1 without MDO (tier 2) invocation notification frequency.")     \
+"C1 without MDO (tier 2) invocation notification frequency")      \
 \
 product(intx, Tier3BackedgeNotifyFreqLog, 13,                             \
 "C1 with MDO profiling (tier 3) invocation notification "         \
-"frequency.")                                                     \
+"frequency")                                                      \
 \
 product(intx, Tier2CompileThreshold, 0,                                   \
 "threshold at which tier 2 compilation is invoked")               \
 \
 product(intx, Tier2BackEdgeThreshold, 0,                                  \
 product(intx, Tier3MinInvocationThreshold, 100,                           \
 "Minimum invocation to compile at tier 3")                        \
 \
 product(intx, Tier3CompileThreshold, 2000,                                \
 "Threshold at which tier 3 compilation is invoked (invocation "   \
-"minimum must be satisfied.")                                     \
+"minimum must be satisfied")                                      \
 \
 product(intx, Tier3BackEdgeThreshold,  60000,                             \
 "Back edge threshold at which tier 3 OSR compilation is invoked") \
 \
 product(intx, Tier4InvocationThreshold, 5000,                             \
 product(intx, Tier4MinInvocationThreshold, 600,                           \
 "Minimum invocation to compile at tier 4")                        \
 \
 product(intx, Tier4CompileThreshold, 15000,                               \
 "Threshold at which tier 4 compilation is invoked (invocation "   \
-"minimum must be satisfied.")                                     \
+"minimum must be satisfied")                                      \
 \
 product(intx, Tier4BackEdgeThreshold, 40000,                              \
 "Back edge threshold at which tier 4 OSR compilation is invoked") \
 \
 product(intx, Tier3DelayOn, 5,                                            \
 \
 product(intx, TieredStopAtLevel, 4,                                       \
 "Stop at given compilation level")                                \
 \
 product(intx, Tier0ProfilingStartPercentage, 200,                         \
-"Start profiling in interpreter if the counters exceed tier 3"    \
+"Start profiling in interpreter if the counters exceed tier 3 "   \
 "thresholds by the specified percentage")                         \
 \
 product(uintx, IncreaseFirstTierCompileThresholdAt, 50,                   \
-"Increase the compile threshold for C1 compilation if the code"   \
+"Increase the compile threshold for C1 compilation if the code "  \
-"cache is filled by the specified percentage.")                   \
+"cache is filled by the specified percentage")                    \
 \
 product(intx, TieredRateUpdateMinTime, 1,                                 \
 "Minimum rate sampling interval (in milliseconds)")               \
 \
 product(intx, TieredRateUpdateMaxTime, 25,                                \
 \
 product(bool, PrintTieredEvents, false,                                   \
 "Print tiered events notifications")                              \
 \
 product_pd(intx, OnStackReplacePercentage,                                \
-"NON_TIERED number of method invocations/branches (expressed as %"\
+"NON_TIERED number of method invocations/branches (expressed as " \
-"of CompileThreshold) before (re-)compiling OSR code")            \
+"% of CompileThreshold) before (re-)compiling OSR code")          \
 \
 product(intx, InterpreterProfilePercentage, 33,                           \
-"NON_TIERED number of method invocations/branches (expressed as %"\
+"NON_TIERED number of method invocations/branches (expressed as " \
-"of CompileThreshold) before profiling in the interpreter")       \
+"% of CompileThreshold) before profiling in the interpreter")     \
 \
 develop(intx, MaxRecompilationSearchLength,    10,                        \
-"max. # frames to inspect searching for recompilee")              \
+"The maximum number of frames to inspect when searching for "     \
+"recompilee")                                                     \
 \
 develop(intx, MaxInterpretedSearchLength,     3,                          \
-"max. # interp. frames to skip when searching for recompilee")    \
+"The maximum number of interpreted frames to skip when searching "\
+"for recompilee")                                                 \
 \
 develop(intx, DesiredMethodLimit,  8000,                                  \
-"desired max. method size (in bytecodes) after inlining")         \
+"The desired maximum method size (in bytecodes) after inlining")  \
 \
 develop(intx, HugeMethodLimit,  8000,                                     \
-"don't compile methods larger than this if "                      \
+"Don't compile methods larger than this if "                      \
 "+DontCompileHugeMethods")                                        \
 \
 /* New JDK 1.4 reflection implementation */                               \
 \
 develop(bool, UseNewReflection, true,                                     \
 \
 product(bool, ReflectionWrapResolutionErrors, true,                       \
 "Temporary flag for transition to AbstractMethodError wrapped "   \
 "in InvocationTargetException. See 6531596")                      \
 \
+develop(bool, VerifyLambdaBytecodes, false,                               \
+"Force verification of jdk 8 lambda metafactory bytecodes")       \
 \
 develop(intx, FastSuperclassLimit, 8,                                     \
 "Depth of hardwired instanceof accelerator array")                \
 \
 /* Properties for Java libraries  */                                      \
 "Testing Only: Use the new version while testing")                \
 \
 /* flags for performance data collection */                               \
 \
 product(bool, UsePerfData, falseInEmbedded,                               \
-"Flag to disable jvmstat instrumentation for performance testing" \
+"Flag to disable jvmstat instrumentation for performance testing "\
-"and problem isolation purposes.")                                \
+"and problem isolation purposes")                                 \
 \
 product(bool, PerfDataSaveToFile, false,                                  \
 "Save PerfData memory to hsperfdata_<pid> file on exit")          \
 \
 product(ccstr, PerfDataSaveFile, NULL,                                    \
-"Save PerfData memory to the specified absolute pathname,"        \
+"Save PerfData memory to the specified absolute pathname. "       \
-"%p in the file name if present will be replaced by pid")        \
+"The string %p in the file name (if present) "                    \
-\
+"will be replaced by pid")                                        \
-product(intx, PerfDataSamplingInterval, 50 /*ms*/,                        \
+\
-"Data sampling interval in milliseconds")                         \
+product(intx, PerfDataSamplingInterval, 50,                               \
+"Data sampling interval (in milliseconds)")                       \
 \
 develop(bool, PerfTraceDataCreation, false,                               \
 "Trace creation of Performance Data Entries")                     \
 \
 develop(bool, PerfTraceMemOps, false,                                     \
 \
 product(bool, PerfBypassFileSystemCheck, false,                           \
 "Bypass Win32 file system criteria checks (Windows Only)")        \
 \
 product(intx, UnguardOnExecutionViolation, 0,                             \
-"Unguard page and retry on no-execute fault (Win32 only)"         \
+"Unguard page and retry on no-execute fault (Win32 only) "        \
 "0=off, 1=conservative, 2=aggressive")                            \
 \
 /* Serviceability Support */                                              \
 \
 product(bool, ManagementServer, false,                                    \
 "Create JMX Management Server")                                   \
 \
 product(bool, DisableAttachMechanism, false,                              \
-"Disable mechanism that allows tools to attach to this VM")        \
+"Disable mechanism that allows tools to attach to this VM")       \
 \
 product(bool, StartAttachListener, false,                                 \
 "Always start Attach Listener at VM startup")                     \
 \
 manageable(bool, PrintConcurrentLocks, false,                             \
 \
 product(bool, RequireSharedSpaces, false,                                 \
 "Require shared spaces for metadata")                             \
 \
 product(bool, DumpSharedSpaces, false,                                    \
-"Special mode: JVM reads a class list, loads classes, builds "   \
+"Special mode: JVM reads a class list, loads classes, builds "    \
-"shared spaces, and dumps the shared spaces to a file to be "   \
+"shared spaces, and dumps the shared spaces to a file to be "     \
-"used in future JVM runs.")                                     \
+"used in future JVM runs")                                        \
 \
 product(bool, PrintSharedSpaces, false,                                   \
 "Print usage of shared spaces")                                   \
 \
 product(uintx, SharedReadWriteSize,  NOT_LP64(12*M) LP64_ONLY(16*M),      \
 "show method handle implementation frames (usually hidden)")      \
 \
 experimental(bool, TrustFinalNonStaticFields, false,                      \
 "trust final non-static declarations for constant folding")       \
 \
+experimental(bool, FoldStableValues, false,                               \
+"Private flag to control optimizations for stable variables")     \
+\
 develop(bool, TraceInvokeDynamic, false,                                  \
 "trace internal invoke dynamic operations")                       \
 \
 diagnostic(bool, PauseAtStartup,      false,                              \
 "Causes the VM to pause at startup time and wait for the pause "  \
 \
 product(bool, RelaxAccessControlCheck, false,                             \
 "Relax the access control checks in the verifier")                \
 \
 diagnostic(bool, PrintDTraceDOF, false,                                   \
-"Print the DTrace DOF passed to the system for JSDT probes")   \
+"Print the DTrace DOF passed to the system for JSDT probes")      \
 \
 product(uintx, StringTableSize, defaultStringTableSize,                   \
 "Number of buckets in the interned String table")                 \
 \
+experimental(uintx, SymbolTableSize, defaultSymbolTableSize,              \
+"Number of buckets in the JVM internal Symbol table")             \
+\
 develop(bool, TraceDefaultMethods, false,                                 \
 "Trace the default method processing steps")                      \
 \
-develop(bool, ParseAllGenericSignatures, false,                           \
-"Parse all generic signatures while classloading")                \
-\
 develop(bool, VerifyGenericSignatures, false,                             \
 "Abort VM on erroneous or inconsistent generic signatures")       \
 \
-product(bool, ParseGenericDefaults, false,                                \
-"Parse generic signatures for default method handling")           \
-\
 product(bool, UseVMInterruptibleIO, false,                                \
 "(Unstable, Solaris-specific) Thread interrupt before or with "   \
-"EINTR for I/O operations results in OS_INTRPT. The default value"\
+"EINTR for I/O operations results in OS_INTRPT. The default "     \
-" of this flag is true for JDK 6 and earlier")                    \
+"value of this flag is true for JDK 6 and earlier")               \
 \
 diagnostic(bool, WhiteBoxAPI, false,                                      \
 "Enable internal testing APIs")                                   \
 \
 product(bool, PrintGCCause, true,                                         \
 "Allocation less than this value will be allocated "              \
 "using malloc. Larger allocations will use mmap.")                \
 \
 product(bool, EnableTracing, false,                                       \
 "Enable event-based tracing")                                     \
+\
 product(bool, UseLockedTracing, false,                                    \
 "Use locked-tracing when doing event-based tracing")
 /*
 *  Macros for factoring of globals
 */
 // Interface macros
-#define DECLARE_PRODUCT_FLAG(type, name, value, doc)    extern "C" type name;
+#define DECLARE_PRODUCT_FLAG(type, name, value, doc)      extern "C" type name;
-#define DECLARE_PD_PRODUCT_FLAG(type, name, doc)        extern "C" type name;
+#define DECLARE_PD_PRODUCT_FLAG(type, name, doc)          extern "C" type name;
-#define DECLARE_DIAGNOSTIC_FLAG(type, name, value, doc) extern "C" type name;
+#define DECLARE_DIAGNOSTIC_FLAG(type, name, value, doc)   extern "C" type name;
 #define DECLARE_EXPERIMENTAL_FLAG(type, name, value, doc) extern "C" type name;
-#define DECLARE_MANAGEABLE_FLAG(type, name, value, doc) extern "C" type name;
+#define DECLARE_MANAGEABLE_FLAG(type, name, value, doc)   extern "C" type name;
-#define DECLARE_PRODUCT_RW_FLAG(type, name, value, doc) extern "C" type name;
+#define DECLARE_PRODUCT_RW_FLAG(type, name, value, doc)   extern "C" type name;
 #ifdef PRODUCT
-#define DECLARE_DEVELOPER_FLAG(type, name, value, doc)  const type name = value;
+#define DECLARE_DEVELOPER_FLAG(type, name, value, doc)    extern "C" type CONST_##name; const type name = value;
-#define DECLARE_PD_DEVELOPER_FLAG(type, name, doc)      const type name = pd_##name;
+#define DECLARE_PD_DEVELOPER_FLAG(type, name, doc)        extern "C" type CONST_##name; const type name = pd_##name;
-#define DECLARE_NOTPRODUCT_FLAG(type, name, value, doc)
+#define DECLARE_NOTPRODUCT_FLAG(type, name, value, doc)   extern "C" type CONST_##name;
 #else
-#define DECLARE_DEVELOPER_FLAG(type, name, value, doc)  extern "C" type name;
+#define DECLARE_DEVELOPER_FLAG(type, name, value, doc)    extern "C" type name;
-#define DECLARE_PD_DEVELOPER_FLAG(type, name, doc)      extern "C" type name;
+#define DECLARE_PD_DEVELOPER_FLAG(type, name, doc)        extern "C" type name;
-#define DECLARE_NOTPRODUCT_FLAG(type, name, value, doc)  extern "C" type name;
+#define DECLARE_NOTPRODUCT_FLAG(type, name, value, doc)   extern "C" type name;
 #endif
 // Special LP64 flags, product only needed for now.
 #ifdef _LP64
 #define DECLARE_LP64_PRODUCT_FLAG(type, name, value, doc) extern "C" type name;
 #else
 #define DECLARE_LP64_PRODUCT_FLAG(type, name, value, doc) const type name = value;
 #endif // _LP64
 // Implementation macros
-#define MATERIALIZE_PRODUCT_FLAG(type, name, value, doc)   type name = value;
+#define MATERIALIZE_PRODUCT_FLAG(type, name, value, doc)      type name = value;
-#define MATERIALIZE_PD_PRODUCT_FLAG(type, name, doc)       type name = pd_##name;
+#define MATERIALIZE_PD_PRODUCT_FLAG(type, name, doc)          type name = pd_##name;
-#define MATERIALIZE_DIAGNOSTIC_FLAG(type, name, value, doc) type name = value;
+#define MATERIALIZE_DIAGNOSTIC_FLAG(type, name, value, doc)   type name = value;
 #define MATERIALIZE_EXPERIMENTAL_FLAG(type, name, value, doc) type name = value;
-#define MATERIALIZE_MANAGEABLE_FLAG(type, name, value, doc) type name = value;
+#define MATERIALIZE_MANAGEABLE_FLAG(type, name, value, doc)   type name = value;
-#define MATERIALIZE_PRODUCT_RW_FLAG(type, name, value, doc) type name = value;
+#define MATERIALIZE_PRODUCT_RW_FLAG(type, name, value, doc)   type name = value;
 #ifdef PRODUCT
-#define MATERIALIZE_DEVELOPER_FLAG(type, name, value, doc) /* flag name is constant */
+#define MATERIALIZE_DEVELOPER_FLAG(type, name, value, doc)    type CONST_##name = value;
-#define MATERIALIZE_PD_DEVELOPER_FLAG(type, name, doc)     /* flag name is constant */
+#define MATERIALIZE_PD_DEVELOPER_FLAG(type, name, doc)        type CONST_##name = pd_##name;
-#define MATERIALIZE_NOTPRODUCT_FLAG(type, name, value, doc)
+#define MATERIALIZE_NOTPRODUCT_FLAG(type, name, value, doc)   type CONST_##name = value;
 #else
-#define MATERIALIZE_DEVELOPER_FLAG(type, name, value, doc) type name = value;
+#define MATERIALIZE_DEVELOPER_FLAG(type, name, value, doc)    type name = value;
-#define MATERIALIZE_PD_DEVELOPER_FLAG(type, name, doc)     type name = pd_##name;
+#define MATERIALIZE_PD_DEVELOPER_FLAG(type, name, doc)        type name = pd_##name;
-#define MATERIALIZE_NOTPRODUCT_FLAG(type, name, value, doc) type name = value;
+#define MATERIALIZE_NOTPRODUCT_FLAG(type, name, value, doc)   type name = value;
 #endif
 #ifdef _LP64
-#define MATERIALIZE_LP64_PRODUCT_FLAG(type, name, value, doc)   type name = value;
+#define MATERIALIZE_LP64_PRODUCT_FLAG(type, name, value, doc) type name = value;
 #else
 #define MATERIALIZE_LP64_PRODUCT_FLAG(type, name, value, doc) /* flag is constant */
 #endif // _LP64
 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)

changeset 22838	82c7497fbad4
parent 22836	e7e511228518
parent 21095	1a04f7b3946e
child 22851	4c4b6a45be43