--- jsr166/src/test/loops/TimeoutProducerConsumerLoops.java 2009/10/23 19:57:07 1.3 +++ jsr166/src/test/loops/TimeoutProducerConsumerLoops.java 2009/10/29 23:09:08 1.4 @@ -17,7 +17,7 @@ public class TimeoutProducerConsumerLoop static final int POOL_MASK = POOL_SIZE-1; static final Integer[] intPool = new Integer[POOL_SIZE]; static { - for (int i = 0; i < POOL_SIZE; ++i) + for (int i = 0; i < POOL_SIZE; ++i) intPool[i] = Integer.valueOf(i); } @@ -43,7 +43,7 @@ public class TimeoutProducerConsumerLoop int maxPairs = NCPUS * 3 / 2; int iters = 1000000; - if (args.length > 0) + if (args.length > 0) maxPairs = Integer.parseInt(args[0]); print = true; @@ -55,8 +55,8 @@ public class TimeoutProducerConsumerLoop if (i == k) { k = i << 1; i = i + (i >>> 1); - } - else + } + else i = k; } pool.shutdown(); @@ -104,13 +104,13 @@ public class TimeoutProducerConsumerLoop oneRun(new ArrayBlockingQueue(POOL_SIZE, true), n, iters/16); } - + static abstract class Stage implements Runnable { final int iters; final BlockingQueue queue; final CyclicBarrier barrier; Stage (BlockingQueue q, CyclicBarrier b, int iters) { - queue = q; + queue = q; barrier = b; this.iters = iters; } @@ -143,15 +143,15 @@ public class TimeoutProducerConsumerLoop addProducerSum(s); barrier.await(); } - catch (Exception ie) { - ie.printStackTrace(); - return; + catch (Exception ie) { + ie.printStackTrace(); + return; } } } static class Consumer extends Stage { - Consumer(BlockingQueue q, CyclicBarrier b, int iters) { + Consumer(BlockingQueue q, CyclicBarrier b, int iters) { super(q, b, iters); } @@ -163,7 +163,7 @@ public class TimeoutProducerConsumerLoop int i = 0; long timeout = 1000; while (i < iters) { - Integer e = queue.poll(timeout, + Integer e = queue.poll(timeout, TimeUnit.NANOSECONDS); if (e != null) { l = LoopHelpers.compute4(e.intValue()); @@ -178,9 +178,9 @@ public class TimeoutProducerConsumerLoop addConsumerSum(s); barrier.await(); } - catch (Exception ie) { - ie.printStackTrace(); - return; + catch (Exception ie) { + ie.printStackTrace(); + return; } } @@ -205,12 +205,12 @@ public class TimeoutProducerConsumerLoop static final class LTQasSQ extends LinkedTransferQueue { LTQasSQ() { super(); } public void put(T x) { - try { super.transfer(x); + try { super.transfer(x); } catch (InterruptedException ex) { throw new Error(); } } public boolean offer(T x, long timeout, TimeUnit unit) { - return super.offer(x, timeout, unit); + return super.offer(x, timeout, unit); } }