--- jsr166/src/test/loops/UnboundedQueueFillEmptyLoops.java	2005/11/28 15:40:56	1.1
+++ jsr166/src/test/loops/UnboundedQueueFillEmptyLoops.java	2016/10/29 20:48:16	1.15
@@ -1,35 +1,36 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain. Use, modify, and
- * redistribute this code in any way without acknowledgement.
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-import java.util.concurrent.atomic.*;
+import java.util.Random;
+import java.util.Queue;
 
 public class UnboundedQueueFillEmptyLoops {
-    static int maxSize = 10000;
+    static int maxSize = 50000;
     static Random rng = new Random(3153122688L);
     static volatile int total;
     static Integer[] numbers;
 
     public static void main(String[] args) throws Exception {
-        Class klass = null;
-        if (args.length > 0) {
-            try {
-                klass = Class.forName(args[0]);
-            } catch(ClassNotFoundException e) {
-                throw new RuntimeException("Class " + args[0] + " not found.");
-            }
+        if (args.length < 1) {
+            System.out.printf(
+                "Usage: UnboundedQueueFillEmptyLoops className [maxSize]%n");
+            System.exit(1);
+        }
+
+        final Class<?> klass;
+        try {
+            klass = Class.forName(args[0]);
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Class " + args[0] + " not found.");
         }
 
-        if (args.length > 2) 
-            maxSize = Integer.parseInt(args[2]);
+        if (args.length > 1)
+            maxSize = Integer.parseInt(args[1]);
 
-        System.out.print("Class: " + klass.getName());
-        System.out.println(" size: " + maxSize);
+        System.out.printf("Class: %s size: %d%n", klass.getName(), maxSize);
 
         numbers = new Integer[maxSize];
         for (int i = 0; i < maxSize; ++i)
@@ -42,10 +43,11 @@ public class UnboundedQueueFillEmptyLoop
         oneRun(klass, maxSize);
 
         if (total == 0) System.out.print(" ");
-   }
+    }
 
-    static void oneRun(Class klass, int n) throws Exception {
-        Queue<Integer> q = (Queue<Integer>)klass.newInstance();
+    static void oneRun(Class<?> klass, int n) throws Exception {
+        Queue<Integer> q =
+            (Queue<Integer>) klass.getConstructor().newInstance();
         int sum = total;
         int m = rng.nextInt(numbers.length);
         long startTime = System.nanoTime();
@@ -55,14 +57,13 @@ public class UnboundedQueueFillEmptyLoop
                     m = 0;
                 q.offer(numbers[m++]);
             }
-            Integer p;
-            while ((p = q.poll()) != null)
+            for (Integer p; (p = q.poll()) != null; )
                 sum += p.intValue();
         }
         total += sum;
         long endTime = System.nanoTime();
         long time = endTime - startTime;
-        double secs = (double)(time) / 1000000000.0;
+        double secs = (double) time / 1000000000.0;
         System.out.println("Time: " + secs);
     }