comparison src/share/vm/runtime/arguments.cpp @ 3332:f4063a3503fc

Merge
author kamg
date Fri, 06 May 2011 11:25:16 -0400
parents 6c978a541c03 567c87d484a0
children 942e888897bc
comparison
equal deleted inserted replaced
3331:ededdaaf8ca5 3332:f4063a3503fc
1419 FLAG_SET_DEFAULT(MarkSweepDeadRatio, 1); 1419 FLAG_SET_DEFAULT(MarkSweepDeadRatio, 1);
1420 } 1420 }
1421 if (FLAG_IS_DEFAULT(PermMarkSweepDeadRatio)) { 1421 if (FLAG_IS_DEFAULT(PermMarkSweepDeadRatio)) {
1422 FLAG_SET_DEFAULT(PermMarkSweepDeadRatio, 5); 1422 FLAG_SET_DEFAULT(PermMarkSweepDeadRatio, 5);
1423 } 1423 }
1424 }
1425 }
1426 if (UseNUMA) {
1427 if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
1428 FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M);
1424 } 1429 }
1425 } 1430 }
1426 } 1431 }
1427 1432
1428 void Arguments::set_g1_gc_flags() { 1433 void Arguments::set_g1_gc_flags() {
2374 // ostream_init_log(), when called will use this filename 2379 // ostream_init_log(), when called will use this filename
2375 // to initialize a fileStream. 2380 // to initialize a fileStream.
2376 _gc_log_filename = strdup(tail); 2381 _gc_log_filename = strdup(tail);
2377 FLAG_SET_CMDLINE(bool, PrintGC, true); 2382 FLAG_SET_CMDLINE(bool, PrintGC, true);
2378 FLAG_SET_CMDLINE(bool, PrintGCTimeStamps, true); 2383 FLAG_SET_CMDLINE(bool, PrintGCTimeStamps, true);
2379 FLAG_SET_CMDLINE(bool, TraceClassUnloading, true);
2380 2384
2381 // JNI hooks 2385 // JNI hooks
2382 } else if (match_option(option, "-Xcheck", &tail)) { 2386 } else if (match_option(option, "-Xcheck", &tail)) {
2383 if (!strcmp(tail, ":jni")) { 2387 if (!strcmp(tail, ":jni")) {
2384 CheckJNICalls = true; 2388 CheckJNICalls = true;