Skip to content

Commit 7a6b0d2

Browse files
AlanBatemanAlanBateman
committedApr 24, 2022
Merge
2 parents c381b25 + ab11fa7 commit 7a6b0d2

21 files changed

+474
-379
lines changed
 

‎test/jdk/java/lang/Thread/virtual/CustomScheduler.java

+12-10
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @test
2626
* @summary Test virtual threads using a custom scheduler
2727
* @modules java.base/java.lang:+open
28-
* @compile --enable-preview -source ${jdk.version} CustomScheduler.java TestHelper.java
28+
* @compile --enable-preview -source ${jdk.version} CustomScheduler.java
2929
* @run testng/othervm --enable-preview CustomScheduler
3030
*/
3131

@@ -67,7 +67,7 @@ public void shutdown() {
6767
@Test
6868
public void testCustomScheduler1() throws Exception {
6969
AtomicReference<Executor> ref = new AtomicReference<>();
70-
TestHelper.virtualThreadBuilder(SCHEDULER_1).start(() -> {
70+
ThreadBuilders.virtualThreadBuilder(SCHEDULER_1).start(() -> {
7171
ref.set(scheduler(Thread.currentThread()));
7272
}).join();
7373
assertTrue(ref.get() == SCHEDULER_1);
@@ -81,7 +81,7 @@ public void testCustomScheduler2() throws Exception {
8181
AtomicReference<Executor> ref = new AtomicReference<>();
8282
Thread.ofVirtual().start(() -> {
8383
try {
84-
TestHelper.virtualThreadBuilder(SCHEDULER_1).start(() -> {
84+
ThreadBuilders.virtualThreadBuilder(SCHEDULER_1).start(() -> {
8585
ref.set(scheduler(Thread.currentThread()));
8686
}).join();
8787
} catch (Exception e) {
@@ -98,7 +98,7 @@ public void testCustomScheduler2() throws Exception {
9898
@Test
9999
public void testCustomScheduler3() throws Exception {
100100
AtomicReference<Executor> ref = new AtomicReference<>();
101-
TestHelper.virtualThreadBuilder(SCHEDULER_1).start(() -> {
101+
ThreadBuilders.virtualThreadBuilder(SCHEDULER_1).start(() -> {
102102
try {
103103
Thread.ofVirtual().start(() -> {
104104
ref.set(scheduler(Thread.currentThread()));
@@ -117,9 +117,9 @@ public void testCustomScheduler3() throws Exception {
117117
@Test
118118
public void testCustomScheduler4() throws Exception {
119119
AtomicReference<Executor> ref = new AtomicReference<>();
120-
TestHelper.virtualThreadBuilder(SCHEDULER_1).start(() -> {
120+
ThreadBuilders.virtualThreadBuilder(SCHEDULER_1).start(() -> {
121121
try {
122-
TestHelper.virtualThreadBuilder(SCHEDULER_2).start(() -> {
122+
ThreadBuilders.virtualThreadBuilder(SCHEDULER_2).start(() -> {
123123
ref.set(scheduler(Thread.currentThread()));
124124
}).join();
125125
} catch (Exception e) {
@@ -151,7 +151,7 @@ public void testBadCarrier() {
151151
assertTrue(exc.get() instanceof WrongThreadException);
152152
};
153153

154-
TestHelper.virtualThreadBuilder(scheduler).start(LockSupport::park);
154+
ThreadBuilders.virtualThreadBuilder(scheduler).start(LockSupport::park);
155155
}
156156

157157
/**
@@ -164,7 +164,8 @@ public void testParkWithInterruptSet() {
164164
if (carrier.isVirtual())
165165
throw new SkipException("Main test is a virtual thread");
166166
try {
167-
Thread vthread = TestHelper.virtualThreadBuilder(Runnable::run).start(() -> {
167+
var builder = ThreadBuilders.virtualThreadBuilder(Runnable::run);
168+
Thread vthread = builder.start(() -> {
168169
Thread.currentThread().interrupt();
169170
Thread.yield();
170171
});
@@ -185,7 +186,8 @@ public void testTerminateWithInterruptSet() {
185186
if (carrier.isVirtual())
186187
throw new SkipException("Main test is a virtual thread");
187188
try {
188-
Thread vthread = TestHelper.virtualThreadBuilder(Runnable::run).start(() -> {
189+
var builder = ThreadBuilders.virtualThreadBuilder(Runnable::run);
190+
Thread vthread = builder.start(() -> {
189191
Thread.currentThread().interrupt();
190192
});
191193
assertTrue(vthread.isInterrupted());
@@ -208,7 +210,7 @@ public void testRunWithInterruptSet() throws Exception {
208210
};
209211
try {
210212
AtomicBoolean interrupted = new AtomicBoolean();
211-
Thread vthread = TestHelper.virtualThreadBuilder(scheduler).start(() -> {
213+
Thread vthread = ThreadBuilders.virtualThreadBuilder(scheduler).start(() -> {
212214
interrupted.set(Thread.currentThread().isInterrupted());
213215
});
214216
assertFalse(vthread.isInterrupted());

‎test/jdk/java/lang/Thread/virtual/GetStackTrace.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void execute(Runnable task) {
114114
}
115115

116116
Thread startVirtualThread(Runnable task) {
117-
return TestHelper.virtualThreadBuilder(this).start(task);
117+
return ThreadBuilders.virtualThreadBuilder(this).start(task);
118118
}
119119
}
120120

‎test/jdk/java/lang/Thread/virtual/HoldsLock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @test
2626
* @summary Test Thread.holdsLock when lock held by carrier thread
2727
* @modules java.base/java.lang:+open
28-
* @compile --enable-preview -source ${jdk.version} HoldsLock.java TestHelper.java
28+
* @compile --enable-preview -source ${jdk.version} HoldsLock.java
2929
* @run testng/othervm --enable-preview HoldsLock
3030
* @run testng/othervm --enable-preview -XX:+UseHeavyMonitors HoldsLock
3131
*/
@@ -175,7 +175,7 @@ static void join(Thread t, AtomicReference<Throwable> ex) throws Exception {
175175
}
176176

177177
static Thread newThread(Executor scheduler, Runnable task) {
178-
ThreadFactory factory = TestHelper.virtualThreadBuilder(scheduler).factory();
178+
ThreadFactory factory = ThreadBuilders.virtualThreadBuilder(scheduler).factory();
179179
return factory.newThread(task);
180180
}
181181
}

‎test/jdk/java/lang/Thread/virtual/JfrEvents.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @test
2626
* @summary Basic test for JFR jdk.VirtualThreadXXX events.
2727
* @modules jdk.jfr java.base/java.lang:+open
28-
* @compile --enable-preview -source ${jdk.version} JfrEvents.java TestHelper.java
28+
* @compile --enable-preview -source ${jdk.version} JfrEvents.java
2929
* @run testng/othervm --enable-preview JfrEvents
3030
*/
3131

@@ -134,7 +134,7 @@ public void testVirtualThreadSubmitFailed() throws Exception {
134134
Executor scheduler = task -> pool.execute(task);
135135

136136
// create virtual thread that uses custom scheduler
137-
ThreadFactory factory = TestHelper.virtualThreadBuilder(scheduler).factory();
137+
ThreadFactory factory = ThreadBuilders.virtualThreadBuilder(scheduler).factory();
138138

139139
// start a thread
140140
Thread thread = factory.newThread(LockSupport::park);

‎test/jdk/java/lang/Thread/virtual/Locking.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
/**
2525
* @test
2626
* @summary Test virtual threads using java.util.concurrent locks
27+
* @library /test/lib
2728
* @compile --enable-preview -source ${jdk.version} Locking.java
2829
* @run testng/othervm --enable-preview Locking
2930
*/
@@ -32,6 +33,7 @@
3233
import java.util.concurrent.locks.LockSupport;
3334
import java.util.concurrent.locks.ReentrantLock;
3435

36+
import jdk.test.lib.thread.VThreadRunner;
3537
import org.testng.annotations.Test;
3638
import static org.testng.Assert.*;
3739

@@ -42,7 +44,7 @@ public class Locking {
4244
*/
4345
@Test
4446
public void testReentrantLock1() throws Exception {
45-
TestHelper.runInVirtualThread(() -> {
47+
VThreadRunner.run(() -> {
4648
ReentrantLock lock = new ReentrantLock();
4749
assertFalse(lock.isHeldByCurrentThread());
4850
lock.lock();
@@ -57,7 +59,7 @@ public void testReentrantLock1() throws Exception {
5759
*/
5860
@Test
5961
public void testReentrantLock2() throws Exception {
60-
TestHelper.runInVirtualThread(() -> {
62+
VThreadRunner.run(() -> {
6163
ReentrantLock lock = new ReentrantLock();
6264
assertFalse(lock.isHeldByCurrentThread());
6365
boolean acquired = lock.tryLock();
@@ -73,7 +75,7 @@ public void testReentrantLock2() throws Exception {
7375
*/
7476
@Test
7577
public void testReentrantLock3() throws Exception {
76-
TestHelper.runInVirtualThread(() -> {
78+
VThreadRunner.run(() -> {
7779
ReentrantLock lock = new ReentrantLock();
7880
assertFalse(lock.isHeldByCurrentThread());
7981
assertTrue(lock.getHoldCount() == 0);

‎test/jdk/java/lang/Thread/virtual/ParkWithFixedThreadPool.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @test
2626
* @summary Test virtual thread park when scheduler is a fixed thread pool
2727
* @modules java.base/java.lang:+open
28-
* @compile --enable-preview -source ${jdk.version} ParkWithFixedThreadPool.java TestHelper.java
28+
* @compile --enable-preview -source ${jdk.version} ParkWithFixedThreadPool.java
2929
* @run testng/othervm --enable-preview ParkWithFixedThreadPool
3030
*/
3131
import java.util.concurrent.*;
@@ -60,7 +60,7 @@ public void run() {
6060
}
6161
};
6262

63-
ThreadFactory factory = TestHelper.virtualThreadBuilder(scheduler)
63+
ThreadFactory factory = ThreadBuilders.virtualThreadBuilder(scheduler)
6464
.name("vthread-", 0)
6565
.factory();
6666

‎test/jdk/java/lang/Thread/virtual/Parking.java

+33-16
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
/**
2525
* @test
2626
* @summary Test virtual threads using park/unpark
27+
* @library /test/lib
2728
* @compile --enable-preview -source ${jdk.version} Parking.java
2829
* @run testng/othervm --enable-preview Parking
2930
*/
@@ -32,6 +33,7 @@
3233
import java.util.concurrent.TimeUnit;
3334
import java.util.concurrent.locks.LockSupport;
3435

36+
import jdk.test.lib.thread.VThreadRunner;
3537
import org.testng.SkipException;
3638
import org.testng.annotations.Test;
3739
import static org.testng.Assert.*;
@@ -141,7 +143,7 @@ public void testPark7() throws Exception {
141143
*/
142144
@Test
143145
public void testPark8() throws Exception {
144-
TestHelper.runInVirtualThread(() -> {
146+
VThreadRunner.run(() -> {
145147
Thread t = Thread.currentThread();
146148
t.interrupt();
147149
LockSupport.park();
@@ -154,9 +156,9 @@ public void testPark8() throws Exception {
154156
*/
155157
@Test
156158
public void testPark9() throws Exception {
157-
TestHelper.runInVirtualThread(() -> {
159+
VThreadRunner.run(() -> {
158160
Thread t = Thread.currentThread();
159-
TestHelper.scheduleInterrupt(t, 1000);
161+
scheduleInterrupt(t, 1000);
160162
while (!Thread.currentThread().isInterrupted()) {
161163
LockSupport.park();
162164
}
@@ -168,7 +170,7 @@ public void testPark9() throws Exception {
168170
*/
169171
@Test
170172
public void testPark10() throws Exception {
171-
TestHelper.runInVirtualThread(() -> {
173+
VThreadRunner.run(() -> {
172174
Thread t = Thread.currentThread();
173175
t.interrupt();
174176
synchronized (lock) {
@@ -183,9 +185,9 @@ public void testPark10() throws Exception {
183185
*/
184186
@Test
185187
public void testPark11() throws Exception {
186-
TestHelper.runInVirtualThread(() -> {
188+
VThreadRunner.run(() -> {
187189
Thread t = Thread.currentThread();
188-
TestHelper.scheduleInterrupt(t, 1000);
190+
scheduleInterrupt(t, 1000);
189191
while (!Thread.currentThread().isInterrupted()) {
190192
synchronized (lock) {
191193
LockSupport.park();
@@ -199,23 +201,23 @@ public void testPark11() throws Exception {
199201
*/
200202
@Test
201203
public void testParkNanos1() throws Exception {
202-
TestHelper.runInVirtualThread(() -> LockSupport.parkNanos(-1));
204+
VThreadRunner.run(() -> LockSupport.parkNanos(-1));
203205
}
204206

205207
/**
206208
* parkNanos(0) completes immediately
207209
*/
208210
@Test
209211
public void testParkNanos2() throws Exception {
210-
TestHelper.runInVirtualThread(() -> LockSupport.parkNanos(0));
212+
VThreadRunner.run(() -> LockSupport.parkNanos(0));
211213
}
212214

213215
/**
214216
* parkNanos(1000ms) parks thread.
215217
*/
216218
@Test
217219
public void testParkNanos3() throws Exception {
218-
TestHelper.runInVirtualThread(() -> {
220+
VThreadRunner.run(() -> {
219221
// park for 1000ms
220222
long nanos = TimeUnit.NANOSECONDS.convert(1000, TimeUnit.MILLISECONDS);
221223
long start = System.nanoTime();
@@ -262,7 +264,7 @@ public void testParkNanos5() throws Exception {
262264
*/
263265
@Test
264266
public void testParkNanos6() throws Exception {
265-
TestHelper.runInVirtualThread(() -> {
267+
VThreadRunner.run(() -> {
266268
LockSupport.unpark(Thread.currentThread());
267269
long nanos = TimeUnit.NANOSECONDS.convert(1, TimeUnit.DAYS);
268270
LockSupport.parkNanos(nanos);
@@ -290,7 +292,7 @@ public void testParkNanos7() throws Exception {
290292
*/
291293
@Test
292294
public void testParkNanos8() throws Exception {
293-
TestHelper.runInVirtualThread(() -> {
295+
VThreadRunner.run(() -> {
294296
Thread t = Thread.currentThread();
295297
t.interrupt();
296298
LockSupport.parkNanos(Duration.ofDays(1).toNanos());
@@ -303,9 +305,9 @@ public void testParkNanos8() throws Exception {
303305
*/
304306
@Test
305307
public void testParkNanos9() throws Exception {
306-
TestHelper.runInVirtualThread(() -> {
308+
VThreadRunner.run(() -> {
307309
Thread t = Thread.currentThread();
308-
TestHelper.scheduleInterrupt(t, 1000);
310+
scheduleInterrupt(t, 1000);
309311
while (!Thread.currentThread().isInterrupted()) {
310312
LockSupport.parkNanos(Duration.ofDays(1).toNanos());
311313
}
@@ -317,7 +319,7 @@ public void testParkNanos9() throws Exception {
317319
*/
318320
@Test
319321
public void testParkNanos10() throws Exception {
320-
TestHelper.runInVirtualThread(() -> {
322+
VThreadRunner.run(() -> {
321323
Thread t = Thread.currentThread();
322324
t.interrupt();
323325
synchronized (lock) {
@@ -332,14 +334,29 @@ public void testParkNanos10() throws Exception {
332334
*/
333335
@Test
334336
public void testParkNanos11() throws Exception {
335-
TestHelper.runInVirtualThread(() -> {
337+
VThreadRunner.run(() -> {
336338
Thread t = Thread.currentThread();
337-
TestHelper.scheduleInterrupt(t, 1000);
339+
scheduleInterrupt(t, 1000);
338340
while (!Thread.currentThread().isInterrupted()) {
339341
synchronized (lock) {
340342
LockSupport.parkNanos(Duration.ofDays(1).toNanos());
341343
}
342344
}
343345
});
344346
}
347+
348+
/**
349+
* Schedule a thread to be interrupted after a delay.
350+
*/
351+
private static void scheduleInterrupt(Thread thread, long delay) {
352+
Runnable interruptTask = () -> {
353+
try {
354+
Thread.sleep(delay);
355+
thread.interrupt();
356+
} catch (Exception e) {
357+
e.printStackTrace();
358+
}
359+
};
360+
new Thread(interruptTask).start();
361+
}
345362
}

‎test/jdk/java/lang/Thread/virtual/Reflection.java

+18-16
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
* @test
2626
* @summary Test virtual threads using core reflection
2727
* @modules java.base/java.lang:+open
28-
* @compile --enable-preview -source ${jdk.version} Reflection.java TestHelper.java
28+
* @library /test/lib
29+
* @compile --enable-preview -source ${jdk.version} Reflection.java
2930
* @run testng/othervm --enable-preview Reflection
3031
*/
3132

@@ -37,6 +38,7 @@
3738
import java.util.concurrent.ThreadFactory;
3839
import java.util.concurrent.locks.LockSupport;
3940

41+
import jdk.test.lib.thread.VThreadRunner;
4042
import org.testng.annotations.Test;
4143
import static org.testng.Assert.*;
4244

@@ -47,7 +49,7 @@ public class Reflection {
4749
*/
4850
@Test
4951
public void testInvokeStatic1() throws Exception {
50-
TestHelper.runInVirtualThread(() -> {
52+
VThreadRunner.run(() -> {
5153
int result = (int) divideMethod().invoke(null, 20, 2);
5254
assertTrue(result == 10);
5355
});
@@ -59,7 +61,7 @@ public void testInvokeStatic1() throws Exception {
5961
*/
6062
@Test
6163
public void testInvokeStatic2() throws Exception {
62-
TestHelper.runInVirtualThread(() -> {
64+
VThreadRunner.run(() -> {
6365
try {
6466
divideMethod().invoke(null, 20, 0);
6567
fail();
@@ -75,7 +77,7 @@ public void testInvokeStatic2() throws Exception {
7577
*/
7678
@Test
7779
public void testInvokeStatic3() throws Exception {
78-
TestHelper.runInVirtualThread(() -> {
80+
VThreadRunner.run(() -> {
7981
assertThrows(IllegalArgumentException.class,
8082
() -> divideMethod().invoke(null));
8183
assertThrows(IllegalArgumentException.class,
@@ -97,7 +99,7 @@ public void testInvokeStatic3() throws Exception {
9799
*/
98100
@Test
99101
public void testInvokeStatic4() throws Exception {
100-
TestHelper.runInVirtualThread(() -> {
102+
VThreadRunner.run(() -> {
101103
Method foo = BadClass1.class.getDeclaredMethod("foo");
102104
try {
103105
foo.invoke(null);
@@ -121,7 +123,7 @@ static void foo() { }
121123
*/
122124
@Test
123125
public void testInvokeStatic5() throws Exception {
124-
TestHelper.runInVirtualThread(() -> {
126+
VThreadRunner.run(() -> {
125127
Method foo = BadClass2.class.getDeclaredMethod("foo");
126128
assertThrows(AbstractMethodError.class, () -> foo.invoke(null));
127129
});
@@ -141,7 +143,7 @@ static void foo() { }
141143
public void testInvokeStatic6() throws Exception {
142144
Method parkMethod = Parker.class.getDeclaredMethod("park");
143145
try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
144-
ThreadFactory factory = TestHelper.virtualThreadBuilder(scheduler).factory();
146+
ThreadFactory factory = ThreadBuilders.virtualThreadBuilder(scheduler).factory();
145147

146148
Thread vthread = factory.newThread(() -> {
147149
try {
@@ -168,7 +170,7 @@ public void testInvokeStatic6() throws Exception {
168170
*/
169171
@Test
170172
public void testInvokeInstance1() throws Exception {
171-
TestHelper.runInVirtualThread(() -> {
173+
VThreadRunner.run(() -> {
172174
var adder = new Adder();
173175
Adder.addMethod().invoke(adder, 5);
174176
assertTrue(adder.sum == 5);
@@ -181,7 +183,7 @@ public void testInvokeInstance1() throws Exception {
181183
*/
182184
@Test
183185
public void testInvokeInstance2() throws Exception {
184-
TestHelper.runInVirtualThread(() -> {
186+
VThreadRunner.run(() -> {
185187
var adder = new Adder();
186188
try {
187189
Adder.addMethod().invoke(adder, -5);
@@ -198,7 +200,7 @@ public void testInvokeInstance2() throws Exception {
198200
*/
199201
@Test
200202
public void testInvokeInstance3() throws Exception {
201-
TestHelper.runInVirtualThread(() -> {
203+
VThreadRunner.run(() -> {
202204
var adder = new Adder();
203205
Method addMethod = Adder.addMethod();
204206
assertThrows(NullPointerException.class,
@@ -219,7 +221,7 @@ public void testInvokeInstance3() throws Exception {
219221
*/
220222
@Test
221223
public void testNewInstance1() throws Exception {
222-
TestHelper.runInVirtualThread(() -> {
224+
VThreadRunner.run(() -> {
223225
Constructor<?> ctor = Adder.class.getDeclaredConstructor(long.class);
224226
Adder adder = (Adder) ctor.newInstance(10);
225227
assertTrue(adder.sum == 10);
@@ -232,7 +234,7 @@ public void testNewInstance1() throws Exception {
232234
*/
233235
@Test
234236
public void testNewInstance2() throws Exception {
235-
TestHelper.runInVirtualThread(() -> {
237+
VThreadRunner.run(() -> {
236238
Constructor<?> ctor = Adder.class.getDeclaredConstructor(long.class);
237239
try {
238240
ctor.newInstance(-10);
@@ -249,7 +251,7 @@ public void testNewInstance2() throws Exception {
249251
*/
250252
@Test
251253
public void testNewInstance3() throws Exception {
252-
TestHelper.runInVirtualThread(() -> {
254+
VThreadRunner.run(() -> {
253255
var adder = new Adder();
254256
Constructor<?> ctor = Adder.class.getDeclaredConstructor(long.class);
255257
assertThrows(IllegalArgumentException.class,
@@ -271,7 +273,7 @@ public void testNewInstance3() throws Exception {
271273
*/
272274
@Test
273275
public void testNewInstance4() throws Exception {
274-
TestHelper.runInVirtualThread(() -> {
276+
VThreadRunner.run(() -> {
275277
Constructor<?> ctor = BadClass3.class.getDeclaredConstructor();
276278
try {
277279
ctor.newInstance((Object[])null);
@@ -295,7 +297,7 @@ static void foo() { }
295297
*/
296298
@Test
297299
public void testNewInstance5() throws Exception {
298-
TestHelper.runInVirtualThread(() -> {
300+
VThreadRunner.run(() -> {
299301
Constructor<?> ctor = BadClass4.class.getDeclaredConstructor();
300302
assertThrows(AbstractMethodError.class, () -> ctor.newInstance((Object[])null));
301303
});
@@ -315,7 +317,7 @@ static void foo() { }
315317
public void testNewInstance6() throws Exception {
316318
Constructor<?> ctor = Parker.class.getDeclaredConstructor();
317319
try (ExecutorService scheduler = Executors.newFixedThreadPool(1)) {
318-
ThreadFactory factory = TestHelper.virtualThreadBuilder(scheduler).factory();
320+
ThreadFactory factory = ThreadBuilders.virtualThreadBuilder(scheduler).factory();
319321

320322
Thread vthread = factory.newThread(() -> {
321323
try {

‎test/jdk/java/lang/Thread/virtual/StackTraces.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
* @summary Test stack traces in exceptions and stack frames waslked by the StackWalker
2727
* API do not include the carrier stack frames
2828
* @modules java.management
29+
* @library /test/lib
2930
* @compile --enable-preview -source ${jdk.version} StackTraces.java
3031
* @run testng/othervm --enable-preview StackTraces
3132
* @run testng/othervm --enable-preview -XX:+UnlockDiagnosticVMOptions -XX:+ShowCarrierFrames StackTraces
@@ -37,6 +38,7 @@
3738
import java.util.concurrent.ForkJoinPool;
3839
import static java.lang.StackWalker.Option.*;
3940

41+
import jdk.test.lib.thread.VThreadRunner;
4042
import org.testng.annotations.Test;
4143
import static org.testng.Assert.*;
4244

@@ -48,7 +50,7 @@ public class StackTraces {
4850
*/
4951
@Test
5052
public void testStackTrace() throws Exception {
51-
TestHelper.runInVirtualThread(() -> {
53+
VThreadRunner.run(() -> {
5254
Exception e = new Exception();
5355
boolean found = Arrays.stream(e.getStackTrace())
5456
.map(StackTraceElement::getClassName)
@@ -62,7 +64,7 @@ public void testStackTrace() throws Exception {
6264
*/
6365
@Test
6466
public void testStackWalker() throws Exception {
65-
TestHelper.runInVirtualThread(() -> {
67+
VThreadRunner.run(() -> {
6668
StackWalker walker = StackWalker.getInstance(Set.of(RETAIN_CLASS_REFERENCE));
6769
boolean found = walker.walk(sf ->
6870
sf.map(StackWalker.StackFrame::getDeclaringClass)

‎test/jdk/java/lang/Thread/virtual/TestHelper.java

-165
This file was deleted.

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

+104-86
Large diffs are not rendered by default.

‎test/jdk/java/lang/Thread/virtual/ThreadBuilders.java

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.lang.reflect.Field;
25+
import java.util.concurrent.Executor;
26+
27+
/**
28+
* Helper class for creating Thread buidlers.
29+
*/
30+
class ThreadBuilders {
31+
private ThreadBuilders() { }
32+
33+
/**
34+
* Returns a builder to create virtual threads that use the given scheduler.
35+
*
36+
* Tests using this method need to open java.base/java.lang.
37+
*/
38+
static Thread.Builder.OfVirtual virtualThreadBuilder(Executor scheduler) {
39+
Thread.Builder.OfVirtual builder = Thread.ofVirtual();
40+
try {
41+
Class<?> clazz = Class.forName("java.lang.ThreadBuilders$VirtualThreadBuilder");
42+
Field field = clazz.getDeclaredField("scheduler");
43+
field.setAccessible(true);
44+
field.set(builder, scheduler);
45+
} catch (RuntimeException | Error e) {
46+
throw e;
47+
} catch (Exception e) {
48+
throw new RuntimeException(e);
49+
}
50+
return builder;
51+
}
52+
}

‎test/jdk/java/lang/Thread/virtual/ThreadLocals.java

+14-12
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@
2424
/**
2525
* @test
2626
* @summary Test Virtual threads using thread locals
27+
* @library /test/lib
2728
* @compile --enable-preview -source ${jdk.version} ThreadLocals.java
2829
* @run testng/othervm --enable-preview ThreadLocals
2930
*/
3031

32+
import jdk.test.lib.thread.VThreadRunner;
3133
import org.testng.annotations.Test;
3234
import static org.testng.Assert.*;
3335

@@ -41,7 +43,7 @@ public class ThreadLocals {
4143
@Test
4244
public void testThreadLocal1() throws Exception {
4345
for (int i = 0; i < 10; i++) {
44-
TestHelper.runInVirtualThread(() -> {
46+
VThreadRunner.run(() -> {
4547
assertTrue(LOCAL.get() == null);
4648
Object obj = new Object();
4749
LOCAL.set(obj);
@@ -55,7 +57,7 @@ public void testThreadLocal1() throws Exception {
5557
*/
5658
@Test
5759
public void testThreadLocal2() throws Exception {
58-
TestHelper.runInVirtualThread(() -> {
60+
VThreadRunner.run(() -> {
5961
assertTrue(LOCAL.get() == null);
6062
Object obj = new Object();
6163
LOCAL.set(obj);
@@ -83,7 +85,7 @@ protected Object initialValue() {
8385
}
8486
};
8587

86-
TestHelper.runInVirtualThread(TestHelper.NO_THREAD_LOCALS, () -> {
88+
VThreadRunner.run(VThreadRunner.NO_THREAD_LOCALS, () -> {
8789
assertThrows(UnsupportedOperationException.class, () -> LOCAL.set(null));
8890
assertThrows(UnsupportedOperationException.class, () -> LOCAL.set(new Object()));
8991
assertTrue(LOCAL.get() == null);
@@ -113,7 +115,7 @@ protected Object initialValue() {
113115
public void testInheritedThreadLocal1() throws Exception {
114116
assertTrue(INHERITED_LOCAL.get() == null);
115117
for (int i = 0; i < 10; i++) {
116-
TestHelper.runInVirtualThread(() -> {
118+
VThreadRunner.run(() -> {
117119
assertTrue(INHERITED_LOCAL.get() == null);
118120
Object obj = new Object();
119121
INHERITED_LOCAL.set(obj);
@@ -132,7 +134,7 @@ public void testInheritedThreadLocal2() throws Exception {
132134
var obj = new Object();
133135
INHERITED_LOCAL.set(obj);
134136
try {
135-
TestHelper.runInVirtualThread(() -> {
137+
VThreadRunner.run(() -> {
136138
assertTrue(INHERITED_LOCAL.get() == obj);
137139
});
138140
} finally {
@@ -146,10 +148,10 @@ public void testInheritedThreadLocal2() throws Exception {
146148
@Test
147149
public void testInheritedThreadLocal3() throws Exception {
148150
assertTrue(INHERITED_LOCAL.get() == null);
149-
TestHelper.runInVirtualThread(() -> {
151+
VThreadRunner.run(() -> {
150152
var obj = new Object();
151153
INHERITED_LOCAL.set(obj);
152-
TestHelper.runInVirtualThread(() -> {
154+
VThreadRunner.run(() -> {
153155
assertTrue(INHERITED_LOCAL.get() == obj);
154156
});
155157
assertTrue(INHERITED_LOCAL.get() == obj);
@@ -168,8 +170,8 @@ public void testInheritedThreadLocal4() throws Exception {
168170
var obj = new Object();
169171
INHERITED_LOCAL.set(obj);
170172
try {
171-
int characteristics = TestHelper.NO_INHERIT_THREAD_LOCALS;
172-
TestHelper.runInVirtualThread(characteristics, () -> {
173+
int characteristics = VThreadRunner.NO_INHERIT_THREAD_LOCALS;
174+
VThreadRunner.run(characteristics, () -> {
173175
assertTrue(INHERITED_LOCAL.get() == null);
174176
});
175177
} finally {
@@ -184,11 +186,11 @@ public void testInheritedThreadLocal4() throws Exception {
184186
@Test
185187
public void testInheritedThreadLocal5() throws Exception {
186188
assertTrue(INHERITED_LOCAL.get() == null);
187-
TestHelper.runInVirtualThread(() -> {
189+
VThreadRunner.run(() -> {
188190
var obj = new Object();
189191
INHERITED_LOCAL.set(obj);
190-
int characteristics = TestHelper.NO_INHERIT_THREAD_LOCALS;
191-
TestHelper.runInVirtualThread(characteristics, () -> {
192+
int characteristics = VThreadRunner.NO_INHERIT_THREAD_LOCALS;
193+
VThreadRunner.run(characteristics, () -> {
192194
assertTrue(INHERITED_LOCAL.get() == null);
193195
});
194196
assertTrue(INHERITED_LOCAL.get() == obj);

‎test/jdk/java/lang/Thread/virtual/WaitNotify.java

+20-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@
2424
/**
2525
* @test
2626
* @summary Test virtual threads using Object.wait/notifyAll
27+
* @library /test/lib
2728
* @compile --enable-preview -source ${jdk.version} WaitNotify.java
2829
* @run testng/othervm --enable-preview WaitNotify
2930
*/
3031

3132
import java.util.concurrent.Semaphore;
3233

34+
import jdk.test.lib.thread.VThreadRunner;
3335
import org.testng.annotations.Test;
3436
import static org.testng.Assert.*;
3537

@@ -108,7 +110,7 @@ public void testWaitNotify3() throws Exception {
108110
*/
109111
@Test
110112
public void testWaitNotify4() throws Exception {
111-
TestHelper.runInVirtualThread(() -> {
113+
VThreadRunner.run(() -> {
112114
Thread t = Thread.currentThread();
113115
t.interrupt();
114116
Object lock = new Object();
@@ -129,9 +131,9 @@ public void testWaitNotify4() throws Exception {
129131
*/
130132
@Test
131133
public void testWaitNotify5() throws Exception {
132-
TestHelper.runInVirtualThread(() -> {
134+
VThreadRunner.run(() -> {
133135
Thread t = Thread.currentThread();
134-
TestHelper.scheduleInterrupt(t, 1000);
136+
scheduleInterrupt(t, 1000);
135137
Object lock = new Object();
136138
synchronized (lock) {
137139
try {
@@ -144,4 +146,19 @@ public void testWaitNotify5() throws Exception {
144146
}
145147
});
146148
}
149+
150+
/**
151+
* Schedule a thread to be interrupted after a delay.
152+
*/
153+
private static void scheduleInterrupt(Thread thread, long delay) {
154+
Runnable interruptTask = () -> {
155+
try {
156+
Thread.sleep(delay);
157+
thread.interrupt();
158+
} catch (Exception e) {
159+
e.printStackTrace();
160+
}
161+
};
162+
new Thread(interruptTask).start();
163+
}
147164
}

‎test/jdk/java/lang/Thread/virtual/stress/GetStackTraceALot.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* @summary Stress test asynchronous Thread.getStackTrace
2727
* @requires vm.debug != true
2828
* @modules java.base/java.lang:+open
29-
* @compile --enable-preview -source ${jdk.version} GetStackTraceALot.java ../TestHelper.java
29+
* @compile --enable-preview -source ${jdk.version} GetStackTraceALot.java ../ThreadBuilders.java
3030
* @run main/othervm --enable-preview GetStackTraceALot
3131
*
3232
*/
@@ -35,7 +35,7 @@
3535
* @test
3636
* @requires vm.debug == true
3737
* @modules java.base/java.lang:+open
38-
* @compile --enable-preview -source ${jdk.version} GetStackTraceALot.java ../TestHelper.java
38+
* @compile --enable-preview -source ${jdk.version} GetStackTraceALot.java ../ThreadBuilders.java
3939
* @run main/othervm/timeout=300 --enable-preview GetStackTraceALot 1000
4040
*/
4141

@@ -84,7 +84,7 @@ public static void main(String[] args) throws Exception {
8484
AtomicInteger count = new AtomicInteger();
8585

8686
try (RoundRobinExecutor executor = new RoundRobinExecutor()) {
87-
Thread thread = TestHelper.virtualThreadBuilder(executor).start(() -> {
87+
Thread thread = ThreadBuilders.virtualThreadBuilder(executor).start(() -> {
8888
while (count.incrementAndGet() < ITERATIONS) {
8989
long start = System.nanoTime();
9090
while ((System.nanoTime() - start) < SPIN_NANOS) {

‎test/jdk/java/lang/Thread/virtual/NetSockets.java ‎test/jdk/java/net/vthread/BlockingSocketOps.java

+26-24
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323

2424
/**
2525
* @test
26-
* @summary Basic tests for virtual threads using java.net sockets.
27-
* @compile --enable-preview -source ${jdk.version} NetSockets.java
28-
* @run testng/othervm/timeout=300 --enable-preview NetSockets
29-
* @run testng/othervm/timeout=300 --enable-preview -Djdk.useDirectRegister NetSockets
26+
* @summary Basic tests of virtual threads doing blocking I/O with java.net sockets
27+
* @library /test/lib
28+
* @compile --enable-preview -source ${jdk.version} BlockingSocketOps.java
29+
* @run testng/othervm/timeout=300 --enable-preview BlockingSocketOps
30+
* @run testng/othervm/timeout=300 --enable-preview -Djdk.useDirectRegister BlockingSocketOps
3031
*/
3132

3233
import java.io.Closeable;
@@ -43,10 +44,11 @@
4344
import java.net.SocketException;
4445
import java.net.SocketTimeoutException;
4546

47+
import jdk.test.lib.thread.VThreadRunner;
4648
import org.testng.annotations.Test;
4749
import static org.testng.Assert.*;
4850

49-
public class NetSockets {
51+
public class BlockingSocketOps {
5052

5153
private static final long DELAY = 2000;
5254

@@ -55,7 +57,7 @@ public class NetSockets {
5557
*/
5658
@Test
5759
public void testSocketReadWrite1() throws Exception {
58-
TestHelper.runInVirtualThread(() -> {
60+
VThreadRunner.run(() -> {
5961
try (var connection = new Connection()) {
6062
Socket s1 = connection.socket1();
6163
Socket s2 = connection.socket2();
@@ -90,7 +92,7 @@ public void testSocketRead2() throws Exception {
9092
}
9193

9294
void testSocketRead(int timeout) throws Exception {
93-
TestHelper.runInVirtualThread(() -> {
95+
VThreadRunner.run(() -> {
9496
try (var connection = new Connection()) {
9597
Socket s1 = connection.socket1();
9698
Socket s2 = connection.socket2();
@@ -117,7 +119,7 @@ void testSocketRead(int timeout) throws Exception {
117119
*/
118120
@Test
119121
public void testSocketWrite1() throws Exception {
120-
TestHelper.runInVirtualThread(() -> {
122+
VThreadRunner.run(() -> {
121123
try (var connection = new Connection()) {
122124
Socket s1 = connection.socket1();
123125
Socket s2 = connection.socket2();
@@ -140,7 +142,7 @@ public void testSocketWrite1() throws Exception {
140142
*/
141143
@Test
142144
public void testSocketReadPeerClose1() throws Exception {
143-
TestHelper.runInVirtualThread(() -> {
145+
VThreadRunner.run(() -> {
144146
try (var connection = new Connection()) {
145147
Socket s1 = connection.socket1();
146148
Socket s2 = connection.socket2();
@@ -158,7 +160,7 @@ public void testSocketReadPeerClose1() throws Exception {
158160
*/
159161
@Test
160162
public void testSocketReadPeerClose2() throws Exception {
161-
TestHelper.runInVirtualThread(() -> {
163+
VThreadRunner.run(() -> {
162164
try (var connection = new Connection()) {
163165
Socket s1 = connection.socket1();
164166
Socket s2 = connection.socket2();
@@ -193,7 +195,7 @@ public void testSocketReadAsyncClose2() throws Exception {
193195
}
194196

195197
void testSocketReadAsyncClose(int timeout) throws Exception {
196-
TestHelper.runInVirtualThread(() -> {
198+
VThreadRunner.run(() -> {
197199
try (var connection = new Connection()) {
198200
Socket s = connection.socket1();
199201
ScheduledCloser.schedule(s, DELAY);
@@ -226,7 +228,7 @@ public void testSocketReadInterrupt2() throws Exception {
226228
}
227229

228230
void testSocketReadInterrupt(int timeout) throws Exception {
229-
TestHelper.runInVirtualThread(() -> {
231+
VThreadRunner.run(() -> {
230232
try (var connection = new Connection()) {
231233
Socket s = connection.socket1();
232234
ScheduledInterrupter.schedule(Thread.currentThread(), DELAY);
@@ -250,7 +252,7 @@ void testSocketReadInterrupt(int timeout) throws Exception {
250252
*/
251253
@Test
252254
public void testSocketWriteAsyncClose() throws Exception {
253-
TestHelper.runInVirtualThread(() -> {
255+
VThreadRunner.run(() -> {
254256
try (var connection = new Connection()) {
255257
Socket s = connection.socket1();
256258
ScheduledCloser.schedule(s, DELAY);
@@ -270,7 +272,7 @@ public void testSocketWriteAsyncClose() throws Exception {
270272
*/
271273
@Test
272274
public void testSocketWriteInterrupt() throws Exception {
273-
TestHelper.runInVirtualThread(() -> {
275+
VThreadRunner.run(() -> {
274276
try (var connection = new Connection()) {
275277
Socket s = connection.socket1();
276278
ScheduledInterrupter.schedule(Thread.currentThread(), DELAY);
@@ -293,7 +295,7 @@ public void testSocketWriteInterrupt() throws Exception {
293295
*/
294296
@Test
295297
public void testSocketReadUrgentData() throws Exception {
296-
TestHelper.runInVirtualThread(() -> {
298+
VThreadRunner.run(() -> {
297299
try (var connection = new Connection()) {
298300
Socket s1 = connection.socket1();
299301
Socket s2 = connection.socket2();
@@ -323,7 +325,7 @@ public void testSocketReadUrgentData() throws Exception {
323325
*/
324326
@Test
325327
public void testServerSocketAccept1() throws Exception {
326-
TestHelper.runInVirtualThread(() -> {
328+
VThreadRunner.run(() -> {
327329
try (var listener = new ServerSocket(0)) {
328330
var socket1 = new Socket(listener.getInetAddress(), listener.getLocalPort());
329331
// accept should not block
@@ -351,7 +353,7 @@ public void testServerSocketAccept3() throws Exception {
351353
}
352354

353355
void testServerSocketAccept(int timeout) throws Exception {
354-
TestHelper.runInVirtualThread(() -> {
356+
VThreadRunner.run(() -> {
355357
try (var listener = new ServerSocket(0)) {
356358
var socket1 = new Socket();
357359
ScheduledConnector.schedule(socket1, listener.getLocalSocketAddress(), DELAY);
@@ -384,7 +386,7 @@ public void testServerSocketAcceptAsyncClose2() throws Exception {
384386
}
385387

386388
void testServerSocketAcceptAsyncClose(int timeout) throws Exception {
387-
TestHelper.runInVirtualThread(() -> {
389+
VThreadRunner.run(() -> {
388390
try (var listener = new ServerSocket(0)) {
389391
ScheduledCloser.schedule(listener, DELAY);
390392
if (timeout > 0) {
@@ -416,7 +418,7 @@ public void testServerSocketAcceptInterrupt2() throws Exception {
416418
}
417419

418420
void testServerSocketAcceptInterrupt(int timeout) throws Exception {
419-
TestHelper.runInVirtualThread(() -> {
421+
VThreadRunner.run(() -> {
420422
try (var listener = new ServerSocket(0)) {
421423
ScheduledInterrupter.schedule(Thread.currentThread(), DELAY);
422424
if (timeout > 0) {
@@ -439,7 +441,7 @@ void testServerSocketAcceptInterrupt(int timeout) throws Exception {
439441
*/
440442
@Test
441443
public void testDatagramSocketSendReceive1() throws Exception {
442-
TestHelper.runInVirtualThread(() -> {
444+
VThreadRunner.run(() -> {
443445
try (DatagramSocket s1 = new DatagramSocket(null);
444446
DatagramSocket s2 = new DatagramSocket(null)) {
445447

@@ -480,7 +482,7 @@ public void testDatagramSocketSendReceive3() throws Exception {
480482
}
481483

482484
private void testDatagramSocketSendReceive(int timeout) throws Exception {
483-
TestHelper.runInVirtualThread(() -> {
485+
VThreadRunner.run(() -> {
484486
try (DatagramSocket s1 = new DatagramSocket(null);
485487
DatagramSocket s2 = new DatagramSocket(null)) {
486488

@@ -513,7 +515,7 @@ private void testDatagramSocketSendReceive(int timeout) throws Exception {
513515
*/
514516
@Test
515517
public void testDatagramSocketReceiveTimeout() throws Exception {
516-
TestHelper.runInVirtualThread(() -> {
518+
VThreadRunner.run(() -> {
517519
try (DatagramSocket s = new DatagramSocket(null)) {
518520
InetAddress lh = InetAddress.getLoopbackAddress();
519521
s.bind(new InetSocketAddress(lh, 0));
@@ -545,7 +547,7 @@ public void testDatagramSocketReceiveAsyncClose2() throws Exception {
545547
}
546548

547549
private void testDatagramSocketReceiveAsyncClose(int timeout) throws Exception {
548-
TestHelper.runInVirtualThread(() -> {
550+
VThreadRunner.run(() -> {
549551
try (DatagramSocket s = new DatagramSocket(null)) {
550552
InetAddress lh = InetAddress.getLoopbackAddress();
551553
s.bind(new InetSocketAddress(lh, 0));
@@ -585,7 +587,7 @@ public void testDatagramSocketReceiveInterrupt2() throws Exception {
585587
}
586588

587589
private void testDatagramSocketReceiveInterrupt(int timeout) throws Exception {
588-
TestHelper.runInVirtualThread(() -> {
590+
VThreadRunner.run(() -> {
589591
try (DatagramSocket s = new DatagramSocket(null)) {
590592
InetAddress lh = InetAddress.getLoopbackAddress();
591593
s.bind(new InetSocketAddress(lh, 0));

‎test/jdk/java/lang/Thread/virtual/stress/HttpALot.java ‎test/jdk/java/net/vthread/HttpALot.java

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
* @test
2626
* @summary Stress test the HTTP protocol handler and HTTP server
2727
* @requires vm.debug != true
28-
* @modules java.base/java.util.concurrent:open
2928
* @compile --enable-preview -source ${jdk.version} HttpALot.java
3029
* @run main/othervm/timeout=600
3130
* --enable-preview

‎test/jdk/java/lang/Thread/virtual/NioChannels.java ‎test/jdk/java/nio/channels/vthread/BlockingChannelOps.java

+32-30
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323

2424
/**
2525
* @test
26-
* @summary Basic tests for virtual threads doing blocking I/O with NIO channels
27-
* @compile --enable-preview -source ${jdk.version} NioChannels.java
28-
* @run testng/othervm/timeout=300 --enable-preview NioChannels
29-
* @run testng/othervm/timeout=300 --enable-preview -Djdk.useDirectRegister NioChannels
26+
* @summary Basic tests of virtual threads doing blocking I/O with NIO channels
27+
* @library /test/lib
28+
* @compile --enable-preview -source ${jdk.version} BlockingChannelOps.java
29+
* @run testng/othervm/timeout=300 --enable-preview BlockingChannelOps
30+
* @run testng/othervm/timeout=300 --enable-preview -Djdk.useDirectRegister BlockingChannelOps
3031
*/
3132

3233
import java.io.Closeable;
@@ -46,18 +47,19 @@
4647
import java.nio.channels.SocketChannel;
4748
import java.nio.channels.WritableByteChannel;
4849

50+
import jdk.test.lib.thread.VThreadRunner;
4951
import org.testng.annotations.Test;
5052
import static org.testng.Assert.*;
5153

52-
public class NioChannels {
54+
public class BlockingChannelOps {
5355
private static final long DELAY = 4000;
5456

5557
/**
5658
* SocketChannel read/write, no blocking.
5759
*/
5860
@Test
5961
public void testSocketChannelReadWrite1() throws Exception {
60-
TestHelper.runInVirtualThread(() -> {
62+
VThreadRunner.run(() -> {
6163
try (var connection = new Connection()) {
6264
SocketChannel sc1 = connection.channel1();
6365
SocketChannel sc2 = connection.channel2();
@@ -81,7 +83,7 @@ public void testSocketChannelReadWrite1() throws Exception {
8183
*/
8284
@Test
8385
public void testSocketChannelRead() throws Exception {
84-
TestHelper.runInVirtualThread(() -> {
86+
VThreadRunner.run(() -> {
8587
try (var connection = new Connection()) {
8688
SocketChannel sc1 = connection.channel1();
8789
SocketChannel sc2 = connection.channel2();
@@ -104,7 +106,7 @@ public void testSocketChannelRead() throws Exception {
104106
*/
105107
@Test
106108
public void testSocketChannelWrite() throws Exception {
107-
TestHelper.runInVirtualThread(() -> {
109+
VThreadRunner.run(() -> {
108110
try (var connection = new Connection()) {
109111
SocketChannel sc1 = connection.channel1();
110112
SocketChannel sc2 = connection.channel2();
@@ -128,7 +130,7 @@ public void testSocketChannelWrite() throws Exception {
128130
*/
129131
@Test
130132
public void testSocketChannelReadAsyncClose() throws Exception {
131-
TestHelper.runInVirtualThread(() -> {
133+
VThreadRunner.run(() -> {
132134
try (var connection = new Connection()) {
133135
SocketChannel sc = connection.channel1();
134136
ScheduledCloser.schedule(sc, DELAY);
@@ -145,7 +147,7 @@ public void testSocketChannelReadAsyncClose() throws Exception {
145147
*/
146148
@Test
147149
public void testSocketChannelReadInterrupt() throws Exception {
148-
TestHelper.runInVirtualThread(() -> {
150+
VThreadRunner.run(() -> {
149151
try (var connection = new Connection()) {
150152
SocketChannel sc = connection.channel1();
151153
ScheduledInterrupter.schedule(Thread.currentThread(), DELAY);
@@ -164,7 +166,7 @@ public void testSocketChannelReadInterrupt() throws Exception {
164166
*/
165167
@Test
166168
public void testSocketChannelWriteAsyncClose() throws Exception {
167-
TestHelper.runInVirtualThread(() -> {
169+
VThreadRunner.run(() -> {
168170
try (var connection = new Connection()) {
169171
SocketChannel sc = connection.channel1();
170172
ScheduledCloser.schedule(sc, DELAY);
@@ -185,7 +187,7 @@ public void testSocketChannelWriteAsyncClose() throws Exception {
185187
*/
186188
@Test
187189
public void testSocketChannelWriteInterrupt() throws Exception {
188-
TestHelper.runInVirtualThread(() -> {
190+
VThreadRunner.run(() -> {
189191
try (var connection = new Connection()) {
190192
SocketChannel sc = connection.channel1();
191193
ScheduledInterrupter.schedule(Thread.currentThread(), DELAY);
@@ -220,7 +222,7 @@ public void testSocketAdaptorRead2() throws Exception {
220222
}
221223

222224
private void testSocketAdaptorRead(int timeout) throws Exception {
223-
TestHelper.runInVirtualThread(() -> {
225+
VThreadRunner.run(() -> {
224226
try (var connection = new Connection()) {
225227
SocketChannel sc1 = connection.channel1();
226228
SocketChannel sc2 = connection.channel2();
@@ -246,7 +248,7 @@ private void testSocketAdaptorRead(int timeout) throws Exception {
246248
*/
247249
@Test
248250
public void testServerSocketChannelAccept1() throws Exception {
249-
TestHelper.runInVirtualThread(() -> {
251+
VThreadRunner.run(() -> {
250252
try (var ssc = ServerSocketChannel.open()) {
251253
ssc.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
252254
var sc1 = SocketChannel.open(ssc.getLocalAddress());
@@ -263,7 +265,7 @@ public void testServerSocketChannelAccept1() throws Exception {
263265
*/
264266
@Test
265267
public void testServerSocketChannelAccept2() throws Exception {
266-
TestHelper.runInVirtualThread(() -> {
268+
VThreadRunner.run(() -> {
267269
try (var ssc = ServerSocketChannel.open()) {
268270
ssc.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
269271
var sc1 = SocketChannel.open();
@@ -281,7 +283,7 @@ public void testServerSocketChannelAccept2() throws Exception {
281283
*/
282284
@Test
283285
public void testServerSocketChannelAcceptAsyncClose() throws Exception {
284-
TestHelper.runInVirtualThread(() -> {
286+
VThreadRunner.run(() -> {
285287
try (var ssc = ServerSocketChannel.open()) {
286288
InetAddress lh = InetAddress.getLoopbackAddress();
287289
ssc.bind(new InetSocketAddress(lh, 0));
@@ -300,7 +302,7 @@ public void testServerSocketChannelAcceptAsyncClose() throws Exception {
300302
*/
301303
@Test
302304
public void testServerSocketChannelAcceptInterrupt() throws Exception {
303-
TestHelper.runInVirtualThread(() -> {
305+
VThreadRunner.run(() -> {
304306
try (var ssc = ServerSocketChannel.open()) {
305307
InetAddress lh = InetAddress.getLoopbackAddress();
306308
ssc.bind(new InetSocketAddress(lh, 0));
@@ -333,7 +335,7 @@ public void testSocketChannelAdaptorAccept2() throws Exception {
333335
}
334336

335337
private void testSocketChannelAdaptorAccept(int timeout) throws Exception {
336-
TestHelper.runInVirtualThread(() -> {
338+
VThreadRunner.run(() -> {
337339
try (var ssc = ServerSocketChannel.open()) {
338340
ssc.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
339341
var sc1 = SocketChannel.open();
@@ -355,7 +357,7 @@ private void testSocketChannelAdaptorAccept(int timeout) throws Exception {
355357
*/
356358
@Test
357359
public void testDatagramChannelSendReceive1() throws Exception {
358-
TestHelper.runInVirtualThread(() -> {
360+
VThreadRunner.run(() -> {
359361
try (DatagramChannel dc1 = DatagramChannel.open();
360362
DatagramChannel dc2 = DatagramChannel.open()) {
361363

@@ -380,7 +382,7 @@ public void testDatagramChannelSendReceive1() throws Exception {
380382
*/
381383
@Test
382384
public void testDatagramChannelSendReceive2() throws Exception {
383-
TestHelper.runInVirtualThread(() -> {
385+
VThreadRunner.run(() -> {
384386
try (DatagramChannel dc1 = DatagramChannel.open();
385387
DatagramChannel dc2 = DatagramChannel.open()) {
386388

@@ -404,7 +406,7 @@ public void testDatagramChannelSendReceive2() throws Exception {
404406
*/
405407
@Test
406408
public void testDatagramChannelReceiveAsyncClose() throws Exception {
407-
TestHelper.runInVirtualThread(() -> {
409+
VThreadRunner.run(() -> {
408410
try (DatagramChannel dc = DatagramChannel.open()) {
409411
InetAddress lh = InetAddress.getLoopbackAddress();
410412
dc.bind(new InetSocketAddress(lh, 0));
@@ -422,7 +424,7 @@ public void testDatagramChannelReceiveAsyncClose() throws Exception {
422424
*/
423425
@Test
424426
public void testDatagramChannelReceiveInterrupt() throws Exception {
425-
TestHelper.runInVirtualThread(() -> {
427+
VThreadRunner.run(() -> {
426428
try (DatagramChannel dc = DatagramChannel.open()) {
427429
InetAddress lh = InetAddress.getLoopbackAddress();
428430
dc.bind(new InetSocketAddress(lh, 0));
@@ -454,7 +456,7 @@ public void testDatagramSocketAdaptorReceive2() throws Exception {
454456
}
455457

456458
private void testDatagramSocketAdaptorReceive(int timeout) throws Exception {
457-
TestHelper.runInVirtualThread(() -> {
459+
VThreadRunner.run(() -> {
458460
try (DatagramChannel dc1 = DatagramChannel.open();
459461
DatagramChannel dc2 = DatagramChannel.open()) {
460462

@@ -481,7 +483,7 @@ private void testDatagramSocketAdaptorReceive(int timeout) throws Exception {
481483
*/
482484
@Test
483485
public void testPipeReadWrite1() throws Exception {
484-
TestHelper.runInVirtualThread(() -> {
486+
VThreadRunner.run(() -> {
485487
Pipe p = Pipe.open();
486488
try (Pipe.SinkChannel sink = p.sink();
487489
Pipe.SourceChannel source = p.source()) {
@@ -505,7 +507,7 @@ public void testPipeReadWrite1() throws Exception {
505507
*/
506508
@Test
507509
public void testPipeReadWrite2() throws Exception {
508-
TestHelper.runInVirtualThread(() -> {
510+
VThreadRunner.run(() -> {
509511
Pipe p = Pipe.open();
510512
try (Pipe.SinkChannel sink = p.sink();
511513
Pipe.SourceChannel source = p.source()) {
@@ -528,7 +530,7 @@ public void testPipeReadWrite2() throws Exception {
528530
*/
529531
@Test
530532
public void testPipeReadWrite3() throws Exception {
531-
TestHelper.runInVirtualThread(() -> {
533+
VThreadRunner.run(() -> {
532534
Pipe p = Pipe.open();
533535
try (Pipe.SinkChannel sink = p.sink();
534536
Pipe.SourceChannel source = p.source()) {
@@ -552,7 +554,7 @@ public void testPipeReadWrite3() throws Exception {
552554
*/
553555
@Test
554556
public void testPipeReadAsyncClose() throws Exception {
555-
TestHelper.runInVirtualThread(() -> {
557+
VThreadRunner.run(() -> {
556558
Pipe p = Pipe.open();
557559
try (Pipe.SourceChannel source = p.source()) {
558560
ScheduledCloser.schedule(source, DELAY);
@@ -569,7 +571,7 @@ public void testPipeReadAsyncClose() throws Exception {
569571
*/
570572
@Test
571573
public void testPipeReadInterrupt() throws Exception {
572-
TestHelper.runInVirtualThread(() -> {
574+
VThreadRunner.run(() -> {
573575
Pipe p = Pipe.open();
574576
try (Pipe.SourceChannel source = p.source()) {
575577
ScheduledInterrupter.schedule(Thread.currentThread(), DELAY);
@@ -588,7 +590,7 @@ public void testPipeReadInterrupt() throws Exception {
588590
*/
589591
@Test
590592
public void testPipeWriteAsyncClose() throws Exception {
591-
TestHelper.runInVirtualThread(() -> {
593+
VThreadRunner.run(() -> {
592594
Pipe p = Pipe.open();
593595
try (Pipe.SinkChannel sink = p.sink()) {
594596
ScheduledCloser.schedule(sink, DELAY);
@@ -609,7 +611,7 @@ public void testPipeWriteAsyncClose() throws Exception {
609611
*/
610612
@Test
611613
public void testPipeWriteInterrupt() throws Exception {
612-
TestHelper.runInVirtualThread(() -> {
614+
VThreadRunner.run(() -> {
613615
Pipe p = Pipe.open();
614616
try (Pipe.SinkChannel sink = p.sink()) {
615617
ScheduledInterrupter.schedule(Thread.currentThread(), DELAY);

‎test/jdk/java/util/HashMap/WhiteBoxResizeTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
* @bug 8186958 8210280 8281631
5252
* @modules java.base/java.util:open
5353
* @summary White box tests for HashMap-related internals around table sizing
54-
* @run testng WhiteBoxResizeTest
54+
* @run testng/othervm -Xmx2g WhiteBoxResizeTest
5555
*/
5656
public class WhiteBoxResizeTest {
5757

‎test/lib/jdk/test/lib/thread/VThreadRunner.java

+143
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
/*
2+
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
package jdk.test.lib.thread;
25+
26+
import java.time.Duration;
27+
import java.util.concurrent.atomic.AtomicReference;
28+
29+
/**
30+
* Helper class for running tasks in a virtual thread.
31+
*/
32+
public class VThreadRunner {
33+
private VThreadRunner() { }
34+
35+
/**
36+
* Characteristic value signifying that the thread cannot set values for its
37+
* copy of thread-locals.
38+
*/
39+
public static final int NO_THREAD_LOCALS = 1 << 1;
40+
41+
/**
42+
* Characteristic value signifying that initial values for inheritable
43+
* thread locals are not inherited from the constructing thread.
44+
*/
45+
public static final int NO_INHERIT_THREAD_LOCALS = 1 << 2;
46+
47+
/**
48+
* Represents a task that does not return a result but may throw
49+
* an exception.
50+
*/
51+
@FunctionalInterface
52+
public interface ThrowingRunnable {
53+
/**
54+
* Runs this operation.
55+
*/
56+
void run() throws Exception;
57+
}
58+
59+
/**
60+
* Run a task in a virtual thread and wait for it to terminate.
61+
* If the task completse with an exception then it is thrown by this method.
62+
* If the task throws an Error then it is wrapped in an RuntimeException.
63+
*
64+
* @param name thread name, can be null
65+
* @param characteristics thread characteristics
66+
* @param task the task to run
67+
* @throws Exception the exception thrown by the task
68+
*/
69+
public static void run(String name,
70+
int characteristics,
71+
ThrowingRunnable task) throws Exception {
72+
AtomicReference<Exception> exc = new AtomicReference<>();
73+
Runnable target = () -> {
74+
try {
75+
task.run();
76+
} catch (Error e) {
77+
exc.set(new RuntimeException(e));
78+
} catch (Exception e) {
79+
exc.set(e);
80+
}
81+
};
82+
83+
Thread.Builder builder = Thread.ofVirtual();
84+
if (name != null)
85+
builder.name(name);
86+
if ((characteristics & NO_THREAD_LOCALS) != 0)
87+
builder.allowSetThreadLocals(false);
88+
if ((characteristics & NO_INHERIT_THREAD_LOCALS) != 0)
89+
builder.inheritInheritableThreadLocals(false);
90+
Thread thread = builder.start(target);
91+
92+
// wait for thread to terminate
93+
while (thread.join(Duration.ofSeconds(10)) == false) {
94+
System.out.println("-- " + thread + " --");
95+
for (StackTraceElement e : thread.getStackTrace()) {
96+
System.out.println(" " + e);
97+
}
98+
}
99+
100+
Exception e = exc.get();
101+
if (e != null) {
102+
throw e;
103+
}
104+
}
105+
106+
/**
107+
* Run a task in a virtual thread and wait for it to terminate.
108+
* If the task completse with an exception then it is thrown by this method.
109+
* If the task throws an Error then it is wrapped in an RuntimeException.
110+
*
111+
* @param name thread name, can be null
112+
* @param task the task to run
113+
* @throws Exception the exception thrown by the task
114+
*/
115+
public static void run(String name, ThrowingRunnable task) throws Exception {
116+
run(name, 0, task);
117+
}
118+
119+
/**
120+
* Run a task in a virtual thread and wait for it to terminate.
121+
* If the task completse with an exception then it is thrown by this method.
122+
* If the task throws an Error then it is wrapped in an RuntimeException.
123+
*
124+
* @param characteristics thread characteristics
125+
* @param task the task to run
126+
* @throws Exception the exception thrown by the task
127+
*/
128+
public static void run(int characteristics, ThrowingRunnable task) throws Exception {
129+
run(null, characteristics, task);
130+
}
131+
132+
/**
133+
* Run a task in a virtual thread and wait for it to terminate.
134+
* If the task completse with an exception then it is thrown by this method.
135+
* If the task throws an Error then it is wrapped in an RuntimeException.
136+
*
137+
* @param task the task to run
138+
* @throws Exception the exception thrown by the task
139+
*/
140+
public static void run(ThrowingRunnable task) throws Exception {
141+
run(null, 0, task);
142+
}
143+
}

0 commit comments

Comments
 (0)
Please sign in to comment.