comparison src/share/vm/runtime/arguments.cpp @ 1890:f5c8d6e5bfee

Merge
author jcoomes
date Mon, 01 Nov 2010 10:49:14 -0700
parents 4e22405d98d6 a7214d79fcf1
children 9de67bf4244d
comparison
equal deleted inserted replaced
1882:ee0d26abaad3 1890:f5c8d6e5bfee
188 { "DefaultMaxRAM", JDK_Version::jdk_update(6,18), JDK_Version::jdk(7) }, 188 { "DefaultMaxRAM", JDK_Version::jdk_update(6,18), JDK_Version::jdk(7) },
189 { "DefaultInitialRAMFraction", 189 { "DefaultInitialRAMFraction",
190 JDK_Version::jdk_update(6,18), JDK_Version::jdk(7) }, 190 JDK_Version::jdk_update(6,18), JDK_Version::jdk(7) },
191 { "UseDepthFirstScavengeOrder", 191 { "UseDepthFirstScavengeOrder",
192 JDK_Version::jdk_update(6,22), JDK_Version::jdk(7) }, 192 JDK_Version::jdk_update(6,22), JDK_Version::jdk(7) },
193 { "HandlePromotionFailure",
194 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) },
195 { "MaxLiveObjectEvacuationRatio",
196 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) },
193 { NULL, JDK_Version(0), JDK_Version(0) } 197 { NULL, JDK_Version(0), JDK_Version(0) }
194 }; 198 };
195 199
196 // Returns true if the flag is obsolete and fits into the range specified 200 // Returns true if the flag is obsolete and fits into the range specified
197 // for being ignored. In the case that the flag is ignored, the 'version' 201 // for being ignored. In the case that the flag is ignored, the 'version'
1726 "not " SIZE_FORMAT "\n", 1730 "not " SIZE_FORMAT "\n",
1727 TLABRefillWasteFraction); 1731 TLABRefillWasteFraction);
1728 status = false; 1732 status = false;
1729 } 1733 }
1730 1734
1731 status = status && verify_percentage(MaxLiveObjectEvacuationRatio,
1732 "MaxLiveObjectEvacuationRatio");
1733 status = status && verify_percentage(AdaptiveSizePolicyWeight, 1735 status = status && verify_percentage(AdaptiveSizePolicyWeight,
1734 "AdaptiveSizePolicyWeight"); 1736 "AdaptiveSizePolicyWeight");
1735 status = status && verify_percentage(AdaptivePermSizeWeight, "AdaptivePermSizeWeight"); 1737 status = status && verify_percentage(AdaptivePermSizeWeight, "AdaptivePermSizeWeight");
1736 status = status && verify_percentage(ThresholdTolerance, "ThresholdTolerance"); 1738 status = status && verify_percentage(ThresholdTolerance, "ThresholdTolerance");
1737 status = status && verify_percentage(MinHeapFreeRatio, "MinHeapFreeRatio"); 1739 status = status && verify_percentage(MinHeapFreeRatio, "MinHeapFreeRatio");