infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-14 09:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

8360702: runtime/Thread/AsyncExceptionTest.java timed out

Browse Source 
Reviewed-by: dholmes, fbredberg
This commit is contained in:
Patricio Chilano Mateo 2025-12-04 15:00:09 +00:00
parent c4ec983da5
commit 6f03c7808d
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
test/hotspot/jtreg/runtime/Thread/AsyncExceptionOnMonitorEnter.java
View File

@ -25,7 +25,6 @@
* @test
* @bug 8283044
* @summary Stress delivery of asynchronous exceptions while target is at monitorenter
* @requires test.thread.factory == null
* @library /test/hotspot/jtreg/testlibrary
* @run main/othervm/native AsyncExceptionOnMonitorEnter 0
* @run main/othervm/native -agentlib:AsyncExceptionOnMonitorEnter AsyncExceptionOnMonitorEnter 1
@ -45,9 +44,13 @@ public class AsyncExceptionOnMonitorEnter extends Thread {
public static native int exitRawMonitor();
public static native void destroyRawMonitor();
// Avoid using CountDownLatch or similar objects that require unparking the
// main thread. Otherwise, if the main thread is run as a virtual thread, the
// async exception could be sent while the target is still executing FJP logic.
public volatile boolean started = false;
public volatile boolean gotMonitor = false;
private static Object o1 = new Object();
private static boolean firstWorker = true;
private static Semaphore sem = new Semaphore(0);
@Override
public void run() {
@ -60,11 +63,9 @@ public class AsyncExceptionOnMonitorEnter extends Thread {
public void testWithJavaMonitor() {
try {
started = true;
synchronized (o1) {
if (firstWorker) {
firstWorker = false;
sem.release();
}
gotMonitor = true;
Thread.sleep(1000);
}
} catch (ThreadDeath td) {
@ -75,20 +76,16 @@ public class AsyncExceptionOnMonitorEnter extends Thread {
public void testWithJVMTIRawMonitor() {
boolean savedFirst = false;
try {
started = true;
int retCode = enterRawMonitor();
if (retCode != 0 && firstWorker) {
if (retCode != 0) {
throw new RuntimeException("error in JVMTI RawMonitorEnter: retCode=" + retCode);
}
if (firstWorker) {
firstWorker = false;
savedFirst = true;
sem.release();
}
Thread.sleep(1000);
gotMonitor = true;
Thread.sleep(500);
retCode = exitRawMonitor();
if (retCode != 0 && savedFirst) {
if (retCode != 0) {
throw new RuntimeException("error in JVMTI RawMonitorExit: retCode=" + retCode);
}
} catch (ThreadDeath td) {
@ -134,15 +131,18 @@ public class AsyncExceptionOnMonitorEnter extends Thread {
AsyncExceptionOnMonitorEnter worker2 = new AsyncExceptionOnMonitorEnter();
try {
// Start firstWorker worker and wait until monitor is acquired
firstWorker = true;
// Start first worker and wait until monitor is acquired
worker1.start();
sem.acquire();
while (!worker1.gotMonitor) {
Thread.sleep(1);
}
// Start second worker and allow some time for target to block on monitorenter
// before executing Thread.stop()
worker2.start();
Thread.sleep(300);
while (!worker2.started) {
Thread.sleep(10);
}
while (true) {
JVMTIUtils.stopThread(worker2);
@ -151,6 +151,8 @@ public class AsyncExceptionOnMonitorEnter extends Thread {
// not released worker2 will deadlock on enter
JVMTIUtils.stopThread(worker1);
}
// Give time to throw exception
Thread.sleep(10);
if (!worker1.isAlive() && !worker2.isAlive()) {
// Done with Thread.stop() calls since

23
test/hotspot/jtreg/runtime/Thread/AsyncExceptionTest.java
View File

@ -49,9 +49,11 @@ public class AsyncExceptionTest extends Thread {
private final static int DEF_TIME_MAX = 30; // default max # secs to test
private final static String PROG_NAME = "AsyncExceptionTest";
public CountDownLatch startSyncObj = new CountDownLatch(1);
// Avoid using CountDownLatch or similar objects that require unparking the
// main thread. Otherwise, if the main thread is run as a virtual thread, the
// async exception could be sent while the target is still executing FJP logic.
public volatile boolean started = false;
private boolean firstEntry = true;
private boolean receivedThreadDeathinInternal1 = false;
private boolean receivedThreadDeathinInternal2 = false;
private volatile RuntimeException error = null;
@ -77,6 +79,7 @@ public class AsyncExceptionTest extends Thread {
public void internalRun1() {
try {
started = true;
while (!receivedThreadDeathinInternal2) {
internalRun2();
}
@ -87,16 +90,10 @@ public class AsyncExceptionTest extends Thread {
public void internalRun2() {
try {
Integer myLocalCount = 1;
Integer myLocalCount2 = 1;
int myLocalCount = 1;
int myLocalCount2 = 1;
if (firstEntry) {
// Tell main thread we have started.
startSyncObj.countDown();
firstEntry = false;
}
while(myLocalCount > 0) {
while (myLocalCount > 0) {
myLocalCount2 = (myLocalCount % 3) / 2;
myLocalCount -= 1;
}
@ -128,7 +125,9 @@ public class AsyncExceptionTest extends Thread {
thread.start();
try {
// Wait for the worker thread to get going.
thread.startSyncObj.await();
while (!thread.started) {
Thread.sleep(1);
}
// Send async exception and wait until it is thrown
JVMTIUtils.stopThread(thread);
thread.join();