--- jsr166/src/test/loops/Fib.java 2010/09/19 12:55:37 1.1 +++ jsr166/src/test/loops/Fib.java 2015/01/15 18:34:19 1.7 @@ -1,7 +1,7 @@ /* * 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.concurrent.*; @@ -10,18 +10,17 @@ import java.util.concurrent.*; * Recursive task-based version of Fibonacci. Computes: *
  * Computes fibonacci(n) = fibonacci(n-1) + fibonacci(n-2);  for n> 1
- *          fibonacci(0) = 0; 
- *          fibonacci(1) = 1.       
+ *          fibonacci(0) = 0;
+ *          fibonacci(1) = 1.
  * 
- **/ - + */ public final class Fib extends RecursiveAction { // Performance-tuning constant: static int sequentialThreshold; static long lastStealCount; - + public static void main(String[] args) throws Exception { int procs = 0; int num = 45; @@ -31,7 +30,7 @@ public final class Fib extends Recursive procs = Integer.parseInt(args[0]); if (args.length > 1) num = Integer.parseInt(args[1]); - if (args.length > 2) + if (args.length > 2) sequentialThreshold = Integer.parseInt(args[2]); } catch (Exception e) { @@ -40,7 +39,7 @@ public final class Fib extends Recursive } for (int reps = 0; reps < 2; ++reps) { - ForkJoinPool g = procs == 0? new ForkJoinPool() : + ForkJoinPool g = (procs == 0) ? new ForkJoinPool() : new ForkJoinPool(procs); lastStealCount = g.getStealCount(); for (int i = 0; i < 20; ++i) { @@ -57,7 +56,6 @@ public final class Fib extends Recursive } } - /** for time conversion */ static final long NPS = (1000L * 1000 * 1000); @@ -72,7 +70,7 @@ public final class Fib extends Recursive long result = f.getAnswer(); System.out.print("Fib " + num + " = " + result); System.out.printf("\tTime: %7.3f", secs); - + long sc = g.getStealCount(); long ns = sc - lastStealCount; lastStealCount = sc; @@ -81,7 +79,6 @@ public final class Fib extends Recursive System.out.println(); } - // Initialized with argument; replaced with result int number; @@ -99,8 +96,8 @@ public final class Fib extends Recursive else { Fib f1 = new Fib(n - 1); Fib f2 = new Fib(n - 2); - // forkJoin(f1, f2); - invokeAll(f1, f2); + // forkJoin(f1, f2); + invokeAll(f1, f2); number = f1.number + f2.number; } } @@ -117,4 +114,3 @@ public final class Fib extends Recursive } } -