comparison src/share/vm/runtime/globals.hpp @ 14314:2c95095271e9

Merge
author ehelin
date Thu, 30 Jan 2014 14:01:45 +0100
parents 234d576115b5 44315152d434
children 26c3b944dc35 e5d78f318aec
comparison
equal deleted inserted replaced
14302:1fb56cbac3a1 14314:2c95095271e9
3133 \ 3133 \
3134 product(uintx, CompressedClassSpaceSize, 1*G, \ 3134 product(uintx, CompressedClassSpaceSize, 1*G, \
3135 "Maximum size of class area in Metaspace when compressed " \ 3135 "Maximum size of class area in Metaspace when compressed " \
3136 "class pointers are used") \ 3136 "class pointers are used") \
3137 \ 3137 \
3138 product(uintx, MinHeapFreeRatio, 40, \ 3138 manageable(uintx, MinHeapFreeRatio, 40, \
3139 "The minimum percentage of heap free after GC to avoid expansion."\ 3139 "The minimum percentage of heap free after GC to avoid expansion."\
3140 " For most GCs this applies to the old generation. In G1 it" \ 3140 " For most GCs this applies to the old generation. In G1 and" \
3141 " applies to the whole heap. Not supported by ParallelGC.") \ 3141 " ParallelGC it applies to the whole heap.") \
3142 \ 3142 \
3143 product(uintx, MaxHeapFreeRatio, 70, \ 3143 manageable(uintx, MaxHeapFreeRatio, 70, \
3144 "The maximum percentage of heap free after GC to avoid shrinking."\ 3144 "The maximum percentage of heap free after GC to avoid shrinking."\
3145 " For most GCs this applies to the old generation. In G1 it" \ 3145 " For most GCs this applies to the old generation. In G1 and" \
3146 " applies to the whole heap. Not supported by ParallelGC.") \ 3146 " ParallelGC it applies to the whole heap.") \
3147 \ 3147 \
3148 product(intx, SoftRefLRUPolicyMSPerMB, 1000, \ 3148 product(intx, SoftRefLRUPolicyMSPerMB, 1000, \
3149 "Number of milliseconds per MB of free space in the heap") \ 3149 "Number of milliseconds per MB of free space in the heap") \
3150 \ 3150 \
3151 product(uintx, MinHeapDeltaBytes, ScaleForWordSize(128*K), \ 3151 product(uintx, MinHeapDeltaBytes, ScaleForWordSize(128*K), \
3637 /* Properties for Java libraries */ \ 3637 /* Properties for Java libraries */ \
3638 \ 3638 \
3639 product(uintx, MaxDirectMemorySize, 0, \ 3639 product(uintx, MaxDirectMemorySize, 0, \
3640 "Maximum total size of NIO direct-buffer allocations") \ 3640 "Maximum total size of NIO direct-buffer allocations") \
3641 \ 3641 \
3642 /* temporary developer defined flags */ \ 3642 /* Flags used for temporary code during development */ \
3643 \ 3643 \
3644 diagnostic(bool, UseNewCode, false, \ 3644 diagnostic(bool, UseNewCode, false, \
3645 "Testing Only: Use the new version while testing") \ 3645 "Testing Only: Use the new version while testing") \
3646 \ 3646 \
3647 diagnostic(bool, UseNewCode2, false, \ 3647 diagnostic(bool, UseNewCode2, false, \