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.168 by dl, Tue Jan 1 15:10:39 2013 UTC vs.
Revision 1.171 by jsr166, Thu Jan 3 19:21:21 2013 UTC

# Line 1932 | Line 1932 | public class ForkJoinPool extends Abstra
1932       * @param task the task to join
1933       * @param mode if shared, exit upon completing any task
1934       * if all workers are active
1935     *
1935       */
1936      private int helpComplete(ForkJoinTask<?> task, int mode) {
1937          WorkQueue[] ws; WorkQueue q; int m, n, s, u;
# Line 2556 | Line 2555 | public class ForkJoinPool extends Abstra
2555       * ongoing processing are automatically terminated upon program
2556       * {@link System#exit}.  Any program that relies on asynchronous
2557       * task processing to complete before program termination should
2558 <     * invoke {@link #quiesceCommonPool}, or the timeout-based {@code
2559 <     * commonPool().}{@link #awaitQuiescence}, before exit.
2558 >     * invoke {@code commonPool().}{@link #awaitQuiescence}, before
2559 >     * exit.
2560       *
2561       * @return the common pool instance
2562       */
# Line 3002 | Line 3001 | public class ForkJoinPool extends Abstra
3001       * Possibly initiates an orderly shutdown in which previously
3002       * submitted tasks are executed, but no new tasks will be
3003       * accepted. Invocation has no effect on execution state if this
3004 <     * is the {@link #commonPool}, and no additional effect if
3004 >     * is the {@link #commonPool()}, and no additional effect if
3005       * already shut down.  Tasks that are in the process of being
3006       * submitted concurrently during the course of this method may or
3007       * may not be rejected.
# Line 3020 | Line 3019 | public class ForkJoinPool extends Abstra
3019      /**
3020       * Possibly attempts to cancel and/or stop all tasks, and reject
3021       * all subsequently submitted tasks.  Invocation has no effect on
3022 <     * execution state if this is the {@link #commonPool}, and no
3022 >     * execution state if this is the {@link #commonPool()}, and no
3023       * additional effect if already shut down. Otherwise, tasks that
3024       * are in the process of being submitted or executed concurrently
3025       * during the course of this method may or may not be
# Line 3172 | Line 3171 | public class ForkJoinPool extends Abstra
3171       * Waits and/or attempts to assist performing tasks indefinitely
3172       * until the {@link #commonPool()} {@link #isQuiescent}
3173       */
3174 <    public static void quiesceCommonPool() {
3174 >    static void quiesceCommonPool() {
3175          common.awaitQuiescence(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
3176      }
3177  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines