test/hotspot/jtreg/serviceability/sa/TestPrintMdo.java

@@ -20,23 +20,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
 import java.util.ArrayList;
-import java.util.Scanner;
 import java.util.List;
-import java.io.File;
-import java.io.IOException;
-import java.util.stream.Collectors;
-import java.io.OutputStream;
+import java.util.Map;
+import java.util.HashMap;
 import jdk.test.lib.apps.LingeredApp;
-import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.Platform;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.Utils;
-import jdk.test.lib.Asserts;
 
 /**
  * @test
  * @library /test/lib
  * @requires vm.hasSAandCanAttach

@@ -45,121 +37,37 @@
  * @run main/othervm TestPrintMdo
  */
 
 public class TestPrintMdo {
 
-    private static final String PRINTMDO_OUT_FILE = "printmdo_out.txt";
-
-    private static void verifyPrintMdoOutput() throws Exception {
-
-        Exception unexpected = null;
-        File printMdoFile = new File(PRINTMDO_OUT_FILE);
-        Asserts.assertTrue(printMdoFile.exists() && printMdoFile.isFile(),
-                           "File with printmdo output not created: " +
-                           printMdoFile.getAbsolutePath());
-        try {
-            Scanner scanner = new Scanner(printMdoFile);
-
-            String unexpectedMsg =
-                 "One or more of 'VirtualCallData', 'CounterData', " +
-                 "'ReceiverTypeData', 'bci', 'MethodData' "  +
-                 "or 'java/lang/Object' not found";
-            boolean knownClassFound = false;
-            boolean knownProfileDataTypeFound = false;
-            boolean knownTokensFound = false;
-
-            while (scanner.hasNextLine()) {
-                String line = scanner.nextLine();
-                line = line.trim();
-                System.out.println(line);
-
-                if (line.contains("missing reason for ")) {
-                    unexpected = new RuntimeException("Unexpected msg: missing reason for ");
-                    break;
-                }
-                if (line.contains("VirtualCallData")  ||
-                    line.contains("CounterData")      ||
-                    line.contains("ReceiverTypeData")) {
-                    knownProfileDataTypeFound = true;
-                }
-                if (line.contains("bci") ||
-                    line.contains("MethodData")) {
-                    knownTokensFound = true;
-                }
-                if (line.contains("java/lang/Object")) {
-                    knownClassFound = true;
-                }
-            }
-            if ((knownClassFound           == false)  ||
-                (knownTokensFound          == false)  ||
-                (knownProfileDataTypeFound == false)) {
-                unexpected = new RuntimeException(unexpectedMsg);
-            }
-            if (unexpected != null) {
-                throw unexpected;
-            }
-        } catch (Exception ex) {
-           throw new RuntimeException("Test ERROR " + ex, ex);
-        } finally {
-           printMdoFile.delete();
-        }
-    }
-
-    private static void startClhsdbForPrintMdo(long lingeredAppPid) throws Exception {
-
-        Process p;
-        JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
-        launcher.addToolArg("clhsdb");
-        launcher.addToolArg("--pid");
-        launcher.addToolArg(Long.toString(lingeredAppPid));
-
-        ProcessBuilder pb = new ProcessBuilder();
-        pb.command(launcher.getCommand());
-        System.out.println(
-            pb.command().stream().collect(Collectors.joining(" ")));
-
-        try {
-            p = pb.start();
-        } catch (Exception attachE) {
-            throw new Error("Couldn't start jhsdb or attach to LingeredApp : " + attachE);
-        }
-
-        // Issue the 'printmdo' input at the clhsdb prompt.
-        OutputStream input = p.getOutputStream();
-        String str = "printmdo -a > " + PRINTMDO_OUT_FILE + "\nquit\n";
-        try {
-            input.write(str.getBytes());
-            input.flush();
-        } catch (IOException ioe) {
-            throw new Error("Problem issuing the printmdo command: " + str, ioe);
-        }
-
-        OutputAnalyzer output = new OutputAnalyzer(p);
-
-        try {
-            p.waitFor();
-        } catch (InterruptedException ie) {
-            p.destroyForcibly();
-            throw new Error("Problem awaiting the child process: " + ie, ie);
-        }
-
-        output.shouldHaveExitValue(0);
-    }
-
     public static void main (String... args) throws Exception {
 
+        System.out.println("Starting TestPrintMdo test");
         LingeredApp app = null;
-
         try {
+            ClhsdbLauncher test = new ClhsdbLauncher();
             List<String> vmArgs = new ArrayList<String>();
             vmArgs.add("-XX:+ProfileInterpreter");
             vmArgs.addAll(Utils.getVmOptions());
 
             app = LingeredApp.startApp(vmArgs);
             System.out.println ("Started LingeredApp with pid " + app.getPid());
-            startClhsdbForPrintMdo(app.getPid());
-            verifyPrintMdoOutput();
+            List<String> cmds = List.of("printmado -a");
+
+            Map<String, List<String>> expStrMap = new HashMap<>();
+            expStrMap.put("printmdo -a", List.of(
+                "VirtualCallData",
+                "CounterData",
+                "ReceiverTypeData",
+                "bci",
+                "MethodData",
+                "java/lang/Object"));
+            test.run(app.getPid(), cmds, expStrMap, null);
+        } catch (Exception ex) {
+            throw new RuntimeException("Test ERROR " + ex, ex);
         } finally {
             LingeredApp.stopApp(app);
         }
+
+        System.out.println("Test PASSED");
     }
 }