--- a/hotspot/src/share/vm/runtime/globals.hpp Fri Oct 23 18:44:33 2009 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp Wed Oct 28 16:25:51 2009 -0400
@@ -47,8 +47,8 @@
define_pd_global(intx, OnStackReplacePercentage, 0);
define_pd_global(bool, ResizeTLAB, false);
define_pd_global(intx, FreqInlineSize, 0);
+define_pd_global(intx, InlineSmallCode, 0);
define_pd_global(intx, NewSizeThreadIncrease, 4*K);
-define_pd_global(intx, NewRatio, 4);
define_pd_global(intx, InlineClassNatives, true);
define_pd_global(intx, InlineUnsafeOps, true);
define_pd_global(intx, InitialCodeCacheSize, 160*K);
@@ -58,7 +58,7 @@
define_pd_global(uintx,PermSize, ScaleForWordSize(4*M));
define_pd_global(uintx,MaxPermSize, ScaleForWordSize(64*M));
define_pd_global(bool, NeverActAsServerClassMachine, true);
-define_pd_global(uintx, DefaultMaxRAM, 1*G);
+define_pd_global(uint64_t,MaxRAM, 1ULL*G);
#define CI_COMPILER_COUNT 0
#else
@@ -113,6 +113,10 @@
uintx get_uintx() const { return *((uintx*) addr); }
void set_uintx(uintx value) { *((uintx*) addr) = value; }
+ bool is_uint64_t() const { return strcmp(type, "uint64_t") == 0; }
+ uint64_t get_uint64_t() const { return *((uint64_t*) addr); }
+ void set_uint64_t(uint64_t value) { *((uint64_t*) addr) = value; }
+
bool is_double() const { return strcmp(type, "double") == 0; }
double get_double() const { return *((double*) addr); }
void set_double(double value) { *((double*) addr) = value; }
@@ -188,6 +192,11 @@
static bool uintxAtPut(char* name, size_t len, uintx* value, FlagValueOrigin origin);
static bool uintxAtPut(char* name, uintx* value, FlagValueOrigin 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, uint64_t* value, FlagValueOrigin 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);
@@ -785,7 +794,7 @@
product(bool, ProfilerRecordPC, false, \
"Collects tick for each 16 byte interval of compiled code") \
\
- product(bool, ProfileVM, false, \
+ product(bool, ProfileVM, false, \
"Profiles ticks that fall within VM (either in the VM Thread " \
"or VM code called through stubs)") \
\
@@ -815,7 +824,7 @@
\
product(bool, RegisterFinalizersAtInit, true, \
"Register finalizable objects at end of Object.<init> or " \
- "after allocation.") \
+ "after allocation") \
\
develop(bool, RegisterReferences, true, \
"Tells whether the VM should register soft/weak/final/phantom " \
@@ -862,14 +871,14 @@
product(bool, AlwaysLockClassLoader, false, \
"Require the VM to acquire the class loader lock before calling " \
"loadClass() even for class loaders registering " \
- "as parallel capable. Default false. ") \
+ "as parallel capable") \
\
product(bool, AllowParallelDefineClass, false, \
"Allow parallel defineClass requests for class loaders " \
- "registering as parallel capable. Default false") \
+ "registering as parallel capable") \
\
product(bool, MustCallLoadClassInternal, false, \
- "Call loadClassInternal() rather than loadClass().Default false") \
+ "Call loadClassInternal() rather than loadClass()") \
\
product_pd(bool, DontYieldALot, \
"Throw away obvious excess yield calls (for SOLARIS only)") \
@@ -921,9 +930,9 @@
"(Unstable, Linux-specific)" \
" avoid NPTL-FUTEX hang pthread_cond_timedwait" ) \
\
- product(bool, FilterSpuriousWakeups , true, \
- "Prevent spurious or premature wakeups from object.wait" \
- "(Solaris only)") \
+ product(bool, FilterSpuriousWakeups, true, \
+ "Prevent spurious or premature wakeups from object.wait " \
+ "(Solaris only)") \
\
product(intx, NativeMonitorTimeout, -1, "(Unstable)" ) \
product(intx, NativeMonitorFlags, 0, "(Unstable)" ) \
@@ -973,7 +982,7 @@
\
product(bool, UseAltSigs, false, \
"Use alternate signals instead of SIGUSR1 & SIGUSR2 for VM " \
- "internal signals. (Solaris only)") \
+ "internal signals (Solaris only)") \
\
product(bool, UseSpinning, false, \
"Use spinning in monitor inflation and before entry") \
@@ -1265,12 +1274,12 @@
"Always tenure objects in eden. (ParallelGC only)") \
\
product(bool, NeverTenure, false, \
- "Never tenure objects in eden, May tenure on overflow" \
- " (ParallelGC only)") \
+ "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") \
+ "Scavenge youngest generation before each full GC, " \
+ "used with UseParallelGC") \
\
develop(bool, ScavengeWithObjectsInToSpace, false, \
"Allow scavenges to occur when to_space contains objects.") \
@@ -1283,9 +1292,9 @@
" (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)") \
+ "A System.gc() request invokes a concurrent collection and " \
+ "also unloads classes during such a concurrent gc cycle " \
+ "(effective only when UseConcMarkSweepGC)") \
\
develop(bool, UseCMSAdaptiveFreeLists, true, \
"Use Adaptive Free Lists in the CMS generation") \
@@ -1340,8 +1349,8 @@
"Whether we should 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") \
+ "An `interval' counter that determines how frequently " \
+ "we simulate overflow; a smaller number increases frequency") \
\
product(uintx, ParGCDesiredObjsFromOverflowList, 20, \
"The desired number of objects to claim from the overflow list") \
@@ -1354,12 +1363,12 @@
"It forces all freshly committed pages to be pre-touched.") \
\
product(bool, CMSUseOldDefaults, false, \
- "A flag temporarily introduced to allow reverting to some older" \
- "default settings; older as of 6.0 ") \
+ "A flag temporarily introduced to allow reverting to some " \
+ "older default settings; older as of 6.0") \
\
product(intx, CMSYoungGenPerWorker, 16*M, \
"The amount of young gen chosen by default per GC worker " \
- "thread available ") \
+ "thread available") \
\
product(bool, GCOverheadReporting, false, \
"Enables the GC overhead reporting facility") \
@@ -1380,43 +1389,44 @@
"automatically adjusted") \
\
product(uintx, CMSIncrementalDutyCycleMin, 0, \
- "Lower bound on the duty cycle when CMSIncrementalPacing is" \
- "enabled (a percentage, 0-100).") \
+ "Lower bound on the duty cycle when CMSIncrementalPacing is " \
+ "enabled (a percentage, 0-100)") \
\
product(uintx, CMSIncrementalSafetyFactor, 10, \
- "Percentage (0-100) used to add conservatism when computing the" \
- "duty cycle.") \
+ "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" \
- "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, 25, \
- "Percentage (0-100) used to weight the current sample when" \
- "computing exponential averages for CMS statistics.") \
+ "Percentage (0-100) used to weight the current sample when " \
+ "computing exponential averages for CMS statistics") \
\
product(uintx, CMS_FLSWeight, 50, \
- "Percentage (0-100) used to weight the current sample when" \
- "computing exponentially decating averages for CMS FLS statistics.") \
+ "Percentage (0-100) used to weight the current sample when " \
+ "computing exponentially decating averages for CMS FLS statistics") \
\
product(uintx, CMS_FLSPadding, 2, \
- "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.") \
\
product(uintx, FLSCoalescePolicy, 2, \
"CMS: Aggression level for coalescing, increasing from 0 to 4") \
\
product(uintx, CMS_SweepWeight, 50, \
- "Percentage (0-100) used to weight the current sample when" \
- "computing exponentially decaying average for inter-sweep duration.") \
+ "Percentage (0-100) used to weight the current sample when " \
+ "computing exponentially decaying average for inter-sweep " \
+ "duration") \
\
product(uintx, CMS_SweepPadding, 2, \
- "The multiple of deviation from mean to use for buffering" \
+ "The multiple of deviation from mean to use for buffering " \
"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 threhold in milliseconds") \
\
develop(bool, CMSTraceIncrementalMode, false, \
"Trace CMS incremental mode") \
@@ -1617,35 +1627,36 @@
\
product(intx, CMSTriggerRatio, 80, \
"Percentage of MinHeapFreeRatio in CMS generation that is " \
- " allocated before a CMS collection cycle commences") \
+ "allocated before a CMS collection cycle commences") \
\
product(intx, CMSTriggerPermRatio, 80, \
- "Percentage of MinHeapFreeRatio in the CMS perm generation that" \
- " is allocated before a CMS collection cycle commences, that " \
- " also collects the perm generation") \
+ "Percentage of MinHeapFreeRatio in the CMS perm generation that " \
+ "is allocated before a CMS collection cycle commences, that " \
+ "also collects the perm generation") \
\
product(uintx, CMSBootstrapOccupancy, 50, \
"Percentage CMS generation occupancy at which to " \
- " initiate CMS collection for bootstrapping collection stats") \
+ "initiate CMS collection for bootstrapping collection stats") \
\
product(intx, CMSInitiatingOccupancyFraction, -1, \
"Percentage CMS generation occupancy to start a CMS collection " \
- " cycle (A negative value means that CMSTriggerRatio is used)") \
+ "cycle. A negative value means that CMSTriggerRatio is used") \
\
product(intx, CMSInitiatingPermOccupancyFraction, -1, \
- "Percentage CMS perm generation occupancy to start a CMScollection"\
- " cycle (A negative value means that CMSTriggerPermRatio is used)")\
+ "Percentage CMS perm generation occupancy to start a " \
+ "CMScollection cycle. A negative value means that " \
+ "CMSTriggerPermRatio is used") \
\
product(bool, UseCMSInitiatingOccupancyOnly, false, \
"Only use occupancy as a crierion for starting a CMS collection") \
\
product(intx, CMSIsTooFullPercentage, 98, \
- "An absolute ceiling above which CMS will always consider the" \
- " perm gen ripe for collection") \
+ "An absolute ceiling above which CMS will always consider the " \
+ "perm gen ripe for collection") \
\
develop(bool, CMSTestInFreeList, false, \
"Check if the coalesced range is already in the " \
- "free lists as claimed.") \
+ "free lists as claimed") \
\
notproduct(bool, CMSVerifyReturnedBytes, false, \
"Check that all the garbage collected was returned to the " \
@@ -1663,8 +1674,8 @@
"Enforce ScavengeALot/GCALot at all potential safepoints") \
\
product(bool, HandlePromotionFailure, true, \
- "The youngest generation collection does not require" \
- " a guarantee of full promotion of all live objects.") \
+ "The youngest generation collection does not require " \
+ "a guarantee of full promotion of all live objects.") \
\
notproduct(bool, PromotionFailureALot, false, \
"Use promotion failure handling on every youngest generation " \
@@ -1692,7 +1703,7 @@
"Ratio of hard spins to calls to yield") \
\
product(uintx, PreserveMarkStackSize, 1024, \
- "Size for stack used in promotion failure handling") \
+ "Size for stack used in promotion failure handling") \
\
product_pd(bool, UseTLAB, "Use thread-local object allocation") \
\
@@ -1720,14 +1731,27 @@
product(bool, AlwaysActAsServerClassMachine, false, \
"Always act like a server-class machine") \
\
- product_pd(uintx, DefaultMaxRAM, \
- "Maximum real memory size for setting server class heap size") \
+ product_pd(uint64_t, MaxRAM, \
+ "Real memory size (in bytes) used to set maximum heap size") \
+ \
+ product(uintx, ErgoHeapSizeLimit, 0, \
+ "Maximum ergonomically set heap size (in bytes); zero means use " \
+ "MaxRAM / MaxRAMFraction") \
+ \
+ product(uintx, MaxRAMFraction, 4, \
+ "Maximum fraction (1/n) of real memory used for maximum heap " \
+ "size") \
\
product(uintx, DefaultMaxRAMFraction, 4, \
- "Fraction (1/n) of real memory used for server class max heap") \
- \
- product(uintx, DefaultInitialRAMFraction, 64, \
- "Fraction (1/n) of real memory used for server class initial heap") \
+ "Maximum fraction (1/n) of real memory used for maximum heap " \
+ "size; deprecated: to be renamed to MaxRAMFraction") \
+ \
+ product(uintx, MinRAMFraction, 2, \
+ "Minimum fraction (1/n) of real memory used for maxmimum heap " \
+ "size on systems with small physical memory size") \
+ \
+ product(uintx, InitialRAMFraction, 64, \
+ "Fraction (1/n) of real memory used for initial heap size") \
\
product(bool, UseAutoGCSelectPolicy, false, \
"Use automatic collection selection policy") \
@@ -1778,7 +1802,7 @@
"Number of collections before the adaptive sizing is started") \
\
product(uintx, AdaptiveSizePolicyOutputInterval, 0, \
- "Collecton interval for printing information, zero => never") \
+ "Collecton interval for printing information; zero => never") \
\
product(bool, UseAdaptiveSizePolicyFootprintGoal, true, \
"Use adaptive minimum footprint as a goal") \
@@ -1808,7 +1832,8 @@
"Allowed collection cost difference between generations") \
\
product(uintx, AdaptiveSizePolicyCollectionCostMargin, 50, \
- "If collection costs are within margin, reduce both by full delta") \
+ "If collection costs are within margin, reduce both by full " \
+ "delta") \
\
product(uintx, YoungGenerationSizeIncrement, 20, \
"Adaptive size percentage change in young generation") \
@@ -2527,7 +2552,7 @@
\
develop(bool, VerifyCompiledCode, false, \
"Include miscellaneous runtime verifications in nmethod code; " \
- "off by default because it disturbs nmethod size heuristics.") \
+ "default off because it disturbs nmethod size heuristics") \
\
\
/* compilation */ \
@@ -2789,20 +2814,28 @@
"an OS lock") \
\
/* gc parameters */ \
- product(uintx, MaxHeapSize, ScaleForWordSize(64*M), \
- "Default maximum size for object heap (in bytes)") \
- \
- product_pd(uintx, NewSize, \
- "Default size of new generation (in bytes)") \
+ product(uintx, InitialHeapSize, 0, \
+ "Initial heap size (in bytes); zero means OldSize + NewSize") \
+ \
+ product(uintx, MaxHeapSize, ScaleForWordSize(96*M), \
+ "Maximum heap size (in bytes)") \
+ \
+ product(uintx, OldSize, ScaleForWordSize(4*M), \
+ "Initial tenured generation size (in bytes)") \
+ \
+ product(uintx, NewSize, ScaleForWordSize(4*M), \
+ "Initial new generation size (in bytes)") \
\
product(uintx, MaxNewSize, max_uintx, \
- "Maximum size of new generation (in bytes)") \
+ "Maximum new generation size (in bytes), max_uintx means set " \
+ "ergonomically") \
\
product(uintx, PretenureSizeThreshold, 0, \
- "Max size in bytes of objects allocated in DefNew generation") \
- \
- product_pd(uintx, TLABSize, \
- "Default (or starting) size of TLAB (in bytes)") \
+ "Maximum size in bytes of objects allocated in DefNew " \
+ "generation; zero means no maximum") \
+ \
+ product(uintx, TLABSize, 0, \
+ "Starting TLAB size (in bytes); zero means set ergonomically") \
\
product(uintx, MinTLABSize, 2*K, \
"Minimum allowed TLAB size (in bytes)") \
@@ -2819,10 +2852,10 @@
product(uintx, TLABWasteIncrement, 4, \
"Increment allowed waste at slow allocation") \
\
- product_pd(intx, SurvivorRatio, \
+ product(intx, SurvivorRatio, 8, \
"Ratio of eden/survivor space size") \
\
- product_pd(intx, NewRatio, \
+ product(intx, NewRatio, 2, \
"Ratio of new/old generation sizes") \
\
product(uintx, MaxLiveObjectEvacuationRatio, 100, \
@@ -2832,11 +2865,8 @@
"Additional size added to desired new generation size per " \
"non-daemon thread (in bytes)") \
\
- product(uintx, OldSize, ScaleForWordSize(4096*K), \
- "Default size of tenured generation (in bytes)") \
- \
product_pd(uintx, PermSize, \
- "Default size of permanent generation (in bytes)") \
+ "Initial size of permanent generation (in bytes)") \
\
product_pd(uintx, MaxPermSize, \
"Maximum size of permanent generation (in bytes)") \