8251257: NMT: jcmd VM.native_memory scale=1 crashes target VM

Backport-of: 6df465d
openjdk · Jan 26, 2021 · 614325c · 614325c · openjdk-notifier · Jan 26, 2021
1 parent 0bb1017
commit 614325c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/hotspot/share/services/nmtCommon.cpp b/src/hotspot/share/services/nmtCommon.cpp
@@ -35,6 +35,7 @@ const char* NMTUtil::_memory_type_names[] = {
 
 const char* NMTUtil::scale_name(size_t scale) {
   switch(scale) {
+    case 1: return "";
     case K: return "KB";
     case M: return "MB";
     case G: return "GB";

diff --git a/test/hotspot/jtreg/runtime/NMT/JcmdScale.java b/test/hotspot/jtreg/runtime/NMT/JcmdScale.java
@@ -43,6 +43,14 @@ public static void main(String args[]) throws Exception {
     // Grab my own PID
     String pid = Long.toString(ProcessTools.getProcessId());
 
+    pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=1"});
+    output = new OutputAnalyzer(pb.start());
+    output.shouldContain(", committed=");
+
+    pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=b"});
+    output = new OutputAnalyzer(pb.start());
+    output.shouldContain(", committed=");
+
     pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "scale=KB"});
     output = new OutputAnalyzer(pb.start());
     output.shouldContain("KB, committed=");