8282379: [LOOM] vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011 sometimes fails

Reviewed-by: dholmes, sspitsyn

Author: plummercj

test/hotspot/jtreg/ProblemList-svc-vthread.txt

@@ -82,8 +82,6 @@ vmTestbase/nsk/jdb/repeat/repeat001/repeat001.java  8300707 generic-all
 ####
 ## NSK JDI tests failing with wrapper
 
-vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011/TestDescription.java 8282379 generic-all
-
 ####
 ## The test expects an NPE to be uncaught, but nsk.share.MainWrapper
 ## introduces exception handlers.

test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -209,6 +209,16 @@ private int runIt(String args[], PrintStream out) {
                 clsType.setValue(fldToExit, vm.mirrorOf(true));
 
                 invThr.join(argHandler.getWaitTime()*60000);
+                if (invThr.isAlive()) {
+                    // The join failed because the invoke never completed.
+                    log.complain("TEST FAILED: invoke never completed");
+                    tot_res = Consts.TEST_FAILED;
+                    // Do a vm.resume() to see if that helps.
+                    vm.resume();
+                    invThr.join(); // let test time out if this fails
+                    return quitDebuggee();
+                }
+
                 log.display("Thread \"" + invThr.getName() + "\" done");
 
                 // check threads status after method invocation

test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod011t.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -87,11 +87,15 @@ private int runIt(String args[]) {
     static volatile boolean isInvoked = false;
 
     static long dummyMeth(long l) throws InterruptedException {
+        /*
+         * WARNING: Since this method is called using INVOKE_SINGLE_THREADED, we need to
+         * be careful not to do anything that might block on another thread. That includes
+         * calling Thread.sleep(), which can be a problem for virtual threads.
+         */
         invokemethod011t.log.display("dummyMeth: going to loop");
         isInvoked = true;
         while(!doExit) {
             l--; l++;
-            Thread.currentThread().sleep(400);
         }
         invokemethod011t.log.display("dummyMeth: exiting");
         isInvoked = false;

test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -202,6 +202,15 @@ private int runIt(String args[], PrintStream out) {
 
             clsType.setValue(fldToExit, vm.mirrorOf(true));
             invThr.join(argHandler.getWaitTime()*60000);
+            if (invThr.isAlive()) {
+                // The join failed because the invoke never completed.
+                log.complain("TEST FAILED: invoke never completed");
+                tot_res = Consts.TEST_FAILED;
+                // Do a vm.resume() to see if that helps.
+                vm.resume();
+                invThr.join(); // let test time out if this fails
+                return quitDebuggee();
+            }
             log.display("Thread \"" + invThr.getName() + "\" done");
 
             // check threads status after the method invocation

test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod012t.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -89,11 +89,15 @@ private int runIt(String args[]) {
     static volatile boolean isInvoked = false;
 
     static long dummyMeth(long l) throws InterruptedException {
+        /*
+         * WARNING: Since this method is called using INVOKE_SINGLE_THREADED, we need to
+         * be careful not to do anything that might block on another thread. That includes
+         * calling Thread.sleep(), which can be a problem for virtual threads.
+         */
         invokemethod012t.log.display("dummyMeth: going to loop");
         isInvoked = true;
         while(!doExit) {
             l--; l++;
-            Thread.currentThread().sleep(400);
         }
         invokemethod012t.log.display("dummyMeth: exiting");
         isInvoked = false;

test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -204,6 +204,15 @@ private int runIt(String args[], PrintStream out) {
             // finish the invocation
             clsRef.setValue(fldToExit, vm.mirrorOf(true));
             invThr.join(argHandler.getWaitTime()*60000);
+            if (invThr.isAlive()) {
+                // The join failed because the invoke never completed.
+                log.complain("TEST FAILED: invoke never completed");
+                tot_res = Consts.TEST_FAILED;
+                // Do a vm.resume() to see if that helps.
+                vm.resume();
+                invThr.join(); // let test time out if this fails
+                return quitDebuggee();
+            }
             log.display("Thread \"" + invThr.getName() + "\" done");
 
             // check threads status after the method invocation

test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassType/invokeMethod/invokemethod013t.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -88,11 +88,15 @@ private int runIt(String args[]) {
     static volatile boolean isInvoked = false;
 
     static long dummyMeth(long l) throws InterruptedException {
+        /*
+         * WARNING: Since this method is called using INVOKE_SINGLE_THREADED, we need to
+         * be careful not to do anything that might block on another thread. That includes
+         * calling Thread.sleep(), which can be a problem for virtual threads.
+         */
         invokemethod013t.log.display("dummyMeth: going to loop");
         isInvoked = true;
         while(!doExit) {
             l--; l++;
-            Thread.currentThread().sleep(400);
         }
         invokemethod013t.log.display("dummyMeth: exiting");
         isInvoked = false;

test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -206,6 +206,16 @@ private int runIt(String args[], PrintStream out) {
                 objRef.setValue(fldToExit, vm.mirrorOf(true));
 
                 invThr.join(argHandler.getWaitTime()*60000);
+                if (invThr.isAlive()) {
+                    // The join failed because the invoke never completed.
+                    log.complain("TEST FAILED: invoke never completed");
+                    tot_res = Consts.TEST_FAILED;
+                    // Do a vm.resume() to see if that helps.
+                    vm.resume();
+                    invThr.join(); // let test time out if this fails
+                    return quitDebuggee();
+                }
+
                 log.display("Thread \"" + invThr.getName() + "\" done");
 
                 // check threads status after method invocation

test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod010t.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -181,11 +181,15 @@ class invokemethod010tDummyClass {
     volatile boolean isInvoked = false;
 
     long longMeth(long l) throws InterruptedException {
+        /*
+         * WARNING: Since this method is called using INVOKE_SINGLE_THREADED, we need to
+         * be careful not to do anything that might block on another thread. That includes
+         * calling Thread.sleep(), which can be a problem for virtual threads.
+         */
         invokemethod010t.log.display("invokemethod010tDummyClass: longMeth: going to loop");
         isInvoked = true;
         while(!doExit) {
             l--; l++;
-            Thread.currentThread().sleep(400);
         }
         invokemethod010t.log.display("invokemethod010tDummyClass: longMeth: exiting");
         isInvoked = false;

test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/invokeMethod/invokemethod011.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, 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
@@ -206,6 +206,16 @@ private int runIt(String args[], PrintStream out) {
                 objRef.setValue(fldToExit, vm.mirrorOf(true));
 
                 invThr.join(argHandler.getWaitTime()*60000);
+                if (invThr.isAlive()) {
+                    // The join failed because the invoke never completed.
+                    log.complain("TEST FAILED: invoke never completed");
+                    tot_res = Consts.TEST_FAILED;
+                    // Do a vm.resume() to see if that helps.
+                    vm.resume();
+                    invThr.join(); // let test time out if this fails
+                    return quitDebuggee();
+                }
+
                 log.display("Thread \"" + invThr.getName() + "\" done");
 
                 // check threads status after method invocation