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; |
269 |
< |
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 |
|
} |
310 |
|
try { |
311 |
|
AsyncFib f = this; |
312 |
|
int n = f.number; |
313 |
< |
if (n > 1) { |
314 |
< |
while (n > 1) { |
315 |
< |
AsyncFib p = f; |
316 |
< |
AsyncFib r = new AsyncFib(n - 2); |
317 |
< |
f = new AsyncFib(--n); |
318 |
< |
p.linkSubtasks(r, f); |
312 |
< |
r.fork(); |
313 |
< |
} |
314 |
< |
f.number = n; |
313 |
> |
while (n > 1) { |
314 |
> |
AsyncFib p = f; |
315 |
> |
AsyncFib r = new AsyncFib(n - 2); |
316 |
> |
f = new AsyncFib(--n); |
317 |
> |
p.linkSubtasks(r, f); |
318 |
> |
r.fork(); |
319 |
|
} |
320 |
|
f.complete(); |
321 |
|
} |
322 |
|
catch (Throwable ex) { |
323 |
|
compareAndSetForkJoinTaskTag(INITIAL_STATE, EXCEPTION_STATE); |
324 |
|
} |
325 |
+ |
if (getForkJoinTaskTag() == EXCEPTION_STATE) |
326 |
+ |
throw new FJException(); |
327 |
|
return false; |
328 |
|
} |
329 |
|
|
345 |
|
} |
346 |
|
|
347 |
|
public final boolean exec() { |
348 |
< |
FailingAsyncFib f = this; |
349 |
< |
int n = f.number; |
350 |
< |
if (n > 1) { |
348 |
> |
try { |
349 |
> |
FailingAsyncFib f = this; |
350 |
> |
int n = f.number; |
351 |
|
while (n > 1) { |
352 |
|
FailingAsyncFib p = f; |
353 |
|
FailingAsyncFib r = new FailingAsyncFib(n - 2); |
355 |
|
p.linkSubtasks(r, f); |
356 |
|
r.fork(); |
357 |
|
} |
358 |
< |
f.number = n; |
358 |
> |
f.complete(); |
359 |
> |
} |
360 |
> |
catch (Throwable ex) { |
361 |
> |
compareAndSetForkJoinTaskTag(INITIAL_STATE, EXCEPTION_STATE); |
362 |
|
} |
363 |
< |
f.complete(); |
363 |
> |
if (getForkJoinTaskTag() == EXCEPTION_STATE) |
364 |
> |
throw new FJException(); |
365 |
|
return false; |
366 |
|
} |
367 |
|
|
921 |
|
AsyncFib f = new AsyncFib(8); |
922 |
|
FailingAsyncFib g = new FailingAsyncFib(9); |
923 |
|
ForkJoinTask[] tasks = { f, g }; |
924 |
< |
Collections.shuffle(Arrays.asList(tasks)); |
924 |
> |
shuffle(tasks); |
925 |
|
try { |
926 |
|
invokeAll(tasks[0], tasks[1]); |
927 |
|
shouldThrow(); |
948 |
|
FailingAsyncFib g = new FailingAsyncFib(9); |
949 |
|
AsyncFib h = new AsyncFib(7); |
950 |
|
ForkJoinTask[] tasks = { f, g, h }; |
951 |
< |
Collections.shuffle(Arrays.asList(tasks)); |
951 |
> |
shuffle(tasks); |
952 |
|
try { |
953 |
|
invokeAll(tasks[0], tasks[1], tasks[2]); |
954 |
|
shouldThrow(); |
975 |
|
AsyncFib g = new AsyncFib(9); |
976 |
|
AsyncFib h = new AsyncFib(7); |
977 |
|
ForkJoinTask[] tasks = { f, g, h }; |
978 |
< |
Collections.shuffle(Arrays.asList(tasks)); |
978 |
> |
shuffle(tasks); |
979 |
|
try { |
980 |
|
invokeAll(Arrays.asList(tasks)); |
981 |
|
shouldThrow(); |
1173 |
|
final ForkJoinTask b = ForkJoinTask.adapt(awaiter(done)); |
1174 |
|
final ForkJoinTask c = ForkJoinTask.adapt(awaiter(done)); |
1175 |
|
final ForkJoinPool p = singletonPool(); |
1176 |
< |
try (PoolCleaner cleaner = cleaner(p)) { |
1176 |
> |
try (PoolCleaner cleaner = cleaner(p, done)) { |
1177 |
|
Thread external = new Thread(new CheckedRunnable() { |
1178 |
|
public void realRun() { |
1179 |
|
p.execute(a); |
1195 |
|
assertFalse(r.isDone()); |
1196 |
|
}}; |
1197 |
|
p.invoke(s); |
1188 |
– |
done.countDown(); |
1198 |
|
} |
1199 |
|
} |
1200 |
|
|