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

Comparing jsr166/src/jsr166y/ForkJoinPool.java (file contents):
Revision 1.146 by dl, Mon Nov 19 18:12:42 2012 UTC vs.
Revision 1.148 by jsr166, Tue Nov 20 06:18:39 2012 UTC

# Line 103 | Line 103 | import java.util.concurrent.TimeUnit;
103   * java.util.concurrent.ForkJoinPool.common}: {@code parallelism} --
104   * an integer greater than zero, {@code threadFactory} -- the class
105   * name of a {@link ForkJoinWorkerThreadFactory}, and {@code
106 – <<<<<<< ForkJoinPool.java
107 – * exceptionHandler} -- the class name of a {@code
108 – =======
106   * exceptionHandler} -- the class name of a {@link
107   * java.lang.Thread.UncaughtExceptionHandler
111 – >>>>>>> 1.111
108   * Thread.UncaughtExceptionHandler}. Upon any error in establishing
109   * these settings, default parameters are used.
110   *
# Line 2480 | Line 2476 | public class ForkJoinPool extends Abstra
2476              throw new IllegalArgumentException();
2477          this.factory = factory;
2478          this.ueh = handler;
2479 <        this.config = parallelism | (asyncMode? (FIFO_QUEUE << 16) : 0);
2479 >        this.config = parallelism | (asyncMode ? (FIFO_QUEUE << 16) : 0);
2480          long np = (long)(-parallelism); // offset ctl counts
2481          this.ctl = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
2482          int pn = nextPoolId();

Diff Legend

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