ViewVC Help

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

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

Comparing jsr166/src/test/tck/CyclicBarrierTest.java (file contents):
Revision 1.12 by jsr166, Sat Nov 21 02:07:26 2009 UTC vs.
Revision 1.31 by jsr166, Fri Feb 1 19:14:23 2019 UTC

#	Line 1 | Line 1
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		* Other contributors include Andrew Wright, Jeffrey Hayes,
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 {
49		new CyclicBarrier(-1, (Runnable)null);
50		shouldThrow();
51	<	} catch (IllegalArgumentException e) {}
51	>	} catch (IllegalArgumentException success) {}
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 {
60		new CyclicBarrier(-1);
61		shouldThrow();
62	<	} catch (IllegalArgumentException e) {}
62	>	} catch (IllegalArgumentException success) {}
63		}
64
65		/**
#	Line 57 | Line 74 | public class CyclicBarrierTest extends J
74		/**
75		* A 1-party barrier triggers after single await
76		*/
77	<	public void testSingleParty() {
78	<	try {
79	<	CyclicBarrier b = new CyclicBarrier(1);
80	<	assertEquals(1, b.getParties());
81	<	assertEquals(0, b.getNumberWaiting());
82	<	b.await();
83	<	b.await();
67	<	assertEquals(0, b.getNumberWaiting());
68	<	}
69	<	catch (Exception e) {
70	<	unexpectedException();
71	<	}
77	>	public void testSingleParty() throws Exception {
78	>	CyclicBarrier b = new CyclicBarrier(1);
79	>	assertEquals(1, b.getParties());
80	>	assertEquals(0, b.getNumberWaiting());
81	>	b.await();
82	>	b.await();
83	>	assertEquals(0, b.getNumberWaiting());
84		}
85
86		/**
87		* The supplied barrier action is run at barrier
88		*/
89	<	public void testBarrierAction() {
90	<	try {
91	<	countAction = 0;
92	<	CyclicBarrier b = new CyclicBarrier(1, new MyAction());
93	<	assertEquals(1, b.getParties());
94	<	assertEquals(0, b.getNumberWaiting());
95	<	b.await();
96	<	b.await();
97	<	assertEquals(0, b.getNumberWaiting());
98	<	assertEquals(countAction, 2);
99	<	}
88	<	catch (Exception e) {
89	<	unexpectedException();
90	<	}
89	>	public void testBarrierAction() throws Exception {
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(2, count.get());
100		}
101
102		/**
103		* A 2-party/thread barrier triggers after both threads invoke await
104		*/
105	<	public void testTwoParties() {
105	>	public void testTwoParties() throws Exception {
106		final CyclicBarrier b = new CyclicBarrier(2);
107	<	Thread t = new Thread(new Runnable() {
108	<	public void run() {
109	<	try {
110	<	b.await();
111	<	b.await();
112	<	b.await();
113	<	b.await();
114	<	} catch (Exception e) {
115	<	threadUnexpectedException();
116	<	}}});
117	<
118	<	try {
119	<	t.start();
111	<	b.await();
112	<	b.await();
113	<	b.await();
114	<	b.await();
115	<	t.join();
116	<	} catch (Exception e) {
117	<	unexpectedException();
118	<	}
107	>	Thread t = newStartedThread(new CheckedRunnable() {
108	>	public void realRun() throws Exception {
109	>	b.await();
110	>	b.await();
111	>	b.await();
112	>	b.await();
113	>	}});
114	>
115	>	b.await();
116	>	b.await();
117	>	b.await();
118	>	b.await();
119	>	awaitTermination(t);
120		}
121
121	–
122		/**
123		* An interruption in one party causes others waiting in await to
124		* throw BrokenBarrierException
125		*/
126		public void testAwait1_Interrupted_BrokenBarrier() {
127		final CyclicBarrier c = new CyclicBarrier(3);
128	<	Thread t1 = new Thread(new Runnable() {
129	<	public void run() {
130	<	try {
131	<	c.await();
132	<	threadShouldThrow();
133	<	} catch (InterruptedException success) {}
134	<	catch (Exception b) {
135	<	threadUnexpectedException();
136	<	}
137	<	}
138	<	});
139	<	Thread t2 = new Thread(new Runnable() {
140	<	public void run() {
141	<	try {
142	<	c.await();
143	<	threadShouldThrow();
144	<	} catch (BrokenBarrierException success) {
145	<	} catch (Exception i) {
146	<	threadUnexpectedException();
147	<	}
148	<	}
149	<	});
150	<	try {
151	<	t1.start();
152	<	t2.start();
153	<	Thread.sleep(SHORT_DELAY_MS);
154	<	t1.interrupt();
155	<	t1.join();
156	<	t2.join();
157	<	} catch (InterruptedException e) {
158	<	unexpectedException();
159	<	}
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	>	await(pleaseInterrupt);
143	>	t1.interrupt();
144	>	awaitTermination(t1);
145	>	awaitTermination(t2);
146		}
147
148		/**
149		* An interruption in one party causes others waiting in timed await to
150		* throw BrokenBarrierException
151		*/
152	<	public void testAwait2_Interrupted_BrokenBarrier() {
152	>	public void testAwait2_Interrupted_BrokenBarrier() throws Exception {
153		final CyclicBarrier c = new CyclicBarrier(3);
154	<	Thread t1 = new Thread(new Runnable() {
155	<	public void run() {
156	<	try {
157	<	c.await(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
158	<	threadShouldThrow();
159	<	} catch (InterruptedException success) {
160	<	} catch (Exception b) {
161	<	threadUnexpectedException();
162	<	}
163	<	}
164	<	});
165	<	Thread t2 = new Thread(new Runnable() {
166	<	public void run() {
167	<	try {
168	<	c.await(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
169	<	threadShouldThrow();
170	<	} catch (BrokenBarrierException success) {
171	<	} catch (Exception i) {
186	<	threadUnexpectedException();
187	<	}
188	<	}
189	<	});
190	<	try {
191	<	t1.start();
192	<	t2.start();
193	<	Thread.sleep(SHORT_DELAY_MS);
194	<	t1.interrupt();
195	<	t1.join();
196	<	t2.join();
197	<	} catch (InterruptedException e) {
198	<	unexpectedException();
199	<	}
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	>	await(pleaseInterrupt);
169	>	t1.interrupt();
170	>	awaitTermination(t1);
171	>	awaitTermination(t2);
172		}
173
174		/**
175		* A timeout in timed await throws TimeoutException
176		*/
177	<	public void testAwait3_TimeOutException() {
177	>	public void testAwait3_TimeoutException() throws InterruptedException {
178		final CyclicBarrier c = new CyclicBarrier(2);
179	<	Thread t = new Thread(new Runnable() {
180	<	public void run() {
181	<	try {
182	<	c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
183	<	threadShouldThrow();
184	<	} catch (TimeoutException success) {
185	<	} catch (Exception b) {
186	<	threadUnexpectedException();
179	>	Thread t = newStartedThread(new CheckedRunnable() {
180	>	public void realRun() throws Exception {
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	<	}
217	<	}
218	<	});
219	<	try {
220	<	t.start();
221	<	t.join();
222	<	} catch (InterruptedException e) {
223	<	unexpectedException();
224	<	}
189	>	awaitTermination(t);
190		}
191
192		/**
193		* A timeout in one party causes others waiting in timed await to
194		* throw BrokenBarrierException
195		*/
196	<	public void testAwait4_Timeout_BrokenBarrier() {
196	>	public void testAwait4_Timeout_BrokenBarrier() throws InterruptedException {
197		final CyclicBarrier c = new CyclicBarrier(3);
198	<	Thread t1 = new Thread(new Runnable() {
199	<	public void run() {
200	<	try {
201	<	c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
202	<	threadShouldThrow();
203	<	} catch (TimeoutException success) {
204	<	} catch (Exception b) {
205	<	threadUnexpectedException();
206	<	}
207	<	}
208	<	});
209	<	Thread t2 = new Thread(new Runnable() {
210	<	public void run() {
211	<	try {
212	<	c.await(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
213	<	threadShouldThrow();
214	<	} catch (BrokenBarrierException success) {
215	<	} catch (Exception i) {
216	<	threadUnexpectedException();
217	<	}
253	<	}
254	<	});
255	<	try {
256	<	t1.start();
257	<	t2.start();
258	<	t1.join();
259	<	t2.join();
260	<	} catch (InterruptedException e) {
261	<	unexpectedException();
262	<	}
198	>	Thread t1 = newStartedThread(new CheckedRunnable() {
199	>	public void realRun() throws Exception {
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	>	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	>	awaitTermination(t1);
217	>	awaitTermination(t2);
218		}
219
220		/**
221		* A timeout in one party causes others waiting in await to
222		* throw BrokenBarrierException
223		*/
224	<	public void testAwait5_Timeout_BrokenBarrier() {
224	>	public void testAwait5_Timeout_BrokenBarrier() throws InterruptedException {
225		final CyclicBarrier c = new CyclicBarrier(3);
226	<	Thread t1 = new Thread(new Runnable() {
227	<	public void run() {
228	<	try {
229	<	c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
230	<	threadShouldThrow();
231	<	} catch (TimeoutException success) {
232	<	} catch (Exception b) {
233	<	threadUnexpectedException();
234	<	}
235	<	}
236	<	});
237	<	Thread t2 = new Thread(new Runnable() {
238	<	public void run() {
239	<	try {
240	<	c.await();
241	<	threadShouldThrow();
242	<	} catch (BrokenBarrierException success) {
243	<	} catch (Exception i) {
244	<	threadUnexpectedException();
245	<	}
291	<	}
292	<	});
293	<	try {
294	<	t1.start();
295	<	t2.start();
296	<	t1.join();
297	<	t2.join();
298	<	} catch (InterruptedException e) {
299	<	unexpectedException();
300	<	}
226	>	Thread t1 = newStartedThread(new CheckedRunnable() {
227	>	public void realRun() throws Exception {
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	>	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	>	awaitTermination(t1);
245	>	awaitTermination(t2);
246		}
247
248		/**
249		* A reset of an active barrier causes waiting threads to throw
250		* BrokenBarrierException
251		*/
252	<	public void testReset_BrokenBarrier() {
252	>	public void testReset_BrokenBarrier() throws InterruptedException {
253		final CyclicBarrier c = new CyclicBarrier(3);
254	<	Thread t1 = new Thread(new Runnable() {
255	<	public void run() {
256	<	try {
257	<	c.await();
258	<	threadShouldThrow();
259	<	} catch (BrokenBarrierException success) {}
260	<	catch (Exception b) {
261	<	threadUnexpectedException();
262	<	}
263	<	}
264	<	});
265	<	Thread t2 = new Thread(new Runnable() {
266	<	public void run() {
267	<	try {
268	<	c.await();
269	<	threadShouldThrow();
270	<	} catch (BrokenBarrierException success) {
271	<	} catch (Exception i) {
272	<	threadUnexpectedException();
273	<	}
329	<	}
330	<	});
331	<	try {
332	<	t1.start();
333	<	t2.start();
334	<	Thread.sleep(SHORT_DELAY_MS);
335	<	c.reset();
336	<	t1.join();
337	<	t2.join();
338	<	} catch (InterruptedException e) {
339	<	unexpectedException();
340	<	}
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	>	await(pleaseReset);
269	>
270	>	awaitNumberWaiting(c, 2);
271	>	c.reset();
272	>	awaitTermination(t1);
273	>	awaitTermination(t2);
274		}
275
276		/**
277		* A reset before threads enter barrier does not throw
278		* BrokenBarrierException
279		*/
280	<	public void testReset_NoBrokenBarrier() {
280	>	public void testReset_NoBrokenBarrier() throws Exception {
281		final CyclicBarrier c = new CyclicBarrier(3);
282	<	Thread t1 = new Thread(new Runnable() {
283	<	public void run() {
284	<	try {
285	<	c.await();
286	<	} catch (Exception b) {
287	<	threadUnexpectedException();
288	<	}
289	<	}
290	<	});
291	<	Thread t2 = new Thread(new Runnable() {
292	<	public void run() {
293	<	try {
294	<	c.await();
295	<	} catch (Exception i) {
363	<	threadUnexpectedException();
364	<	}
365	<	}
366	<	});
367	<	try {
368	<	c.reset();
369	<	t1.start();
370	<	t2.start();
371	<	c.await();
372	<	t1.join();
373	<	t2.join();
374	<	} catch (Exception e) {
375	<	unexpectedException();
376	<	}
282	>	c.reset();
283	>
284	>	Thread t1 = newStartedThread(new CheckedRunnable() {
285	>	public void realRun() throws Exception {
286	>	c.await();
287	>	}});
288	>	Thread t2 = newStartedThread(new CheckedRunnable() {
289	>	public void realRun() throws Exception {
290	>	c.await();
291	>	}});
292	>
293	>	c.await();
294	>	awaitTermination(t1);
295	>	awaitTermination(t2);
296		}
297
298		/**
299		* All threads block while a barrier is broken.
300		*/
301	<	public void testReset_Leakage() {
302	<	try {
303	<	final CyclicBarrier c = new CyclicBarrier(2);
304	<	final AtomicBoolean done = new AtomicBoolean();
305	<	Thread t = new Thread() {
306	<	public void run() {
307	<	while (!done.get()) {
308	<	try {
309	<	while (c.isBroken())
310	<	c.reset();
311	<
312	<	c.await();
394	<	threadFail("await should not return");
395	<	}
396	<	catch (BrokenBarrierException e) {
397	<	}
398	<	catch (InterruptedException ie) {
399	<	}
400	<	}
301	>	public void testReset_Leakage() throws InterruptedException {
302	>	final CyclicBarrier c = new CyclicBarrier(2);
303	>	final AtomicBoolean done = new AtomicBoolean();
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	<	};
314	>	catch (BrokenBarrierException | InterruptedException ok) {}
315	>	}}});
316
317	<	t.start();
318	<	for ( int i = 0; i < 4; i++) {
406	<	Thread.sleep(SHORT_DELAY_MS);
407	<	t.interrupt();
408	<	}
409	<	done.set(true);
317	>	for (int i = 0; i < 4; i++) {
318	>	delay(timeoutMillis());
319		t.interrupt();
320		}
321	<	catch (Exception ex) {
322	<	unexpectedException();
323	<	}
321	>	done.set(true);
322	>	t.interrupt();
323	>	awaitTermination(t);
324		}
325
326		/**
327		* Reset of a non-broken barrier does not break barrier
328		*/
329	<	public void testResetWithoutBreakage() {
330	<	try {
329	>	public void testResetWithoutBreakage() throws Exception {
330	>	final CyclicBarrier barrier = new CyclicBarrier(3);
331	>	for (int i = 0; i < 3; i++) {
332		final CyclicBarrier start = new CyclicBarrier(3);
333	<	final CyclicBarrier barrier = new CyclicBarrier(3);
334	<	for (int i = 0; i < 3; i++) {
335	<	Thread t1 = new Thread(new Runnable() {
336	<	public void run() {
337	<	try { start.await(); }
338	<	catch (Exception ie) {
339	<	threadFail("start barrier");
340	<	}
341	<	try { barrier.await(); }
342	<	catch (Throwable thrown) {
343	<	unexpectedException();
344	<	}}});
345	<
346	<	Thread t2 = new Thread(new Runnable() {
347	<	public void run() {
348	<	try { start.await(); }
349	<	catch (Exception ie) {
350	<	threadFail("start barrier");
351	<	}
352	<	try { barrier.await(); }
353	<	catch (Throwable thrown) {
444	<	unexpectedException();
445	<	}}});
446	<
447	<
448	<	t1.start();
449	<	t2.start();
450	<	try { start.await(); }
451	<	catch (Exception ie) { threadFail("start barrier"); }
452	<	barrier.await();
453	<	t1.join();
454	<	t2.join();
455	<	assertFalse(barrier.isBroken());
456	<	assertEquals(0, barrier.getNumberWaiting());
457	<	if (i == 1) barrier.reset();
458	<	assertFalse(barrier.isBroken());
459	<	assertEquals(0, barrier.getNumberWaiting());
460	<	}
461	<	}
462	<	catch (Exception ex) {
463	<	unexpectedException();
333	>	Thread t1 = newStartedThread(new CheckedRunnable() {
334	>	public void realRun() throws Exception {
335	>	start.await();
336	>	barrier.await();
337	>	}});
338	>
339	>	Thread t2 = newStartedThread(new CheckedRunnable() {
340	>	public void realRun() throws Exception {
341	>	start.await();
342	>	barrier.await();
343	>	}});
344	>
345	>	start.await();
346	>	barrier.await();
347	>	awaitTermination(t1);
348	>	awaitTermination(t2);
349	>	assertFalse(barrier.isBroken());
350	>	assertEquals(0, barrier.getNumberWaiting());
351	>	if (i == 1) barrier.reset();
352	>	assertFalse(barrier.isBroken());
353	>	assertEquals(0, barrier.getNumberWaiting());
354		}
355		}
356
357		/**
358		* Reset of a barrier after interruption reinitializes it.
359		*/
360	<	public void testResetAfterInterrupt() {
361	<	try {
360	>	public void testResetAfterInterrupt() throws Exception {
361	>	final CyclicBarrier barrier = new CyclicBarrier(3);
362	>	for (int i = 0; i < 2; i++) {
363		final CyclicBarrier start = new CyclicBarrier(3);
364	<	final CyclicBarrier barrier = new CyclicBarrier(3);
365	<	for (int i = 0; i < 2; i++) {
366	<	Thread t1 = new Thread(new Runnable() {
367	<	public void run() {
368	<	try { start.await(); }
369	<	catch (Exception ie) {
370	<	threadFail("start barrier");
371	<	}
372	<	try { barrier.await(); }
373	<	catch (InterruptedException ok) {}
374	<	catch (Throwable thrown) {
375	<	unexpectedException();
376	<	}}});
377	<
378	<	Thread t2 = new Thread(new Runnable() {
379	<	public void run() {
380	<	try { start.await(); }
381	<	catch (Exception ie) {
382	<	threadFail("start barrier");
383	<	}
384	<	try { barrier.await(); }
385	<	catch (BrokenBarrierException ok) {}
386	<	catch (Throwable thrown) {
496	<	unexpectedException();
497	<	}}});
498	<
499	<	t1.start();
500	<	t2.start();
501	<	try { start.await(); }
502	<	catch (Exception ie) { threadFail("start barrier"); }
503	<	t1.interrupt();
504	<	t1.join();
505	<	t2.join();
506	<	assertTrue(barrier.isBroken());
507	<	assertEquals(0, barrier.getNumberWaiting());
508	<	barrier.reset();
509	<	assertFalse(barrier.isBroken());
510	<	assertEquals(0, barrier.getNumberWaiting());
511	<	}
512	<	}
513	<	catch (Exception ex) {
514	<	unexpectedException();
364	>	Thread t1 = new ThreadShouldThrow(InterruptedException.class) {
365	>	public void realRun() throws Exception {
366	>	start.await();
367	>	barrier.await();
368	>	}};
369	>
370	>	Thread t2 = new ThreadShouldThrow(BrokenBarrierException.class) {
371	>	public void realRun() throws Exception {
372	>	start.await();
373	>	barrier.await();
374	>	}};
375	>
376	>	t1.start();
377	>	t2.start();
378	>	start.await();
379	>	t1.interrupt();
380	>	awaitTermination(t1);
381	>	awaitTermination(t2);
382	>	assertTrue(barrier.isBroken());
383	>	assertEquals(0, barrier.getNumberWaiting());
384	>	barrier.reset();
385	>	assertFalse(barrier.isBroken());
386	>	assertEquals(0, barrier.getNumberWaiting());
387		}
388		}
389
390		/**
391		* Reset of a barrier after timeout reinitializes it.
392		*/
393	<	public void testResetAfterTimeout() {
394	<	try {
395	<	final CyclicBarrier start = new CyclicBarrier(3);
396	<	final CyclicBarrier barrier = new CyclicBarrier(3);
397	<	for (int i = 0; i < 2; i++) {
398	<	Thread t1 = new Thread(new Runnable() {
399	<	public void run() {
400	<	try { start.await(); }
401	<	catch (Exception ie) {
402	<	threadFail("start barrier");
403	<	}
404	<	try { barrier.await(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); }
405	<	catch (TimeoutException ok) {}
406	<	catch (Throwable thrown) {
407	<	unexpectedException();
408	<	}}});
409	<
410	<	Thread t2 = new Thread(new Runnable() {
411	<	public void run() {
412	<	try { start.await(); }
413	<	catch (Exception ie) {
414	<	threadFail("start barrier");
415	<	}
416	<	try { barrier.await(); }
417	<	catch (BrokenBarrierException ok) {}
418	<	catch (Throwable thrown) {
419	<	unexpectedException();
420	<	}}});
421	<
422	<	t1.start();
551	<	t2.start();
552	<	try { start.await(); }
553	<	catch (Exception ie) { threadFail("start barrier"); }
554	<	t1.join();
555	<	t2.join();
556	<	assertTrue(barrier.isBroken());
557	<	assertEquals(0, barrier.getNumberWaiting());
558	<	barrier.reset();
559	<	assertFalse(barrier.isBroken());
560	<	assertEquals(0, barrier.getNumberWaiting());
561	<	}
562	<	}
563	<	catch (Exception ex) {
564	<	unexpectedException();
393	>	public void testResetAfterTimeout() throws Exception {
394	>	final CyclicBarrier barrier = new CyclicBarrier(3);
395	>	for (int i = 0; i < 2; i++) {
396	>	assertEquals(0, barrier.getNumberWaiting());
397	>	Thread t1 = newStartedThread(new CheckedRunnable() {
398	>	public void realRun() throws Exception {
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	>	awaitTermination(t1);
416	>	awaitTermination(t2);
417	>	assertEquals(0, barrier.getNumberWaiting());
418	>	assertTrue(barrier.isBroken());
419	>	assertEquals(0, barrier.getNumberWaiting());
420	>	barrier.reset();
421	>	assertFalse(barrier.isBroken());
422	>	assertEquals(0, barrier.getNumberWaiting());
423		}
424		}
425
568	–
426		/**
427		* Reset of a barrier after a failed command reinitializes it.
428		*/
429	<	public void testResetAfterCommandException() {
430	<	try {
429	>	public void testResetAfterCommandException() throws Exception {
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	<	final CyclicBarrier barrier =
437	<	new CyclicBarrier(3, new Runnable() {
438	<	public void run() {
439	<	throw new NullPointerException(); }});
440	<	for (int i = 0; i < 2; i++) {
441	<	Thread t1 = new Thread(new Runnable() {
442	<	public void run() {
443	<	try { start.await(); }
444	<	catch (Exception ie) {
445	<	threadFail("start barrier");
446	<	}
447	<	try { barrier.await(); }
448	<	catch (BrokenBarrierException ok) {}
449	<	catch (Throwable thrown) {
450	<	unexpectedException();
451	<	}}});
452	<
453	<	Thread t2 = new Thread(new Runnable() {
454	<	public void run() {
455	<	try { start.await(); }
456	<	catch (Exception ie) {
457	<	threadFail("start barrier");
458	<	}
459	<	try { barrier.await(); }
460	<	catch (BrokenBarrierException ok) {}
461	<	catch (Throwable thrown) {
462	<	unexpectedException();
602	<	}}});
603	<
604	<	t1.start();
605	<	t2.start();
606	<	try { start.await(); }
607	<	catch (Exception ie) { threadFail("start barrier"); }
608	<	while (barrier.getNumberWaiting() < 2) { Thread.yield(); }
609	<	try { barrier.await(); }
610	<	catch (Exception ok) { }
611	<	t1.join();
612	<	t2.join();
613	<	assertTrue(barrier.isBroken());
614	<	assertEquals(0, barrier.getNumberWaiting());
615	<	barrier.reset();
616	<	assertFalse(barrier.isBroken());
617	<	assertEquals(0, barrier.getNumberWaiting());
618	<	}
619	<	}
620	<	catch (Exception ex) {
621	<	unexpectedException();
436	>	Thread t1 = new ThreadShouldThrow(BrokenBarrierException.class) {
437	>	public void realRun() throws Exception {
438	>	start.await();
439	>	barrier.await();
440	>	}};
441	>
442	>	Thread t2 = new ThreadShouldThrow(BrokenBarrierException.class) {
443	>	public void realRun() throws Exception {
444	>	start.await();
445	>	barrier.await();
446	>	}};
447	>
448	>	t1.start();
449	>	t2.start();
450	>	start.await();
451	>	awaitNumberWaiting(barrier, 2);
452	>	try {
453	>	barrier.await();
454	>	shouldThrow();
455	>	} catch (NullPointerException success) {}
456	>	awaitTermination(t1);
457	>	awaitTermination(t2);
458	>	assertTrue(barrier.isBroken());
459	>	assertEquals(0, barrier.getNumberWaiting());
460	>	barrier.reset();
461	>	assertFalse(barrier.isBroken());
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