Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 3349:942e888897bc
Merge
author | never |
---|---|
date | Fri, 06 May 2011 11:36:25 -0700 |
parents | e9b8ef09622a f4063a3503fc |
children | be4ca325525a 2a241e764894 |
comparison
equal
deleted
inserted
replaced
3348:f879eafd5835 | 3349:942e888897bc |
---|---|
958 _mode = mode; | 958 _mode = mode; |
959 | 959 |
960 // Ensure Agent_OnLoad has the correct initial values. | 960 // Ensure Agent_OnLoad has the correct initial values. |
961 // This may not be the final mode; mode may change later in onload phase. | 961 // This may not be the final mode; mode may change later in onload phase. |
962 PropertyList_unique_add(&_system_properties, "java.vm.info", | 962 PropertyList_unique_add(&_system_properties, "java.vm.info", |
963 (char*)Abstract_VM_Version::vm_info_string(), false); | 963 (char*)VM_Version::vm_info_string(), false); |
964 | 964 |
965 UseInterpreter = true; | 965 UseInterpreter = true; |
966 UseCompiler = true; | 966 UseCompiler = true; |
967 UseLoopCounter = true; | 967 UseLoopCounter = true; |
968 | 968 |
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() { |
2377 // ostream_init_log(), when called will use this filename | 2382 // ostream_init_log(), when called will use this filename |
2378 // to initialize a fileStream. | 2383 // to initialize a fileStream. |
2379 _gc_log_filename = strdup(tail); | 2384 _gc_log_filename = strdup(tail); |
2380 FLAG_SET_CMDLINE(bool, PrintGC, true); | 2385 FLAG_SET_CMDLINE(bool, PrintGC, true); |
2381 FLAG_SET_CMDLINE(bool, PrintGCTimeStamps, true); | 2386 FLAG_SET_CMDLINE(bool, PrintGCTimeStamps, true); |
2382 FLAG_SET_CMDLINE(bool, TraceClassUnloading, true); | |
2383 | 2387 |
2384 // JNI hooks | 2388 // JNI hooks |
2385 } else if (match_option(option, "-Xcheck", &tail)) { | 2389 } else if (match_option(option, "-Xcheck", &tail)) { |
2386 if (!strcmp(tail, ":jni")) { | 2390 if (!strcmp(tail, ":jni")) { |
2387 CheckJNICalls = true; | 2391 CheckJNICalls = true; |