--- jsr166/src/test/loops/TimeoutProducerConsumerLoops.java	2009/10/29 23:09:08	1.4
+++ jsr166/src/test/loops/TimeoutProducerConsumerLoops.java	2015/08/10 03:13:33	1.13
@@ -1,11 +1,10 @@
 /*
  * 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.concurrent.*;
-//import jsr166y.*;
 
 public class TimeoutProducerConsumerLoops {
     static final int NCPUS = Runtime.getRuntime().availableProcessors();
@@ -21,6 +20,10 @@ public class TimeoutProducerConsumerLoop
             intPool[i] = Integer.valueOf(i);
     }
 
+    // max lag between a producer and consumer to avoid
+    // this becoming a GC test rather than queue test.
+    // Used only per-pair to lessen impact on queue sync
+    static final int LAG_MASK = (1 << 12) - 1;
 
     static boolean print = false;
     static int producerSum;
@@ -47,8 +50,7 @@ public class TimeoutProducerConsumerLoop
             maxPairs = Integer.parseInt(args[0]);
 
         print = true;
-        int k = 1;
-        for (int i = 1; i <= maxPairs;) {
+        for (int k = 1, i = 1; i <= maxPairs;) {
             System.out.println("Pairs:" + i);
             oneTest(i, iters);
             Thread.sleep(100);
@@ -60,7 +62,7 @@ public class TimeoutProducerConsumerLoop
                 i = k;
         }
         pool.shutdown();
-   }
+    }
 
     static void oneTest(int n, int iters) throws Exception {
         if (print)
@@ -102,23 +104,24 @@ public class TimeoutProducerConsumerLoop
         if (print)
             System.out.print("ArrayBlockingQueue(fair) ");
         oneRun(new ArrayBlockingQueue<Integer>(POOL_SIZE, true), n, iters/16);
-
     }
 
-    static abstract class Stage implements Runnable {
+    abstract static class Stage implements Runnable {
         final int iters;
         final BlockingQueue<Integer> queue;
         final CyclicBarrier barrier;
-        Stage (BlockingQueue<Integer> q, CyclicBarrier b, int iters) {
+        final Phaser lagPhaser;
+        Stage(BlockingQueue<Integer> q, CyclicBarrier b, Phaser s, int iters) {
             queue = q;
             barrier = b;
+            lagPhaser = s;
             this.iters = iters;
         }
     }
 
     static class Producer extends Stage {
-        Producer(BlockingQueue<Integer> q, CyclicBarrier b, int iters) {
-            super(q, b, iters);
+        Producer(BlockingQueue<Integer> q, CyclicBarrier b, Phaser s, int iters) {
+            super(q, b, s, iters);
         }
 
         public void run() {
@@ -136,6 +139,8 @@ public class TimeoutProducerConsumerLoop
                         ++i;
                         if (timeout > 1)
                             timeout--;
+                        if ((i & LAG_MASK) == LAG_MASK)
+                            lagPhaser.arriveAndAwaitAdvance();
                     }
                     else
                         timeout++;
@@ -151,8 +156,8 @@ public class TimeoutProducerConsumerLoop
     }
 
     static class Consumer extends Stage {
-        Consumer(BlockingQueue<Integer> q, CyclicBarrier b, int iters) {
-            super(q, b, iters);
+        Consumer(BlockingQueue<Integer> q, CyclicBarrier b, Phaser s, int iters) {
+            super(q, b, s, iters);
         }
 
         public void run() {
@@ -171,6 +176,8 @@ public class TimeoutProducerConsumerLoop
                         ++i;
                         if (timeout > 1)
                             --timeout;
+                        if ((i & LAG_MASK) == LAG_MASK)
+                            lagPhaser.arriveAndAwaitAdvance();
                     }
                     else
                         ++timeout;
@@ -190,8 +197,9 @@ public class TimeoutProducerConsumerLoop
         LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();
         CyclicBarrier barrier = new CyclicBarrier(npairs * 2 + 1, timer);
         for (int i = 0; i < npairs; ++i) {
-            pool.execute(new Producer(q, barrier, iters));
-            pool.execute(new Consumer(q, barrier, iters));
+            Phaser s = new Phaser(2);
+            pool.execute(new Producer(q, barrier, s, iters));
+            pool.execute(new Consumer(q, barrier, s, iters));
         }
         barrier.await();
         barrier.await();