--- jsr166/src/test/loops/OfferPollLoops.java	2009/10/29 23:09:07	1.2
+++ jsr166/src/test/loops/OfferPollLoops.java	2016/12/31 19:50:56	1.11
@@ -1,16 +1,26 @@
 /*
  * 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.Queue;
+import java.util.Random;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ConcurrentLinkedQueue;
+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;
 
 public class OfferPollLoops {
     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 +64,7 @@ public class OfferPollLoops {
 
         warmup();
         print = true;
-        int k = 1;
-        for (int i = 1; i <= maxN;) {
+        for (int k = 1, i = 1; i <= maxN;) {
             System.out.println("Pairs:" + i);
             oneTest(i, ITERS);
             if (i == k) {
@@ -103,6 +112,11 @@ public class OfferPollLoops {
 
         Thread.sleep(100); // System.gc();
         if (print)
+            System.out.print("ConcurrentLinkedDeque   ");
+        oneRun(new ConcurrentLinkedDeque<Integer>(), n, iters);
+
+        Thread.sleep(100); // System.gc();
+        if (print)
             System.out.print("LinkedBlockingQueue     ");
         oneRun(new LinkedBlockingQueue<Integer>(), n, iters);
 
@@ -121,7 +135,6 @@ public class OfferPollLoops {
             System.out.print("ArrayBlockingQueue      ");
         oneRun(new ArrayBlockingQueue<Integer>(POOL_SIZE), n, iters);
 
-
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("PriorityBlockingQueue   ");
@@ -131,16 +144,14 @@ public class OfferPollLoops {
         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 Queue<Integer> queue;
         final CyclicBarrier barrier;
         final Phaser lagPhaser;
-        Stage (Queue<Integer> q, CyclicBarrier b, Phaser s,
-               int iters) {
+        Stage(Queue<Integer> q, CyclicBarrier b, Phaser s, int iters) {
             queue = q;
             barrier = b;
             lagPhaser = s;
@@ -233,5 +244,4 @@ public class OfferPollLoops {
             System.out.println("\t: " + LoopHelpers.rightJustify(time / (iters * n)) + " ns per transfer");
     }
 
-
 }