Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 20371:fd4dbaff3002 jdk8u40-b04
Merge
author | amurillo |
---|---|
date | Tue, 02 Sep 2014 14:08:36 -0700 |
parents | 3374ec4c4448 833b0f92429a |
children | 7430aa5718a5 |
comparison
equal
deleted
inserted
replaced
20348:77878c021b8d | 20371:fd4dbaff3002 |
---|---|
294 { "UseISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 294 { "UseISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
295 { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 295 { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
296 { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 296 { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
297 { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, | 297 { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, |
298 { "UseOldInlining", JDK_Version::jdk(9), JDK_Version::jdk(10) }, | 298 { "UseOldInlining", JDK_Version::jdk(9), JDK_Version::jdk(10) }, |
299 { "AutoShutdownNMT", JDK_Version::jdk(9), JDK_Version::jdk(10) }, | |
299 #ifdef PRODUCT | 300 #ifdef PRODUCT |
300 { "DesiredMethodLimit", | 301 { "DesiredMethodLimit", |
301 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, | 302 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, |
302 #endif // PRODUCT | 303 #endif // PRODUCT |
303 { NULL, JDK_Version(0), JDK_Version(0) } | 304 { NULL, JDK_Version(0), JDK_Version(0) } |
2349 | 2350 |
2350 status = status && verify_min_value(MarkSweepAlwaysCompactCount, 1, "MarkSweepAlwaysCompactCount"); | 2351 status = status && verify_min_value(MarkSweepAlwaysCompactCount, 1, "MarkSweepAlwaysCompactCount"); |
2351 | 2352 |
2352 if (PrintNMTStatistics) { | 2353 if (PrintNMTStatistics) { |
2353 #if INCLUDE_NMT | 2354 #if INCLUDE_NMT |
2354 if (MemTracker::tracking_level() == MemTracker::NMT_off) { | 2355 if (MemTracker::tracking_level() == NMT_off) { |
2355 #endif // INCLUDE_NMT | 2356 #endif // INCLUDE_NMT |
2356 warning("PrintNMTStatistics is disabled, because native memory tracking is not enabled"); | 2357 warning("PrintNMTStatistics is disabled, because native memory tracking is not enabled"); |
2357 PrintNMTStatistics = false; | 2358 PrintNMTStatistics = false; |
2358 #if INCLUDE_NMT | 2359 #if INCLUDE_NMT |
2359 } | 2360 } |
3539 } | 3540 } |
3540 if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) { | 3541 if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) { |
3541 CommandLineFlags::printFlags(tty, false); | 3542 CommandLineFlags::printFlags(tty, false); |
3542 vm_exit(0); | 3543 vm_exit(0); |
3543 } | 3544 } |
3545 #if INCLUDE_NMT | |
3544 if (match_option(option, "-XX:NativeMemoryTracking", &tail)) { | 3546 if (match_option(option, "-XX:NativeMemoryTracking", &tail)) { |
3545 #if INCLUDE_NMT | 3547 // The launcher did not setup nmt environment variable properly. |
3546 MemTracker::init_tracking_options(tail); | 3548 // if (!MemTracker::check_launcher_nmt_support(tail)) { |
3547 #else | 3549 // warning("Native Memory Tracking did not setup properly, using wrong launcher?"); |
3548 jio_fprintf(defaultStream::error_stream(), | 3550 // } |
3549 "Native Memory Tracking is not supported in this VM\n"); | 3551 |
3550 return JNI_ERR; | 3552 // Verify if nmt option is valid. |
3553 if (MemTracker::verify_nmt_option()) { | |
3554 // Late initialization, still in single-threaded mode. | |
3555 if (MemTracker::tracking_level() >= NMT_summary) { | |
3556 MemTracker::init(); | |
3557 } | |
3558 } else { | |
3559 vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL); | |
3560 } | |
3561 } | |
3551 #endif | 3562 #endif |
3552 } | |
3553 | 3563 |
3554 | 3564 |
3555 #ifndef PRODUCT | 3565 #ifndef PRODUCT |
3556 if (match_option(option, "-XX:+PrintFlagsWithComments", &tail)) { | 3566 if (match_option(option, "-XX:+PrintFlagsWithComments", &tail)) { |
3557 CommandLineFlags::printFlags(tty, true); | 3567 CommandLineFlags::printFlags(tty, true); |