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

Comparing jsr166/src/jsr166e/ForkJoinPool.java (file contents):
Revision 1.13 by jsr166, Wed Nov 14 18:45:53 2012 UTC vs.
Revision 1.17 by jsr166, Mon Nov 19 01:04:24 2012 UTC

# Line 63 | Line 63 | import java.util.concurrent.TimeUnit;
63   * {@link #toString} returns indications of pool state in a
64   * convenient form for informal monitoring.
65   *
66 < * <p> As is the case with other ExecutorServices, there are three
66 > * <p>As is the case with other ExecutorServices, there are three
67   * main task execution methods summarized in the following table.
68   * These are designed to be used primarily by clients not already
69   * engaged in fork/join computations in the current pool.  The main
# Line 105 | Line 105 | import java.util.concurrent.TimeUnit;
105   * an integer greater than zero, {@code threadFactory} -- the class
106   * name of a {@link ForkJoinWorkerThreadFactory}, and {@code
107   * exceptionHandler} -- the class name of a {@link
108 + * java.lang.Thread.UncaughtExceptionHandler
109   * Thread.UncaughtExceptionHandler}. Upon any error in establishing
110   * these settings, default parameters are used.
111   *
# Line 449 | Line 450 | public class ForkJoinPool extends Abstra
450       * perform some subtask processing (see externalHelpJoin and
451       * related methods).  We do not need to record whether these
452       * submissions are to the common pool -- if not, externalHelpJoin
453 <     * returns quicky (at the most helping to signal some common pool
453 >     * returns quickly (at the most helping to signal some common pool
454       * workers). These submitters would otherwise be blocked waiting
455       * for completion, so the extra effort (with liberally sprinkled
456       * task status checks) in inapplicable cases amounts to an odd
# Line 654 | Line 655 | public class ForkJoinPool extends Abstra
655  
656          /**
657           * Pushes a task. Call only by owner in unshared queues.
658 <         * Cases needing resizing or rejection are relyaed to fullPush
658 >         * Cases needing resizing or rejection are relayed to fullPush
659           * (that also handles shared queues).
660           *
661           * @param task the task. Caller must ensure non-null.
# Line 1632 | Line 1633 | public class ForkJoinPool extends Abstra
1633       * termination and possibly shrink pool.
1634       *
1635       * * If already enqueued and none of the above apply, possibly
1636 <     * (with 1/2 probablility) park awaiting signal, else lingering to
1636 >     * (with 1/2 probability) park awaiting signal, else lingering to
1637       * help scan and signal.
1638       *
1639       * @param w the worker (via its WorkQueue)
# Line 1850 | Line 1851 | public class ForkJoinPool extends Abstra
1851  
1852      /**
1853       * Analog of tryHelpStealer for CountedCompleters. Tries to steal
1854 <     * and run tasks within the target's computation
1854 >     * and run tasks within the target's computation.
1855       *
1856       * @param task the task to join
1857       * @param mode if shared, exit upon completing any task

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines