1.1 --- a/src/share/vm/runtime/globals.hpp Tue Feb 23 23:14:34 2010 -0500
1.2 +++ b/src/share/vm/runtime/globals.hpp Wed Feb 24 07:00:33 2010 -0800
1.3 @@ -1245,9 +1245,6 @@
1.4 product(uintx, ParallelGCThreads, 0, \
1.5 "Number of parallel threads parallel gc will use") \
1.6 \
1.7 - product(uintx, ParallelCMSThreads, 0, \
1.8 - "Max number of threads CMS will use for concurrent work") \
1.9 - \
1.10 develop(bool, ParallelOldGCSplitALot, false, \
1.11 "Provoke splitting (copying data from a young gen space to" \
1.12 "multiple destination spaces)") \
1.13 @@ -1258,8 +1255,8 @@
1.14 develop(bool, TraceRegionTasksQueuing, false, \
1.15 "Trace the queuing of the region tasks") \
1.16 \
1.17 - product(uintx, ParallelMarkingThreads, 0, \
1.18 - "Number of marking threads concurrent gc will use") \
1.19 + product(uintx, ConcGCThreads, 0, \
1.20 + "Number of threads concurrent gc will use") \
1.21 \
1.22 product(uintx, YoungPLABSize, 4096, \
1.23 "Size of young gen promotion labs (in HeapWords)") \
1.24 @@ -1535,11 +1532,11 @@
1.25 develop(bool, CMSOverflowEarlyRestoration, false, \
1.26 "Whether preserved marks should be restored early") \
1.27 \
1.28 - product(uintx, CMSMarkStackSize, NOT_LP64(32*K) LP64_ONLY(4*M), \
1.29 - "Size of CMS marking stack") \
1.30 - \
1.31 - product(uintx, CMSMarkStackSizeMax, NOT_LP64(4*M) LP64_ONLY(512*M), \
1.32 - "Max size of CMS marking stack") \
1.33 + product(uintx, MarkStackSize, NOT_LP64(32*K) LP64_ONLY(4*M), \
1.34 + "Size of marking stack") \
1.35 + \
1.36 + product(uintx, MarkStackSizeMax, NOT_LP64(4*M) LP64_ONLY(512*M), \
1.37 + "Max size of marking stack") \
1.38 \
1.39 notproduct(bool, CMSMarkStackOverflowALot, false, \
1.40 "Whether we should simulate frequent marking stack / work queue" \
