1.1 --- a/src/share/vm/gc_implementation/g1/g1_globals.hpp Mon May 04 02:57:39 2009 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/g1_globals.hpp Thu Apr 30 15:07:53 2009 -0700
1.3 @@ -28,46 +28,34 @@
1.4
1.5 #define G1_FLAGS(develop, develop_pd, product, product_pd, diagnostic, experimental, notproduct, manageable, product_rw) \
1.6 \
1.7 - product(intx, ParallelGCG1AllocBufferSize, 8*K, \
1.8 + product(intx, G1ParallelGCAllocBufferSize, 8*K, \
1.9 "Size of parallel G1 allocation buffers in to-space.") \
1.10 \
1.11 - product(intx, G1TimeSliceMS, 500, \
1.12 - "Time slice for MMU specification") \
1.13 - \
1.14 - product(intx, G1MaxPauseTimeMS, 200, \
1.15 - "Max GC time per MMU time slice") \
1.16 - \
1.17 - product(intx, G1ConfidencePerc, 50, \
1.18 + product(intx, G1ConfidencePercent, 50, \
1.19 "Confidence level for MMU/pause predictions") \
1.20 \
1.21 - product(intx, G1MarkingOverheadPerc, 0, \
1.22 + develop(intx, G1MarkingOverheadPercent, 0, \
1.23 "Overhead of concurrent marking") \
1.24 \
1.25 - product(bool, G1AccountConcurrentOverhead, false, \
1.26 + develop(bool, G1AccountConcurrentOverhead, false, \
1.27 "Whether soft real-time compliance in G1 will take into account" \
1.28 "concurrent overhead") \
1.29 \
1.30 product(intx, G1YoungGenSize, 0, \
1.31 "Size of the G1 young generation, 0 is the adaptive policy") \
1.32 \
1.33 - product(bool, G1Gen, true, \
1.34 + develop(bool, G1Gen, true, \
1.35 "If true, it will enable the generational G1") \
1.36 \
1.37 - develop(intx, G1GCPct, 10, \
1.38 + develop(intx, G1GCPercent, 10, \
1.39 "The desired percent time spent on GC") \
1.40 \
1.41 - product(intx, G1PolicyVerbose, 0, \
1.42 + develop(intx, G1PolicyVerbose, 0, \
1.43 "The verbosity level on G1 policy decisions") \
1.44 \
1.45 develop(bool, G1UseHRIntoRS, true, \
1.46 "Determines whether the 'advanced' HR Into rem set is used.") \
1.47 \
1.48 - product(bool, G1VerifyRemSet, false, \
1.49 - "If true, verify the rem set functioning at each GC") \
1.50 - \
1.51 - product(bool, G1VerifyConcMark, false, \
1.52 - "If true, verify the conc marking code at full GC time") \
1.53 - \
1.54 develop(intx, G1MarkingVerboseLevel, 0, \
1.55 "Level (0-4) of verboseness of the marking code") \
1.56 \
1.57 @@ -77,38 +65,28 @@
1.58 develop(bool, G1TraceMarkStackOverflow, false, \
1.59 "If true, extra debugging code for CM restart for ovflw.") \
1.60 \
1.61 - product(bool, G1VerifyMarkingInEvac, false, \
1.62 - "If true, verify marking info during evacuation") \
1.63 - \
1.64 develop(intx, G1PausesBtwnConcMark, -1, \
1.65 "If positive, fixed number of pauses between conc markings") \
1.66 \
1.67 - product(intx, G1EfficiencyPctCausesMark, 80, \
1.68 - "The cum gc efficiency since mark fall-off that causes " \
1.69 - "new marking") \
1.70 - \
1.71 - product(bool, TraceConcurrentMark, false, \
1.72 - "Trace concurrent mark") \
1.73 - \
1.74 - product(bool, SummarizeG1ConcMark, false, \
1.75 + diagnostic(bool, G1SummarizeConcurrentMark, false, \
1.76 "Summarize concurrent mark info") \
1.77 \
1.78 - product(bool, SummarizeG1RSStats, false, \
1.79 + diagnostic(bool, G1SummarizeRSetStats, false, \
1.80 "Summarize remembered set processing info") \
1.81 \
1.82 - product(bool, SummarizeG1ZFStats, false, \
1.83 + diagnostic(bool, G1SummarizeZFStats, false, \
1.84 "Summarize zero-filling info") \
1.85 \
1.86 - product(bool, TraceG1Refine, false, \
1.87 + develop(bool, G1TraceConcurrentRefinement, false, \
1.88 "Trace G1 concurrent refinement") \
1.89 \
1.90 develop(bool, G1ConcMark, true, \
1.91 "If true, run concurrent marking for G1") \
1.92 \
1.93 - product(intx, G1CMStackSize, 2 * 1024 * 1024, \
1.94 + product(intx, G1MarkStackSize, 2 * 1024 * 1024, \
1.95 "Size of the mark stack for concurrent marking.") \
1.96 \
1.97 - product(intx, G1CMRegionStackSize, 1024 * 1024, \
1.98 + product(intx, G1MarkRegionStackSize, 1024 * 1024, \
1.99 "Size of the region stack for concurrent marking.") \
1.100 \
1.101 develop(bool, G1ConcRefine, true, \
1.102 @@ -121,7 +99,7 @@
1.103 "Number of heap regions of alloc ahead of starting collection " \
1.104 "pause to start concurrent refinement (initially)") \
1.105 \
1.106 - product(bool, G1SmoothConcRefine, true, \
1.107 + develop(bool, G1SmoothConcRefine, true, \
1.108 "Attempts to smooth out the overhead of concurrent refinement") \
1.109 \
1.110 develop(bool, G1ConcZeroFill, true, \
1.111 @@ -157,7 +135,7 @@
1.112 develop(bool, G1SATBPrintStubs, false, \
1.113 "If true, print generated stubs for the SATB barrier") \
1.114 \
1.115 - product(intx, G1ExpandByPctOfAvail, 20, \
1.116 + product(intx, G1ExpandByPercentOfAvailable, 20, \
1.117 "When expanding, % of uncommitted space to claim.") \
1.118 \
1.119 develop(bool, G1RSBarrierRegionFilter, true, \
1.120 @@ -179,18 +157,9 @@
1.121 "If true, verify that no dirty cards remain after RS log " \
1.122 "processing.") \
1.123 \
1.124 - product(intx, G1MinPausesBetweenMarks, 2, \
1.125 - "Number of inefficient pauses necessary to trigger marking.") \
1.126 - \
1.127 - product(intx, G1InefficientPausePct, 80, \
1.128 - "Threshold of an 'inefficient' pauses (as % of cum efficiency.") \
1.129 - \
1.130 develop(bool, G1RSCountHisto, false, \
1.131 "If true, print a histogram of RS occupancies after each pause") \
1.132 \
1.133 - product(bool, G1TraceFileOverwrite, false, \
1.134 - "Allow the trace file to be overwritten") \
1.135 - \
1.136 develop(intx, G1PrintRegionLivenessInfo, 0, \
1.137 "When > 0, print the occupancies of the <n> best and worst" \
1.138 "regions.") \
1.139 @@ -198,9 +167,6 @@
1.140 develop(bool, G1PrintParCleanupStats, false, \
1.141 "When true, print extra stats about parallel cleanup.") \
1.142 \
1.143 - product(bool, G1DoAgeCohortChecks, false, \
1.144 - "When true, check well-formedness of age cohort structures.") \
1.145 - \
1.146 develop(bool, G1DisablePreBarrier, false, \
1.147 "Disable generation of pre-barrier (i.e., marking barrier) ") \
1.148 \
1.149 @@ -214,17 +180,17 @@
1.150 develop(intx, G1ConcRSLogCacheSize, 10, \
1.151 "Log base 2 of the length of conc RS hot-card cache.") \
1.152 \
1.153 - product(bool, G1ConcRSCountTraversals, false, \
1.154 + develop(bool, G1ConcRSCountTraversals, false, \
1.155 "If true, gather data about the number of times CR traverses " \
1.156 "cards ") \
1.157 \
1.158 - product(intx, G1ConcRSHotCardLimit, 4, \
1.159 + develop(intx, G1ConcRSHotCardLimit, 4, \
1.160 "The threshold that defines (>=) a hot card.") \
1.161 \
1.162 develop(bool, G1PrintOopAppls, false, \
1.163 "When true, print applications of closures to external locs.") \
1.164 \
1.165 - product(intx, G1LogRSRegionEntries, 7, \
1.166 + develop(intx, G1LogRSRegionEntries, 7, \
1.167 "Log_2 of max number of regions for which we keep bitmaps.") \
1.168 \
1.169 develop(bool, G1RecordHRRSOops, false, \
1.170 @@ -254,11 +220,11 @@
1.171 "It determines whether the system will calculate an optimum " \
1.172 "scan-only set.") \
1.173 \
1.174 - product(intx, G1MinReservePerc, 10, \
1.175 + product(intx, G1MinReservePercent, 10, \
1.176 "It determines the minimum reserve we should have in the heap " \
1.177 "to minimize the probability of promotion failure.") \
1.178 \
1.179 - product(bool, G1TraceRegions, false, \
1.180 + diagnostic(bool, G1PrintRegions, false, \
1.181 "If set G1 will print information on which regions are being " \
1.182 "allocated and which are reclaimed.") \
1.183 \
1.184 @@ -268,24 +234,24 @@
1.185 develop(bool, G1HRRSFlushLogBuffersOnVerify, false, \
1.186 "Forces flushing of log buffers before verification.") \
1.187 \
1.188 - product(bool, G1UseSurvivorSpace, true, \
1.189 + product(bool, G1UseSurvivorSpaces, true, \
1.190 "When true, use survivor space.") \
1.191 \
1.192 - product(bool, G1FixedTenuringThreshold, false, \
1.193 + develop(bool, G1FixedTenuringThreshold, false, \
1.194 "When set, G1 will not adjust the tenuring threshold") \
1.195 \
1.196 - product(bool, G1FixedEdenSize, false, \
1.197 + develop(bool, G1FixedEdenSize, false, \
1.198 "When set, G1 will not allocate unused survivor space regions") \
1.199 \
1.200 - product(uintx, G1FixedSurvivorSpaceSize, 0, \
1.201 + develop(uintx, G1FixedSurvivorSpaceSize, 0, \
1.202 "If non-0 is the size of the G1 survivor space, " \
1.203 "otherwise SurvivorRatio is used to determine the size") \
1.204 \
1.205 - experimental(bool, G1EnableParallelRSetUpdating, false, \
1.206 + experimental(bool, G1ParallelRSetUpdatingEnabled, false, \
1.207 "Enables the parallelization of remembered set updating " \
1.208 "during evacuation pauses") \
1.209 \
1.210 - experimental(bool, G1EnableParallelRSetScanning, false, \
1.211 + experimental(bool, G1ParallelRSetScanningEnabled, false, \
1.212 "Enables the parallelization of remembered set scanning " \
1.213 "during evacuation pauses")
1.214
