--- jsr166/src/test/loops/MultipleProducersSingleConsumerLoops.java	2010/09/27 19:15:15	1.7
+++ jsr166/src/test/loops/MultipleProducersSingleConsumerLoops.java	2016/12/31 21:34:47	1.15
@@ -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 MultipleProducersSingleConsumerLoops {
     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;
@@ -54,8 +61,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 +127,6 @@ public class MultipleProducersSingleCons
             System.out.print("SynchronousQueue        ");
         oneRun(new SynchronousQueue<Integer>(), n, iters);
 
-
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("SynchronousQueue(fair)  ");
@@ -146,8 +151,6 @@ public class MultipleProducersSingleCons
         if (print)
             System.out.print("ArrayBlockingQueue(fair)");
         oneRun(new ArrayBlockingQueue<Integer>(POOL_SIZE, true), n, fairIters);
-
-
     }
 
     abstract static class Stage implements Runnable {
@@ -230,7 +233,6 @@ public class MultipleProducersSingleCons
 
     }
 
-
     static void oneRun(BlockingQueue<Integer> q, int n, int iters) throws Exception {
 
         LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();
@@ -251,8 +253,8 @@ public class MultipleProducersSingleCons
     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); }
         }
     }
 
@@ -263,10 +265,8 @@ public class MultipleProducersSingleCons
             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); }
             }
         }
     }