comparison src/share/vm/runtime/arguments.cpp @ 2176:27e4ea99855d

Merge
author johnc
date Thu, 27 Jan 2011 13:42:28 -0800
parents bb2c2878f134 234761c55641
children d25d4ca69222 59e20a452a2a c08677f98289
comparison
equal deleted inserted replaced
2171:9846d99e16d3 2176:27e4ea99855d
1939 "error: +ExplictGCInvokesConcurrent[AndUnloadsClasses] conflicts" 1939 "error: +ExplictGCInvokesConcurrent[AndUnloadsClasses] conflicts"
1940 " with -UseAsyncConcMarkSweepGC"); 1940 " with -UseAsyncConcMarkSweepGC");
1941 status = false; 1941 status = false;
1942 } 1942 }
1943 1943
1944 #ifndef SERIALGC
1944 if (UseG1GC) { 1945 if (UseG1GC) {
1945 status = status && verify_percentage(InitiatingHeapOccupancyPercent, 1946 status = status && verify_percentage(InitiatingHeapOccupancyPercent,
1946 "InitiatingHeapOccupancyPercent"); 1947 "InitiatingHeapOccupancyPercent");
1947 } 1948 status = status && verify_min_value(G1RefProcDrainInterval, 1,
1949 "G1RefProcDrainInterval");
1950 status = status && verify_min_value((intx)G1ConcMarkStepDurationMillis, 1,
1951 "G1ConcMarkStepDurationMillis");
1952 }
1953 #endif
1948 1954
1949 status = status && verify_interval(RefDiscoveryPolicy, 1955 status = status && verify_interval(RefDiscoveryPolicy,
1950 ReferenceProcessor::DiscoveryPolicyMin, 1956 ReferenceProcessor::DiscoveryPolicyMin,
1951 ReferenceProcessor::DiscoveryPolicyMax, 1957 ReferenceProcessor::DiscoveryPolicyMax,
1952 "RefDiscoveryPolicy"); 1958 "RefDiscoveryPolicy");