ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/loops/TieredPhaserLoops.java
(Generate patch)

Comparing jsr166/src/test/loops/TieredPhaserLoops.java (file contents):
Revision 1.1 by dl, Sun Nov 1 21:28:57 2009 UTC vs.
Revision 1.4 by dl, Tue Nov 3 12:37:27 2009 UTC

# Line 21 | Line 21 | public class TieredPhaserLoops {
21      static final long NPS = (1000L * 1000 * 1000);
22  
23      static int tasksPerPhaser = Math.max(NCPUS / 8, 4);
24 <    
24 >
25      static void build(Runnable[] actions, int sz, int lo, int hi, Phaser b) {
26 <        int step = (hi - lo) / tasksPerPhaser;
27 <        if (step > 1) {
28 <            int i = lo;
29 <            while (i < hi) {
30 <                int r = Math.min(i + step, hi);
31 <                build(actions, sz, i, r, new Phaser(b));
32 <                i = r;
26 >        if (hi - lo > tasksPerPhaser) {
27 >            for (int i = lo; i < hi; i += tasksPerPhaser) {
28 >                int j = Math.min(i + tasksPerPhaser, hi);
29 >                build(actions, sz, i, j, new Phaser(b));
30              }
31 <        }
32 <        else {
36 <            for (int i = lo; i < hi; ++i)
31 >        } else {
32 >            for (int i = lo; i < hi; ++i)
33                  actions[i] = new PhaserAction(i, b, sz);
34          }
35      }
36 +    
37  
38      static final class PhaserAction implements Runnable {
39          final int id;
# Line 53 | Line 50 | public class TieredPhaserLoops {
50          public void run() {
51              int n = size;
52              Phaser b = phaser;
53 <            for(int i = 0; i < n; ++i)
53 >            for (int i = 0; i < n; ++i)
54                  b.arriveAndAwaitAdvance();
55          }
56      }
# Line 64 | Line 61 | public class TieredPhaserLoops {
61              nthreads = Integer.parseInt(args[0]);
62          if (args.length > 1)
63              tasksPerPhaser = Integer.parseInt(args[1]);
64 <            
64 >
65          System.out.printf("Max %d Threads, %d tasks per phaser\n", nthreads, tasksPerPhaser);
66  
67          for (int k = 2; k <= nthreads; k *= 2) {
68              for (int size = FIRST_SIZE; size <= LAST_SIZE; size *= 10) {
69                  long startTime = System.nanoTime();
70 <                
70 >
71                  Runnable[] actions = new Runnable [k];
72                  build(actions, size, 0, k, new Phaser());
73                  Future[] futures = new Future[k];
# Line 88 | Line 85 | public class TieredPhaserLoops {
85          }
86          pool.shutdown();
87      }
91    
92 }
93
88  
89 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines