8263635: Add --servername option to jhsdb debugd

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/RMIHelper.java

@@ -93,14 +93,19 @@ public static Remote lookup(String connectionString) throws DebuggerException {
         Matcher matcher = CONNECT_PATTERN.matcher(connectionString);
         matcher.find();
 
-        String rmiObjectName = matcher.group("servername") == null ? DEFAULT_RMI_OBJECT_NAME
-                                                                   : matcher.group("servername");
         String serverNamePrefix = System.getProperty("sun.jvm.hotspot.rmi.serverNamePrefix");
+        String rmiObjectName = matcher.group("servername");
         if (serverNamePrefix != null) {
-            System.err.println("WARNING: sun.jvm.hotspot.rmi.serverNamePrefix is deprecated. Please specify it in --connect.");
-            rmiObjectName = serverNamePrefix;
+            if (rmiObjectName == null) {
+                System.err.println("WARNING: sun.jvm.hotspot.rmi.serverNamePrefix is deprecated. Please specify it in --connect.");
+                rmiObjectName = serverNamePrefix;
+            } else {
+                throw new DebuggerException("Cannot set both sun.jvm.hotspot.rmi.serverNamePrefix and servername in --connect together");
+            }
+        }
+        if (rmiObjectName == null) {
+            rmiObjectName = DEFAULT_RMI_OBJECT_NAME;
         }
-
         StringBuilder nameBuf = new StringBuilder("//");
         nameBuf.append(matcher.group("host"));
         nameBuf.append('/');
@@ -118,11 +123,18 @@ public static Remote lookup(String connectionString) throws DebuggerException {
     }
 
     private static String getName(String serverID, String serverName) {
-        String name = serverName == null ? DEFAULT_RMI_OBJECT_NAME : serverName;
+        String name = serverName;
         String serverNamePrefix = System.getProperty("sun.jvm.hotspot.rmi.serverNamePrefix");
         if (serverNamePrefix != null) {
-            System.err.println("WARNING: sun.jvm.hotspot.rmi.serverNamePrefix is deprecated. Please specify it in --servername.");
-            name = serverNamePrefix;
+            if (serverName == null) {
+                System.err.println("WARNING: sun.jvm.hotspot.rmi.serverNamePrefix is deprecated. Please specify it with --servername.");
+                name = serverNamePrefix;
+            } else {
+                throw new DebuggerException("Cannot set both sun.jvm.hotspot.rmi.serverNamePrefix and in --servername together");
+            }
+        }
+        if (name == null) {
+            name = DEFAULT_RMI_OBJECT_NAME;
         }
         if (serverID != null) {
            name += "_" + serverID;

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java

@@ -91,7 +91,8 @@ private static boolean commonHelp(String mode, boolean canConnectToRemote) {
     }
 
     private static boolean debugdHelp() {
-        System.out.println("    --serverid <id>         A unique identifier for this debug server.");
+        System.out.println("    --serverid <id>         A unique identifier for this debugd server.");
+        System.out.println("    --servername <name>     Instance name of debugd server.");
         System.out.println("    --rmiport <port>        Sets the port number to which the RMI connector is bound." +
                 " If not specified a random available port is used.");
         System.out.println("    --registryport <port>   Sets the RMI registry port." +
@@ -102,7 +103,6 @@ private static boolean debugdHelp() {
                 " be a hostname or an IPv4/IPv6 address. This option overrides the system property" +
                 " 'java.rmi.server.hostname'. If not specified, the system property is used. If the system" +
                 " property is not set, a system hostname is used.");
-        System.out.println("    --servername <name>     Instance name of debugd server.");
         return commonHelp("debugd");
     }
 

src/jdk.hotspot.agent/share/man/jhsdb.1

@@ -203,7 +203,7 @@ If the system property is not set, a system hostname is used.
 .B \f[CB]\-\-servername\f[R] \f[I]servername\f[R]
 Sets the instance name of debugd server to distinguish SA debugee.
 It is used for RMI object name for server instance.
-If not specified, "SARemoteDebugger" will be set.
+If not specified, "SARemoteDebugger" will be used.
 .RS
 .RE
 .SH OPTIONS FOR THE JINFO MODE