Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.hpp Wed Jan 29 19:54:44 2014 -0500 +++ b/src/share/vm/runtime/globals.hpp Thu Jan 30 14:01:45 2014 +0100 @@ -3135,15 +3135,15 @@ "Maximum size of class area in Metaspace when compressed " \ "class pointers are used") \ \ - product(uintx, MinHeapFreeRatio, 40, \ + manageable(uintx, MinHeapFreeRatio, 40, \ "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, \ + " For most GCs this applies to the old generation. In G1 and" \ + " ParallelGC it applies to the whole heap.") \ + \ + manageable(uintx, MaxHeapFreeRatio, 70, \ "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.") \ + " For most GCs this applies to the old generation. In G1 and" \ + " ParallelGC it applies to the whole heap.") \ \ product(intx, SoftRefLRUPolicyMSPerMB, 1000, \ "Number of milliseconds per MB of free space in the heap") \ @@ -3639,7 +3639,7 @@ product(uintx, MaxDirectMemorySize, 0, \ "Maximum total size of NIO direct-buffer allocations") \ \ - /* temporary developer defined flags */ \ + /* Flags used for temporary code during development */ \ \ diagnostic(bool, UseNewCode, false, \ "Testing Only: Use the new version while testing") \