提交 f5a393f7 编写于 作者: D dholmes

8067235: embedded/minvm/checknmt fails on compact1 and compact2 with minimal VM

Reviewed-by: lfoltan, sspitsyn
上级 98662158
...@@ -3837,8 +3837,8 @@ jint Arguments::parse(const JavaVMInitArgs* args) { ...@@ -3837,8 +3837,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?");
...@@ -3853,8 +3853,12 @@ jint Arguments::parse(const JavaVMInitArgs* args) { ...@@ -3853,8 +3853,12 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
} else { } else {
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);
} }
} #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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册