ViewVC Help

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

root/jsr166/jsr166/src/test/loops/CancelledProducerConsumerLoops.java

Comparing jsr166/src/test/loops/CancelledProducerConsumerLoops.java (file contents):
Revision 1.5 by jsr166, Thu Oct 29 23:09:07 2009 UTC vs.
Revision 1.11 by jsr166, Tue Mar 15 19:47:05 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		*/
6		import java.util.concurrent.*;
7
#	Line 26 | Line 26 | public class CancelledProducerConsumerLo
26		try {
27		oneTest(i, iters);
28		}
29	<	catch(BrokenBarrierException bb) {
29	>	catch (BrokenBarrierException bb) {
30		// OK, ignore
31		}
32		Thread.sleep(100);
#	Line 72 | Line 72 | public class CancelledProducerConsumerLo
72		long endTime = System.nanoTime();
73		long time = endTime - timer.startTime;
74		if (print) {
75	<	double secs = (double)(time) / 1000000000.0;
75	>	double secs = (double) time / 1000000000.0;
76		System.out.println("\t " + secs + "s run time");
77		}
78		}
#	Line 87 | Line 87 | public class CancelledProducerConsumerLo
87		System.out.print("LinkedBlockingQueue     ");
88		oneRun(new LinkedBlockingQueue<Integer>(CAPACITY), pairs, iters);
89
90	+	if (print)
91	+	System.out.print("LinkedTransferQueue     ");
92	+	oneRun(new LinkedTransferQueue<Integer>(), pairs, iters);
93
94		if (print)
95		System.out.print("SynchronousQueue        ");
#	Line 104 | Line 107 | public class CancelledProducerConsumerLo
107		*/
108		}
109
110	<	static abstract class Stage implements Callable {
110	>	abstract static class Stage implements Callable {
111		final BlockingQueue<Integer> queue;
112		final CyclicBarrier barrier;
113		final int iters;
114	<	Stage (BlockingQueue<Integer> q, CyclicBarrier b, int iters) {
114	>	Stage(BlockingQueue<Integer> q, CyclicBarrier b, int iters) {
115		queue = q;
116		barrier = b;
117		this.iters = iters;

Diff Legend

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