1 |
|
/* |
2 |
|
* Written by Doug Lea with assistance from members of JCP JSR-166 |
3 |
|
* Expert Group and released to the public domain, as explained at |
4 |
< |
* http://creativecommons.org/licenses/publicdomain |
4 |
> |
* http://creativecommons.org/publicdomain/zero/1.0/ |
5 |
|
*/ |
6 |
– |
import junit.framework.*; |
7 |
– |
import java.util.concurrent.*; |
8 |
– |
import java.util.*; |
6 |
|
|
7 |
+ |
import junit.framework.*; |
8 |
+ |
import java.util.concurrent.CancellationException; |
9 |
+ |
import java.util.concurrent.SynchronousQueue; |
10 |
+ |
import java.util.concurrent.ExecutionException; |
11 |
+ |
import java.util.concurrent.ForkJoinPool; |
12 |
+ |
import java.util.concurrent.ForkJoinTask; |
13 |
+ |
import java.util.concurrent.ForkJoinWorkerThread; |
14 |
+ |
import java.util.concurrent.RecursiveAction; |
15 |
+ |
import java.util.concurrent.TimeUnit; |
16 |
+ |
import java.util.concurrent.TimeoutException; |
17 |
+ |
import static java.util.concurrent.TimeUnit.SECONDS; |
18 |
+ |
import java.util.HashSet; |
19 |
|
|
20 |
|
public class RecursiveActionTest extends JSR166TestCase { |
21 |
|
|
22 |
|
public static void main(String[] args) { |
23 |
< |
junit.textui.TestRunner.run (suite()); |
23 |
> |
junit.textui.TestRunner.run(suite()); |
24 |
|
} |
25 |
+ |
|
26 |
|
public static Test suite() { |
27 |
|
return new TestSuite(RecursiveActionTest.class); |
28 |
|
} |
29 |
|
|
30 |
< |
static final ForkJoinPool mainPool = new ForkJoinPool(); |
31 |
< |
static final ForkJoinPool singletonPool = new ForkJoinPool(1); |
32 |
< |
static final ForkJoinPool asyncSingletonPool = |
33 |
< |
new ForkJoinPool(1, ForkJoinPool.defaultForkJoinWorkerThreadFactory, |
34 |
< |
null, true); |
30 |
> |
private static ForkJoinPool mainPool() { |
31 |
> |
return new ForkJoinPool(); |
32 |
> |
} |
33 |
> |
|
34 |
> |
private static ForkJoinPool singletonPool() { |
35 |
> |
return new ForkJoinPool(1); |
36 |
> |
} |
37 |
> |
|
38 |
> |
private static ForkJoinPool asyncSingletonPool() { |
39 |
> |
return new ForkJoinPool(1, |
40 |
> |
ForkJoinPool.defaultForkJoinWorkerThreadFactory, |
41 |
> |
null, true); |
42 |
> |
} |
43 |
> |
|
44 |
> |
private void testInvokeOnPool(ForkJoinPool pool, RecursiveAction a) { |
45 |
> |
try { |
46 |
> |
checkNotDone(a); |
47 |
> |
|
48 |
> |
assertNull(pool.invoke(a)); |
49 |
> |
|
50 |
> |
checkCompletedNormally(a); |
51 |
> |
} finally { |
52 |
> |
joinPool(pool); |
53 |
> |
} |
54 |
> |
} |
55 |
> |
|
56 |
> |
void checkNotDone(RecursiveAction a) { |
57 |
> |
assertFalse(a.isDone()); |
58 |
> |
assertFalse(a.isCompletedNormally()); |
59 |
> |
assertFalse(a.isCompletedAbnormally()); |
60 |
> |
assertFalse(a.isCancelled()); |
61 |
> |
assertNull(a.getException()); |
62 |
> |
assertNull(a.getRawResult()); |
63 |
> |
|
64 |
> |
if (! ForkJoinTask.inForkJoinPool()) { |
65 |
> |
Thread.currentThread().interrupt(); |
66 |
> |
try { |
67 |
> |
a.get(); |
68 |
> |
shouldThrow(); |
69 |
> |
} catch (InterruptedException success) { |
70 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
71 |
> |
|
72 |
> |
Thread.currentThread().interrupt(); |
73 |
> |
try { |
74 |
> |
a.get(5L, SECONDS); |
75 |
> |
shouldThrow(); |
76 |
> |
} catch (InterruptedException success) { |
77 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
78 |
> |
} |
79 |
> |
|
80 |
> |
try { |
81 |
> |
a.get(0L, SECONDS); |
82 |
> |
shouldThrow(); |
83 |
> |
} catch (TimeoutException success) { |
84 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
85 |
> |
} |
86 |
> |
|
87 |
> |
void checkCompletedNormally(RecursiveAction a) { |
88 |
> |
assertTrue(a.isDone()); |
89 |
> |
assertFalse(a.isCancelled()); |
90 |
> |
assertTrue(a.isCompletedNormally()); |
91 |
> |
assertFalse(a.isCompletedAbnormally()); |
92 |
> |
assertNull(a.getException()); |
93 |
> |
assertNull(a.getRawResult()); |
94 |
> |
assertNull(a.join()); |
95 |
> |
assertFalse(a.cancel(false)); |
96 |
> |
assertFalse(a.cancel(true)); |
97 |
> |
try { |
98 |
> |
assertNull(a.get()); |
99 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
100 |
> |
try { |
101 |
> |
assertNull(a.get(5L, SECONDS)); |
102 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
103 |
> |
} |
104 |
> |
|
105 |
> |
void checkCancelled(RecursiveAction a) { |
106 |
> |
assertTrue(a.isDone()); |
107 |
> |
assertTrue(a.isCancelled()); |
108 |
> |
assertFalse(a.isCompletedNormally()); |
109 |
> |
assertTrue(a.isCompletedAbnormally()); |
110 |
> |
assertTrue(a.getException() instanceof CancellationException); |
111 |
> |
assertNull(a.getRawResult()); |
112 |
> |
|
113 |
> |
try { |
114 |
> |
a.join(); |
115 |
> |
shouldThrow(); |
116 |
> |
} catch (CancellationException success) { |
117 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
118 |
> |
|
119 |
> |
try { |
120 |
> |
a.get(); |
121 |
> |
shouldThrow(); |
122 |
> |
} catch (CancellationException success) { |
123 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
124 |
> |
|
125 |
> |
try { |
126 |
> |
a.get(5L, SECONDS); |
127 |
> |
shouldThrow(); |
128 |
> |
} catch (CancellationException success) { |
129 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
130 |
> |
} |
131 |
> |
|
132 |
> |
void checkCompletedAbnormally(RecursiveAction a, Throwable t) { |
133 |
> |
assertTrue(a.isDone()); |
134 |
> |
assertFalse(a.isCancelled()); |
135 |
> |
assertFalse(a.isCompletedNormally()); |
136 |
> |
assertTrue(a.isCompletedAbnormally()); |
137 |
> |
assertSame(t.getClass(), a.getException().getClass()); |
138 |
> |
assertNull(a.getRawResult()); |
139 |
> |
assertFalse(a.cancel(false)); |
140 |
> |
assertFalse(a.cancel(true)); |
141 |
> |
|
142 |
> |
try { |
143 |
> |
a.join(); |
144 |
> |
shouldThrow(); |
145 |
> |
} catch (Throwable expected) { |
146 |
> |
assertSame(expected.getClass(), t.getClass()); |
147 |
> |
} |
148 |
|
|
149 |
< |
static final class FJException extends RuntimeException { |
150 |
< |
FJException() { super(); } |
149 |
> |
try { |
150 |
> |
a.get(); |
151 |
> |
shouldThrow(); |
152 |
> |
} catch (ExecutionException success) { |
153 |
> |
assertSame(t.getClass(), success.getCause().getClass()); |
154 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
155 |
> |
|
156 |
> |
try { |
157 |
> |
a.get(5L, SECONDS); |
158 |
> |
shouldThrow(); |
159 |
> |
} catch (ExecutionException success) { |
160 |
> |
assertSame(t.getClass(), success.getCause().getClass()); |
161 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
162 |
> |
} |
163 |
> |
|
164 |
> |
public static final class FJException extends RuntimeException { |
165 |
> |
public FJException() { super(); } |
166 |
> |
public FJException(Throwable cause) { super(cause); } |
167 |
|
} |
168 |
|
|
169 |
|
// A simple recursive action for testing |
170 |
< |
static final class FibAction extends RecursiveAction { |
170 |
> |
final class FibAction extends CheckedRecursiveAction { |
171 |
|
final int number; |
172 |
|
int result; |
173 |
|
FibAction(int n) { number = n; } |
174 |
< |
public void compute() { |
174 |
> |
public void realCompute() { |
175 |
|
int n = number; |
176 |
|
if (n <= 1) |
177 |
|
result = n; |
206 |
|
* invoke returns when task completes normally. |
207 |
|
* isCompletedAbnormally and isCancelled return false for normally |
208 |
|
* completed tasks. getRawResult of a RecursiveAction returns null; |
70 |
– |
* |
209 |
|
*/ |
210 |
|
public void testInvoke() { |
211 |
< |
RecursiveAction a = new RecursiveAction() { |
212 |
< |
public void compute() { |
211 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
212 |
> |
public void realCompute() { |
213 |
|
FibAction f = new FibAction(8); |
214 |
< |
f.invoke(); |
215 |
< |
threadAssertTrue(f.result == 21); |
216 |
< |
threadAssertTrue(f.isDone()); |
79 |
< |
threadAssertFalse(f.isCancelled()); |
80 |
< |
threadAssertFalse(f.isCompletedAbnormally()); |
81 |
< |
threadAssertTrue(f.getRawResult() == null); |
214 |
> |
assertNull(f.invoke()); |
215 |
> |
assertEquals(21, f.result); |
216 |
> |
checkCompletedNormally(f); |
217 |
|
}}; |
218 |
< |
mainPool.invoke(a); |
218 |
> |
testInvokeOnPool(mainPool(), a); |
219 |
|
} |
220 |
|
|
221 |
|
/** |
224 |
|
* completed tasks |
225 |
|
*/ |
226 |
|
public void testQuietlyInvoke() { |
227 |
< |
RecursiveAction a = new RecursiveAction() { |
228 |
< |
public void compute() { |
227 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
228 |
> |
public void realCompute() { |
229 |
|
FibAction f = new FibAction(8); |
230 |
|
f.quietlyInvoke(); |
231 |
< |
threadAssertTrue(f.result == 21); |
232 |
< |
threadAssertTrue(f.isDone()); |
98 |
< |
threadAssertFalse(f.isCancelled()); |
99 |
< |
threadAssertFalse(f.isCompletedAbnormally()); |
100 |
< |
threadAssertTrue(f.getRawResult() == null); |
231 |
> |
assertEquals(21, f.result); |
232 |
> |
checkCompletedNormally(f); |
233 |
|
}}; |
234 |
< |
mainPool.invoke(a); |
234 |
> |
testInvokeOnPool(mainPool(), a); |
235 |
|
} |
236 |
|
|
237 |
|
/** |
238 |
|
* join of a forked task returns when task completes |
239 |
|
*/ |
240 |
|
public void testForkJoin() { |
241 |
< |
RecursiveAction a = new RecursiveAction() { |
242 |
< |
public void compute() { |
241 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
242 |
> |
public void realCompute() { |
243 |
|
FibAction f = new FibAction(8); |
244 |
< |
f.fork(); |
245 |
< |
f.join(); |
246 |
< |
threadAssertTrue(f.result == 21); |
247 |
< |
threadAssertTrue(f.isDone()); |
116 |
< |
threadAssertTrue(f.getRawResult() == null); |
244 |
> |
assertSame(f, f.fork()); |
245 |
> |
assertNull(f.join()); |
246 |
> |
assertEquals(21, f.result); |
247 |
> |
checkCompletedNormally(f); |
248 |
|
}}; |
249 |
< |
mainPool.invoke(a); |
249 |
> |
testInvokeOnPool(mainPool(), a); |
250 |
|
} |
251 |
|
|
252 |
|
/** |
253 |
< |
* get of a forked task returns when task completes |
253 |
> |
* join/quietlyJoin of a forked task succeeds in the presence of interrupts |
254 |
|
*/ |
255 |
< |
public void testForkGet() { |
256 |
< |
RecursiveAction a = new RecursiveAction() { |
257 |
< |
public void compute() { |
255 |
> |
public void testJoinIgnoresInterrupts() { |
256 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
257 |
> |
public void realCompute() { |
258 |
> |
FibAction f = new FibAction(8); |
259 |
> |
final Thread myself = Thread.currentThread(); |
260 |
> |
|
261 |
> |
// test join() |
262 |
> |
assertSame(f, f.fork()); |
263 |
> |
myself.interrupt(); |
264 |
> |
assertTrue(myself.isInterrupted()); |
265 |
> |
assertNull(f.join()); |
266 |
> |
Thread.interrupted(); |
267 |
> |
assertEquals(21, f.result); |
268 |
> |
checkCompletedNormally(f); |
269 |
> |
|
270 |
> |
f = new FibAction(8); |
271 |
> |
f.cancel(true); |
272 |
> |
assertSame(f, f.fork()); |
273 |
> |
myself.interrupt(); |
274 |
> |
assertTrue(myself.isInterrupted()); |
275 |
|
try { |
276 |
< |
FibAction f = new FibAction(8); |
277 |
< |
f.fork(); |
278 |
< |
f.get(); |
279 |
< |
threadAssertTrue(f.result == 21); |
280 |
< |
threadAssertTrue(f.isDone()); |
281 |
< |
} catch (Exception ex) { |
282 |
< |
unexpectedException(ex); |
276 |
> |
f.join(); |
277 |
> |
shouldThrow(); |
278 |
> |
} catch (CancellationException success) { |
279 |
> |
Thread.interrupted(); |
280 |
> |
checkCancelled(f); |
281 |
> |
} |
282 |
> |
|
283 |
> |
f = new FibAction(8); |
284 |
> |
f.completeExceptionally(new FJException()); |
285 |
> |
assertSame(f, f.fork()); |
286 |
> |
myself.interrupt(); |
287 |
> |
assertTrue(myself.isInterrupted()); |
288 |
> |
try { |
289 |
> |
f.join(); |
290 |
> |
shouldThrow(); |
291 |
> |
} catch (FJException success) { |
292 |
> |
Thread.interrupted(); |
293 |
> |
checkCompletedAbnormally(f, success); |
294 |
|
} |
295 |
+ |
|
296 |
+ |
// test quietlyJoin() |
297 |
+ |
f = new FibAction(8); |
298 |
+ |
assertSame(f, f.fork()); |
299 |
+ |
myself.interrupt(); |
300 |
+ |
assertTrue(myself.isInterrupted()); |
301 |
+ |
f.quietlyJoin(); |
302 |
+ |
Thread.interrupted(); |
303 |
+ |
assertEquals(21, f.result); |
304 |
+ |
checkCompletedNormally(f); |
305 |
+ |
|
306 |
+ |
f = new FibAction(8); |
307 |
+ |
f.cancel(true); |
308 |
+ |
assertSame(f, f.fork()); |
309 |
+ |
myself.interrupt(); |
310 |
+ |
assertTrue(myself.isInterrupted()); |
311 |
+ |
f.quietlyJoin(); |
312 |
+ |
Thread.interrupted(); |
313 |
+ |
checkCancelled(f); |
314 |
+ |
|
315 |
+ |
f = new FibAction(8); |
316 |
+ |
f.completeExceptionally(new FJException()); |
317 |
+ |
assertSame(f, f.fork()); |
318 |
+ |
myself.interrupt(); |
319 |
+ |
assertTrue(myself.isInterrupted()); |
320 |
+ |
f.quietlyJoin(); |
321 |
+ |
Thread.interrupted(); |
322 |
+ |
checkCompletedAbnormally(f, f.getException()); |
323 |
|
}}; |
324 |
< |
mainPool.invoke(a); |
324 |
> |
testInvokeOnPool(mainPool(), a); |
325 |
> |
a.reinitialize(); |
326 |
> |
testInvokeOnPool(singletonPool(), a); |
327 |
|
} |
328 |
|
|
329 |
|
/** |
330 |
< |
* timed get of a forked task returns when task completes |
330 |
> |
* join/quietlyJoin of a forked task when not in ForkJoinPool |
331 |
> |
* succeeds in the presence of interrupts |
332 |
|
*/ |
333 |
< |
public void testForkTimedGet() { |
334 |
< |
RecursiveAction a = new RecursiveAction() { |
335 |
< |
public void compute() { |
333 |
> |
public void testJoinIgnoresInterruptsOutsideForkJoinPool() { |
334 |
> |
final SynchronousQueue<FibAction[]> sq = |
335 |
> |
new SynchronousQueue<FibAction[]>(); |
336 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
337 |
> |
public void realCompute() throws InterruptedException { |
338 |
> |
FibAction[] fibActions = new FibAction[6]; |
339 |
> |
for (int i = 0; i < fibActions.length; i++) |
340 |
> |
fibActions[i] = new FibAction(8); |
341 |
> |
|
342 |
> |
fibActions[1].cancel(false); |
343 |
> |
fibActions[2].completeExceptionally(new FJException()); |
344 |
> |
fibActions[4].cancel(true); |
345 |
> |
fibActions[5].completeExceptionally(new FJException()); |
346 |
> |
|
347 |
> |
for (int i = 0; i < fibActions.length; i++) |
348 |
> |
fibActions[i].fork(); |
349 |
> |
|
350 |
> |
sq.put(fibActions); |
351 |
> |
|
352 |
> |
helpQuiesce(); |
353 |
> |
}}; |
354 |
> |
|
355 |
> |
Runnable r = new CheckedRunnable() { |
356 |
> |
public void realRun() throws InterruptedException { |
357 |
> |
FibAction[] fibActions = sq.take(); |
358 |
> |
FibAction f; |
359 |
> |
final Thread myself = Thread.currentThread(); |
360 |
> |
|
361 |
> |
// test join() ------------ |
362 |
> |
|
363 |
> |
f = fibActions[0]; |
364 |
> |
assertFalse(ForkJoinTask.inForkJoinPool()); |
365 |
> |
myself.interrupt(); |
366 |
> |
assertTrue(myself.isInterrupted()); |
367 |
> |
assertNull(f.join()); |
368 |
> |
assertTrue(Thread.interrupted()); |
369 |
> |
assertEquals(21, f.result); |
370 |
> |
checkCompletedNormally(f); |
371 |
> |
|
372 |
> |
f = fibActions[1]; |
373 |
> |
myself.interrupt(); |
374 |
> |
assertTrue(myself.isInterrupted()); |
375 |
|
try { |
376 |
< |
FibAction f = new FibAction(8); |
377 |
< |
f.fork(); |
378 |
< |
f.get(5L, TimeUnit.SECONDS); |
379 |
< |
threadAssertTrue(f.result == 21); |
380 |
< |
threadAssertTrue(f.isDone()); |
381 |
< |
} catch (Exception ex) { |
382 |
< |
unexpectedException(ex); |
376 |
> |
f.join(); |
377 |
> |
shouldThrow(); |
378 |
> |
} catch (CancellationException success) { |
379 |
> |
assertTrue(Thread.interrupted()); |
380 |
> |
checkCancelled(f); |
381 |
> |
} |
382 |
> |
|
383 |
> |
f = fibActions[2]; |
384 |
> |
myself.interrupt(); |
385 |
> |
assertTrue(myself.isInterrupted()); |
386 |
> |
try { |
387 |
> |
f.join(); |
388 |
> |
shouldThrow(); |
389 |
> |
} catch (FJException success) { |
390 |
> |
assertTrue(Thread.interrupted()); |
391 |
> |
checkCompletedAbnormally(f, success); |
392 |
|
} |
393 |
+ |
|
394 |
+ |
// test quietlyJoin() --------- |
395 |
+ |
|
396 |
+ |
f = fibActions[3]; |
397 |
+ |
myself.interrupt(); |
398 |
+ |
assertTrue(myself.isInterrupted()); |
399 |
+ |
f.quietlyJoin(); |
400 |
+ |
assertTrue(Thread.interrupted()); |
401 |
+ |
assertEquals(21, f.result); |
402 |
+ |
checkCompletedNormally(f); |
403 |
+ |
|
404 |
+ |
f = fibActions[4]; |
405 |
+ |
myself.interrupt(); |
406 |
+ |
assertTrue(myself.isInterrupted()); |
407 |
+ |
f.quietlyJoin(); |
408 |
+ |
assertTrue(Thread.interrupted()); |
409 |
+ |
checkCancelled(f); |
410 |
+ |
|
411 |
+ |
f = fibActions[5]; |
412 |
+ |
myself.interrupt(); |
413 |
+ |
assertTrue(myself.isInterrupted()); |
414 |
+ |
f.quietlyJoin(); |
415 |
+ |
assertTrue(Thread.interrupted()); |
416 |
+ |
assertTrue(f.getException() instanceof FJException); |
417 |
+ |
checkCompletedAbnormally(f, f.getException()); |
418 |
+ |
}}; |
419 |
+ |
|
420 |
+ |
Thread t; |
421 |
+ |
|
422 |
+ |
t = newStartedThread(r); |
423 |
+ |
testInvokeOnPool(mainPool(), a); |
424 |
+ |
awaitTermination(t, LONG_DELAY_MS); |
425 |
+ |
|
426 |
+ |
a.reinitialize(); |
427 |
+ |
t = newStartedThread(r); |
428 |
+ |
testInvokeOnPool(singletonPool(), a); |
429 |
+ |
awaitTermination(t, LONG_DELAY_MS); |
430 |
+ |
} |
431 |
+ |
|
432 |
+ |
/** |
433 |
+ |
* get of a forked task returns when task completes |
434 |
+ |
*/ |
435 |
+ |
public void testForkGet() { |
436 |
+ |
RecursiveAction a = new CheckedRecursiveAction() { |
437 |
+ |
public void realCompute() throws Exception { |
438 |
+ |
FibAction f = new FibAction(8); |
439 |
+ |
assertSame(f, f.fork()); |
440 |
+ |
assertNull(f.get()); |
441 |
+ |
assertEquals(21, f.result); |
442 |
+ |
checkCompletedNormally(f); |
443 |
|
}}; |
444 |
< |
mainPool.invoke(a); |
444 |
> |
testInvokeOnPool(mainPool(), a); |
445 |
> |
} |
446 |
> |
|
447 |
> |
/** |
448 |
> |
* timed get of a forked task returns when task completes |
449 |
> |
*/ |
450 |
> |
public void testForkTimedGet() { |
451 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
452 |
> |
public void realCompute() throws Exception { |
453 |
> |
FibAction f = new FibAction(8); |
454 |
> |
assertSame(f, f.fork()); |
455 |
> |
assertNull(f.get(5L, SECONDS)); |
456 |
> |
assertEquals(21, f.result); |
457 |
> |
checkCompletedNormally(f); |
458 |
> |
}}; |
459 |
> |
testInvokeOnPool(mainPool(), a); |
460 |
|
} |
461 |
|
|
462 |
|
/** |
463 |
|
* timed get with null time unit throws NPE |
464 |
|
*/ |
465 |
|
public void testForkTimedGetNPE() { |
466 |
< |
RecursiveAction a = new RecursiveAction() { |
467 |
< |
public void compute() { |
466 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
467 |
> |
public void realCompute() throws Exception { |
468 |
> |
FibAction f = new FibAction(8); |
469 |
> |
assertSame(f, f.fork()); |
470 |
|
try { |
166 |
– |
FibAction f = new FibAction(8); |
167 |
– |
f.fork(); |
471 |
|
f.get(5L, null); |
472 |
|
shouldThrow(); |
473 |
< |
} catch (NullPointerException success) { |
171 |
< |
} catch (Exception ex) { |
172 |
< |
unexpectedException(ex); |
173 |
< |
} |
473 |
> |
} catch (NullPointerException success) {} |
474 |
|
}}; |
475 |
< |
mainPool.invoke(a); |
475 |
> |
testInvokeOnPool(mainPool(), a); |
476 |
|
} |
477 |
|
|
478 |
|
/** |
479 |
|
* quietlyJoin of a forked task returns when task completes |
480 |
|
*/ |
481 |
|
public void testForkQuietlyJoin() { |
482 |
< |
RecursiveAction a = new RecursiveAction() { |
483 |
< |
public void compute() { |
482 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
483 |
> |
public void realCompute() { |
484 |
|
FibAction f = new FibAction(8); |
485 |
< |
f.fork(); |
485 |
> |
assertSame(f, f.fork()); |
486 |
|
f.quietlyJoin(); |
487 |
< |
threadAssertTrue(f.result == 21); |
488 |
< |
threadAssertTrue(f.isDone()); |
487 |
> |
assertEquals(21, f.result); |
488 |
> |
checkCompletedNormally(f); |
489 |
|
}}; |
490 |
< |
mainPool.invoke(a); |
490 |
> |
testInvokeOnPool(mainPool(), a); |
491 |
|
} |
492 |
|
|
193 |
– |
|
493 |
|
/** |
494 |
|
* helpQuiesce returns when tasks are complete. |
495 |
|
* getQueuedTaskCount returns 0 when quiescent |
496 |
|
*/ |
497 |
|
public void testForkHelpQuiesce() { |
498 |
< |
RecursiveAction a = new RecursiveAction() { |
499 |
< |
public void compute() { |
498 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
499 |
> |
public void realCompute() { |
500 |
|
FibAction f = new FibAction(8); |
501 |
< |
f.fork(); |
502 |
< |
f.helpQuiesce(); |
503 |
< |
threadAssertTrue(f.result == 21); |
504 |
< |
threadAssertTrue(f.isDone()); |
505 |
< |
threadAssertTrue(getQueuedTaskCount() == 0); |
501 |
> |
assertSame(f, f.fork()); |
502 |
> |
helpQuiesce(); |
503 |
> |
assertEquals(21, f.result); |
504 |
> |
assertEquals(0, getQueuedTaskCount()); |
505 |
> |
checkCompletedNormally(f); |
506 |
|
}}; |
507 |
< |
mainPool.invoke(a); |
507 |
> |
testInvokeOnPool(mainPool(), a); |
508 |
|
} |
509 |
|
|
211 |
– |
|
510 |
|
/** |
511 |
|
* invoke task throws exception when task completes abnormally |
512 |
|
*/ |
513 |
|
public void testAbnormalInvoke() { |
514 |
< |
RecursiveAction a = new RecursiveAction() { |
515 |
< |
public void compute() { |
514 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
515 |
> |
public void realCompute() { |
516 |
> |
FailingFibAction f = new FailingFibAction(8); |
517 |
|
try { |
219 |
– |
FailingFibAction f = new FailingFibAction(8); |
518 |
|
f.invoke(); |
519 |
|
shouldThrow(); |
520 |
|
} catch (FJException success) { |
521 |
+ |
checkCompletedAbnormally(f, success); |
522 |
|
} |
523 |
|
}}; |
524 |
< |
mainPool.invoke(a); |
524 |
> |
testInvokeOnPool(mainPool(), a); |
525 |
|
} |
526 |
|
|
527 |
|
/** |
528 |
|
* quietlyInvoke task returns when task completes abnormally |
529 |
|
*/ |
530 |
|
public void testAbnormalQuietlyInvoke() { |
531 |
< |
RecursiveAction a = new RecursiveAction() { |
532 |
< |
public void compute() { |
531 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
532 |
> |
public void realCompute() { |
533 |
|
FailingFibAction f = new FailingFibAction(8); |
534 |
|
f.quietlyInvoke(); |
535 |
< |
threadAssertTrue(f.isDone()); |
535 |
> |
assertTrue(f.getException() instanceof FJException); |
536 |
> |
checkCompletedAbnormally(f, f.getException()); |
537 |
|
}}; |
538 |
< |
mainPool.invoke(a); |
538 |
> |
testInvokeOnPool(mainPool(), a); |
539 |
|
} |
540 |
|
|
541 |
|
/** |
542 |
|
* join of a forked task throws exception when task completes abnormally |
543 |
|
*/ |
544 |
|
public void testAbnormalForkJoin() { |
545 |
< |
RecursiveAction a = new RecursiveAction() { |
546 |
< |
public void compute() { |
545 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
546 |
> |
public void realCompute() { |
547 |
> |
FailingFibAction f = new FailingFibAction(8); |
548 |
> |
assertSame(f, f.fork()); |
549 |
|
try { |
248 |
– |
FailingFibAction f = new FailingFibAction(8); |
249 |
– |
f.fork(); |
550 |
|
f.join(); |
551 |
|
shouldThrow(); |
552 |
|
} catch (FJException success) { |
553 |
+ |
checkCompletedAbnormally(f, success); |
554 |
|
} |
555 |
|
}}; |
556 |
< |
mainPool.invoke(a); |
556 |
> |
testInvokeOnPool(mainPool(), a); |
557 |
|
} |
558 |
|
|
559 |
|
/** |
560 |
|
* get of a forked task throws exception when task completes abnormally |
561 |
|
*/ |
562 |
|
public void testAbnormalForkGet() { |
563 |
< |
RecursiveAction a = new RecursiveAction() { |
564 |
< |
public void compute() { |
563 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
564 |
> |
public void realCompute() throws Exception { |
565 |
> |
FailingFibAction f = new FailingFibAction(8); |
566 |
> |
assertSame(f, f.fork()); |
567 |
|
try { |
265 |
– |
FailingFibAction f = new FailingFibAction(8); |
266 |
– |
f.fork(); |
568 |
|
f.get(); |
569 |
|
shouldThrow(); |
570 |
|
} catch (ExecutionException success) { |
571 |
< |
} catch (Exception ex) { |
572 |
< |
unexpectedException(ex); |
571 |
> |
Throwable cause = success.getCause(); |
572 |
> |
assertTrue(cause instanceof FJException); |
573 |
> |
checkCompletedAbnormally(f, cause); |
574 |
|
} |
575 |
|
}}; |
576 |
< |
mainPool.invoke(a); |
576 |
> |
testInvokeOnPool(mainPool(), a); |
577 |
|
} |
578 |
|
|
579 |
|
/** |
580 |
|
* timed get of a forked task throws exception when task completes abnormally |
581 |
|
*/ |
582 |
|
public void testAbnormalForkTimedGet() { |
583 |
< |
RecursiveAction a = new RecursiveAction() { |
584 |
< |
public void compute() { |
583 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
584 |
> |
public void realCompute() throws Exception { |
585 |
> |
FailingFibAction f = new FailingFibAction(8); |
586 |
> |
assertSame(f, f.fork()); |
587 |
|
try { |
284 |
– |
FailingFibAction f = new FailingFibAction(8); |
285 |
– |
f.fork(); |
588 |
|
f.get(5L, TimeUnit.SECONDS); |
589 |
|
shouldThrow(); |
590 |
|
} catch (ExecutionException success) { |
591 |
< |
} catch (Exception ex) { |
592 |
< |
unexpectedException(ex); |
591 |
> |
Throwable cause = success.getCause(); |
592 |
> |
assertTrue(cause instanceof FJException); |
593 |
> |
checkCompletedAbnormally(f, cause); |
594 |
|
} |
595 |
|
}}; |
596 |
< |
mainPool.invoke(a); |
596 |
> |
testInvokeOnPool(mainPool(), a); |
597 |
|
} |
598 |
|
|
599 |
|
/** |
600 |
|
* quietlyJoin of a forked task returns when task completes abnormally |
601 |
|
*/ |
602 |
|
public void testAbnormalForkQuietlyJoin() { |
603 |
< |
RecursiveAction a = new RecursiveAction() { |
604 |
< |
public void compute() { |
603 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
604 |
> |
public void realCompute() { |
605 |
|
FailingFibAction f = new FailingFibAction(8); |
606 |
< |
f.fork(); |
606 |
> |
assertSame(f, f.fork()); |
607 |
|
f.quietlyJoin(); |
608 |
< |
threadAssertTrue(f.isDone()); |
609 |
< |
threadAssertTrue(f.isCompletedAbnormally()); |
307 |
< |
threadAssertTrue(f.getException() instanceof FJException); |
608 |
> |
assertTrue(f.getException() instanceof FJException); |
609 |
> |
checkCompletedAbnormally(f, f.getException()); |
610 |
|
}}; |
611 |
< |
mainPool.invoke(a); |
611 |
> |
testInvokeOnPool(mainPool(), a); |
612 |
|
} |
613 |
|
|
614 |
|
/** |
615 |
|
* invoke task throws exception when task cancelled |
616 |
|
*/ |
617 |
|
public void testCancelledInvoke() { |
618 |
< |
RecursiveAction a = new RecursiveAction() { |
619 |
< |
public void compute() { |
618 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
619 |
> |
public void realCompute() { |
620 |
> |
FibAction f = new FibAction(8); |
621 |
> |
assertTrue(f.cancel(true)); |
622 |
|
try { |
319 |
– |
FibAction f = new FibAction(8); |
320 |
– |
f.cancel(true); |
623 |
|
f.invoke(); |
624 |
|
shouldThrow(); |
625 |
|
} catch (CancellationException success) { |
626 |
+ |
checkCancelled(f); |
627 |
|
} |
628 |
|
}}; |
629 |
< |
mainPool.invoke(a); |
629 |
> |
testInvokeOnPool(mainPool(), a); |
630 |
|
} |
631 |
|
|
632 |
|
/** |
633 |
|
* join of a forked task throws exception when task cancelled |
634 |
|
*/ |
635 |
|
public void testCancelledForkJoin() { |
636 |
< |
RecursiveAction a = new RecursiveAction() { |
637 |
< |
public void compute() { |
636 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
637 |
> |
public void realCompute() { |
638 |
> |
FibAction f = new FibAction(8); |
639 |
> |
assertTrue(f.cancel(true)); |
640 |
> |
assertSame(f, f.fork()); |
641 |
|
try { |
336 |
– |
FibAction f = new FibAction(8); |
337 |
– |
f.cancel(true); |
338 |
– |
f.fork(); |
642 |
|
f.join(); |
643 |
|
shouldThrow(); |
644 |
|
} catch (CancellationException success) { |
645 |
+ |
checkCancelled(f); |
646 |
|
} |
647 |
|
}}; |
648 |
< |
mainPool.invoke(a); |
648 |
> |
testInvokeOnPool(mainPool(), a); |
649 |
|
} |
650 |
|
|
651 |
|
/** |
652 |
|
* get of a forked task throws exception when task cancelled |
653 |
|
*/ |
654 |
|
public void testCancelledForkGet() { |
655 |
< |
RecursiveAction a = new RecursiveAction() { |
656 |
< |
public void compute() { |
655 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
656 |
> |
public void realCompute() throws Exception { |
657 |
> |
FibAction f = new FibAction(8); |
658 |
> |
assertTrue(f.cancel(true)); |
659 |
> |
assertSame(f, f.fork()); |
660 |
|
try { |
354 |
– |
FibAction f = new FibAction(8); |
355 |
– |
f.cancel(true); |
356 |
– |
f.fork(); |
661 |
|
f.get(); |
662 |
|
shouldThrow(); |
663 |
|
} catch (CancellationException success) { |
664 |
< |
} catch (Exception ex) { |
361 |
< |
unexpectedException(ex); |
664 |
> |
checkCancelled(f); |
665 |
|
} |
666 |
|
}}; |
667 |
< |
mainPool.invoke(a); |
667 |
> |
testInvokeOnPool(mainPool(), a); |
668 |
|
} |
669 |
|
|
670 |
|
/** |
671 |
|
* timed get of a forked task throws exception when task cancelled |
672 |
|
*/ |
673 |
|
public void testCancelledForkTimedGet() { |
674 |
< |
RecursiveAction a = new RecursiveAction() { |
675 |
< |
public void compute() { |
674 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
675 |
> |
public void realCompute() throws Exception { |
676 |
> |
FibAction f = new FibAction(8); |
677 |
> |
assertTrue(f.cancel(true)); |
678 |
> |
assertSame(f, f.fork()); |
679 |
|
try { |
680 |
< |
FibAction f = new FibAction(8); |
375 |
< |
f.cancel(true); |
376 |
< |
f.fork(); |
377 |
< |
f.get(5L, TimeUnit.SECONDS); |
680 |
> |
f.get(5L, SECONDS); |
681 |
|
shouldThrow(); |
682 |
|
} catch (CancellationException success) { |
683 |
< |
} catch (Exception ex) { |
381 |
< |
unexpectedException(ex); |
683 |
> |
checkCancelled(f); |
684 |
|
} |
685 |
|
}}; |
686 |
< |
mainPool.invoke(a); |
686 |
> |
testInvokeOnPool(mainPool(), a); |
687 |
|
} |
688 |
|
|
689 |
|
/** |
690 |
|
* quietlyJoin of a forked task returns when task cancelled |
691 |
|
*/ |
692 |
|
public void testCancelledForkQuietlyJoin() { |
693 |
< |
RecursiveAction a = new RecursiveAction() { |
694 |
< |
public void compute() { |
693 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
694 |
> |
public void realCompute() { |
695 |
|
FibAction f = new FibAction(8); |
696 |
< |
f.cancel(true); |
697 |
< |
f.fork(); |
696 |
> |
assertTrue(f.cancel(true)); |
697 |
> |
assertSame(f, f.fork()); |
698 |
|
f.quietlyJoin(); |
699 |
< |
threadAssertTrue(f.isDone()); |
398 |
< |
threadAssertTrue(f.isCompletedAbnormally()); |
399 |
< |
threadAssertTrue(f.getException() instanceof CancellationException); |
699 |
> |
checkCancelled(f); |
700 |
|
}}; |
701 |
< |
mainPool.invoke(a); |
701 |
> |
testInvokeOnPool(mainPool(), a); |
702 |
|
} |
703 |
|
|
704 |
|
/** |
705 |
|
* getPool of executing task returns its pool |
706 |
|
*/ |
707 |
|
public void testGetPool() { |
708 |
< |
RecursiveAction a = new RecursiveAction() { |
709 |
< |
public void compute() { |
710 |
< |
threadAssertTrue(getPool() == mainPool); |
708 |
> |
final ForkJoinPool mainPool = mainPool(); |
709 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
710 |
> |
public void realCompute() { |
711 |
> |
assertSame(mainPool, getPool()); |
712 |
|
}}; |
713 |
< |
mainPool.invoke(a); |
713 |
> |
testInvokeOnPool(mainPool, a); |
714 |
|
} |
715 |
|
|
716 |
|
/** |
717 |
|
* getPool of non-FJ task returns null |
718 |
|
*/ |
719 |
|
public void testGetPool2() { |
720 |
< |
RecursiveAction a = new RecursiveAction() { |
721 |
< |
public void compute() { |
722 |
< |
threadAssertTrue(getPool() == null); |
720 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
721 |
> |
public void realCompute() { |
722 |
> |
assertNull(getPool()); |
723 |
|
}}; |
724 |
< |
a.invoke(); |
724 |
> |
assertNull(a.invoke()); |
725 |
|
} |
726 |
|
|
727 |
|
/** |
728 |
|
* inForkJoinPool of executing task returns true |
729 |
|
*/ |
730 |
|
public void testInForkJoinPool() { |
731 |
< |
RecursiveAction a = new RecursiveAction() { |
732 |
< |
public void compute() { |
733 |
< |
threadAssertTrue(inForkJoinPool()); |
731 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
732 |
> |
public void realCompute() { |
733 |
> |
assertTrue(inForkJoinPool()); |
734 |
|
}}; |
735 |
< |
mainPool.invoke(a); |
735 |
> |
testInvokeOnPool(mainPool(), a); |
736 |
|
} |
737 |
|
|
738 |
|
/** |
739 |
|
* inForkJoinPool of non-FJ task returns false |
740 |
|
*/ |
741 |
|
public void testInForkJoinPool2() { |
742 |
< |
RecursiveAction a = new RecursiveAction() { |
743 |
< |
public void compute() { |
744 |
< |
threadAssertTrue(!inForkJoinPool()); |
742 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
743 |
> |
public void realCompute() { |
744 |
> |
assertFalse(inForkJoinPool()); |
745 |
|
}}; |
746 |
< |
a.invoke(); |
746 |
> |
assertNull(a.invoke()); |
747 |
|
} |
748 |
|
|
749 |
|
/** |
750 |
|
* getPool of current thread in pool returns its pool |
751 |
|
*/ |
752 |
|
public void testWorkerGetPool() { |
753 |
< |
RecursiveAction a = new RecursiveAction() { |
754 |
< |
public void compute() { |
753 |
> |
final ForkJoinPool mainPool = mainPool(); |
754 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
755 |
> |
public void realCompute() { |
756 |
|
ForkJoinWorkerThread w = |
757 |
< |
(ForkJoinWorkerThread)(Thread.currentThread()); |
758 |
< |
threadAssertTrue(w.getPool() == mainPool); |
757 |
> |
(ForkJoinWorkerThread) Thread.currentThread(); |
758 |
> |
assertSame(mainPool, w.getPool()); |
759 |
|
}}; |
760 |
< |
mainPool.invoke(a); |
760 |
> |
testInvokeOnPool(mainPool, a); |
761 |
|
} |
762 |
|
|
763 |
|
/** |
764 |
|
* getPoolIndex of current thread in pool returns 0 <= value < poolSize |
463 |
– |
* |
765 |
|
*/ |
766 |
|
public void testWorkerGetPoolIndex() { |
767 |
< |
RecursiveAction a = new RecursiveAction() { |
768 |
< |
public void compute() { |
767 |
> |
final ForkJoinPool mainPool = mainPool(); |
768 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
769 |
> |
public void realCompute() { |
770 |
|
ForkJoinWorkerThread w = |
771 |
< |
(ForkJoinWorkerThread)(Thread.currentThread()); |
772 |
< |
int idx = w.getPoolIndex(); |
773 |
< |
threadAssertTrue(idx >= 0); |
774 |
< |
threadAssertTrue(idx < mainPool.getPoolSize()); |
771 |
> |
(ForkJoinWorkerThread) Thread.currentThread(); |
772 |
> |
assertTrue(w.getPoolIndex() >= 0); |
773 |
> |
// pool size can shrink after assigning index, so cannot check |
774 |
> |
// assertTrue(w.getPoolIndex() < mainPool.getPoolSize()); |
775 |
|
}}; |
776 |
< |
mainPool.invoke(a); |
776 |
> |
testInvokeOnPool(mainPool, a); |
777 |
|
} |
778 |
|
|
477 |
– |
|
779 |
|
/** |
780 |
|
* setRawResult(null) succeeds |
781 |
|
*/ |
782 |
|
public void testSetRawResult() { |
783 |
< |
RecursiveAction a = new RecursiveAction() { |
784 |
< |
public void compute() { |
783 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
784 |
> |
public void realCompute() { |
785 |
|
setRawResult(null); |
786 |
+ |
assertNull(getRawResult()); |
787 |
|
}}; |
788 |
< |
a.invoke(); |
788 |
> |
assertNull(a.invoke()); |
789 |
|
} |
790 |
|
|
791 |
|
/** |
792 |
|
* A reinitialized task may be re-invoked |
793 |
|
*/ |
794 |
|
public void testReinitialize() { |
795 |
< |
RecursiveAction a = new RecursiveAction() { |
796 |
< |
public void compute() { |
795 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
796 |
> |
public void realCompute() { |
797 |
|
FibAction f = new FibAction(8); |
798 |
< |
f.invoke(); |
799 |
< |
threadAssertTrue(f.result == 21); |
800 |
< |
threadAssertTrue(f.isDone()); |
801 |
< |
threadAssertFalse(f.isCancelled()); |
802 |
< |
threadAssertFalse(f.isCompletedAbnormally()); |
803 |
< |
f.reinitialize(); |
804 |
< |
f.invoke(); |
805 |
< |
threadAssertTrue(f.result == 21); |
798 |
> |
checkNotDone(f); |
799 |
> |
|
800 |
> |
for (int i = 0; i < 3; i++) { |
801 |
> |
assertNull(f.invoke()); |
802 |
> |
assertEquals(21, f.result); |
803 |
> |
checkCompletedNormally(f); |
804 |
> |
f.reinitialize(); |
805 |
> |
checkNotDone(f); |
806 |
> |
} |
807 |
|
}}; |
808 |
< |
mainPool.invoke(a); |
808 |
> |
testInvokeOnPool(mainPool(), a); |
809 |
|
} |
810 |
|
|
811 |
|
/** |
812 |
|
* invoke task throws exception after invoking completeExceptionally |
813 |
|
*/ |
814 |
|
public void testCompleteExceptionally() { |
815 |
< |
RecursiveAction a = new RecursiveAction() { |
816 |
< |
public void compute() { |
815 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
816 |
> |
public void realCompute() { |
817 |
> |
FibAction f = new FibAction(8); |
818 |
> |
f.completeExceptionally(new FJException()); |
819 |
|
try { |
515 |
– |
FibAction f = new FibAction(8); |
516 |
– |
f.completeExceptionally(new FJException()); |
820 |
|
f.invoke(); |
821 |
|
shouldThrow(); |
822 |
|
} catch (FJException success) { |
823 |
+ |
checkCompletedAbnormally(f, success); |
824 |
|
} |
825 |
|
}}; |
826 |
< |
mainPool.invoke(a); |
826 |
> |
testInvokeOnPool(mainPool(), a); |
827 |
|
} |
828 |
|
|
829 |
|
/** |
830 |
|
* invoke task suppresses execution invoking complete |
831 |
|
*/ |
832 |
|
public void testComplete() { |
833 |
< |
RecursiveAction a = new RecursiveAction() { |
834 |
< |
public void compute() { |
833 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
834 |
> |
public void realCompute() { |
835 |
|
FibAction f = new FibAction(8); |
836 |
|
f.complete(null); |
837 |
< |
f.invoke(); |
838 |
< |
threadAssertTrue(f.isDone()); |
839 |
< |
threadAssertTrue(f.result == 0); |
837 |
> |
assertNull(f.invoke()); |
838 |
> |
assertEquals(0, f.result); |
839 |
> |
checkCompletedNormally(f); |
840 |
|
}}; |
841 |
< |
mainPool.invoke(a); |
841 |
> |
testInvokeOnPool(mainPool(), a); |
842 |
|
} |
843 |
|
|
844 |
|
/** |
845 |
|
* invokeAll(t1, t2) invokes all task arguments |
846 |
|
*/ |
847 |
|
public void testInvokeAll2() { |
848 |
< |
RecursiveAction a = new RecursiveAction() { |
849 |
< |
public void compute() { |
848 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
849 |
> |
public void realCompute() { |
850 |
|
FibAction f = new FibAction(8); |
851 |
|
FibAction g = new FibAction(9); |
852 |
|
invokeAll(f, g); |
853 |
< |
threadAssertTrue(f.isDone()); |
854 |
< |
threadAssertTrue(f.result == 21); |
855 |
< |
threadAssertTrue(g.isDone()); |
856 |
< |
threadAssertTrue(g.result == 34); |
853 |
> |
checkCompletedNormally(f); |
854 |
> |
assertEquals(21, f.result); |
855 |
> |
checkCompletedNormally(g); |
856 |
> |
assertEquals(34, g.result); |
857 |
|
}}; |
858 |
< |
mainPool.invoke(a); |
858 |
> |
testInvokeOnPool(mainPool(), a); |
859 |
|
} |
860 |
|
|
861 |
|
/** |
862 |
|
* invokeAll(tasks) with 1 argument invokes task |
863 |
|
*/ |
864 |
|
public void testInvokeAll1() { |
865 |
< |
RecursiveAction a = new RecursiveAction() { |
866 |
< |
public void compute() { |
865 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
866 |
> |
public void realCompute() { |
867 |
|
FibAction f = new FibAction(8); |
868 |
|
invokeAll(f); |
869 |
< |
threadAssertTrue(f.isDone()); |
870 |
< |
threadAssertTrue(f.result == 21); |
869 |
> |
checkCompletedNormally(f); |
870 |
> |
assertEquals(21, f.result); |
871 |
|
}}; |
872 |
< |
mainPool.invoke(a); |
872 |
> |
testInvokeOnPool(mainPool(), a); |
873 |
|
} |
874 |
|
|
875 |
|
/** |
876 |
|
* invokeAll(tasks) with > 2 argument invokes tasks |
877 |
|
*/ |
878 |
|
public void testInvokeAll3() { |
879 |
< |
RecursiveAction a = new RecursiveAction() { |
880 |
< |
public void compute() { |
879 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
880 |
> |
public void realCompute() { |
881 |
|
FibAction f = new FibAction(8); |
882 |
|
FibAction g = new FibAction(9); |
883 |
|
FibAction h = new FibAction(7); |
884 |
|
invokeAll(f, g, h); |
885 |
< |
threadAssertTrue(f.isDone()); |
886 |
< |
threadAssertTrue(f.result == 21); |
887 |
< |
threadAssertTrue(g.isDone()); |
888 |
< |
threadAssertTrue(g.result == 34); |
889 |
< |
threadAssertTrue(h.isDone()); |
890 |
< |
threadAssertTrue(h.result == 13); |
885 |
> |
assertTrue(f.isDone()); |
886 |
> |
assertTrue(g.isDone()); |
887 |
> |
assertTrue(h.isDone()); |
888 |
> |
checkCompletedNormally(f); |
889 |
> |
assertEquals(21, f.result); |
890 |
> |
checkCompletedNormally(g); |
891 |
> |
assertEquals(34, g.result); |
892 |
> |
checkCompletedNormally(g); |
893 |
> |
assertEquals(13, h.result); |
894 |
|
}}; |
895 |
< |
mainPool.invoke(a); |
895 |
> |
testInvokeOnPool(mainPool(), a); |
896 |
|
} |
897 |
|
|
898 |
|
/** |
899 |
|
* invokeAll(collection) invokes all tasks in the collection |
900 |
|
*/ |
901 |
|
public void testInvokeAllCollection() { |
902 |
< |
RecursiveAction a = new RecursiveAction() { |
903 |
< |
public void compute() { |
902 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
903 |
> |
public void realCompute() { |
904 |
|
FibAction f = new FibAction(8); |
905 |
|
FibAction g = new FibAction(9); |
906 |
|
FibAction h = new FibAction(7); |
909 |
|
set.add(g); |
910 |
|
set.add(h); |
911 |
|
invokeAll(set); |
912 |
< |
threadAssertTrue(f.isDone()); |
913 |
< |
threadAssertTrue(f.result == 21); |
914 |
< |
threadAssertTrue(g.isDone()); |
915 |
< |
threadAssertTrue(g.result == 34); |
916 |
< |
threadAssertTrue(h.isDone()); |
917 |
< |
threadAssertTrue(h.result == 13); |
912 |
> |
assertTrue(f.isDone()); |
913 |
> |
assertTrue(g.isDone()); |
914 |
> |
assertTrue(h.isDone()); |
915 |
> |
checkCompletedNormally(f); |
916 |
> |
assertEquals(21, f.result); |
917 |
> |
checkCompletedNormally(g); |
918 |
> |
assertEquals(34, g.result); |
919 |
> |
checkCompletedNormally(g); |
920 |
> |
assertEquals(13, h.result); |
921 |
|
}}; |
922 |
< |
mainPool.invoke(a); |
922 |
> |
testInvokeOnPool(mainPool(), a); |
923 |
|
} |
924 |
|
|
615 |
– |
|
925 |
|
/** |
926 |
|
* invokeAll(tasks) with any null task throws NPE |
927 |
|
*/ |
928 |
|
public void testInvokeAllNPE() { |
929 |
< |
RecursiveAction a = new RecursiveAction() { |
930 |
< |
public void compute() { |
929 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
930 |
> |
public void realCompute() { |
931 |
> |
FibAction f = new FibAction(8); |
932 |
> |
FibAction g = new FibAction(9); |
933 |
> |
FibAction h = null; |
934 |
|
try { |
623 |
– |
FibAction f = new FibAction(8); |
624 |
– |
FibAction g = new FibAction(9); |
625 |
– |
FibAction h = null; |
935 |
|
invokeAll(f, g, h); |
936 |
|
shouldThrow(); |
937 |
< |
} catch (NullPointerException success) { |
629 |
< |
} |
937 |
> |
} catch (NullPointerException success) {} |
938 |
|
}}; |
939 |
< |
mainPool.invoke(a); |
939 |
> |
testInvokeOnPool(mainPool(), a); |
940 |
|
} |
941 |
|
|
942 |
|
/** |
943 |
|
* invokeAll(t1, t2) throw exception if any task does |
944 |
|
*/ |
945 |
|
public void testAbnormalInvokeAll2() { |
946 |
< |
RecursiveAction a = new RecursiveAction() { |
947 |
< |
public void compute() { |
946 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
947 |
> |
public void realCompute() { |
948 |
> |
FibAction f = new FibAction(8); |
949 |
> |
FailingFibAction g = new FailingFibAction(9); |
950 |
|
try { |
641 |
– |
FibAction f = new FibAction(8); |
642 |
– |
FailingFibAction g = new FailingFibAction(9); |
951 |
|
invokeAll(f, g); |
952 |
|
shouldThrow(); |
953 |
|
} catch (FJException success) { |
954 |
+ |
checkCompletedAbnormally(g, success); |
955 |
|
} |
956 |
|
}}; |
957 |
< |
mainPool.invoke(a); |
957 |
> |
testInvokeOnPool(mainPool(), a); |
958 |
|
} |
959 |
|
|
960 |
|
/** |
961 |
|
* invokeAll(tasks) with 1 argument throws exception if task does |
962 |
|
*/ |
963 |
|
public void testAbnormalInvokeAll1() { |
964 |
< |
RecursiveAction a = new RecursiveAction() { |
965 |
< |
public void compute() { |
964 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
965 |
> |
public void realCompute() { |
966 |
> |
FailingFibAction g = new FailingFibAction(9); |
967 |
|
try { |
658 |
– |
FailingFibAction g = new FailingFibAction(9); |
968 |
|
invokeAll(g); |
969 |
|
shouldThrow(); |
970 |
|
} catch (FJException success) { |
971 |
+ |
checkCompletedAbnormally(g, success); |
972 |
|
} |
973 |
|
}}; |
974 |
< |
mainPool.invoke(a); |
974 |
> |
testInvokeOnPool(mainPool(), a); |
975 |
|
} |
976 |
|
|
977 |
|
/** |
978 |
|
* invokeAll(tasks) with > 2 argument throws exception if any task does |
979 |
|
*/ |
980 |
|
public void testAbnormalInvokeAll3() { |
981 |
< |
RecursiveAction a = new RecursiveAction() { |
982 |
< |
public void compute() { |
981 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
982 |
> |
public void realCompute() { |
983 |
> |
FibAction f = new FibAction(8); |
984 |
> |
FailingFibAction g = new FailingFibAction(9); |
985 |
> |
FibAction h = new FibAction(7); |
986 |
|
try { |
674 |
– |
FibAction f = new FibAction(8); |
675 |
– |
FailingFibAction g = new FailingFibAction(9); |
676 |
– |
FibAction h = new FibAction(7); |
987 |
|
invokeAll(f, g, h); |
988 |
|
shouldThrow(); |
989 |
|
} catch (FJException success) { |
990 |
+ |
checkCompletedAbnormally(g, success); |
991 |
|
} |
992 |
|
}}; |
993 |
< |
mainPool.invoke(a); |
993 |
> |
testInvokeOnPool(mainPool(), a); |
994 |
|
} |
995 |
|
|
996 |
|
/** |
997 |
|
* invokeAll(collection) throws exception if any task does |
998 |
|
*/ |
999 |
|
public void testAbnormalInvokeAllCollection() { |
1000 |
< |
RecursiveAction a = new RecursiveAction() { |
1001 |
< |
public void compute() { |
1000 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
1001 |
> |
public void realCompute() { |
1002 |
> |
FailingFibAction f = new FailingFibAction(8); |
1003 |
> |
FibAction g = new FibAction(9); |
1004 |
> |
FibAction h = new FibAction(7); |
1005 |
> |
HashSet set = new HashSet(); |
1006 |
> |
set.add(f); |
1007 |
> |
set.add(g); |
1008 |
> |
set.add(h); |
1009 |
|
try { |
692 |
– |
FailingFibAction f = new FailingFibAction(8); |
693 |
– |
FibAction g = new FibAction(9); |
694 |
– |
FibAction h = new FibAction(7); |
695 |
– |
HashSet set = new HashSet(); |
696 |
– |
set.add(f); |
697 |
– |
set.add(g); |
698 |
– |
set.add(h); |
1010 |
|
invokeAll(set); |
1011 |
|
shouldThrow(); |
1012 |
|
} catch (FJException success) { |
1013 |
+ |
checkCompletedAbnormally(f, success); |
1014 |
|
} |
1015 |
|
}}; |
1016 |
< |
mainPool.invoke(a); |
1016 |
> |
testInvokeOnPool(mainPool(), a); |
1017 |
|
} |
1018 |
|
|
1019 |
|
/** |
1021 |
|
* and suppresses execution |
1022 |
|
*/ |
1023 |
|
public void testTryUnfork() { |
1024 |
< |
RecursiveAction a = new RecursiveAction() { |
1025 |
< |
public void compute() { |
1024 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
1025 |
> |
public void realCompute() { |
1026 |
|
FibAction g = new FibAction(9); |
1027 |
< |
g.fork(); |
1027 |
> |
assertSame(g, g.fork()); |
1028 |
|
FibAction f = new FibAction(8); |
1029 |
< |
f.fork(); |
1030 |
< |
threadAssertTrue(f.tryUnfork()); |
1029 |
> |
assertSame(f, f.fork()); |
1030 |
> |
assertTrue(f.tryUnfork()); |
1031 |
|
helpQuiesce(); |
1032 |
< |
threadAssertFalse(f.isDone()); |
1033 |
< |
threadAssertTrue(g.isDone()); |
1032 |
> |
checkNotDone(f); |
1033 |
> |
checkCompletedNormally(g); |
1034 |
|
}}; |
1035 |
< |
singletonPool.invoke(a); |
1035 |
> |
testInvokeOnPool(singletonPool(), a); |
1036 |
|
} |
1037 |
|
|
1038 |
|
/** |
1040 |
|
* there are more tasks than threads |
1041 |
|
*/ |
1042 |
|
public void testGetSurplusQueuedTaskCount() { |
1043 |
< |
RecursiveAction a = new RecursiveAction() { |
1044 |
< |
public void compute() { |
1043 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
1044 |
> |
public void realCompute() { |
1045 |
|
FibAction h = new FibAction(7); |
1046 |
< |
h.fork(); |
1046 |
> |
assertSame(h, h.fork()); |
1047 |
|
FibAction g = new FibAction(9); |
1048 |
< |
g.fork(); |
1048 |
> |
assertSame(g, g.fork()); |
1049 |
|
FibAction f = new FibAction(8); |
1050 |
< |
f.fork(); |
1051 |
< |
threadAssertTrue(getSurplusQueuedTaskCount() > 0); |
1050 |
> |
assertSame(f, f.fork()); |
1051 |
> |
assertTrue(getSurplusQueuedTaskCount() > 0); |
1052 |
|
helpQuiesce(); |
1053 |
+ |
assertEquals(0, getSurplusQueuedTaskCount()); |
1054 |
+ |
checkCompletedNormally(f); |
1055 |
+ |
checkCompletedNormally(g); |
1056 |
+ |
checkCompletedNormally(h); |
1057 |
|
}}; |
1058 |
< |
singletonPool.invoke(a); |
1058 |
> |
testInvokeOnPool(singletonPool(), a); |
1059 |
|
} |
1060 |
|
|
1061 |
|
/** |
1062 |
|
* peekNextLocalTask returns most recent unexecuted task. |
1063 |
|
*/ |
1064 |
|
public void testPeekNextLocalTask() { |
1065 |
< |
RecursiveAction a = new RecursiveAction() { |
1066 |
< |
public void compute() { |
1065 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
1066 |
> |
public void realCompute() { |
1067 |
|
FibAction g = new FibAction(9); |
1068 |
< |
g.fork(); |
1068 |
> |
assertSame(g, g.fork()); |
1069 |
|
FibAction f = new FibAction(8); |
1070 |
< |
f.fork(); |
1071 |
< |
threadAssertTrue(peekNextLocalTask() == f); |
1072 |
< |
f.join(); |
1073 |
< |
threadAssertTrue(f.isDone()); |
1070 |
> |
assertSame(f, f.fork()); |
1071 |
> |
assertSame(f, peekNextLocalTask()); |
1072 |
> |
assertNull(f.join()); |
1073 |
> |
checkCompletedNormally(f); |
1074 |
|
helpQuiesce(); |
1075 |
+ |
checkCompletedNormally(f); |
1076 |
+ |
checkCompletedNormally(g); |
1077 |
|
}}; |
1078 |
< |
singletonPool.invoke(a); |
1078 |
> |
testInvokeOnPool(singletonPool(), a); |
1079 |
|
} |
1080 |
|
|
1081 |
|
/** |
1083 |
|
* without executing it |
1084 |
|
*/ |
1085 |
|
public void testPollNextLocalTask() { |
1086 |
< |
RecursiveAction a = new RecursiveAction() { |
1087 |
< |
public void compute() { |
1086 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
1087 |
> |
public void realCompute() { |
1088 |
|
FibAction g = new FibAction(9); |
1089 |
< |
g.fork(); |
1089 |
> |
assertSame(g, g.fork()); |
1090 |
|
FibAction f = new FibAction(8); |
1091 |
< |
f.fork(); |
1092 |
< |
threadAssertTrue(pollNextLocalTask() == f); |
1091 |
> |
assertSame(f, f.fork()); |
1092 |
> |
assertSame(f, pollNextLocalTask()); |
1093 |
|
helpQuiesce(); |
1094 |
< |
threadAssertFalse(f.isDone()); |
1094 |
> |
checkNotDone(f); |
1095 |
> |
checkCompletedNormally(g); |
1096 |
|
}}; |
1097 |
< |
singletonPool.invoke(a); |
1097 |
> |
testInvokeOnPool(singletonPool(), a); |
1098 |
|
} |
1099 |
|
|
1100 |
|
/** |
1101 |
< |
* pollTask returns an unexecuted task |
783 |
< |
* without executing it |
1101 |
> |
* pollTask returns an unexecuted task without executing it |
1102 |
|
*/ |
1103 |
|
public void testPollTask() { |
1104 |
< |
RecursiveAction a = new RecursiveAction() { |
1105 |
< |
public void compute() { |
1104 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
1105 |
> |
public void realCompute() { |
1106 |
|
FibAction g = new FibAction(9); |
1107 |
< |
g.fork(); |
1107 |
> |
assertSame(g, g.fork()); |
1108 |
|
FibAction f = new FibAction(8); |
1109 |
< |
f.fork(); |
1110 |
< |
threadAssertTrue(pollTask() == f); |
1109 |
> |
assertSame(f, f.fork()); |
1110 |
> |
assertSame(f, pollTask()); |
1111 |
|
helpQuiesce(); |
1112 |
< |
threadAssertFalse(f.isDone()); |
1113 |
< |
threadAssertTrue(g.isDone()); |
1112 |
> |
checkNotDone(f); |
1113 |
> |
checkCompletedNormally(g); |
1114 |
|
}}; |
1115 |
< |
singletonPool.invoke(a); |
1115 |
> |
testInvokeOnPool(singletonPool(), a); |
1116 |
|
} |
1117 |
|
|
1118 |
|
/** |
1119 |
|
* peekNextLocalTask returns least recent unexecuted task in async mode |
1120 |
|
*/ |
1121 |
|
public void testPeekNextLocalTaskAsync() { |
1122 |
< |
RecursiveAction a = new RecursiveAction() { |
1123 |
< |
public void compute() { |
1122 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
1123 |
> |
public void realCompute() { |
1124 |
|
FibAction g = new FibAction(9); |
1125 |
< |
g.fork(); |
1125 |
> |
assertSame(g, g.fork()); |
1126 |
|
FibAction f = new FibAction(8); |
1127 |
< |
f.fork(); |
1128 |
< |
threadAssertTrue(peekNextLocalTask() == g); |
1129 |
< |
f.join(); |
1127 |
> |
assertSame(f, f.fork()); |
1128 |
> |
assertSame(g, peekNextLocalTask()); |
1129 |
> |
assertNull(f.join()); |
1130 |
|
helpQuiesce(); |
1131 |
< |
threadAssertTrue(f.isDone()); |
1131 |
> |
checkCompletedNormally(f); |
1132 |
> |
checkCompletedNormally(g); |
1133 |
|
}}; |
1134 |
< |
asyncSingletonPool.invoke(a); |
1134 |
> |
testInvokeOnPool(asyncSingletonPool(), a); |
1135 |
|
} |
1136 |
|
|
1137 |
|
/** |
1138 |
< |
* pollNextLocalTask returns least recent unexecuted task |
1139 |
< |
* without executing it, in async mode |
1138 |
> |
* pollNextLocalTask returns least recent unexecuted task without |
1139 |
> |
* executing it, in async mode |
1140 |
|
*/ |
1141 |
|
public void testPollNextLocalTaskAsync() { |
1142 |
< |
RecursiveAction a = new RecursiveAction() { |
1143 |
< |
public void compute() { |
1142 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
1143 |
> |
public void realCompute() { |
1144 |
|
FibAction g = new FibAction(9); |
1145 |
< |
g.fork(); |
1145 |
> |
assertSame(g, g.fork()); |
1146 |
|
FibAction f = new FibAction(8); |
1147 |
< |
f.fork(); |
1148 |
< |
threadAssertTrue(pollNextLocalTask() == g); |
1147 |
> |
assertSame(f, f.fork()); |
1148 |
> |
assertSame(g, pollNextLocalTask()); |
1149 |
|
helpQuiesce(); |
1150 |
< |
threadAssertTrue(f.isDone()); |
1151 |
< |
threadAssertFalse(g.isDone()); |
1150 |
> |
checkCompletedNormally(f); |
1151 |
> |
checkNotDone(g); |
1152 |
|
}}; |
1153 |
< |
asyncSingletonPool.invoke(a); |
1153 |
> |
testInvokeOnPool(asyncSingletonPool(), a); |
1154 |
|
} |
1155 |
|
|
1156 |
|
/** |
1157 |
< |
* pollTask returns an unexecuted task |
1158 |
< |
* without executing it, in async mode |
1157 |
> |
* pollTask returns an unexecuted task without executing it, in |
1158 |
> |
* async mode |
1159 |
|
*/ |
1160 |
|
public void testPollTaskAsync() { |
1161 |
< |
RecursiveAction a = new RecursiveAction() { |
1162 |
< |
public void compute() { |
1161 |
> |
RecursiveAction a = new CheckedRecursiveAction() { |
1162 |
> |
public void realCompute() { |
1163 |
|
FibAction g = new FibAction(9); |
1164 |
< |
g.fork(); |
1164 |
> |
assertSame(g, g.fork()); |
1165 |
|
FibAction f = new FibAction(8); |
1166 |
< |
f.fork(); |
1167 |
< |
threadAssertTrue(pollTask() == g); |
1166 |
> |
assertSame(f, f.fork()); |
1167 |
> |
assertSame(g, pollTask()); |
1168 |
|
helpQuiesce(); |
1169 |
< |
threadAssertTrue(f.isDone()); |
1170 |
< |
threadAssertFalse(g.isDone()); |
1169 |
> |
checkCompletedNormally(f); |
1170 |
> |
checkNotDone(g); |
1171 |
|
}}; |
1172 |
< |
asyncSingletonPool.invoke(a); |
1172 |
> |
testInvokeOnPool(asyncSingletonPool(), a); |
1173 |
|
} |
1174 |
|
|
1175 |
|
} |