--- jsr166/src/test/loops/ProducerConsumerLoops.java	2009/10/23 19:57:06	1.3
+++ jsr166/src/test/loops/ProducerConsumerLoops.java	2016/12/31 21:34:47	1.14
@@ -1,16 +1,23 @@
 /*
  * 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.*;
-import java.util.concurrent.*;
-//import jsr166y.*;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.SynchronousQueue;
 
 public class ProducerConsumerLoops {
     static final int NCPUS = Runtime.getRuntime().availableProcessors();
-    static final Random rng = new Random();
     static final ExecutorService pool = Executors.newCachedThreadPool();
     static boolean print = false;
     static int producerSum;
@@ -34,14 +41,14 @@ public class ProducerConsumerLoops {
     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);
     }
 
     // Number of puts by producers or takes by consumers
     static final int ITERS = 1 << 20;
 
-    // max lag between a producer and consumer to avoid 
+    // 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;
@@ -49,20 +56,19 @@ public class ProducerConsumerLoops {
     public static void main(String[] args) throws Exception {
         int maxPairs = NCPUS * 3 / 2;
 
-        if (args.length > 0) 
+        if (args.length > 0)
             maxPairs = Integer.parseInt(args[0]);
 
         warmup();
         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);
             if (i == k) {
                 k = i << 1;
                 i = i + (i >>> 1);
-            } 
-            else 
+            }
+            else
                 i = k;
         }
         pool.shutdown();
@@ -73,14 +79,14 @@ public class ProducerConsumerLoops {
         System.out.print("Warmup ");
         int it = 2000;
         for (int j = 5; j > 0; --j) {
-            oneTest(j, it); 
+            oneTest(j, it);
             System.out.print(".");
             it += 1000;
         }
         System.gc();
         it = 20000;
         for (int j = 5; j > 0; --j) {
-            oneTest(j, it); 
+            oneTest(j, it);
             System.out.print(".");
             it += 10000;
         }
@@ -110,7 +116,7 @@ public class ProducerConsumerLoops {
         if (print)
             System.out.print("LinkedBlockingDeque     ");
         oneRun(new LinkedBlockingDeque<Integer>(), n, iters);
-        
+
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("ArrayBlockingQueue      ");
@@ -121,7 +127,6 @@ public class ProducerConsumerLoops {
             System.out.print("SynchronousQueue        ");
         oneRun(new SynchronousQueue<Integer>(), n, iters);
 
-        
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("SynchronousQueue(fair)  ");
@@ -136,7 +141,7 @@ public class ProducerConsumerLoops {
         if (print)
             System.out.print("LinkedTransferQueue(half)");
         oneRun(new HalfSyncLTQ<Integer>(), n, iters);
-        
+
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("PriorityBlockingQueue   ");
@@ -146,17 +151,15 @@ public class ProducerConsumerLoops {
         if (print)
             System.out.print("ArrayBlockingQueue(fair)");
         oneRun(new ArrayBlockingQueue<Integer>(POOL_SIZE, true), n, fairIters);
-
     }
-    
-    static abstract class Stage implements Runnable {
+
+    abstract static class Stage implements Runnable {
         final int iters;
         final BlockingQueue<Integer> queue;
         final CyclicBarrier barrier;
         final Phaser lagPhaser;
-        Stage (BlockingQueue<Integer> q, CyclicBarrier b, Phaser s,
-               int iters) {
-            queue = q; 
+        Stage(BlockingQueue<Integer> q, CyclicBarrier b, Phaser s, int iters) {
+            queue = q;
             barrier = b;
             lagPhaser = s;
             this.iters = iters;
@@ -186,16 +189,16 @@ public class ProducerConsumerLoops {
                 addProducerSum(ps);
                 barrier.await();
             }
-            catch (Exception ie) { 
-                ie.printStackTrace(); 
-                return; 
+            catch (Exception ie) {
+                ie.printStackTrace();
+                return;
             }
         }
     }
 
     static class Consumer extends Stage {
         Consumer(BlockingQueue<Integer> q, CyclicBarrier b, Phaser s,
-                 int iters) { 
+                 int iters) {
             super(q, b, s, iters);
         }
 
@@ -213,9 +216,9 @@ public class ProducerConsumerLoops {
                 addConsumerSum(cs);
                 barrier.await();
             }
-            catch (Exception ie) { 
-                ie.printStackTrace(); 
-                return; 
+            catch (Exception ie) {
+                ie.printStackTrace();
+                return;
             }
         }
 
@@ -240,8 +243,8 @@ public class ProducerConsumerLoops {
     static final class LTQasSQ<T> extends LinkedTransferQueue<T> {
         LTQasSQ() { super(); }
         public void put(T x) {
-            try { super.transfer(x); 
-            } catch (InterruptedException ex) { throw new Error(); }
+            try { super.transfer(x); }
+            catch (InterruptedException ex) { throw new Error(ex); }
         }
     }
 
@@ -252,10 +255,8 @@ public class ProducerConsumerLoops {
             if ((++calls & 1) == 0)
                 super.put(x);
             else {
-                try { super.transfer(x); 
-                } catch (InterruptedException ex) { 
-                    throw new Error(); 
-                }
+                try { super.transfer(x); }
+                catch (InterruptedException ex) { throw new Error(ex); }
             }
         }
     }