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

Comparing jsr166/src/test/loops/SpinningTieredPhaserLoops.java (file contents):
Revision 1.3 by jsr166, Mon Nov 2 23:42:46 2009 UTC vs.
Revision 1.7 by jsr166, Thu Dec 18 18:43:22 2014 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7   import java.util.*;
8   import java.util.concurrent.*;
9   //import jsr166y.*;
10  
11 < /*
11 > /**
12   * Based loosely on Java Grande Forum barrierBench
13   */
14 –
14   public class SpinningTieredPhaserLoops {
15      static final int NCPUS = Runtime.getRuntime().availableProcessors();
16      static final ExecutorService pool = Executors.newCachedThreadPool();
# Line 23 | Line 22 | public class SpinningTieredPhaserLoops {
22      static int tasksPerPhaser = Math.max(NCPUS / 4, 4);
23  
24      static void build(Runnable[] actions, int sz, int lo, int hi, Phaser b) {
25 <        int step = (hi - lo) / tasksPerPhaser;
26 <        if (step > 1) {
27 <            int i = lo;
28 <            while (i < hi) {
30 <                int r = Math.min(i + step, hi);
31 <                build(actions, sz, i, r, new Phaser(b));
32 <                i = r;
25 >        if (hi - lo > tasksPerPhaser) {
26 >            for (int i = lo; i < hi; i += tasksPerPhaser) {
27 >                int j = Math.min(i + tasksPerPhaser, hi);
28 >                build(actions, sz, i, j, new Phaser(b));
29              }
30 <        }
35 <        else {
30 >        } else {
31              for (int i = lo; i < hi; ++i)
32                  actions[i] = new PhaserAction(i, b, sz);
33          }
# Line 76 | Line 71 | public class SpinningTieredPhaserLoops {
71              for (int size = FIRST_SIZE; size <= LAST_SIZE; size *= 10) {
72                  long startTime = System.nanoTime();
73  
74 <                Runnable[] actions = new Runnable [k];
74 >                Runnable[] actions = new Runnable[k];
75                  build(actions, size, 0, k, new Phaser());
76 <                Future[] futures = new Future[k];
76 >                Future<?>[] futures = new Future<?>[k];
77                  for (int i = 0; i < k; ++i) {
78                      futures[i] = pool.submit(actions[i]);
79                  }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines