stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8295713: runtime/ParallelLoad/SuperWait/SuperWaitTest.java fails intermittently on Windows

Browse Source 
Reviewed-by: pchilanomate, dholmes
This commit is contained in:
Coleen Phillimore 2022-10-26 17:28:44 +00:00
parent 46e6aee0d0
commit a8450b37ee
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/hotspot/jtreg/runtime/ParallelLoad/SuperWait/ClassLoadingThread.java
View File

@ -23,14 +23,12 @@
class ClassLoadingThread extends Thread { class ClassLoadingThread extends Thread {
private ClassLoader ldr1; private String className;
private ClassLoader ldr2; private ClassLoader ldr;
private int which;
public ClassLoadingThread(ClassLoader loader1, ClassLoader loader2, int i) { public ClassLoadingThread(String name, ClassLoader loader) {
ldr1 = loader1; className = name;
ldr2 = loader2; ldr = loader;
which = i;
} }
private boolean success = true; private boolean success = true;
@ -50,10 +48,6 @@ class ClassLoadingThread extends Thread {
} }
public void run() { public void run() {
if (which == 0) { callForName(className, ldr);
callForName("A",ldr1);
} else {
callForName("C", ldr2);
}
} }
} }

30
test/hotspot/jtreg/runtime/ParallelLoad/SuperWait/SuperWaitTest.java
View File

@ -36,19 +36,17 @@ import java.util.concurrent.Semaphore;
public class SuperWaitTest { public class SuperWaitTest {
private static Semaphore mainSync = null;
// Loads classes A and D, delegates for A's super class B // Loads classes A and D, delegates for A's super class B
private static class MyLoaderOne extends ClassLoader { private static class MyLoaderOne extends ClassLoader {
private static boolean dIsLoading = false;
ClassLoader parent; ClassLoader parent;
ClassLoader baseLoader; ClassLoader baseLoader;
int count;
MyLoaderOne(ClassLoader parent) { MyLoaderOne(ClassLoader parent) {
this.parent = parent; this.parent = parent;
this.baseLoader = null; this.baseLoader = null;
this.count = 0;
} }
public void setBaseLoader(ClassLoader ldr) { public void setBaseLoader(ClassLoader ldr) {
@ -61,13 +59,15 @@ public class SuperWaitTest {
if (name.equals("A") || name.equals("D")) { if (name.equals("A") || name.equals("D")) {
ThreadPrint.println("Loading " + name); ThreadPrint.println("Loading " + name);
if (name.equals("A")) { if (name.equals("A")) {
try { ThreadPrint.println("Waiting for " + name);
ThreadPrint.println("Waiting for " + name); while (!dIsLoading) { // guard against spurious wakeup
mainSync.acquire(); // wait until other thread gets here try {
wait(); // let the other thread have this lock. wait(); // let the other thread have this lock.
} catch (InterruptedException ie) {} } catch (InterruptedException ie) {}
}
} else { } else {
notify(); // reacquire lock when superclass loading is done dIsLoading = true;
notify(); // notify lock when superclass loading is done
} }
byte[] classfile = ClassUnloadCommon.getClassData(name); byte[] classfile = ClassUnloadCommon.getClassData(name);
return defineClass(name, classfile, 0, classfile.length); return defineClass(name, classfile, 0, classfile.length);
@ -85,12 +85,10 @@ public class SuperWaitTest {
ClassLoader parent; ClassLoader parent;
ClassLoader baseLoader; ClassLoader baseLoader;
int count;
MyLoaderTwo(ClassLoader parent) { MyLoaderTwo(ClassLoader parent) {
this.parent = parent; this.parent = parent;
this.baseLoader = null; this.baseLoader = null;
this.count = 0;
} }
public void setBaseLoader(ClassLoader ldr) { public void setBaseLoader(ClassLoader ldr) {
@ -102,9 +100,6 @@ public class SuperWaitTest {
if (loadedClass != null) return loadedClass; if (loadedClass != null) return loadedClass;
if (name.equals("C") || name.equals("B")) { if (name.equals("C") || name.equals("B")) {
ThreadPrint.println("Loading " + name); ThreadPrint.println("Loading " + name);
if (name.equals("C")) {
mainSync.release();
}
byte[] classfile = ClassUnloadCommon.getClassData(name); byte[] classfile = ClassUnloadCommon.getClassData(name);
return defineClass(name, classfile, 0, classfile.length); return defineClass(name, classfile, 0, classfile.length);
} else if (name.equals("D")) { } else if (name.equals("D")) {
@ -131,7 +126,6 @@ public class SuperWaitTest {
public static void main(java.lang.String[] unused) { public static void main(java.lang.String[] unused) {
// t1 loads (A,CL1) extends (B,CL2); t2 loads (C,CL2) extends (D,CL1) // t1 loads (A,CL1) extends (B,CL2); t2 loads (C,CL2) extends (D,CL1)
mainSync = new Semaphore(0);
ClassLoader appLoader = SuperWaitTest.class.getClassLoader(); ClassLoader appLoader = SuperWaitTest.class.getClassLoader();
MyLoaderOne ldr1 = new MyLoaderOne(appLoader); MyLoaderOne ldr1 = new MyLoaderOne(appLoader);
@ -139,12 +133,14 @@ public class SuperWaitTest {
ldr1.setBaseLoader(ldr2); ldr1.setBaseLoader(ldr2);
ldr2.setBaseLoader(ldr1); ldr2.setBaseLoader(ldr1);
threads[0] = new ClassLoadingThread("A", ldr1);
threads[1] = new ClassLoadingThread("C", ldr2);
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
threads[i] = new ClassLoadingThread(ldr1, ldr2, i);
threads[i].setName("Loading Thread #" + (i + 1)); threads[i].setName("Loading Thread #" + (i + 1));
threads[i].start(); threads[i].start();
System.out.println("Thread " + (i + 1) + " was started..."); System.out.println("Thread " + (i + 1) + " was started...");
} }
if (report_success()) { if (report_success()) {
System.out.println("PASSED"); System.out.println("PASSED");
} else { } else {