--- jsr166/src/test/loops/Integrate.java	2009/10/29 23:16:47	1.4
+++ jsr166/src/test/loops/Integrate.java	2015/01/15 18:42:39	1.18
@@ -1,10 +1,9 @@
 /*
  * 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 jsr166y.*;
 import java.util.concurrent.*;
 
 /**
@@ -12,7 +11,6 @@ import java.util.concurrent.*;
  * This version uses a simplified hardwired function.  Inspired by a
  * <A href="http://www.cs.uga.edu/~dkl/filaments/dist.html">
  * Filaments</A> demo program.
- *
  */
 public final class Integrate {
 
@@ -26,14 +24,15 @@ public final class Integrate {
     static int forkPolicy = DYNAMIC;
     static String forkArg = "dynamic";
 
-    // the function to integrate
-    static double computeFunction(double x)  {
+    /** the function to integrate */
+    static double computeFunction(double x) {
         return (x * x + 1.0) * x;
     }
 
     static final double start = 0.0;
     static final double end = 1536.0;
-    /*
+
+    /**
      * The number of recursive calls for
      * integrate from start to end.
      * (Empirically determined)
@@ -41,7 +40,7 @@ public final class Integrate {
     static final int calls = 263479047;
 
     public static void main(String[] args) throws Exception {
-        int procs = Runtime.getRuntime().availableProcessors();
+        int procs = 0;
 
         try {
             if (args.length > 0)
@@ -55,15 +54,22 @@ public final class Integrate {
             }
         }
         catch (Exception e) {
-            System.out.println("Usage: java Integrate threads <s[erial] | d[ynamic] | f[ork] - default d>");
+            System.out.println("Usage: java Integrate3 threads <s[erial] | d[ynamic] | f[ork] - default d>");
             return;
         }
+        oneTest(procs);
+        oneTest(procs);
+        oneTest(procs);
+    }
 
-        ForkJoinPool g = new ForkJoinPool(procs);
+    static void oneTest(int procs) {
+        ForkJoinPool g = (procs == 0) ? new ForkJoinPool() :
+            new ForkJoinPool(procs);
+        System.out.println("Number of procs=" + g.getParallelism());
         System.out.println("Integrating from " + start + " to " + end +
                            " forkPolicy = " + forkArg);
         long lastTime = System.nanoTime();
-        for (int i = 0; i < 10; ++i) {
+        for (int i = 0; i < 20; ++i) {
             double a;
             if (forkPolicy == SERIAL)
                 a = SQuad.computeArea(g, start, end);
@@ -76,14 +82,14 @@ public final class Integrate {
             lastTime = now;
             System.out.printf("Calls/sec: %12d", (long) (calls / s));
             System.out.printf(" Time: %7.3f", s);
-            System.out.printf(" Area: %12.1f", a);
+            System.out.printf(" Threads: %5d", g.getPoolSize());
+            //            System.out.printf(" Area: %12.1f", a);
             System.out.println();
         }
         System.out.println(g);
         g.shutdown();
     }
 
-
     // Sequential version
     static final class SQuad extends RecursiveAction {
         static double computeArea(ForkJoinPool pool, double l, double r) {
@@ -162,7 +168,7 @@ public final class Integrate {
             q.fork();
             ar = recEval(c, r, fc, fr, ar);
             if (!q.tryUnfork()) {
-                q.quietlyHelpJoin();
+                q.quietlyJoin();
                 return ar + q.area;
             }
             return ar + recEval(l, c, fl, fc, al);
@@ -210,7 +216,7 @@ public final class Integrate {
                 (q = new DQuad(l, c, al)).fork();
             ar = recEval(c, r, fc, fr, ar);
             if (q != null && !q.tryUnfork()) {
-                q.quietlyHelpJoin();
+                q.quietlyJoin();
                 return ar + q.area;
             }
             return ar + recEval(l, c, fl, fc, al);