8333108: Update vmTestbase/nsk/share/DebugeeProcess.java to don't use finalization

Reviewed-by: cjplummer, sspitsyn

Author: lmesnik

test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc04x001.java

@@ -110,6 +110,11 @@ public static int run(String argv[], PrintStream out) {
             e.printStackTrace();
         } finally {
             debugee.resume();
+            int code = debugee.waitFor();
+            if (code != Consts.JCK_STATUS_BASE) {
+                log.complain("Debugee FAILED with exit code: " + code);
+                exitStatus = Consts.TEST_FAILED;
+            }
         }
         display("Test finished. exitStatus = " + exitStatus);
 

test/hotspot/jtreg/vmTestbase/nsk/jdi/VMDeathEvent/_itself_/vmdeath003.java

@@ -280,7 +280,12 @@ private void testRun()
             //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         }
         log1("    TESTING ENDS");
-        return;
+        int code = debuggee.waitFor();
+        if (code != Consts.JCK_STATUS_BASE) {
+            log2("Debugee FAILED with exit code: " + code);
+            testExitCode = Consts.TEST_FAILED;
+        }
+
     }
 
 }

test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/exit/exit001.java

@@ -173,6 +173,12 @@ private int runThis(String argv[], PrintStream out) {
             logHandler.complain("TEST FAILED");
         }
 
+        int code = debuggee.waitFor();
+        if (code != 0) {
+            log2("Debugee FAILED with exit code: " + code);
+            testExitCode = Consts.TEST_FAILED;
+        }
+
         return testExitCode;
     }
 }

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

@@ -128,8 +128,6 @@ public Binder (ArgumentHandler argumentHandler, Log log) {
      */
     public Debugee makeLocalDebugee(Process process) {
         LocalLaunchedDebugee debugee = new LocalLaunchedDebugee(process, this);
-
-        debugee.registerCleanup();
         return debugee;
     }
 
@@ -936,9 +934,6 @@ protected RemoteLaunchedDebugee startRemoteDebugee(String[] cmdArgs) {
         }
 
         RemoteLaunchedDebugee debugee = new RemoteLaunchedDebugee(this);
-
-        debugee.registerCleanup();
-
         return debugee;
     }
 
@@ -949,9 +944,6 @@ protected RemoteLaunchedDebugee startRemoteDebugee(String[] cmdArgs) {
     protected ManualLaunchedDebugee startManualDebugee(String cmd) {
         ManualLaunchedDebugee debugee = new ManualLaunchedDebugee(this);
         debugee.launchDebugee(cmd);
-
-        debugee.registerCleanup();
-
         return debugee;
     }
 

test/hotspot/jtreg/vmTestbase/nsk/share/jdwp/Binder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, 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
@@ -106,8 +106,6 @@ public Debugee bindToDebugee (String classToExecute) {
             debugee.redirectOutput(log);
         }
 
-        debugee.registerCleanup();
-
         Transport transport = debugee.connect();
 
         return debugee;

test/hotspot/jtreg/vmTestbase/nsk/share/jpda/DebugeeProcess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, 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
@@ -52,7 +52,7 @@
  * @see nsk.share.jdi.Debugee
  * @see nsk.share.jdwp.Debugee
  */
-abstract public class DebugeeProcess extends FinalizableObject {
+abstract public class DebugeeProcess {
 
     /** Default prefix for log messages. */
     public static final String LOG_PREFIX = "binder> ";
@@ -84,9 +84,6 @@ abstract public class DebugeeProcess extends FinalizableObject {
     protected DebugeeProcess (DebugeeBinder binder) {
         this.binder = binder;
         this.log = binder.getLog();
-
-        // Register the cleanup() method to be called when this instance becomes unreachable.
-        registerCleanup();
     }
 
     /**
@@ -430,7 +427,7 @@ public JDWP.ListenAddress redirectOutputAndDetectListeningAddress(Log log) {
     /**
      * Kill the debugee VM if it is not terminated yet.
      *
-     * @throws Throwable if any throwable exception is thrown during finalization
+     * @throws Throwable if any throwable exception is thrown during shutdown
      */
     public void close() {
         if (checkTermination) {
@@ -458,12 +455,4 @@ protected void complain(String message) {
         log.complain(prefix + message);
     }
 
-    /**
-     * Finalize debuggee VM wrapper by invoking <code>close()</code>.
-     *
-     * @throws Throwable if any throwable exception is thrown during finalization
-     */
-    public void cleanup() {
-        close();
-    }
 }