archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Jaroslav Bachorik 2015-04-08 08:07:47 +00:00
commit 1baf145d9e
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -3714,8 +3714,8 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
CommandLineFlags::printFlags(tty, false); CommandLineFlags::printFlags(tty, false);
vm_exit(0); vm_exit(0);
} }
#if INCLUDE_NMT
if (match_option(option, "-XX:NativeMemoryTracking", &tail)) { if (match_option(option, "-XX:NativeMemoryTracking", &tail)) {
#if INCLUDE_NMT
// The launcher did not setup nmt environment variable properly. // The launcher did not setup nmt environment variable properly.
if (!MemTracker::check_launcher_nmt_support(tail)) { if (!MemTracker::check_launcher_nmt_support(tail)) {
warning("Native Memory Tracking did not setup properly, using wrong launcher?"); warning("Native Memory Tracking did not setup properly, using wrong launcher?");
@ -3731,9 +3731,12 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL); vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL);
} }
continue; continue;
} #else
jio_fprintf(defaultStream::error_stream(),
"Native Memory Tracking is not supported in this VM\n");
return JNI_ERR;
#endif #endif
}
#ifndef PRODUCT #ifndef PRODUCT
if (match_option(option, "-XX:+PrintFlagsWithComments")) { if (match_option(option, "-XX:+PrintFlagsWithComments")) {