ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ForkJoinTask8Test.java

Comparing jsr166/src/test/tck/ForkJoinTask8Test.java (file contents):
Revision 1.23 by dl, Sun Oct 11 13:30:30 2015 UTC vs.
Revision 1.27 by jsr166, Wed Aug 24 22:22:39 2016 UTC

#	Line 8 | Line 8 | import static java.util.concurrent.TimeU
8		import static java.util.concurrent.TimeUnit.SECONDS;
9
10		import java.util.Arrays;
11	–	import java.util.Collections;
11		import java.util.concurrent.CountDownLatch;
12		import java.util.concurrent.ExecutionException;
13		import java.util.concurrent.ForkJoinPool;
#	Line 250 | Line 249 | public class ForkJoinTask8Test extends J
249		}
250		return false;
251		}
252	<
252	>
253		public final void complete() {
254		BinaryAsyncAction a = this;
255		for (;;) {
#	Line 310 | Line 309 | public class ForkJoinTask8Test extends J
309		try {
310		AsyncFib f = this;
311		int n = f.number;
312	<	if (n > 1) {
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);
319	<	r.fork();
320	<	}
321	<	f.number = n;
312	>	while (n > 1) {
313	>	AsyncFib p = f;
314	>	AsyncFib r = new AsyncFib(n - 2);
315	>	f = new AsyncFib(--n);
316	>	p.linkSubtasks(r, f);
317	>	r.fork();
318		}
319		f.complete();
320		}
#	Line 351 | Line 347 | public class ForkJoinTask8Test extends J
347		try {
348		FailingAsyncFib f = this;
349		int n = f.number;
350	<	if (n > 1) {
351	<	while (n > 1) {
352	<	FailingAsyncFib p = f;
353	<	FailingAsyncFib r = new FailingAsyncFib(n - 2);
354	<	f = new FailingAsyncFib(--n);
355	<	p.linkSubtasks(r, f);
360	<	r.fork();
361	<	}
362	<	f.number = n;
350	>	while (n > 1) {
351	>	FailingAsyncFib p = f;
352	>	FailingAsyncFib r = new FailingAsyncFib(n - 2);
353	>	f = new FailingAsyncFib(--n);
354	>	p.linkSubtasks(r, f);
355	>	r.fork();
356		}
357		f.complete();
358		}
#	Line 927 | Line 920 | public class ForkJoinTask8Test extends J
920		AsyncFib f = new AsyncFib(8);
921		FailingAsyncFib g = new FailingAsyncFib(9);
922		ForkJoinTask[] tasks = { f, g };
923	<	Collections.shuffle(Arrays.asList(tasks));
923	>	shuffle(tasks);
924		try {
925		invokeAll(tasks[0], tasks[1]);
926		shouldThrow();
#	Line 954 | Line 947 | public class ForkJoinTask8Test extends J
947		FailingAsyncFib g = new FailingAsyncFib(9);
948		AsyncFib h = new AsyncFib(7);
949		ForkJoinTask[] tasks = { f, g, h };
950	<	Collections.shuffle(Arrays.asList(tasks));
950	>	shuffle(tasks);
951		try {
952		invokeAll(tasks[0], tasks[1], tasks[2]);
953		shouldThrow();
#	Line 981 | Line 974 | public class ForkJoinTask8Test extends J
974		AsyncFib g = new AsyncFib(9);
975		AsyncFib h = new AsyncFib(7);
976		ForkJoinTask[] tasks = { f, g, h };
977	<	Collections.shuffle(Arrays.asList(tasks));
977	>	shuffle(tasks);
978		try {
979		invokeAll(Arrays.asList(tasks));
980		shouldThrow();

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines