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

Comparing jsr166/src/test/tck/CyclicBarrierTest.java (file contents):
Revision 1.19 by jsr166, Sun May 15 16:56:41 2011 UTC vs.
Revision 1.31 by jsr166, Fri Feb 1 19:14:23 2019 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.*;
11 import java.util.concurrent.*;
12 import java.util.concurrent.locks.*;
13 import java.util.concurrent.atomic.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10  
11 + import java.util.concurrent.BrokenBarrierException;
12 + import java.util.concurrent.CountDownLatch;
13 + import java.util.concurrent.CyclicBarrier;
14 + import java.util.concurrent.ExecutorService;
15 + import java.util.concurrent.Executors;
16 + import java.util.concurrent.ThreadLocalRandom;
17 + import java.util.concurrent.TimeoutException;
18 + import java.util.concurrent.atomic.AtomicBoolean;
19 + import java.util.concurrent.atomic.AtomicInteger;
20 +
21 + import junit.framework.Test;
22 + import junit.framework.TestSuite;
23 +
24   public class CyclicBarrierTest extends JSR166TestCase {
25      public static void main(String[] args) {
26 <        junit.textui.TestRunner.run(suite());
26 >        main(suite(), args);
27      }
28      public static Test suite() {
29          return new TestSuite(CyclicBarrierTest.class);
30      }
31  
32 <    private volatile int countAction;
33 <    private class MyAction implements Runnable {
34 <        public void run() { ++countAction; }
32 >    /**
33 >     * Spin-waits till the number of waiters == numberOfWaiters.
34 >     */
35 >    void awaitNumberWaiting(CyclicBarrier barrier, int numberOfWaiters) {
36 >        long startTime = System.nanoTime();
37 >        while (barrier.getNumberWaiting() != numberOfWaiters) {
38 >            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
39 >                fail("timed out");
40 >            Thread.yield();
41 >        }
42      }
43  
44      /**
45 <     * Creating with negative parties throws IAE
45 >     * Creating with negative parties throws IllegalArgumentException
46       */
47      public void testConstructor1() {
48          try {
# Line 37 | Line 52 | public class CyclicBarrierTest extends J
52      }
53  
54      /**
55 <     * Creating with negative parties and no action throws IAE
55 >     * Creating with negative parties and no action throws
56 >     * IllegalArgumentException
57       */
58      public void testConstructor2() {
59          try {
# Line 71 | Line 87 | public class CyclicBarrierTest extends J
87       * The supplied barrier action is run at barrier
88       */
89      public void testBarrierAction() throws Exception {
90 <        countAction = 0;
91 <        CyclicBarrier b = new CyclicBarrier(1, new MyAction());
90 >        final AtomicInteger count = new AtomicInteger(0);
91 >        final Runnable incCount = new Runnable() { public void run() {
92 >            count.getAndIncrement(); }};
93 >        CyclicBarrier b = new CyclicBarrier(1, incCount);
94          assertEquals(1, b.getParties());
95          assertEquals(0, b.getNumberWaiting());
96          b.await();
97          b.await();
98          assertEquals(0, b.getNumberWaiting());
99 <        assertEquals(countAction, 2);
99 >        assertEquals(2, count.get());
100      }
101  
102      /**
# Line 86 | Line 104 | public class CyclicBarrierTest extends J
104       */
105      public void testTwoParties() throws Exception {
106          final CyclicBarrier b = new CyclicBarrier(2);
107 <        Thread t = new Thread(new CheckedRunnable() {
107 >        Thread t = newStartedThread(new CheckedRunnable() {
108              public void realRun() throws Exception {
109                  b.await();
110                  b.await();
# Line 94 | Line 112 | public class CyclicBarrierTest extends J
112                  b.await();
113              }});
114  
97        t.start();
115          b.await();
116          b.await();
117          b.await();
118          b.await();
119 <        t.join();
119 >        awaitTermination(t);
120      }
121  
105
122      /**
123       * An interruption in one party causes others waiting in await to
124       * throw BrokenBarrierException
125       */
126 <    public void testAwait1_Interrupted_BrokenBarrier() throws Exception {
126 >    public void testAwait1_Interrupted_BrokenBarrier() {
127          final CyclicBarrier c = new CyclicBarrier(3);
128 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(2);
129          Thread t1 = new ThreadShouldThrow(InterruptedException.class) {
130              public void realRun() throws Exception {
131 +                pleaseInterrupt.countDown();
132                  c.await();
133              }};
134          Thread t2 = new ThreadShouldThrow(BrokenBarrierException.class) {
135              public void realRun() throws Exception {
136 +                pleaseInterrupt.countDown();
137                  c.await();
138              }};
139  
140          t1.start();
141          t2.start();
142 <        delay(SHORT_DELAY_MS);
142 >        await(pleaseInterrupt);
143          t1.interrupt();
144 <        t1.join();
145 <        t2.join();
144 >        awaitTermination(t1);
145 >        awaitTermination(t2);
146      }
147  
148      /**
# Line 132 | Line 151 | public class CyclicBarrierTest extends J
151       */
152      public void testAwait2_Interrupted_BrokenBarrier() throws Exception {
153          final CyclicBarrier c = new CyclicBarrier(3);
154 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(2);
155          Thread t1 = new ThreadShouldThrow(InterruptedException.class) {
156              public void realRun() throws Exception {
157 +                pleaseInterrupt.countDown();
158                  c.await(LONG_DELAY_MS, MILLISECONDS);
159              }};
160          Thread t2 = new ThreadShouldThrow(BrokenBarrierException.class) {
161              public void realRun() throws Exception {
162 +                pleaseInterrupt.countDown();
163                  c.await(LONG_DELAY_MS, MILLISECONDS);
164              }};
165  
166          t1.start();
167          t2.start();
168 <        delay(SHORT_DELAY_MS);
168 >        await(pleaseInterrupt);
169          t1.interrupt();
170 <        t1.join();
171 <        t2.join();
170 >        awaitTermination(t1);
171 >        awaitTermination(t2);
172      }
173  
174      /**
# Line 154 | Line 176 | public class CyclicBarrierTest extends J
176       */
177      public void testAwait3_TimeoutException() throws InterruptedException {
178          final CyclicBarrier c = new CyclicBarrier(2);
179 <        Thread t = new ThreadShouldThrow(TimeoutException.class) {
179 >        Thread t = newStartedThread(new CheckedRunnable() {
180              public void realRun() throws Exception {
181 <                c.await(SHORT_DELAY_MS, MILLISECONDS);
182 <            }};
181 >                long startTime = System.nanoTime();
182 >                try {
183 >                    c.await(timeoutMillis(), MILLISECONDS);
184 >                    shouldThrow();
185 >                } catch (TimeoutException success) {}
186 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
187 >            }});
188  
189 <        t.start();
163 <        t.join();
189 >        awaitTermination(t);
190      }
191  
192      /**
# Line 169 | Line 195 | public class CyclicBarrierTest extends J
195       */
196      public void testAwait4_Timeout_BrokenBarrier() throws InterruptedException {
197          final CyclicBarrier c = new CyclicBarrier(3);
198 <        Thread t1 = new ThreadShouldThrow(TimeoutException.class) {
198 >        Thread t1 = newStartedThread(new CheckedRunnable() {
199              public void realRun() throws Exception {
200 <                c.await(SHORT_DELAY_MS, MILLISECONDS);
201 <            }};
202 <        Thread t2 = new ThreadShouldThrow(BrokenBarrierException.class) {
200 >                try {
201 >                    c.await(LONG_DELAY_MS, MILLISECONDS);
202 >                    shouldThrow();
203 >                } catch (BrokenBarrierException success) {}
204 >            }});
205 >        Thread t2 = newStartedThread(new CheckedRunnable() {
206              public void realRun() throws Exception {
207 <                c.await(MEDIUM_DELAY_MS, MILLISECONDS);
208 <            }};
207 >                awaitNumberWaiting(c, 1);
208 >                long startTime = System.nanoTime();
209 >                try {
210 >                    c.await(timeoutMillis(), MILLISECONDS);
211 >                    shouldThrow();
212 >                } catch (TimeoutException success) {}
213 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
214 >            }});
215  
216 <        t1.start();
217 <        t2.start();
183 <        t1.join();
184 <        t2.join();
216 >        awaitTermination(t1);
217 >        awaitTermination(t2);
218      }
219  
220      /**
# Line 190 | Line 223 | public class CyclicBarrierTest extends J
223       */
224      public void testAwait5_Timeout_BrokenBarrier() throws InterruptedException {
225          final CyclicBarrier c = new CyclicBarrier(3);
226 <        Thread t1 = new ThreadShouldThrow(TimeoutException.class) {
226 >        Thread t1 = newStartedThread(new CheckedRunnable() {
227              public void realRun() throws Exception {
228 <                c.await(SHORT_DELAY_MS, MILLISECONDS);
229 <            }};
230 <        Thread t2 = new ThreadShouldThrow(BrokenBarrierException.class) {
228 >                try {
229 >                    c.await();
230 >                    shouldThrow();
231 >                } catch (BrokenBarrierException success) {}
232 >            }});
233 >        Thread t2 = newStartedThread(new CheckedRunnable() {
234              public void realRun() throws Exception {
235 <                c.await();
236 <            }};
235 >                awaitNumberWaiting(c, 1);
236 >                long startTime = System.nanoTime();
237 >                try {
238 >                    c.await(timeoutMillis(), MILLISECONDS);
239 >                    shouldThrow();
240 >                } catch (TimeoutException success) {}
241 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
242 >            }});
243  
244 <        t1.start();
245 <        t2.start();
204 <        t1.join();
205 <        t2.join();
244 >        awaitTermination(t1);
245 >        awaitTermination(t2);
246      }
247  
248      /**
# Line 211 | Line 251 | public class CyclicBarrierTest extends J
251       */
252      public void testReset_BrokenBarrier() throws InterruptedException {
253          final CyclicBarrier c = new CyclicBarrier(3);
254 +        final CountDownLatch pleaseReset = new CountDownLatch(2);
255          Thread t1 = new ThreadShouldThrow(BrokenBarrierException.class) {
256              public void realRun() throws Exception {
257 +                pleaseReset.countDown();
258                  c.await();
259              }};
260          Thread t2 = new ThreadShouldThrow(BrokenBarrierException.class) {
261              public void realRun() throws Exception {
262 +                pleaseReset.countDown();
263                  c.await();
264              }};
265  
266          t1.start();
267          t2.start();
268 <        delay(SHORT_DELAY_MS);
268 >        await(pleaseReset);
269 >
270 >        awaitNumberWaiting(c, 2);
271          c.reset();
272 <        t1.join();
273 <        t2.join();
272 >        awaitTermination(t1);
273 >        awaitTermination(t2);
274      }
275  
276      /**
# Line 234 | Line 279 | public class CyclicBarrierTest extends J
279       */
280      public void testReset_NoBrokenBarrier() throws Exception {
281          final CyclicBarrier c = new CyclicBarrier(3);
282 <        Thread t1 = new Thread(new CheckedRunnable() {
282 >        c.reset();
283 >
284 >        Thread t1 = newStartedThread(new CheckedRunnable() {
285              public void realRun() throws Exception {
286                  c.await();
287              }});
288 <        Thread t2 = new Thread(new CheckedRunnable() {
288 >        Thread t2 = newStartedThread(new CheckedRunnable() {
289              public void realRun() throws Exception {
290                  c.await();
291              }});
292  
246        c.reset();
247        t1.start();
248        t2.start();
293          c.await();
294 <        t1.join();
295 <        t2.join();
294 >        awaitTermination(t1);
295 >        awaitTermination(t2);
296      }
297  
298      /**
# Line 257 | Line 301 | public class CyclicBarrierTest extends J
301      public void testReset_Leakage() throws InterruptedException {
302          final CyclicBarrier c = new CyclicBarrier(2);
303          final AtomicBoolean done = new AtomicBoolean();
304 <        Thread t = new Thread() {
305 <                public void run() {
306 <                    while (!done.get()) {
307 <                        try {
308 <                            while (c.isBroken())
309 <                                c.reset();
310 <
311 <                            c.await();
312 <                            threadFail("await should not return");
269 <                        }
270 <                        catch (BrokenBarrierException e) {
271 <                        }
272 <                        catch (InterruptedException ie) {
273 <                        }
304 >        Thread t = newStartedThread(new CheckedRunnable() {
305 >            public void realRun() {
306 >                while (!done.get()) {
307 >                    try {
308 >                        while (c.isBroken())
309 >                            c.reset();
310 >
311 >                        c.await();
312 >                        shouldThrow();
313                      }
314 <                }
315 <            };
314 >                    catch (BrokenBarrierException | InterruptedException ok) {}
315 >                }}});
316  
278        t.start();
317          for (int i = 0; i < 4; i++) {
318 <            delay(SHORT_DELAY_MS);
318 >            delay(timeoutMillis());
319              t.interrupt();
320          }
321          done.set(true);
322          t.interrupt();
323 <        t.join();
323 >        awaitTermination(t);
324      }
325  
326      /**
327       * Reset of a non-broken barrier does not break barrier
328       */
329      public void testResetWithoutBreakage() throws Exception {
292        final CyclicBarrier start = new CyclicBarrier(3);
330          final CyclicBarrier barrier = new CyclicBarrier(3);
331          for (int i = 0; i < 3; i++) {
332 <            Thread t1 = new Thread(new CheckedRunnable() {
332 >            final CyclicBarrier start = new CyclicBarrier(3);
333 >            Thread t1 = newStartedThread(new CheckedRunnable() {
334                  public void realRun() throws Exception {
335                      start.await();
336                      barrier.await();
337                  }});
338  
339 <            Thread t2 = new Thread(new CheckedRunnable() {
339 >            Thread t2 = newStartedThread(new CheckedRunnable() {
340                  public void realRun() throws Exception {
341                      start.await();
342                      barrier.await();
343                  }});
344  
307            t1.start();
308            t2.start();
345              start.await();
346              barrier.await();
347 <            t1.join();
348 <            t2.join();
347 >            awaitTermination(t1);
348 >            awaitTermination(t2);
349              assertFalse(barrier.isBroken());
350              assertEquals(0, barrier.getNumberWaiting());
351              if (i == 1) barrier.reset();
# Line 322 | Line 358 | public class CyclicBarrierTest extends J
358       * Reset of a barrier after interruption reinitializes it.
359       */
360      public void testResetAfterInterrupt() throws Exception {
325        final CyclicBarrier start = new CyclicBarrier(3);
361          final CyclicBarrier barrier = new CyclicBarrier(3);
362          for (int i = 0; i < 2; i++) {
363 +            final CyclicBarrier start = new CyclicBarrier(3);
364              Thread t1 = new ThreadShouldThrow(InterruptedException.class) {
365                  public void realRun() throws Exception {
366                      start.await();
# Line 341 | Line 377 | public class CyclicBarrierTest extends J
377              t2.start();
378              start.await();
379              t1.interrupt();
380 <            t1.join();
381 <            t2.join();
380 >            awaitTermination(t1);
381 >            awaitTermination(t2);
382              assertTrue(barrier.isBroken());
383              assertEquals(0, barrier.getNumberWaiting());
384              barrier.reset();
# Line 355 | Line 391 | public class CyclicBarrierTest extends J
391       * Reset of a barrier after timeout reinitializes it.
392       */
393      public void testResetAfterTimeout() throws Exception {
358        final CyclicBarrier start = new CyclicBarrier(2);
394          final CyclicBarrier barrier = new CyclicBarrier(3);
395          for (int i = 0; i < 2; i++) {
396 <            Thread t1 = new ThreadShouldThrow(TimeoutException.class) {
397 <                    public void realRun() throws Exception {
363 <                        start.await();
364 <                        barrier.await(SHORT_DELAY_MS, MILLISECONDS);
365 <                    }};
366 <
367 <            Thread t2 = new ThreadShouldThrow(BrokenBarrierException.class) {
396 >            assertEquals(0, barrier.getNumberWaiting());
397 >            Thread t1 = newStartedThread(new CheckedRunnable() {
398                  public void realRun() throws Exception {
399 <                    start.await();
400 <                    barrier.await();
401 <                }};
399 >                    try {
400 >                        barrier.await();
401 >                        shouldThrow();
402 >                    } catch (BrokenBarrierException success) {}
403 >                }});
404 >            Thread t2 = newStartedThread(new CheckedRunnable() {
405 >                public void realRun() throws Exception {
406 >                    awaitNumberWaiting(barrier, 1);
407 >                    long startTime = System.nanoTime();
408 >                    try {
409 >                        barrier.await(timeoutMillis(), MILLISECONDS);
410 >                        shouldThrow();
411 >                    } catch (TimeoutException success) {}
412 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
413 >                }});
414  
415 <            t1.start();
416 <            t2.start();
417 <            t1.join();
376 <            t2.join();
415 >            awaitTermination(t1);
416 >            awaitTermination(t2);
417 >            assertEquals(0, barrier.getNumberWaiting());
418              assertTrue(barrier.isBroken());
419              assertEquals(0, barrier.getNumberWaiting());
420              barrier.reset();
# Line 382 | Line 423 | public class CyclicBarrierTest extends J
423          }
424      }
425  
385
426      /**
427       * Reset of a barrier after a failed command reinitializes it.
428       */
429      public void testResetAfterCommandException() throws Exception {
390        final CyclicBarrier start = new CyclicBarrier(3);
430          final CyclicBarrier barrier =
431              new CyclicBarrier(3, new Runnable() {
432                      public void run() {
433                          throw new NullPointerException(); }});
434          for (int i = 0; i < 2; i++) {
435 +            final CyclicBarrier start = new CyclicBarrier(3);
436              Thread t1 = new ThreadShouldThrow(BrokenBarrierException.class) {
437                  public void realRun() throws Exception {
438                      start.await();
# Line 408 | Line 448 | public class CyclicBarrierTest extends J
448              t1.start();
449              t2.start();
450              start.await();
451 <            while (barrier.getNumberWaiting() < 2) { Thread.yield(); }
451 >            awaitNumberWaiting(barrier, 2);
452              try {
453                  barrier.await();
454                  shouldThrow();
455              } catch (NullPointerException success) {}
456 <            t1.join();
457 <            t2.join();
456 >            awaitTermination(t1);
457 >            awaitTermination(t2);
458              assertTrue(barrier.isBroken());
459              assertEquals(0, barrier.getNumberWaiting());
460              barrier.reset();
# Line 422 | Line 462 | public class CyclicBarrierTest extends J
462              assertEquals(0, barrier.getNumberWaiting());
463          }
464      }
465 +
466 +    /**
467 +     * There can be more threads calling await() than parties, as long as each
468 +     * task only calls await once and the task count is a multiple of parties.
469 +     */
470 +    public void testMoreTasksThanParties() throws Exception {
471 +        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
472 +        final int parties = rnd.nextInt(1, 5);
473 +        final int nTasks = rnd.nextInt(1, 5) * parties;
474 +        final AtomicInteger tripCount = new AtomicInteger(0);
475 +        final AtomicInteger awaitCount = new AtomicInteger(0);
476 +        final CyclicBarrier barrier =
477 +            new CyclicBarrier(parties, () -> tripCount.getAndIncrement());
478 +        final ExecutorService e = Executors.newFixedThreadPool(nTasks);
479 +        final Runnable awaiter = () -> {
480 +            try {
481 +                if (ThreadLocalRandom.current().nextBoolean())
482 +                    barrier.await();
483 +                else
484 +                    barrier.await(LONG_DELAY_MS, MILLISECONDS);
485 +                awaitCount.getAndIncrement();
486 +            } catch (Throwable fail) { threadUnexpectedException(fail); }};
487 +        try (PoolCleaner cleaner = cleaner(e)) {
488 +            for (int i = nTasks; i--> 0; )
489 +                e.execute(awaiter);
490 +        }
491 +        assertEquals(nTasks / parties, tripCount.get());
492 +        assertEquals(nTasks, awaitCount.get());
493 +        assertEquals(0, barrier.getNumberWaiting());
494 +    }
495   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines