< prev index next >

test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadState/GetThreadStateTest.java

Print this page
@@ -23,24 +23,26 @@
  
  /*
   * @test id=default
   * @bug 8312498
   * @summary Basic test for JVMTI GetThreadState with virtual threads
+  * @library /test/lib
   * @run junit/othervm/native GetThreadStateTest
   */
  
  /*
   * @test id=no-vmcontinuations
   * @requires vm.continuations
+  * @library /test/lib
   * @run junit/othervm/native -XX:+UnlockExperimentalVMOptions -XX:-VMContinuations GetThreadStateTest
   */
  
  import java.util.StringJoiner;
- import java.util.concurrent.CountDownLatch;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.util.concurrent.locks.LockSupport;
  
+ import jdk.test.lib.thread.VThreadPinner;
  import org.junit.jupiter.api.BeforeAll;
  import org.junit.jupiter.api.Test;
  import static org.junit.jupiter.api.Assertions.*;
  
  class GetThreadStateTest {

@@ -73,23 +75,23 @@
      /**
       * Test state of runnable thread.
       */
      @Test
      void testRunnable() throws Exception {
-         var latch = new CountDownLatch(1);
+         var started = new AtomicBoolean();
          var done = new AtomicBoolean();
          var thread = Thread.ofVirtual().start(() -> {
-             latch.countDown();
+             started.set(true);
  
              // spin until done
              while (!done.get()) {
                  Thread.onSpinWait();
              }
          });
          try {
              // wait for thread to start execution
-             latch.await();
+             awaitTrue(started);
  
              // thread should be runnable
              int expected = JVMTI_THREAD_STATE_ALIVE | JVMTI_THREAD_STATE_RUNNABLE;
              check(thread, expected);
  

@@ -105,21 +107,21 @@
      /**
       * Test state of thread waiting to enter a monitor.
       */
      @Test
      void testMonitorEnter() throws Exception {
-         var latch = new CountDownLatch(1);
+         var started = new AtomicBoolean();
          Object lock = new Object();
          var thread = Thread.ofVirtual().unstarted(() -> {
-             latch.countDown();
+             started.set(true);
              synchronized (lock) { }
          });
          try {
              synchronized (lock) {
                  // start thread and wait for it to start execution
                  thread.start();
-                 latch.await();
+                 awaitTrue(started);
  
                  // thread should block on monitor enter
                  int expected = JVMTI_THREAD_STATE_ALIVE | JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER;
                  await(thread, expected);
  

@@ -135,23 +137,23 @@
      /**
       * Test state of thread waiting in Object.wait().
       */
      @Test
      void testObjectWait() throws Exception {
-         var latch = new CountDownLatch(1);
+         var started = new AtomicBoolean();
          Object lock = new Object();
          var thread = Thread.ofVirtual().start(() -> {
              synchronized (lock) {
-                 latch.countDown();
+                 started.set(true);
                  try {
                      lock.wait();
                  } catch (InterruptedException e) { }
              }
          });
          try {
-             // wait for thread to own monitor
-             latch.await();
+             // wait for thread to start execution
+             awaitTrue(started);
  
              // thread should wait
              int expected = JVMTI_THREAD_STATE_ALIVE |
                      JVMTI_THREAD_STATE_WAITING |
                      JVMTI_THREAD_STATE_WAITING_INDEFINITELY |

@@ -177,23 +179,23 @@
      /**
       * Test state of thread waiting in Object.wait(millis).
       */
      @Test
      void testObjectWaitMillis() throws Exception {
-         var latch = new CountDownLatch(1);
+         var started = new AtomicBoolean();
          Object lock = new Object();
          var thread = Thread.ofVirtual().start(() -> {
              synchronized (lock) {
-                 latch.countDown();
+                 started.set(true);
                  try {
                      lock.wait(Long.MAX_VALUE);
                  } catch (InterruptedException e) { }
              }
          });
          try {
-             // wait for thread to own monitor
-             latch.await();
+             // wait for thread to start execution
+             awaitTrue(started);
  
              // thread should wait
              int expected = JVMTI_THREAD_STATE_ALIVE |
                      JVMTI_THREAD_STATE_WAITING |
                      JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT |

@@ -219,21 +221,21 @@
      /**
       * Test state of thread parked with LockSupport.park.
       */
      @Test
      void testPark() throws Exception {
-         var latch = new CountDownLatch(1);
+         var started = new AtomicBoolean();
          var done = new AtomicBoolean();
          var thread = Thread.ofVirtual().start(() -> {
-             latch.countDown();
+             started.set(true);
              while (!done.get()) {
                  LockSupport.park();
              }
          });
          try {
              // wait for thread to start execution
-             latch.await();
+             awaitTrue(started);
  
              // thread should park
              int expected = JVMTI_THREAD_STATE_ALIVE |
                      JVMTI_THREAD_STATE_WAITING |
                      JVMTI_THREAD_STATE_WAITING_INDEFINITELY |

@@ -249,21 +251,21 @@
      /**
       * Test state of thread parked with LockSupport.parkNanos.
       */
      @Test
      void testParkNanos() throws Exception {
-         var latch = new CountDownLatch(1);
+         var started = new AtomicBoolean();
          var done = new AtomicBoolean();
          var thread = Thread.ofVirtual().start(() -> {
-             latch.countDown();
+             started.set(true);
              while (!done.get()) {
                  LockSupport.parkNanos(Long.MAX_VALUE);
              }
          });
          try {
              // wait for thread to start execution
-             latch.await();
+             awaitTrue(started);
  
              // thread should park
              int expected = JVMTI_THREAD_STATE_ALIVE |
                      JVMTI_THREAD_STATE_WAITING |
                      JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT |

@@ -279,24 +281,23 @@
      /**
       * Test state of thread parked with LockSupport.park while holding a monitor.
       */
      @Test
      void testParkWhenPinned() throws Exception {
-         var latch = new CountDownLatch(1);
-         Object lock = new Object();
+         var started = new AtomicBoolean();
          var done = new AtomicBoolean();
          var thread = Thread.ofVirtual().start(() -> {
-             synchronized (lock) {
-                 latch.countDown();
+             VThreadPinner.runPinned(() -> {
+                 started.set(true);
                  while (!done.get()) {
                      LockSupport.park();
                  }
-             }
+             });
          });
          try {
-             // wait for thread to own monitor
-             latch.await();
+             // wait for thread to start execution
+             awaitTrue(started);
  
              // thread should park
              int expected = JVMTI_THREAD_STATE_ALIVE |
                      JVMTI_THREAD_STATE_WAITING |
                      JVMTI_THREAD_STATE_WAITING_INDEFINITELY |

@@ -312,24 +313,23 @@
      /**
       * Test state of thread parked with LockSupport.parkNanos while holding a monitor.
       */
      @Test
      void testParkNanosWhenPinned() throws Exception {
-         var latch = new CountDownLatch(1);
-         Object lock = new Object();
+         var started = new AtomicBoolean();
          var done = new AtomicBoolean();
          var thread = Thread.ofVirtual().start(() -> {
-             synchronized (lock) {
-                 latch.countDown();
+             VThreadPinner.runPinned(() -> {
+                 started.set(true);
                  while (!done.get()) {
                      LockSupport.parkNanos(Long.MAX_VALUE);
                  }
-             }
+             });
          });
          try {
-             // wait for thread to own monitor
-             latch.await();
+             // wait for thread to start execution
+             awaitTrue(started);
  
              // thread should park
              int expected = JVMTI_THREAD_STATE_ALIVE |
                      JVMTI_THREAD_STATE_WAITING |
                      JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT |

@@ -340,10 +340,19 @@
              LockSupport.unpark(thread);
              thread.join();
          }
      }
  
+     /**
+      * Waits for the boolean value to become true.
+      */
+     private static void awaitTrue(AtomicBoolean ref) throws Exception {
+         while (!ref.get()) {
+             Thread.sleep(20);
+         }
+     }
+ 
      /**
       * Asserts that the given thread has the expected JVMTI state.
       */
      private static void check(Thread thread, int expected) {
          System.err.format("  expect state=0x%x (%s) ...%n", expected, jvmtiStateToString(expected));
< prev index next >