--- jsr166/src/test/loops/MultipleProducersSingleConsumerLoops.java 2009/10/29 23:09:07 1.5 +++ jsr166/src/test/loops/MultipleProducersSingleConsumerLoops.java 2015/01/15 18:34:19 1.10 @@ -1,7 +1,7 @@ /* * Written by Doug Lea with assistance from members of JCP JSR-166 * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/licenses/publicdomain + * http://creativecommons.org/publicdomain/zero/1.0/ */ import java.util.*; @@ -54,8 +54,7 @@ public class MultipleProducersSingleCons warmup(); print = true; - int k = 1; - for (int i = 1; i <= maxn;) { + for (int k = 1, i = 1; i <= maxn;) { System.out.println("Producers:" + i); oneTest(i, ITERS); if (i == k) { @@ -121,7 +120,6 @@ public class MultipleProducersSingleCons System.out.print("SynchronousQueue "); oneRun(new SynchronousQueue(), n, iters); - Thread.sleep(100); // System.gc(); if (print) System.out.print("SynchronousQueue(fair) "); @@ -147,17 +145,16 @@ public class MultipleProducersSingleCons System.out.print("ArrayBlockingQueue(fair)"); oneRun(new ArrayBlockingQueue(POOL_SIZE, true), n, fairIters); - } - static abstract class Stage implements Runnable { + abstract static class Stage implements Runnable { final int iters; final BlockingQueue queue; final CyclicBarrier barrier; final Phaser lagPhaser; final int lag; - Stage (BlockingQueue q, CyclicBarrier b, Phaser s, - int iters, int lag) { + Stage(BlockingQueue q, CyclicBarrier b, Phaser s, + int iters, int lag) { queue = q; barrier = b; lagPhaser = s; @@ -230,7 +227,6 @@ public class MultipleProducersSingleCons } - static void oneRun(BlockingQueue q, int n, int iters) throws Exception { LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();