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.1 by dl, Sun Aug 31 19:24:54 2003 UTC vs.
Revision 1.31 by jsr166, Fri Feb 1 19:14:23 2019 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by members of JCP JSR-166 Expert Group and released to the
3	<	* public domain. Use, modify, and redistribute this code in any way
4	<	* without acknowledgement. Other contributors include Andrew Wright,
5	<	* Jeffrey Hayes, Pat Fischer, Mike Judd.
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/publicdomain/zero/1.0/
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
9	<	import java.util.*;
10	<	import java.util.concurrent.*;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10
11	<	public class CyclicBarrierTest extends TestCase{
12	<
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		}
17	–
18	–
28		public static Test suite() {
29	<	return new TestSuite(CyclicBarrierTest.class);
29	>	return new TestSuite(CyclicBarrierTest.class);
30		}
22	–
23	–	private static long SHORT_DELAY_MS = 100;
24	–	private static long MEDIUM_DELAY_MS = 1000;
25	–	private static long LONG_DELAY_MS = 10000;
31
32	<	public void testConstructor1(){
33	<	try{
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 IllegalArgumentException
46	>	*/
47	>	public void testConstructor1() {
48	>	try {
49		new CyclicBarrier(-1, (Runnable)null);
50	<	fail("should throw");
51	<	} catch(IllegalArgumentException e){}
50	>	shouldThrow();
51	>	} catch (IllegalArgumentException success) {}
52		}
53
54	<	public void testConstructor2(){
55	<	try{
54	>	/**
55	>	* Creating with negative parties and no action throws
56	>	* IllegalArgumentException
57	>	*/
58	>	public void testConstructor2() {
59	>	try {
60		new CyclicBarrier(-1);
61	<	fail("should throw");
62	<	} catch(IllegalArgumentException e){}
61	>	shouldThrow();
62	>	} catch (IllegalArgumentException success) {}
63		}
64
65	<	public void testConstructor3(){
65	>	/**
66	>	* getParties returns the number of parties given in constructor
67	>	*/
68	>	public void testGetParties() {
69		CyclicBarrier b = new CyclicBarrier(2);
70	<	assertEquals(2, b.getParties());
70	>	assertEquals(2, b.getParties());
71		assertEquals(0, b.getNumberWaiting());
72		}
73
74	<	public void testSingleParty() {
75	<	try {
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	<	catch(Exception e) {
57	<	fail("unexpected exception");
58	<	}
59	<	}
60	<
61	<	private volatile int countAction;
62	<	private class MyAction implements Runnable {
63	<	public void run() { ++countAction; }
74	>	/**
75	>	* A 1-party barrier triggers after single await
76	>	*/
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	<	public void testBarrierAction() {
87	<	try {
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(countAction, 2);
96	<	}
97	<	catch(Exception e) {
98	<	fail("unexpected exception");
99	<	}
86	>	/**
87	>	* The supplied barrier action is run at barrier
88	>	*/
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	<	public void testTwoParties(){
102	>	/**
103	>	* A 2-party/thread barrier triggers after both threads invoke await
104	>	*/
105	>	public void testTwoParties() throws Exception {
106		final CyclicBarrier b = new CyclicBarrier(2);
107	<	Thread t = new Thread(new Runnable() {
108	<	public void run(){
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	>
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	>	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() 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	>	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() throws InterruptedException {
178	>	final CyclicBarrier c = new CyclicBarrier(2);
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	>	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() throws InterruptedException {
197	>	final CyclicBarrier c = new CyclicBarrier(3);
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() throws InterruptedException {
225	>	final CyclicBarrier c = new CyclicBarrier(3);
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() 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	>	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() throws Exception {
281	>	final CyclicBarrier c = new CyclicBarrier(3);
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() 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	<	b.await();
309	<	b.await();
90	<	b.await();
91	<	b.await();
92	<	} catch(Exception e){
93	<	fail("unexpected exception");
94	<	}}});
308	>	while (c.isBroken())
309	>	c.reset();
310
311	<	try {
312	<	t.start();
313	<	b.await();
314	<	b.await();
315	<	b.await();
316	<	b.await();
317	<	t.join();
318	<	} catch(Exception e){
319	<	fail("unexpected exception");
311	>	c.await();
312	>	shouldThrow();
313	>	}
314	>	catch (BrokenBarrierException | InterruptedException ok) {}
315	>	}}});
316	>
317	>	for (int i = 0; i < 4; i++) {
318	>	delay(timeoutMillis());
319	>	t.interrupt();
320	>	}
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() 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	>	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() 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	+	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
109	–	public void testAwait1_Interrupted_BrokenBarrier(){
110	–	final CyclicBarrier c = new CyclicBarrier(3);
111	–	Thread t1 = new Thread(new Runnable() {
112	–	public void run(){
113	–	try{
114	–	c.await();
115	–	fail("should throw");
116	–	} catch(InterruptedException success){}
117	–	catch(Exception b){
118	–	fail("should throw IE");
119	–	}
120	–	}
121	–	});
122	–	Thread t2 = new Thread(new Runnable(){
123	–	public void run(){
124	–	try{
125	–	c.await();
126	–	fail("should throw");
127	–	} catch(BrokenBarrierException success){
128	–	} catch(Exception i){
129	–	fail("should throw BBE");
130	–	}
131	–	}
132	–	});
133	–	try {
376		t1.start();
377		t2.start();
378	<	Thread.sleep(SHORT_DELAY_MS);
378	>	start.await();
379		t1.interrupt();
380	<	t1.join();
381	<	t2.join();
382	<	} catch(InterruptedException e){
383	<	fail("unexpected exception");
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	<	public void testAwait2_Interrupted_BrokenBarrier(){
391	<	final CyclicBarrier c = new CyclicBarrier(3);
392	<	Thread t1 = new Thread(new Runnable() {
393	<	public void run(){
394	<	try{
395	<	c.await(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
396	<	fail("should throw");
397	<	} catch(InterruptedException success){
398	<	} catch(Exception b){
399	<	fail("should throw IE");
400	<	}
401	<	}
402	<	});
403	<	Thread t2 = new Thread(new Runnable(){
404	<	public void run(){
405	<	try{
406	<	c.await(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
407	<	fail("should throw");
408	<	} catch(BrokenBarrierException success){
409	<	} catch(Exception i){
410	<	fail("should throw BBE");
411	<	}
412	<	}
413	<	});
414	<	try {
390	>	/**
391	>	* Reset of a barrier after timeout reinitializes it.
392	>	*/
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	>
426	>	/**
427	>	* Reset of a barrier after a failed command reinitializes it.
428	>	*/
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	>	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	<	Thread.sleep(SHORT_DELAY_MS);
451	<	t1.interrupt();
452	<	t1.join();
453	<	t2.join();
454	<	} catch(InterruptedException e){
455	<	fail("unexpected exception");
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	<	public void testAwait3_TimeOutException(){
467	<	final CyclicBarrier c = new CyclicBarrier(2);
468	<	Thread t = new Thread(new Runnable() {
469	<	public void run(){
470	<	try{
471	<	c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
472	<	fail("should throw");
473	<	} catch(TimeoutException success){
474	<	} catch(Exception b){
475	<	fail("should throw TOE");
476	<
477	<	}
478	<	}
479	<	});
480	<	try {
481	<	t.start();
482	<	t.join();
483	<	} catch(InterruptedException e){
484	<	fail("unexpected exception");
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		}
202	–
495		}

Diff Legend

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