More test updates

Author: AlanBateman

test/jdk/java/lang/Thread/virtual/Monitors.java

@@ -80,6 +80,7 @@
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.api.condition.*;
 import static org.junit.jupiter.api.Assertions.*;
@@ -306,21 +307,28 @@ void testContendedEnterWhenPinnedHeldByVirtualThread() throws Exception {
     /**
      * Test that parking while holding a monitor releases the carrier.
      */
-    @Test
+    @ParameterizedTest
     @EnabledIf("platformIsX64")
-    void testReleaseWhenParked() throws Exception {
+    @ValueSource(booleans = { true, false })
+    void testReleaseWhenParked(boolean reenter) throws Exception {
         assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
             Thread.Builder builder = ThreadBuilders.virtualThreadBuilder(scheduler);
 
             var lock = new Object();
 
-            // thread enters monitor and parks
+            // thread enters (and maybe reenters) a monitor and parks
             var started = new CountDownLatch(1);
             var vthread1 = builder.start(() -> {
                 started.countDown();
                 synchronized (lock) {
-                    LockSupport.park();
+                    if (reenter) {
+                        synchronized (lock) {
+                            LockSupport.park();
+                        }
+                    } else {
+                        LockSupport.park();
+                    }
                 }
             });
 
@@ -344,7 +352,7 @@ void testReleaseWhenParked() throws Exception {
     }
 
     /**
-     * Test that blocked waiting to enter a monitor releases the carrier.
+     * Test that blocking waiting to enter a monitor releases the carrier.
      */
     @Test
     @EnabledIf("platformIsX64")
@@ -619,7 +627,7 @@ private void await(Thread thread, Thread.State expectedState) throws Interrupted
         }
     }
 
-    private boolean platformIsX64() {
+    static boolean platformIsX64() {
         return Platform.isX64();
     }
 }

test/jdk/java/lang/Thread/virtual/ThreadAPI.java

@@ -1081,10 +1081,10 @@ void testSetDaemon2() throws Exception {
     }
 
     /**
-     * Test Thread.yield releases carrier.
+     * Test Thread.yield releases carrier thread.
      */
     @Test
-    void testYieldReleases() throws Exception {
+    void testYield1() throws Exception {
         assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
         var list = new CopyOnWriteArrayList<String>();
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
@@ -1112,7 +1112,7 @@ void testYieldReleases() throws Exception {
      * Test Thread.yield releases carrier when virtual thread holds a monitor.
      */
     @Test
-    void testYieldReleasesWhenHoldingMonitor() throws Exception {
+    void testYield2() throws Exception {
         assumeTrue(Platform.isX64(), "x64 only at this time");
         assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
         var list = new CopyOnWriteArrayList<String>();
@@ -1144,7 +1144,7 @@ void testYieldReleasesWhenHoldingMonitor() throws Exception {
      * Test Thread.yield when thread is pinned by native frame.
      */
     @Test
-    void testYieldWhenPinned() throws Exception {
+    void testYield3() throws Exception {
         assumeTrue(ThreadBuilders.supportsCustomScheduler(), "No support for custom schedulers");
         var list = new CopyOnWriteArrayList<String>();
         try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
@@ -1172,7 +1172,7 @@ void testYieldWhenPinned() throws Exception {
      * Test Thread.yield does not consume the thread's parking permit.
      */
     @Test
-    void testYieldDoesNotConsumeParkingPermit() throws Exception {
+    void testYield4() throws Exception {
         var thread = Thread.ofVirtual().start(() -> {
             LockSupport.unpark(Thread.currentThread());
             Thread.yield();
@@ -1185,7 +1185,7 @@ void testYieldDoesNotConsumeParkingPermit() throws Exception {
      * Test Thread.yield does not make available the thread's parking permit.
      */
     @Test
-    void testYieldDoesNotGrantParkingPermit() throws Exception {
+    void testYield5() throws Exception {
         var thread = Thread.ofVirtual().start(() -> {
             Thread.yield();
             LockSupport.park();  // should park