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.27 by jsr166, Sun Jul 26 17:33:37 2009 UTC vs.
Revision 1.31 by dl, Wed Jul 29 22:48:54 2009 UTC

# Line 20 | Line 20 | import java.util.concurrent.atomic.Atomi
20   import java.util.concurrent.atomic.AtomicLong;
21  
22   /**
23 < * An {@link ExecutorService} for running {@link ForkJoinTask}s.  A
24 < * ForkJoinPool provides the entry point for submissions from
23 > * An {@link ExecutorService} for running {@link ForkJoinTask}s.
24 > * A ForkJoinPool provides the entry point for submissions from
25   * non-ForkJoinTasks, as well as management and monitoring operations.
26   * Normally a single ForkJoinPool is used for a large number of
27   * submitted tasks. Otherwise, use would not usually outweigh the
# Line 34 | Line 34 | import java.util.concurrent.atomic.Atomi
34   * (eventually blocking if none exist). This makes them efficient when
35   * most tasks spawn other subtasks (as do most ForkJoinTasks), as well
36   * as the mixed execution of some plain Runnable- or Callable- based
37 < * activities along with ForkJoinTasks. When setting
38 < * {@code setAsyncMode}, a ForkJoinPools may also be appropriate for
39 < * use with fine-grained tasks that are never joined. Otherwise, other
40 < * ExecutorService implementations are typically more appropriate
41 < * choices.
37 > * activities along with ForkJoinTasks. When setting {@linkplain
38 > * #setAsyncMode async mode}, a ForkJoinPool may also be appropriate
39 > * for use with fine-grained tasks that are never joined. Otherwise,
40 > * other ExecutorService implementations are typically more
41 > * appropriate choices.
42   *
43   * <p>A ForkJoinPool may be constructed with a given parallelism level
44   * (target pool size), which it attempts to maintain by dynamically
45   * adding, suspending, or resuming threads, even if some tasks are
46   * waiting to join others. However, no such adjustments are performed
47   * in the face of blocked IO or other unmanaged synchronization. The
48 < * nested {@code ManagedBlocker} interface enables extension of
48 > * nested {@link ManagedBlocker} interface enables extension of
49   * the kinds of synchronization accommodated.  The target parallelism
50 < * level may also be changed dynamically ({@code setParallelism})
50 > * level may also be changed dynamically ({@link #setParallelism})
51   * and thread construction can be limited using methods
52 < * {@code setMaximumPoolSize} and/or
53 < * {@code setMaintainsParallelism}.
52 > * {@link #setMaximumPoolSize} and/or
53 > * {@link #setMaintainsParallelism}.
54   *
55   * <p>In addition to execution and lifecycle control methods, this
56   * class provides status check methods (for example
57 < * {@code getStealCount}) that are intended to aid in developing,
57 > * {@link #getStealCount}) that are intended to aid in developing,
58   * tuning, and monitoring fork/join applications. Also, method
59 < * {@code toString} returns indications of pool state in a
59 > * {@link #toString} returns indications of pool state in a
60   * convenient form for informal monitoring.
61   *
62   * <p><b>Implementation notes</b>: This implementation restricts the
# Line 311 | Line 311 | public class ForkJoinPool extends Abstra
311      }
312  
313      /**
314 <     * Returns true if argument represents zero active count and
315 <     * nonzero runstate, which is the triggering condition for
314 >     * Returns {@code true} if argument represents zero active count
315 >     * and nonzero runstate, which is the triggering condition for
316       * terminating on shutdown.
317       */
318      private static boolean canTerminateOnShutdown(int c) {
# Line 720 | Line 720 | public class ForkJoinPool extends Abstra
720       * Returns the handler for internal worker threads that terminate
721       * due to unrecoverable errors encountered while executing tasks.
722       *
723 <     * @return the handler, or null if none
723 >     * @return the handler, or {@code null} if none
724       */
725      public Thread.UncaughtExceptionHandler getUncaughtExceptionHandler() {
726          Thread.UncaughtExceptionHandler h;
# Line 741 | Line 741 | public class ForkJoinPool extends Abstra
741       * as handler.
742       *
743       * @param h the new handler
744 <     * @return the old handler, or null if none
744 >     * @return the old handler, or {@code null} if none
745       * @throws SecurityException if a security manager exists and
746       *         the caller is not permitted to modify threads
747       *         because it does not hold {@link
# Line 815 | Line 815 | public class ForkJoinPool extends Abstra
815      /**
816       * Returns the number of worker threads that have started but not
817       * yet terminated.  This result returned by this method may differ
818 <     * from {@code getParallelism} when threads are created to
818 >     * from {@link #getParallelism} when threads are created to
819       * maintain parallelism when others are cooperatively blocked.
820       *
821       * @return the number of worker threads
# Line 851 | Line 851 | public class ForkJoinPool extends Abstra
851  
852  
853      /**
854 <     * Returns true if this pool dynamically maintains its target
855 <     * parallelism level. If false, new threads are added only to
856 <     * avoid possible starvation.
857 <     * This setting is by default true.
854 >     * Returns {@code true} if this pool dynamically maintains its
855 >     * target parallelism level. If false, new threads are added only
856 >     * to avoid possible starvation.  This setting is by default true.
857       *
858 <     * @return true if maintains parallelism
858 >     * @return {@code true} if maintains parallelism
859       */
860      public boolean getMaintainsParallelism() {
861          return maintainsParallelism;
# Line 867 | Line 866 | public class ForkJoinPool extends Abstra
866       * parallelism level. If false, new threads are added only to
867       * avoid possible starvation.
868       *
869 <     * @param enable true to maintains parallelism
869 >     * @param enable {@code true} to maintain parallelism
870       */
871      public void setMaintainsParallelism(boolean enable) {
872          maintainsParallelism = enable;
# Line 878 | Line 877 | public class ForkJoinPool extends Abstra
877       * tasks that are never joined. This mode may be more appropriate
878       * than default locally stack-based mode in applications in which
879       * worker threads only process asynchronous tasks.  This method is
880 <     * designed to be invoked only when pool is quiescent, and
880 >     * designed to be invoked only when the pool is quiescent, and
881       * typically only before any tasks are submitted. The effects of
882       * invocations at other times may be unpredictable.
883       *
884 <     * @param async if true, use locally FIFO scheduling
884 >     * @param async if {@code true}, use locally FIFO scheduling
885       * @return the previous mode
886 +     * @see #getAsyncMode
887       */
888      public boolean setAsyncMode(boolean async) {
889          boolean oldMode = locallyFifo;
# Line 900 | Line 900 | public class ForkJoinPool extends Abstra
900      }
901  
902      /**
903 <     * Returns true if this pool uses local first-in-first-out
903 >     * Returns {@code true} if this pool uses local first-in-first-out
904       * scheduling mode for forked tasks that are never joined.
905       *
906 <     * @return true if this pool uses async mode
906 >     * @return {@code true} if this pool uses async mode
907 >     * @see #setAsyncMode
908       */
909      public boolean getAsyncMode() {
910          return locallyFifo;
# Line 944 | Line 945 | public class ForkJoinPool extends Abstra
945      }
946  
947      /**
948 <     * Returns true if all worker threads are currently idle. An idle
949 <     * worker is one that cannot obtain a task to execute because none
950 <     * are available to steal from other threads, and there are no
951 <     * pending submissions to the pool. This method is conservative;
952 <     * it might not return true immediately upon idleness of all
953 <     * threads, but will eventually become true if threads remain
954 <     * inactive.
948 >     * Returns {@code true} if all worker threads are currently idle.
949 >     * An idle worker is one that cannot obtain a task to execute
950 >     * because none are available to steal from other threads, and
951 >     * there are no pending submissions to the pool. This method is
952 >     * conservative; it might not return {@code true} immediately upon
953 >     * idleness of all threads, but will eventually become true if
954 >     * threads remain inactive.
955       *
956 <     * @return true if all threads are currently idle
956 >     * @return {@code true} if all threads are currently idle
957       */
958      public boolean isQuiescent() {
959          return activeCountOf(runControl) == 0;
# Line 1018 | Line 1019 | public class ForkJoinPool extends Abstra
1019      }
1020  
1021      /**
1022 <     * Returns true if there are any tasks submitted to this pool
1023 <     * that have not yet begun executing.
1022 >     * Returns {@code true} if there are any tasks submitted to this
1023 >     * pool that have not yet begun executing.
1024       *
1025       * @return {@code true} if there are any queued submissions
1026       */
# Line 1032 | Line 1033 | public class ForkJoinPool extends Abstra
1033       * available.  This method may be useful in extensions to this
1034       * class that re-assign work in systems with multiple pools.
1035       *
1036 <     * @return the next submission, or null if none
1036 >     * @return the next submission, or {@code null} if none
1037       */
1038      protected ForkJoinTask<?> pollSubmission() {
1039          return submissionQueue.poll();
# Line 1055 | Line 1056 | public class ForkJoinPool extends Abstra
1056       * @param c the collection to transfer elements into
1057       * @return the number of elements transferred
1058       */
1059 <    protected int drainTasksTo(Collection<ForkJoinTask<?>> c) {
1059 >    protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
1060          int n = submissionQueue.drainTo(c);
1061          ForkJoinWorkerThread[] ws = workers;
1062          if (ws != null) {
# Line 1121 | Line 1122 | public class ForkJoinPool extends Abstra
1122      public void shutdown() {
1123          checkPermission();
1124          transitionRunStateTo(SHUTDOWN);
1125 <        if (canTerminateOnShutdown(runControl))
1125 >        if (canTerminateOnShutdown(runControl)) {
1126 >            if (workers == null) { // shutting down before workers created
1127 >                final ReentrantLock lock = this.workerLock;
1128 >                lock.lock();
1129 >                try {
1130 >                    if (workers == null) {
1131 >                        terminate();
1132 >                        transitionRunStateTo(TERMINATED);
1133 >                        termination.signalAll();
1134 >                    }
1135 >                    
1136 >                } finally {
1137 >                    lock.unlock();
1138 >                }
1139 >            }
1140              terminateOnShutdown();
1141 +        }
1142      }
1143  
1144      /**
# Line 1132 | Line 1148 | public class ForkJoinPool extends Abstra
1148       * method may or may not be rejected. Unlike some other executors,
1149       * this method cancels rather than collects non-executed tasks
1150       * upon termination, so always returns an empty list. However, you
1151 <     * can use method {@code drainTasksTo} before invoking this
1151 >     * can use method {@link #drainTasksTo} before invoking this
1152       * method to transfer unexecuted tasks to another collection.
1153       *
1154       * @return an empty list
# Line 1492 | Line 1508 | public class ForkJoinPool extends Abstra
1508      }
1509  
1510      /**
1511 <     * Returns true if worker waiting on sync can proceed:
1511 >     * Returns {@code true} if worker waiting on sync can proceed:
1512       *  - on signal (thread == null)
1513       *  - on event count advance (winning race to notify vs signaller)
1514       *  - on interrupt
# Line 1500 | Line 1516 | public class ForkJoinPool extends Abstra
1516       * If node was not signalled and event count not advanced on exit,
1517       * then we also help advance event count.
1518       *
1519 <     * @return true if node can be released
1519 >     * @return {@code true} if node can be released
1520       */
1521      final boolean syncIsReleasable(WaitQueueNode node) {
1522          long prev = node.count;
# Line 1519 | Line 1535 | public class ForkJoinPool extends Abstra
1535      }
1536  
1537      /**
1538 <     * Returns true if a new sync event occurred since last call to
1539 <     * sync or this method, if so, updating caller's count.
1538 >     * Returns {@code true} if a new sync event occurred since last
1539 >     * call to sync or this method, if so, updating caller's count.
1540       */
1541      final boolean hasNewSyncEvent(ForkJoinWorkerThread w) {
1542          long lc = w.lastEventCount;
# Line 1604 | Line 1620 | public class ForkJoinPool extends Abstra
1620      }
1621  
1622      /**
1623 <     * Returns true if a spare thread appears to be needed.  If
1624 <     * maintaining parallelism, returns true when the deficit in
1623 >     * Returns {@code true} if a spare thread appears to be needed.
1624 >     * If maintaining parallelism, returns true when the deficit in
1625       * running threads is more than the surplus of total threads, and
1626       * there is apparently some work to do.  This self-limiting rule
1627       * means that the more threads that have already been added, the
# Line 1774 | Line 1790 | public class ForkJoinPool extends Abstra
1790      /**
1791       * Interface for extending managed parallelism for tasks running
1792       * in ForkJoinPools. A ManagedBlocker provides two methods.
1793 <     * Method {@code isReleasable} must return true if blocking is not
1794 <     * necessary. Method {@code block} blocks the current thread if
1795 <     * necessary (perhaps internally invoking {@code isReleasable}
1796 <     * before actually blocking.).
1793 >     * Method {@code isReleasable} must return {@code true} if
1794 >     * blocking is not necessary. Method {@code block} blocks the
1795 >     * current thread if necessary (perhaps internally invoking
1796 >     * {@code isReleasable} before actually blocking.).
1797       *
1798       * <p>For example, here is a ManagedBlocker based on a
1799       * ReentrantLock:
# Line 1801 | Line 1817 | public class ForkJoinPool extends Abstra
1817           * Possibly blocks the current thread, for example waiting for
1818           * a lock or condition.
1819           *
1820 <         * @return true if no additional blocking is necessary (i.e.,
1821 <         * if isReleasable would return true)
1820 >         * @return {@code true} if no additional blocking is necessary
1821 >         * (i.e., if isReleasable would return true)
1822           * @throws InterruptedException if interrupted while waiting
1823           * (the method is not required to do so, but is allowed to)
1824           */
1825          boolean block() throws InterruptedException;
1826  
1827          /**
1828 <         * Returns true if blocking is unnecessary.
1828 >         * Returns {@code true} if blocking is unnecessary.
1829           */
1830          boolean isReleasable();
1831      }
# Line 1819 | Line 1835 | public class ForkJoinPool extends Abstra
1835       * is a ForkJoinWorkerThread, this method possibly arranges for a
1836       * spare thread to be activated if necessary to ensure parallelism
1837       * while the current thread is blocked.  If
1838 <     * {@code maintainParallelism} is true and the pool supports
1838 >     * {@code maintainParallelism} is {@code true} and the pool supports
1839       * it ({@link #getMaintainsParallelism}), this method attempts to
1840       * maintain the pool's nominal parallelism. Otherwise it activates
1841       * a thread only if necessary to avoid complete starvation. This
# Line 1837 | Line 1853 | public class ForkJoinPool extends Abstra
1853       * be expanded to ensure parallelism, and later adjusted.
1854       *
1855       * @param blocker the blocker
1856 <     * @param maintainParallelism if true and supported by this pool,
1857 <     * attempt to maintain the pool's nominal parallelism; otherwise
1858 <     * activate a thread only if necessary to avoid complete
1859 <     * starvation.
1856 >     * @param maintainParallelism if {@code true} and supported by
1857 >     * this pool, attempt to maintain the pool's nominal parallelism;
1858 >     * otherwise activate a thread only if necessary to avoid
1859 >     * complete starvation.
1860       * @throws InterruptedException if blocker.block did so
1861       */
1862      public static void managedBlock(ManagedBlocker blocker,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines