comparison src/share/vm/runtime/arguments.cpp @ 12269:da051ce490eb

Merge
author adlertz
date Thu, 19 Sep 2013 18:01:39 +0200
parents 06ae47d9d088 ae3e68933caf
children 0f37d1badced 72b7e96c1922
comparison
equal deleted inserted replaced
12253:179cd89fb279 12269:da051ce490eb
3406 } 3406 }
3407 } 3407 }
3408 return shared_archive_path; 3408 return shared_archive_path;
3409 } 3409 }
3410 3410
3411 #ifndef PRODUCT
3412 // Determine whether LogVMOutput should be implicitly turned on.
3413 static bool use_vm_log() {
3414 if (LogCompilation || !FLAG_IS_DEFAULT(LogFile) ||
3415 PrintCompilation || PrintInlining || PrintDependencies || PrintNativeNMethods ||
3416 PrintDebugInfo || PrintRelocations || PrintNMethods || PrintExceptionHandlers ||
3417 PrintAssembly || TraceDeoptimization || TraceDependencies ||
3418 (VerifyDependencies && FLAG_IS_CMDLINE(VerifyDependencies))) {
3419 return true;
3420 }
3421
3422 #ifdef COMPILER1
3423 if (PrintC1Statistics) {
3424 return true;
3425 }
3426 #endif // COMPILER1
3427
3428 #ifdef COMPILER2
3429 if (PrintOptoAssembly || PrintOptoStatistics) {
3430 return true;
3431 }
3432 #endif // COMPILER2
3433
3434 return false;
3435 }
3436 #endif // PRODUCT
3437
3411 // Parse entry point called from JNI_CreateJavaVM 3438 // Parse entry point called from JNI_CreateJavaVM
3412 3439
3413 jint Arguments::parse(const JavaVMInitArgs* args) { 3440 jint Arguments::parse(const JavaVMInitArgs* args) {
3414 3441
3415 // Remaining part of option string 3442 // Remaining part of option string
3706 // Force NmethodSweeper to sweep whole CodeCache each time. 3733 // Force NmethodSweeper to sweep whole CodeCache each time.
3707 if (FLAG_IS_DEFAULT(NmethodSweepFraction)) { 3734 if (FLAG_IS_DEFAULT(NmethodSweepFraction)) {
3708 NmethodSweepFraction = 1; 3735 NmethodSweepFraction = 1;
3709 } 3736 }
3710 } 3737 }
3711 #endif 3738
3739 if (!LogVMOutput && FLAG_IS_DEFAULT(LogVMOutput)) {
3740 if (use_vm_log()) {
3741 LogVMOutput = true;
3742 }
3743 }
3744 #endif // PRODUCT
3712 3745
3713 if (PrintCommandLineFlags) { 3746 if (PrintCommandLineFlags) {
3714 CommandLineFlags::printSetFlags(tty); 3747 CommandLineFlags::printSetFlags(tty);
3715 } 3748 }
3716 3749