ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ForkJoinTask8Test.java
(Generate patch)

Comparing jsr166/src/test/tck/ForkJoinTask8Test.java (file contents):
Revision 1.14 by jsr166, Sat Apr 25 04:55:30 2015 UTC vs.
Revision 1.21 by jsr166, Tue Oct 6 05:56:01 2015 UTC

# Line 9 | Line 9 | import static java.util.concurrent.TimeU
9  
10   import java.util.Arrays;
11   import java.util.Collections;
12 + import java.util.concurrent.CountDownLatch;
13   import java.util.concurrent.ExecutionException;
14   import java.util.concurrent.ForkJoinPool;
15   import java.util.concurrent.ForkJoinTask;
16 + import java.util.concurrent.ForkJoinWorkerThread;
17   import java.util.concurrent.RecursiveAction;
18   import java.util.concurrent.TimeoutException;
19  
# Line 72 | Line 74 | public class ForkJoinTask8Test extends J
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());
# Line 88 | Line 90 | public class ForkJoinTask8Test extends J
90              assertFalse(a.isCancelled());
91              assertNull(a.getException());
92              assertNull(a.getRawResult());
91 –        } finally {
92 –            joinPool(pool);
93          }
94      }
95  
# Line 126 | Line 126 | public class ForkJoinTask8Test extends J
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  
# Line 172 | Line 172 | public class ForkJoinTask8Test extends J
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 {
# Line 198 | Line 198 | public class ForkJoinTask8Test extends J
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);
# Line 1152 | Line 1152 | public class ForkJoinTask8Test extends J
1152          testInvokeOnPool(mainPool(), a);
1153      }
1154  
1155 +    // jdk9
1156 +
1157 +    /**
1158 +     * pollSubmission returns unexecuted submitted task, if present
1159 +     */
1160 +    public void testPollSubmission() {
1161 +        final CountDownLatch done = new CountDownLatch(1);
1162 +        final ForkJoinTask a = ForkJoinTask.adapt(awaiter(done));
1163 +        final ForkJoinTask b = ForkJoinTask.adapt(awaiter(done));
1164 +        final ForkJoinTask c = ForkJoinTask.adapt(awaiter(done));
1165 +        final ForkJoinPool p = singletonPool();
1166 +        try (PoolCleaner cleaner = cleaner(p, done)) {
1167 +            Thread external = new Thread(new CheckedRunnable() {
1168 +                public void realRun() {
1169 +                    p.execute(a);
1170 +                    p.execute(b);
1171 +                    p.execute(c);
1172 +                }});
1173 +            RecursiveAction s = new CheckedRecursiveAction() {
1174 +                protected void realCompute() {
1175 +                    external.start();
1176 +                    try {
1177 +                        external.join();
1178 +                    } catch (Exception ex) {
1179 +                        threadUnexpectedException(ex);
1180 +                    }
1181 +                    assertTrue(p.hasQueuedSubmissions());
1182 +                    assertTrue(Thread.currentThread() instanceof ForkJoinWorkerThread);
1183 +                    ForkJoinTask r = ForkJoinTask.pollSubmission();
1184 +                    assertTrue(r == a || r == b || r == c);
1185 +                    assertFalse(r.isDone());
1186 +                }};
1187 +            p.invoke(s);
1188 +        }
1189 +    }
1190 +
1191   }

Diff Legend

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