--- jsr166/src/test/loops/ConcurrentDequeLoops.java	2009/10/29 23:09:07	1.3
+++ jsr166/src/test/loops/ConcurrentDequeLoops.java	2016/12/31 19:02:43	1.14
@@ -1,13 +1,17 @@
 /*
  * 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 java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class ConcurrentDequeLoops {
     static final ExecutorService pool = Executors.newCachedThreadPool();
@@ -18,11 +22,11 @@ public class ConcurrentDequeLoops {
         int maxStages = 8;
         int items = 1000000;
 
-        Class klass = null;
+        Class<?> klass = null;
         if (args.length > 0) {
             try {
                 klass = Class.forName(args[0]);
-            } catch(ClassNotFoundException e) {
+            } catch (ClassNotFoundException e) {
                 throw new RuntimeException("Class " + args[0] + " not found.");
             }
         }
@@ -43,8 +47,7 @@ public class ConcurrentDequeLoops {
         Thread.sleep(100);
         print = true;
 
-        int k = 1;
-        for (int i = 1; i <= maxStages;) {
+        for (int k = 1, i = 1; i <= maxStages;) {
             oneRun(klass, i, items);
             if (i == k) {
                 k = i << 1;
@@ -54,14 +57,14 @@ public class ConcurrentDequeLoops {
                 i = k;
         }
         pool.shutdown();
-   }
+    }
 
     static class Stage implements Callable<Integer> {
         final Deque<Integer> queue;
         final CyclicBarrier barrier;
         final LoopHelpers.SimpleRandom rng = new LoopHelpers.SimpleRandom();
         int items;
-        Stage (Deque<Integer> q, CyclicBarrier b, int items) {
+        Stage(Deque<Integer> q, CyclicBarrier b, int items) {
             queue = q;
             barrier = b;
             this.items = items;
@@ -72,7 +75,7 @@ public class ConcurrentDequeLoops {
             // transform it, and put back in.
             try {
                 barrier.await();
-                int l = (int)System.nanoTime();
+                int l = (int) System.nanoTime();
                 int takes = 0;
                 for (;;) {
                     Integer item;
@@ -117,8 +120,9 @@ public class ConcurrentDequeLoops {
         }
     }
 
-    static void oneRun(Class klass, int n, int items) throws Exception {
-        Deque<Integer> q = (Deque<Integer>)klass.newInstance();
+    static void oneRun(Class<?> klass, int n, int items) throws Exception {
+        Deque<Integer> q =
+            (Deque<Integer>) klass.getConstructor().newInstance();
         LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();
         CyclicBarrier barrier = new CyclicBarrier(n + 1, timer);
         totalItems = new AtomicInteger(n * items);
@@ -141,6 +145,5 @@ public class ConcurrentDequeLoops {
             System.out.println(LoopHelpers.rightJustify(time / (items * n)) + " ns per item");
         if (total == 0) // avoid overoptimization
             System.out.println("useless result: " + total);
-
     }
 }