comparison src/share/vm/runtime/arguments.cpp @ 6910:6ba00f89fbe1

Merge
author asaha
date Thu, 11 Oct 2012 15:29:16 -0700
parents 218a94758fe7 22b8d3d181d9
children d2582a08fa5d
comparison
equal deleted inserted replaced
6909:218a94758fe7 6910:6ba00f89fbe1
1110 } 1110 }
1111 1111
1112 // AlwaysTenure flag should make ParNew promote all at first collection. 1112 // AlwaysTenure flag should make ParNew promote all at first collection.
1113 // See CR 6362902. 1113 // See CR 6362902.
1114 if (AlwaysTenure) { 1114 if (AlwaysTenure) {
1115 FLAG_SET_CMDLINE(intx, MaxTenuringThreshold, 0); 1115 FLAG_SET_CMDLINE(uintx, MaxTenuringThreshold, 0);
1116 } 1116 }
1117 // When using compressed oops, we use local overflow stacks, 1117 // When using compressed oops, we use local overflow stacks,
1118 // rather than using a global overflow list chained through 1118 // rather than using a global overflow list chained through
1119 // the klass word of the object's pre-image. 1119 // the klass word of the object's pre-image.
1120 if (UseCompressedOops && !ParGCUseLocalOverflow) { 1120 if (UseCompressedOops && !ParGCUseLocalOverflow) {
1229 } 1229 }
1230 // Unless explicitly requested otherwise, definitely 1230 // Unless explicitly requested otherwise, definitely
1231 // promote all objects surviving "tenuring_default" scavenges. 1231 // promote all objects surviving "tenuring_default" scavenges.
1232 if (FLAG_IS_DEFAULT(MaxTenuringThreshold) && 1232 if (FLAG_IS_DEFAULT(MaxTenuringThreshold) &&
1233 FLAG_IS_DEFAULT(SurvivorRatio)) { 1233 FLAG_IS_DEFAULT(SurvivorRatio)) {
1234 FLAG_SET_ERGO(intx, MaxTenuringThreshold, tenuring_default); 1234 FLAG_SET_ERGO(uintx, MaxTenuringThreshold, tenuring_default);
1235 } 1235 }
1236 // If we decided above (or user explicitly requested) 1236 // If we decided above (or user explicitly requested)
1237 // `promote all' (via MaxTenuringThreshold := 0), 1237 // `promote all' (via MaxTenuringThreshold := 0),
1238 // prefer minuscule survivor spaces so as not to waste 1238 // prefer minuscule survivor spaces so as not to waste
1239 // space for (non-existent) survivors 1239 // space for (non-existent) survivors