--- jsr166/src/test/loops/SingleProducerMultipleConsumerLoops.java	2009/10/23 19:57:07	1.3
+++ jsr166/src/test/loops/SingleProducerMultipleConsumerLoops.java	2016/12/31 19:40:49	1.11
@@ -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();
@@ -22,48 +30,47 @@ public class SingleProducerMultipleConsu
     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);
     }
 
     public static void main(String[] args) throws Exception {
         int maxn = 12;
 
-        if (args.length > 0) 
+        if (args.length > 0)
             maxn = Integer.parseInt(args[0]);
 
         print = false;
         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) {
                 k = i << 1;
                 i = i + (i >>> 1);
-            } 
-            else 
+            }
+            else
                 i = k;
         }
-        
+
         pool.shutdown();
-   }
+    }
 
     static void warmup() throws Exception {
         print = false;
         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;
         }
@@ -93,7 +100,7 @@ public class SingleProducerMultipleConsu
         if (print)
             System.out.print("LinkedBlockingDeque     ");
         oneRun(new LinkedBlockingDeque<Integer>(), n, iters);
-        
+
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("ArrayBlockingQueue      ");
@@ -103,7 +110,7 @@ public class SingleProducerMultipleConsu
         if (print)
             System.out.print("SynchronousQueue        ");
         oneRun(new SynchronousQueue<Integer>(), n, iters);
-        
+
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("SynchronousQueue(fair)  ");
@@ -118,7 +125,7 @@ public class SingleProducerMultipleConsu
         if (print)
             System.out.print("LinkedTransferQueue(half)");
         oneRun(new HalfSyncLTQ<Integer>(), n, iters);
-        
+
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("PriorityBlockingQueue   ");
@@ -128,16 +135,15 @@ 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) {
-            queue = q; 
+        Stage(BlockingQueue<Integer> q, CyclicBarrier b, int iters) {
+            queue = q;
             barrier = b;
             this.iters = iters;
         }
@@ -160,17 +166,16 @@ public class SingleProducerMultipleConsu
                 barrier.await();
                 result = 432;
             }
-            catch (Exception ie) { 
-                ie.printStackTrace(); 
-                return; 
+            catch (Exception ie) {
+                ie.printStackTrace();
+                return;
             }
         }
     }
 
     static class Consumer extends Stage {
-        Consumer(BlockingQueue<Integer> q, CyclicBarrier b, int iters) { 
+        Consumer(BlockingQueue<Integer> q, CyclicBarrier b, int iters) {
             super(q, b, iters);
-
         }
 
         public void run() {
@@ -186,9 +191,9 @@ public class SingleProducerMultipleConsu
                 result = s;
                 if (s == 0) System.out.print(" ");
             }
-            catch (Exception ie) { 
-                ie.printStackTrace(); 
-                return; 
+            catch (Exception ie) {
+                ie.printStackTrace();
+                return;
             }
         }
 
@@ -211,7 +216,7 @@ public class SingleProducerMultipleConsu
     static final class LTQasSQ<T> extends LinkedTransferQueue<T> {
         LTQasSQ() { super(); }
         public void put(T x) {
-            try { super.transfer(x); 
+            try { super.transfer(x);
             } catch (InterruptedException ex) { throw new Error(); }
         }
     }
@@ -223,9 +228,9 @@ 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();
                 }
             }
         }