archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8288899: java/util/concurrent/ExecutorService/CloseTest.java failed with "InterruptedException: sleep interrupted"

Browse source 
Reviewed-by: alanb
This commit is contained in:
Doug Lea 2023-10-27 10:08:59 +00:00
parent b9dcd4b741
commit 667cca9d7a
18 changed files with 3903 additions and 2107 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
View file

@ -524,6 +524,10 @@ public abstract class CountedCompleter<T> extends ForkJoinTask<T> {
return pending;
}
final void initPending(int count) {
U.putInt(this, PENDING, count);
}
/**
* Sets the pending count to the given value.
*
@ -724,26 +728,27 @@ public abstract class CountedCompleter<T> extends ForkJoinTask<T> {
* processed.
*/
public final void helpComplete(int maxTasks) {
ForkJoinPool.WorkQueue q; Thread t; boolean owned;
if (owned = (t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
ForkJoinPool.WorkQueue q; Thread t; boolean internal;
if (internal =
(t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
q = ((ForkJoinWorkerThread)t).workQueue;
else
q = ForkJoinPool.commonQueue();
if (q != null && maxTasks > 0)
q.helpComplete(this, owned, maxTasks);
q.helpComplete(this, internal, maxTasks);
}
// ForkJoinTask overrides
/**
* Supports ForkJoinTask exception propagation.
*/
@Override
final int trySetException(Throwable ex) {
final void onAuxExceptionSet(Throwable ex) {
CountedCompleter<?> a = this, p = a;
do {} while (isExceptionalStatus(a.trySetThrown(ex)) &&
a.onExceptionalCompletion(ex, p) &&
(a = (p = a).completer) != null && a.status >= 0);
return status;
do {} while (a.onExceptionalCompletion(ex, p) &&
(a = (p = a).completer) != null &&
a.trySetThrown(ex));
}
/**

3050
src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
View file

File diff suppressed because it is too large Load diff

1182
src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
View file

File diff suppressed because it is too large Load diff

5
src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
View file

@ -76,9 +76,8 @@ public class ForkJoinWorkerThread extends Thread {
boolean clearThreadLocals) {
super(group, null, pool.nextWorkerThreadName(), 0L, !clearThreadLocals);
UncaughtExceptionHandler handler = (this.pool = pool).ueh;
this.workQueue = new ForkJoinPool.WorkQueue(this, 0);
if (clearThreadLocals)
workQueue.setClearThreadLocals();
this.workQueue = new ForkJoinPool.WorkQueue(this, 0, (int)pool.config,
clearThreadLocals);
super.setDaemon(true);
if (handler != null)
super.setUncaughtExceptionHandler(handler);