--- jsr166/src/test/loops/SingleProducerMultipleConsumerLoops.java	2009/10/29 23:09:08	1.4
+++ jsr166/src/test/loops/SingleProducerMultipleConsumerLoops.java	2016/12/31 21:34:47	1.12
@@ -1,11 +1,19 @@
 /*
  * 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.*;
+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.PriorityBlockingQueue;
+import java.util.concurrent.SynchronousQueue;
 
 public class SingleProducerMultipleConsumerLoops {
     static final int NCPUS = Runtime.getRuntime().availableProcessors();
@@ -36,8 +44,7 @@ public class SingleProducerMultipleConsu
         warmup();
         print = true;
 
-        int k = 1;
-        for (int i = 1; i <= maxn;) {
+        for (int k = 1, i = 1; i <= maxn;) {
             System.out.println("Consumers:" + i);
             oneTest(i, ITERS);
             if (i == k) {
@@ -49,7 +56,7 @@ public class SingleProducerMultipleConsu
         }
 
         pool.shutdown();
-   }
+    }
 
     static void warmup() throws Exception {
         print = false;
@@ -128,15 +135,14 @@ public class SingleProducerMultipleConsu
         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;
         volatile int result;
-        Stage (BlockingQueue<Integer> q, CyclicBarrier b, int iters) {
+        Stage(BlockingQueue<Integer> q, CyclicBarrier b, int iters) {
             queue = q;
             barrier = b;
             this.iters = iters;
@@ -170,7 +176,6 @@ public class SingleProducerMultipleConsu
     static class Consumer extends Stage {
         Consumer(BlockingQueue<Integer> q, CyclicBarrier b, int iters) {
             super(q, b, iters);
-
         }
 
         public void run() {
@@ -211,8 +216,8 @@ public class SingleProducerMultipleConsu
     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); }
         }
     }
 
@@ -223,10 +228,8 @@ public class SingleProducerMultipleConsu
             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); }
             }
         }
     }