comparison src/share/vm/runtime/arguments.cpp @ 12259:ae3e68933caf

Merge
author adlertz
date Tue, 17 Sep 2013 05:30:19 -0700
parents bb57d48691f5 01b268b3080a
children da051ce490eb
comparison
equal deleted inserted replaced
12193:0821b5d72ca8 12259:ae3e68933caf
3324 } 3324 }
3325 } 3325 }
3326 return shared_archive_path; 3326 return shared_archive_path;
3327 } 3327 }
3328 3328
3329 #ifndef PRODUCT
3330 // Determine whether LogVMOutput should be implicitly turned on.
3331 static bool use_vm_log() {
3332 if (LogCompilation || !FLAG_IS_DEFAULT(LogFile) ||
3333 PrintCompilation || PrintInlining || PrintDependencies || PrintNativeNMethods ||
3334 PrintDebugInfo || PrintRelocations || PrintNMethods || PrintExceptionHandlers ||
3335 PrintAssembly || TraceDeoptimization || TraceDependencies ||
3336 (VerifyDependencies && FLAG_IS_CMDLINE(VerifyDependencies))) {
3337 return true;
3338 }
3339
3340 #ifdef COMPILER1
3341 if (PrintC1Statistics) {
3342 return true;
3343 }
3344 #endif // COMPILER1
3345
3346 #ifdef COMPILER2
3347 if (PrintOptoAssembly || PrintOptoStatistics) {
3348 return true;
3349 }
3350 #endif // COMPILER2
3351
3352 return false;
3353 }
3354 #endif // PRODUCT
3355
3329 // Parse entry point called from JNI_CreateJavaVM 3356 // Parse entry point called from JNI_CreateJavaVM
3330 3357
3331 jint Arguments::parse(const JavaVMInitArgs* args) { 3358 jint Arguments::parse(const JavaVMInitArgs* args) {
3332 3359
3333 // Remaining part of option string 3360 // Remaining part of option string
3615 // Force NmethodSweeper to sweep whole CodeCache each time. 3642 // Force NmethodSweeper to sweep whole CodeCache each time.
3616 if (FLAG_IS_DEFAULT(NmethodSweepFraction)) { 3643 if (FLAG_IS_DEFAULT(NmethodSweepFraction)) {
3617 NmethodSweepFraction = 1; 3644 NmethodSweepFraction = 1;
3618 } 3645 }
3619 } 3646 }
3620 #endif 3647
3648 if (!LogVMOutput && FLAG_IS_DEFAULT(LogVMOutput)) {
3649 if (use_vm_log()) {
3650 LogVMOutput = true;
3651 }
3652 }
3653 #endif // PRODUCT
3621 3654
3622 if (PrintCommandLineFlags) { 3655 if (PrintCommandLineFlags) {
3623 CommandLineFlags::printSetFlags(tty); 3656 CommandLineFlags::printSetFlags(tty);
3624 } 3657 }
3625 3658