74 |
|
} |
75 |
|
|
76 |
|
private void testInvokeOnPool(ForkJoinPool pool, RecursiveAction a) { |
77 |
< |
try { |
77 |
> |
try (PoolCleaner cleaner = cleaner(pool)) { |
78 |
|
assertFalse(a.isDone()); |
79 |
|
assertFalse(a.isCompletedNormally()); |
80 |
|
assertFalse(a.isCompletedAbnormally()); |
90 |
|
assertFalse(a.isCancelled()); |
91 |
|
assertNull(a.getException()); |
92 |
|
assertNull(a.getRawResult()); |
93 |
– |
} finally { |
94 |
– |
joinPool(pool); |
93 |
|
} |
94 |
|
} |
95 |
|
|
126 |
|
|
127 |
|
{ |
128 |
|
Thread.currentThread().interrupt(); |
129 |
< |
long t0 = System.nanoTime(); |
129 |
> |
long startTime = System.nanoTime(); |
130 |
|
assertSame(expected, a.join()); |
131 |
< |
assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS); |
131 |
> |
assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS); |
132 |
|
Thread.interrupted(); |
133 |
|
} |
134 |
|
|
135 |
|
{ |
136 |
|
Thread.currentThread().interrupt(); |
137 |
< |
long t0 = System.nanoTime(); |
137 |
> |
long startTime = System.nanoTime(); |
138 |
|
a.quietlyJoin(); // should be no-op |
139 |
< |
assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS); |
139 |
> |
assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS); |
140 |
|
Thread.interrupted(); |
141 |
|
} |
142 |
|
|
172 |
|
Thread.interrupted(); |
173 |
|
|
174 |
|
{ |
175 |
< |
long t0 = System.nanoTime(); |
175 |
> |
long startTime = System.nanoTime(); |
176 |
|
a.quietlyJoin(); // should be no-op |
177 |
< |
assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS); |
177 |
> |
assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS); |
178 |
|
} |
179 |
|
|
180 |
|
try { |
198 |
|
|
199 |
|
abstract static class BinaryAsyncAction extends ForkJoinTask<Void> { |
200 |
|
|
201 |
< |
private BinaryAsyncAction parent; |
201 |
> |
private volatile BinaryAsyncAction parent; |
202 |
|
|
203 |
< |
private BinaryAsyncAction sibling; |
203 |
> |
private volatile BinaryAsyncAction sibling; |
204 |
|
|
205 |
|
protected BinaryAsyncAction() { |
206 |
|
setForkJoinTaskTag(INITIAL_STATE); |
243 |
|
super.completeExceptionally(ex); |
244 |
|
} |
245 |
|
|
246 |
+ |
public boolean cancel(boolean mayInterruptIfRunning) { |
247 |
+ |
if (super.cancel(mayInterruptIfRunning)) { |
248 |
+ |
completeExceptionally(new FJException()); |
249 |
+ |
return true; |
250 |
+ |
} |
251 |
+ |
return false; |
252 |
+ |
} |
253 |
+ |
|
254 |
|
public final void complete() { |
255 |
|
BinaryAsyncAction a = this; |
256 |
|
for (;;) { |
273 |
|
} |
274 |
|
|
275 |
|
public final void completeExceptionally(Throwable ex) { |
276 |
< |
BinaryAsyncAction a = this; |
271 |
< |
while (!a.isCompletedAbnormally()) { |
276 |
> |
for (BinaryAsyncAction a = this;;) { |
277 |
|
a.completeThisExceptionally(ex); |
278 |
|
BinaryAsyncAction s = a.sibling; |
279 |
< |
if (s != null) |
280 |
< |
s.cancel(false); |
281 |
< |
if (!a.onException() || (a = a.parent) == null) |
279 |
> |
if (s != null && !s.isDone()) |
280 |
> |
s.completeExceptionally(ex); |
281 |
> |
if ((a = a.parent) == null) |
282 |
|
break; |
283 |
|
} |
284 |
|
} |
325 |
|
catch (Throwable ex) { |
326 |
|
compareAndSetForkJoinTaskTag(INITIAL_STATE, EXCEPTION_STATE); |
327 |
|
} |
328 |
+ |
if (getForkJoinTaskTag() == EXCEPTION_STATE) |
329 |
+ |
throw new FJException(); |
330 |
|
return false; |
331 |
|
} |
332 |
|
|
348 |
|
} |
349 |
|
|
350 |
|
public final boolean exec() { |
351 |
< |
FailingAsyncFib f = this; |
352 |
< |
int n = f.number; |
353 |
< |
if (n > 1) { |
354 |
< |
while (n > 1) { |
355 |
< |
FailingAsyncFib p = f; |
356 |
< |
FailingAsyncFib r = new FailingAsyncFib(n - 2); |
357 |
< |
f = new FailingAsyncFib(--n); |
358 |
< |
p.linkSubtasks(r, f); |
359 |
< |
r.fork(); |
351 |
> |
try { |
352 |
> |
FailingAsyncFib f = this; |
353 |
> |
int n = f.number; |
354 |
> |
if (n > 1) { |
355 |
> |
while (n > 1) { |
356 |
> |
FailingAsyncFib p = f; |
357 |
> |
FailingAsyncFib r = new FailingAsyncFib(n - 2); |
358 |
> |
f = new FailingAsyncFib(--n); |
359 |
> |
p.linkSubtasks(r, f); |
360 |
> |
r.fork(); |
361 |
> |
} |
362 |
> |
f.number = n; |
363 |
|
} |
364 |
< |
f.number = n; |
364 |
> |
f.complete(); |
365 |
> |
} |
366 |
> |
catch (Throwable ex) { |
367 |
> |
compareAndSetForkJoinTaskTag(INITIAL_STATE, EXCEPTION_STATE); |
368 |
|
} |
369 |
< |
f.complete(); |
369 |
> |
if (getForkJoinTaskTag() == EXCEPTION_STATE) |
370 |
> |
throw new FJException(); |
371 |
|
return false; |
372 |
|
} |
373 |
|
|
1169 |
|
} |
1170 |
|
|
1171 |
|
// jdk9 |
1172 |
< |
|
1172 |
> |
|
1173 |
|
/** |
1174 |
|
* pollSubmission returns unexecuted submitted task, if present |
1175 |
|
*/ |
1179 |
|
final ForkJoinTask b = ForkJoinTask.adapt(awaiter(done)); |
1180 |
|
final ForkJoinTask c = ForkJoinTask.adapt(awaiter(done)); |
1181 |
|
final ForkJoinPool p = singletonPool(); |
1182 |
< |
Thread external = new Thread() { |
1183 |
< |
public void run() { |
1182 |
> |
try (PoolCleaner cleaner = cleaner(p, done)) { |
1183 |
> |
Thread external = new Thread(new CheckedRunnable() { |
1184 |
> |
public void realRun() { |
1185 |
|
p.execute(a); |
1186 |
|
p.execute(b); |
1187 |
|
p.execute(c); |
1188 |
< |
}}; |
1189 |
< |
RecursiveAction s = new CheckedRecursiveAction() { |
1188 |
> |
}}); |
1189 |
> |
RecursiveAction s = new CheckedRecursiveAction() { |
1190 |
|
protected void realCompute() { |
1191 |
|
external.start(); |
1192 |
|
try { |
1193 |
|
external.join(); |
1194 |
< |
} catch(Exception ex) { |
1194 |
> |
} catch (Exception ex) { |
1195 |
|
threadUnexpectedException(ex); |
1196 |
|
} |
1197 |
|
assertTrue(p.hasQueuedSubmissions()); |
1200 |
|
assertTrue(r == a || r == b || r == c); |
1201 |
|
assertFalse(r.isDone()); |
1202 |
|
}}; |
1188 |
– |
try { |
1203 |
|
p.invoke(s); |
1190 |
– |
} finally { |
1191 |
– |
done.countDown(); |
1192 |
– |
joinPool(p); |
1204 |
|
} |
1205 |
|
} |
1206 |
|
|
1196 |
– |
|
1207 |
|
} |