--- jsr166/src/test/loops/TieredPhaserLoops.java	2009/11/01 21:28:57	1.1
+++ jsr166/src/test/loops/TieredPhaserLoops.java	2009/11/16 04:16:43	1.5
@@ -21,23 +21,20 @@ public class TieredPhaserLoops {
     static final long NPS = (1000L * 1000 * 1000);
 
     static int tasksPerPhaser = Math.max(NCPUS / 8, 4);
-    
+
     static void build(Runnable[] actions, int sz, int lo, int hi, Phaser b) {
-        int step = (hi - lo) / tasksPerPhaser;
-        if (step > 1) {
-            int i = lo;
-            while (i < hi) {
-                int r = Math.min(i + step, hi);
-                build(actions, sz, i, r, new Phaser(b));
-                i = r;
+        if (hi - lo > tasksPerPhaser) {
+            for (int i = lo; i < hi; i += tasksPerPhaser) {
+                int j = Math.min(i + tasksPerPhaser, hi);
+                build(actions, sz, i, j, new Phaser(b));
             }
-        }
-        else {
-            for (int i = lo; i < hi; ++i) 
+        } else {
+            for (int i = lo; i < hi; ++i)
                 actions[i] = new PhaserAction(i, b, sz);
         }
     }
 
+
     static final class PhaserAction implements Runnable {
         final int id;
         final int size;
@@ -53,7 +50,7 @@ public class TieredPhaserLoops {
         public void run() {
             int n = size;
             Phaser b = phaser;
-            for(int i = 0; i < n; ++i)
+            for (int i = 0; i < n; ++i)
                 b.arriveAndAwaitAdvance();
         }
     }
@@ -64,13 +61,13 @@ public class TieredPhaserLoops {
             nthreads = Integer.parseInt(args[0]);
         if (args.length > 1)
             tasksPerPhaser = Integer.parseInt(args[1]);
-            
+
         System.out.printf("Max %d Threads, %d tasks per phaser\n", nthreads, tasksPerPhaser);
 
         for (int k = 2; k <= nthreads; k *= 2) {
             for (int size = FIRST_SIZE; size <= LAST_SIZE; size *= 10) {
                 long startTime = System.nanoTime();
-                
+
                 Runnable[] actions = new Runnable [k];
                 build(actions, size, 0, k, new Phaser());
                 Future[] futures = new Future[k];
@@ -88,7 +85,5 @@ public class TieredPhaserLoops {
         }
         pool.shutdown();
     }
-    
-}
-
 
+}