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

Diff Legend

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