8333117: Remove support of remote and manual debuggee launchers

Reviewed-by: cjplummer

Author: lmesnik

test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Debuggee.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,55 +30,15 @@
 import java.io.*;
 
 /**
- * Interface defining methods to control mirror of debuggee (i.e. debugged VM).
+ * Class defining methods to control mirror of debuggee (i.e. debugged VM).
  */
-public interface Debuggee {
+public class Debuggee extends LocalProcess {
 
     /** Default prefix for log messages. */
     public static final String LOG_PREFIX = "debuggee> ";
     public static final String DEBUGEE_STDOUT_LOG_PREFIX = "debuggee.stdout> ";
     public static final String DEBUGEE_STDERR_LOG_PREFIX = "debuggee.stderr> ";
 
-    /**
-     * Launch debuggee.
-     *
-     * @throws IOException
-     */
-    public void launch (String[] args) throws IOException;
-
-    /** Return exit status. */
-    public int getStatus ();
-
-    /** Check whether the process has been terminated. */
-    public boolean terminated();
-
-    /** Kill the debuggee VM. */
-    public void killDebuggee ();
-
-    /** Wait until the debuggee VM shutdown or crash. */
-    public int waitForDebuggee () throws InterruptedException;
-
-    /** Get a pipe to write to the debuggee's stdin stream. */
-    public OutputStream getInPipe ();
-
-    /** Get a pipe to read the debuggee's stdout stream. */
-    public InputStream getOutPipe ();
-
-    /** Get a pipe to read the debuggee's stderr stream. */
-    public InputStream getErrPipe ();
-
-    /** Redirect stdout stream to <code>Log</code> */
-    public void redirectStdout(Log log, String prefix);
-
-    /** Redirect stderr stream to <code>Log</code> */
-    public void redirectStderr(Log log, String prefix);
-}
-
-/**
- * Mirror of locally launched debuggee.
- */
-final class LocalLaunchedDebuggee extends LocalProcess implements Debuggee {
-
     private IORedirector stdoutRedirector = null;
     private IORedirector stderrRedirector = null;
     private IORedirector stdinRedirector = null;
@@ -90,7 +50,7 @@ final class LocalLaunchedDebuggee extends LocalProcess implements Debuggee {
     private Launcher launcher = null;
 
     /** Enwrap the existing <code>VM</code> mirror. */
-    LocalLaunchedDebuggee (Launcher launcher) {
+    Debuggee(Launcher launcher) {
         super();
         this.launcher = launcher;
     }
@@ -235,70 +195,3 @@ public void redirectStderr(Log log, String prefix) {
 }
 
 
-/**
- * Mirror of remotely launched debuggee.
- */
-final class RemoteLaunchedDebuggee implements Debuggee {
-
-    /** Launcher that creates this debuggee. */
-    private Launcher launcher = null;
-
-    /** Enwrap the existing <code>VM</code> mirror. */
-    RemoteLaunchedDebuggee (Launcher launcher) {
-        super();
-        this.launcher = launcher;
-    }
-
-    /**
-     * Launch debugee on remote host via <code>Launcher</code> object.
-     */
-    public void launch(String[] args) throws IOException {
-        String cmdLine = ArgumentHandler.joinArguments(args, "\"");
-        launcher.display("Starting remote java process:\n" + cmdLine);
-        launcher.launchRemoteProcess(args);
-    }
-
-    /** Return exit status of the debuggee VM. */
-    public int getStatus () {
-        return launcher.getRemoteProcessStatus();
-    }
-
-    /** Check whether the debuggee VM has been terminated. */
-    public boolean terminated () {
-        return launcher.isRemoteProcessTerminated();
-    }
-
-    // ---------------------------------------------- //
-
-    /** Kill the debuggee VM. */
-    public void killDebuggee () {
-        launcher.killRemoteProcess();
-    }
-
-    /** Wait until the debuggee VM shutdown or crash. */
-    public int waitForDebuggee () {
-        return launcher.waitForRemoteProcess();
-    }
-
-    /** Get a pipe to write to the debuggee's stdin stream. */
-    public OutputStream getInPipe () {
-        return null;
-    }
-
-    /** Get a pipe to read the debuggee's stdout stream. */
-    public InputStream getOutPipe () {
-        return null;
-    }
-
-    /** Get a pipe to read the debuggee's stderr stream. */
-    public InputStream getErrPipe () {
-        return null;
-    }
-
-    public void redirectStdout(Log log, String prefix) {
-    }
-
-    public void redirectStderr(Log log, String prefix) {
-    }
-
-}

test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -103,52 +103,21 @@ public void launchJdbAndDebuggee (String classToExecute) throws IOException {
 
         String[] jdbCmdArgs = makeJdbCmdLine(classToExecute);
 
-        if (argumentHandler.isLaunchedLocally()) {
-
-            if (argumentHandler.isDefaultConnector()) {
-
-                localDefaultLaunch(jdbCmdArgs, classToExecute);
-
-            } else if (argumentHandler.isRawLaunchingConnector()) {
-
-                localRawLaunch(jdbCmdArgs, classToExecute);
-
-            } else if (argumentHandler.isLaunchingConnector()) {
-
-                localLaunch(jdbCmdArgs, classToExecute);
-
-            } else if (argumentHandler.isAttachingConnector()) {
-
-                localLaunchAndAttach(jdbCmdArgs, classToExecute);
-
-            } else if (argumentHandler.isListeningConnector()) {
-
-                localLaunchAndListen(jdbCmdArgs, classToExecute);
-
-            } else {
-                throw new TestBug("Unexpected connector type for local launch mode"
-                                  + argumentHandler.getConnectorType());
-            }
-
-        } else if (argumentHandler.isLaunchedRemotely()) {
-
-            connectToBindServer(classToExecute);
-
-            if (argumentHandler.isAttachingConnector()) {
-
-                remoteLaunchAndAttach(jdbCmdArgs, classToExecute);
-
-            } else if (argumentHandler.isListeningConnector()) {
-
-                remoteLaunchAndListen(jdbCmdArgs, classToExecute);
-
-            } else {
-                throw new TestBug("Unexpected connector type for remote launch mode"
-                                  + argumentHandler.getConnectorType());
-            }
+        if (argumentHandler.isDefaultConnector()) {
+            localDefaultLaunch(jdbCmdArgs, classToExecute);
+        } else if (argumentHandler.isRawLaunchingConnector()) {
+            localRawLaunch(jdbCmdArgs, classToExecute);
+        } else if (argumentHandler.isLaunchingConnector()) {
+            localLaunch(jdbCmdArgs, classToExecute);
+        } else if (argumentHandler.isAttachingConnector()) {
+            localLaunchAndAttach(jdbCmdArgs, classToExecute);
+        } else if (argumentHandler.isListeningConnector()) {
+            localLaunchAndListen(jdbCmdArgs, classToExecute);
         } else {
-            throw new Failure("Unexpected launching mode: " + argumentHandler.getLaunchMode());
+            throw new TestBug("Unexpected connector type for local launch mode"
+                              + argumentHandler.getConnectorType());
         }
+
     }
 
     /**
@@ -198,11 +167,7 @@ private String[] makeJdbCmdLine (String classToExecute) {
             if (argumentHandler.isRawLaunchingConnector()) {
 
                 if (argumentHandler.isSocketTransport()) {
-                    if (argumentHandler.isLaunchedLocally()) {
-                        connectorAddress = argumentHandler.getTransportPort();
-                    } else {
-                        connectorAddress = argumentHandler.getDebugeeHost() + ":" + argumentHandler.getTransportPort();
-                    }
+                    connectorAddress = argumentHandler.getTransportPort();
                 } else if (argumentHandler.isShmemTransport() ) {
                     connectorAddress = argumentHandler.getTransportSharedName();
                 } else {
@@ -247,8 +212,6 @@ private String[] makeJdbCmdLine (String classToExecute) {
 
                 if (argumentHandler.isSocketTransport()) {
                     connect.append("port=" + argumentHandler.getTransportPort().trim());
-                    if (argumentHandler.isLaunchedRemotely())
-                        connect.append(",hostname=" + argumentHandler.getDebugeeHost().trim());
                 } else if (argumentHandler.isShmemTransport()) {
                     connect.append("name=" + argumentHandler.getTransportSharedName().trim());
                 } else {
@@ -324,7 +287,7 @@ private String[] makeJdbCmdLine (String classToExecute) {
     private void localLaunchAndAttach
        (String[] jdbCmdArgs, String classToExecute) throws IOException {
 
-        debuggee = new LocalLaunchedDebuggee(this);
+        debuggee = new Debuggee(this);
         String address = makeTransportAddress();
         String[] javaCmdArgs = makeCommandLineArgs(classToExecute, address);
         debuggee.launch(javaCmdArgs);
@@ -346,57 +309,12 @@ private String[] makeJdbCmdLine (String classToExecute) {
         String address = jdb.waitForListeningJdb();
         display("Listening address found: " + address);
 
-        debuggee = new LocalLaunchedDebuggee(this);
+        debuggee = new Debuggee(this);
         String[] javaCmdArgs = makeCommandLineArgs(classToExecute, address);
         debuggee.launch(javaCmdArgs);
 
 //        jdb.waitForPrompt(0, false);
     }
 
-    /**
-     * Run test in remote mode using attaching connector.
-     */
-    private void remoteLaunchAndAttach
-       (String[] jdbCmdArgs, String classToExecute) throws IOException {
-
-        debuggee = new RemoteLaunchedDebuggee(this);
-        String address = makeTransportAddress();
-        String[] javaCmdArgs = makeCommandLineArgs(classToExecute, address);
-        try {
-            debuggee.launch(javaCmdArgs);
-        } catch (IOException e) {
-            throw new Failure("Caught exception while launching debuggee VM process:\n\t"
-                            + e);
-        };
-
-        display("Start jdb attaching to remote debuggee");
-        jdb = Jdb.startAttachingJdb (this, jdbCmdArgs, JDB_STARTED);
-//        jdb.waitForPrompt(0, false);
-    }
-
-    /**
-     * Run test in remote mode using listening connector.
-     */
-    private void remoteLaunchAndListen
-       (String[] jdbCmdArgs, String classToExecute) throws IOException {
-
-        jdb = new Jdb(this);
-        display("Starting jdb listening to remote debuggee");
-        jdb.launch(jdbCmdArgs);
-        String address = jdb.waitForListeningJdb();
-        display("Listening address found: " + address);
-
-        debuggee = new RemoteLaunchedDebuggee(this);
-        String[] javaCmdArgs = makeCommandLineArgs(classToExecute);
-        try {
-            debuggee.launch(javaCmdArgs);
-        } catch (IOException e) {
-            throw new Failure("Caught exception while launching debuggee VM process:\n\t"
-                            + e);
-        };
-
-        jdb.waitForMessage(0, JDB_STARTED);
-//        jdb.waitForPrompt(0, false);
-    }
 
 } // End of Launcher

test/hotspot/jtreg/vmTestbase/nsk/share/jdi/ArgumentHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -457,18 +457,6 @@ protected void checkOptions() {
         }
  */
 
-        if (! isLaunchedLocally() && ! isDefaultDebugeeSuspendMode()) {
-            throw new BadOption("inconsistent options: "
-                                + "-debugee.launch=" + getLaunchMode()
-                                + " and -debugee.suspend=" + getDebugeeSuspendMode());
-        }
-
-        if (! isLaunchedLocally() && isLaunchingConnector()) {
-            throw new BadOption("inconsistent options: "
-                                + "-debugee.launch=" + getLaunchMode()
-                                + " and -connector=" + getConnectorType());
-        }
-
         if (isLaunchingConnector() && ! isDefaultTransport()) {
             throw new BadOption("inconsistent options: "
                                 + "-connector=" + getConnectorType()