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 |
|
} |
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 |
|
|
1179 |
|
final ForkJoinTask b = ForkJoinTask.adapt(awaiter(done)); |
1180 |
|
final ForkJoinTask c = ForkJoinTask.adapt(awaiter(done)); |
1181 |
|
final ForkJoinPool p = singletonPool(); |
1182 |
< |
try (PoolCleaner cleaner = cleaner(p)) { |
1182 |
> |
try (PoolCleaner cleaner = cleaner(p, done)) { |
1183 |
|
Thread external = new Thread(new CheckedRunnable() { |
1184 |
|
public void realRun() { |
1185 |
|
p.execute(a); |
1201 |
|
assertFalse(r.isDone()); |
1202 |
|
}}; |
1203 |
|
p.invoke(s); |
1188 |
– |
done.countDown(); |
1204 |
|
} |
1205 |
|
} |
1206 |
|
|