comparison src/share/vm/runtime/arguments.cpp @ 6998:49f0841607b7

Merge.
author Doug Simon <doug.simon@oracle.com>
date Tue, 20 Nov 2012 22:50:44 +0100
parents edb2d7ed9a01 2cb439954abf
children 7d815d842ee0
comparison
equal deleted inserted replaced
6997:b3a647ae5032 6998:49f0841607b7
22 * 22 *
23 */ 23 */
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "classfile/javaAssertions.hpp" 26 #include "classfile/javaAssertions.hpp"
27 #include "classfile/symbolTable.hpp"
27 #include "compiler/compilerOracle.hpp" 28 #include "compiler/compilerOracle.hpp"
28 #include "memory/allocation.inline.hpp" 29 #include "memory/allocation.inline.hpp"
29 #include "memory/cardTableRS.hpp" 30 #include "memory/cardTableRS.hpp"
30 #include "memory/referenceProcessor.hpp" 31 #include "memory/referenceProcessor.hpp"
31 #include "memory/universe.inline.hpp" 32 #include "memory/universe.inline.hpp"
1859 status = status && verify_percentage(AdaptiveSizePolicyWeight, 1860 status = status && verify_percentage(AdaptiveSizePolicyWeight,
1860 "AdaptiveSizePolicyWeight"); 1861 "AdaptiveSizePolicyWeight");
1861 status = status && verify_percentage(ThresholdTolerance, "ThresholdTolerance"); 1862 status = status && verify_percentage(ThresholdTolerance, "ThresholdTolerance");
1862 status = status && verify_percentage(MinHeapFreeRatio, "MinHeapFreeRatio"); 1863 status = status && verify_percentage(MinHeapFreeRatio, "MinHeapFreeRatio");
1863 status = status && verify_percentage(MaxHeapFreeRatio, "MaxHeapFreeRatio"); 1864 status = status && verify_percentage(MaxHeapFreeRatio, "MaxHeapFreeRatio");
1865
1866 // Divide by bucket size to prevent a large size from causing rollover when
1867 // calculating amount of memory needed to be allocated for the String table.
1868 status = status && verify_interval(StringTableSize, defaultStringTableSize,
1869 (max_uintx / StringTable::bucket_size()), "StringTable size");
1864 1870
1865 if (MinHeapFreeRatio > MaxHeapFreeRatio) { 1871 if (MinHeapFreeRatio > MaxHeapFreeRatio) {
1866 jio_fprintf(defaultStream::error_stream(), 1872 jio_fprintf(defaultStream::error_stream(),
1867 "MinHeapFreeRatio (" UINTX_FORMAT ") must be less than or " 1873 "MinHeapFreeRatio (" UINTX_FORMAT ") must be less than or "
1868 "equal to MaxHeapFreeRatio (" UINTX_FORMAT ")\n", 1874 "equal to MaxHeapFreeRatio (" UINTX_FORMAT ")\n",