comparison src/share/vm/runtime/arguments.cpp @ 1330:4a9cc99938e3

Merge
author acorn
date Fri, 26 Mar 2010 11:10:26 -0400
parents cc98cc548f51
children 56507bcd639e
comparison
equal deleted inserted replaced
1329:84043c7507b9 1330:4a9cc99938e3
1344 if (FLAG_IS_DEFAULT(MaxGCPauseMillis)) { 1344 if (FLAG_IS_DEFAULT(MaxGCPauseMillis)) {
1345 FLAG_SET_DEFAULT(MaxGCPauseMillis, 200); 1345 FLAG_SET_DEFAULT(MaxGCPauseMillis, 200);
1346 } 1346 }
1347 1347
1348 if (FLAG_IS_DEFAULT(MarkStackSize)) { 1348 if (FLAG_IS_DEFAULT(MarkStackSize)) {
1349 // Size as a multiple of TaskQueueSuper::N which is larger 1349 FLAG_SET_DEFAULT(MarkStackSize, 128 * TASKQUEUE_SIZE);
1350 // for 64-bit.
1351 FLAG_SET_DEFAULT(MarkStackSize, 128 * TaskQueueSuper::total_size());
1352 } 1350 }
1353 if (PrintGCDetails && Verbose) { 1351 if (PrintGCDetails && Verbose) {
1354 tty->print_cr("MarkStackSize: %uk MarkStackSizeMax: %uk", 1352 tty->print_cr("MarkStackSize: %uk MarkStackSizeMax: %uk",
1355 MarkStackSize / K, MarkStackSizeMax / K); 1353 MarkStackSize / K, MarkStackSizeMax / K);
1356 tty->print_cr("ConcGCThreads: %u", ConcGCThreads); 1354 tty->print_cr("ConcGCThreads: %u", ConcGCThreads);
2857 UseCompressedOops = false; 2855 UseCompressedOops = false;
2858 } 2856 }
2859 } 2857 }
2860 #endif // _LP64 2858 #endif // _LP64
2861 2859
2860 // MethodHandles code does not support TaggedStackInterpreter.
2861 if (EnableMethodHandles && TaggedStackInterpreter) {
2862 warning("TaggedStackInterpreter is not supported by MethodHandles code. Disabling TaggedStackInterpreter.");
2863 TaggedStackInterpreter = false;
2864 }
2865
2862 // Check the GC selections again. 2866 // Check the GC selections again.
2863 if (!check_gc_consistency()) { 2867 if (!check_gc_consistency()) {
2864 return JNI_EINVAL; 2868 return JNI_EINVAL;
2865 } 2869 }
2866 2870