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

Comparing jsr166/src/jsr166y/ForkJoinTask.java (file contents):
Revision 1.13 by dl, Wed Jul 22 19:04:11 2009 UTC vs.
Revision 1.91 by dl, Sun Oct 28 22:36:01 2012 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7   package jsr166y;
8 +
9   import java.io.Serializable;
10 < import java.util.*;
11 < import java.util.concurrent.*;
12 < import java.util.concurrent.atomic.*;
13 < import sun.misc.Unsafe;
14 < import java.lang.reflect.*;
10 > import java.util.Collection;
11 > import java.util.List;
12 > import java.util.RandomAccess;
13 > import java.lang.ref.WeakReference;
14 > import java.lang.ref.ReferenceQueue;
15 > import java.util.concurrent.Callable;
16 > import java.util.concurrent.CancellationException;
17 > import java.util.concurrent.ExecutionException;
18 > import java.util.concurrent.Future;
19 > import java.util.concurrent.RejectedExecutionException;
20 > import java.util.concurrent.RunnableFuture;
21 > import java.util.concurrent.TimeUnit;
22 > import java.util.concurrent.TimeoutException;
23 > import java.util.concurrent.locks.ReentrantLock;
24 > import java.lang.reflect.Constructor;
25  
26   /**
27 < * Abstract base class for tasks that run within a {@link
28 < * ForkJoinPool}.  A ForkJoinTask is a thread-like entity that is much
27 > * Abstract base class for tasks that run within a {@link ForkJoinPool}.
28 > * A {@code ForkJoinTask} is a thread-like entity that is much
29   * lighter weight than a normal thread.  Huge numbers of tasks and
30   * subtasks may be hosted by a small number of actual threads in a
31   * ForkJoinPool, at the price of some usage limitations.
32   *
33 < * <p> A "main" ForkJoinTask begins execution when submitted to a
34 < * {@link ForkJoinPool}. Once started, it will usually in turn start
35 < * other subtasks.  As indicated by the name of this class, many
36 < * programs using ForkJoinTasks employ only methods {@code fork}
37 < * and {@code join}, or derivatives such as
38 < * {@code invokeAll}.  However, this class also provides a number
39 < * of other methods that can come into play in advanced usages, as
40 < * well as extension mechanics that allow support of new forms of
41 < * fork/join processing.
33 > * <p>A "main" {@code ForkJoinTask} begins execution when it is
34 > * explicitly submitted to a {@link ForkJoinPool}, or, if not already
35 > * engaged in a ForkJoin computation, commenced in the {@link
36 > * ForkJoinPool#commonPool} via {@link #fork}, {@link #invoke}, or
37 > * related methods.  Once started, it will usually in turn start other
38 > * subtasks.  As indicated by the name of this class, many programs
39 > * using {@code ForkJoinTask} employ only methods {@link #fork} and
40 > * {@link #join}, or derivatives such as {@link
41 > * #invokeAll(ForkJoinTask...) invokeAll}.  However, this class also
42 > * provides a number of other methods that can come into play in
43 > * advanced usages, as well as extension mechanics that allow support
44 > * of new forms of fork/join processing.
45 > *
46 > * <p>A {@code ForkJoinTask} is a lightweight form of {@link Future}.
47 > * The efficiency of {@code ForkJoinTask}s stems from a set of
48 > * restrictions (that are only partially statically enforceable)
49 > * reflecting their main use as computational tasks calculating pure
50 > * functions or operating on purely isolated objects.  The primary
51 > * coordination mechanisms are {@link #fork}, that arranges
52 > * asynchronous execution, and {@link #join}, that doesn't proceed
53 > * until the task's result has been computed.  Computations should
54 > * ideally avoid {@code synchronized} methods or blocks, and should
55 > * minimize other blocking synchronization apart from joining other
56 > * tasks or using synchronizers such as Phasers that are advertised to
57 > * cooperate with fork/join scheduling. Subdividable tasks should also
58 > * not perform blocking IO, and should ideally access variables that
59 > * are completely independent of those accessed by other running
60 > * tasks. These guidelines are loosely enforced by not permitting
61 > * checked exceptions such as {@code IOExceptions} to be
62 > * thrown. However, computations may still encounter unchecked
63 > * exceptions, that are rethrown to callers attempting to join
64 > * them. These exceptions may additionally include {@link
65 > * RejectedExecutionException} stemming from internal resource
66 > * exhaustion, such as failure to allocate internal task
67 > * queues. Rethrown exceptions behave in the same way as regular
68 > * exceptions, but, when possible, contain stack traces (as displayed
69 > * for example using {@code ex.printStackTrace()}) of both the thread
70 > * that initiated the computation as well as the thread actually
71 > * encountering the exception; minimally only the latter.
72   *
73 < * <p>A ForkJoinTask is a lightweight form of {@link Future}.  The
74 < * efficiency of ForkJoinTasks stems from a set of restrictions (that
75 < * are only partially statically enforceable) reflecting their
76 < * intended use as computational tasks calculating pure functions or
77 < * operating on purely isolated objects.  The primary coordination
78 < * mechanisms are {@link #fork}, that arranges asynchronous execution,
79 < * and {@link #join}, that doesn't proceed until the task's result has
80 < * been computed.  Computations should avoid {@code synchronized}
81 < * methods or blocks, and should minimize other blocking
82 < * synchronization apart from joining other tasks or using
83 < * synchronizers such as Phasers that are advertised to cooperate with
84 < * fork/join scheduling. Tasks should also not perform blocking IO,
85 < * and should ideally access variables that are completely independent
45 < * of those accessed by other running tasks. Minor breaches of these
46 < * restrictions, for example using shared output streams, may be
47 < * tolerable in practice, but frequent use may result in poor
48 < * performance, and the potential to indefinitely stall if the number
49 < * of threads not waiting for IO or other external synchronization
50 < * becomes exhausted. This usage restriction is in part enforced by
51 < * not permitting checked exceptions such as {@code IOExceptions}
52 < * to be thrown. However, computations may still encounter unchecked
53 < * exceptions, that are rethrown to callers attempting join
54 < * them. These exceptions may additionally include
55 < * RejectedExecutionExceptions stemming from internal resource
56 < * exhaustion such as failure to allocate internal task queues.
73 > * <p>It is possible to define and use ForkJoinTasks that may block,
74 > * but doing do requires three further considerations: (1) Completion
75 > * of few if any <em>other</em> tasks should be dependent on a task
76 > * that blocks on external synchronization or IO. Event-style async
77 > * tasks that are never joined (for example, those subclassing {@link
78 > * CountedCompleter}) often fall into this category.  (2) To minimize
79 > * resource impact, tasks should be small; ideally performing only the
80 > * (possibly) blocking action. (3) Unless the {@link
81 > * ForkJoinPool.ManagedBlocker} API is used, or the number of possibly
82 > * blocked tasks is known to be less than the pool's {@link
83 > * ForkJoinPool#getParallelism} level, the pool cannot guarantee that
84 > * enough threads will be available to ensure progress or good
85 > * performance.
86   *
87   * <p>The primary method for awaiting completion and extracting
88   * results of a task is {@link #join}, but there are several variants:
89   * The {@link Future#get} methods support interruptible and/or timed
90   * waits for completion and report results using {@code Future}
91 < * conventions. Method {@link #helpJoin} enables callers to actively
92 < * execute other tasks while awaiting joins, which is sometimes more
93 < * efficient but only applies when all subtasks are known to be
94 < * strictly tree-structured. Method {@link #invoke} is semantically
66 < * equivalent to {@code fork(); join()} but always attempts to
67 < * begin execution in the current thread. The "<em>quiet</em>" forms
68 < * of these methods do not extract results or report exceptions. These
91 > * conventions. Method {@link #invoke} is semantically
92 > * equivalent to {@code fork(); join()} but always attempts to begin
93 > * execution in the current thread. The "<em>quiet</em>" forms of
94 > * these methods do not extract results or report exceptions. These
95   * may be useful when a set of tasks are being executed, and you need
96   * to delay processing of results or exceptions until all complete.
97   * Method {@code invokeAll} (available in multiple versions)
98   * performs the most common form of parallel invocation: forking a set
99   * of tasks and joining them all.
100   *
101 < * <p> The ForkJoinTask class is not usually directly subclassed.
101 > * <p>In the most typical usages, a fork-join pair act like a call
102 > * (fork) and return (join) from a parallel recursive function. As is
103 > * the case with other forms of recursive calls, returns (joins)
104 > * should be performed innermost-first. For example, {@code a.fork();
105 > * b.fork(); b.join(); a.join();} is likely to be substantially more
106 > * efficient than joining {@code a} before {@code b}.
107 > *
108 > * <p>The execution status of tasks may be queried at several levels
109 > * of detail: {@link #isDone} is true if a task completed in any way
110 > * (including the case where a task was cancelled without executing);
111 > * {@link #isCompletedNormally} is true if a task completed without
112 > * cancellation or encountering an exception; {@link #isCancelled} is
113 > * true if the task was cancelled (in which case {@link #getException}
114 > * returns a {@link java.util.concurrent.CancellationException}); and
115 > * {@link #isCompletedAbnormally} is true if a task was either
116 > * cancelled or encountered an exception, in which case {@link
117 > * #getException} will return either the encountered exception or
118 > * {@link java.util.concurrent.CancellationException}.
119 > *
120 > * <p>The ForkJoinTask class is not usually directly subclassed.
121   * Instead, you subclass one of the abstract classes that support a
122 < * particular style of fork/join processing.  Normally, a concrete
123 < * ForkJoinTask subclass declares fields comprising its parameters,
124 < * established in a constructor, and then defines a {@code compute}
125 < * method that somehow uses the control methods supplied by this base
126 < * class. While these methods have {@code public} access (to allow
127 < * instances of different task subclasses to call each others
128 < * methods), some of them may only be called from within other
129 < * ForkJoinTasks (as may be determined using method {@link
130 < * #inForkJoinPool}).  Attempts to invoke them in other contexts
131 < * result in exceptions or errors possibly including
132 < * ClassCastException.
122 > * particular style of fork/join processing, typically {@link
123 > * RecursiveAction} for most computations that do not return results,
124 > * {@link RecursiveTask} for those that do, and {@link
125 > * CountedCompleter} for those in which completed actions trigger
126 > * other actions.  Normally, a concrete ForkJoinTask subclass declares
127 > * fields comprising its parameters, established in a constructor, and
128 > * then defines a {@code compute} method that somehow uses the control
129 > * methods supplied by this base class.
130 > *
131 > * <p>Method {@link #join} and its variants are appropriate for use
132 > * only when completion dependencies are acyclic; that is, the
133 > * parallel computation can be described as a directed acyclic graph
134 > * (DAG). Otherwise, executions may encounter a form of deadlock as
135 > * tasks cyclically wait for each other.  However, this framework
136 > * supports other methods and techniques (for example the use of
137 > * {@link Phaser}, {@link #helpQuiesce}, and {@link #complete}) that
138 > * may be of use in constructing custom subclasses for problems that
139 > * are not statically structured as DAGs. To support such usages a
140 > * ForkJoinTask may be atomically <em>tagged</em> with a {@code short}
141 > * value using {@link #setForkJoinTaskTag} or {@link
142 > * #compareAndSetForkJoinTaskTag} and checked using {@link
143 > * #getForkJoinTaskTag}. The ForkJoinTask implementation does not use
144 > * these {@code protected} methods or tags for any purpose, but they
145 > * may be of use in the construction of specialized subclasses.  For
146 > * example, parallel graph traversals can use the supplied methods to
147 > * avoid revisiting nodes/tasks that have already been processed.
148 > * (Method names for tagging are bulky in part to encourage definition
149 > * of methods that reflect their usage patterns.)
150   *
151 < * <p>Most base support methods are {@code final} because their
152 < * implementations are intrinsically tied to the underlying
153 < * lightweight task scheduling framework, and so cannot be overridden.
154 < * Developers creating new basic styles of fork/join processing should
155 < * minimally implement {@code protected} methods
156 < * {@code exec}, {@code setRawResult}, and
157 < * {@code getRawResult}, while also introducing an abstract
158 < * computational method that can be implemented in its subclasses,
159 < * possibly relying on other {@code protected} methods provided
98 < * by this class.
151 > * <p>Most base support methods are {@code final}, to prevent
152 > * overriding of implementations that are intrinsically tied to the
153 > * underlying lightweight task scheduling framework.  Developers
154 > * creating new basic styles of fork/join processing should minimally
155 > * implement {@code protected} methods {@link #exec}, {@link
156 > * #setRawResult}, and {@link #getRawResult}, while also introducing
157 > * an abstract computational method that can be implemented in its
158 > * subclasses, possibly relying on other {@code protected} methods
159 > * provided by this class.
160   *
161   * <p>ForkJoinTasks should perform relatively small amounts of
162 < * computations, otherwise splitting into smaller tasks. As a very
163 < * rough rule of thumb, a task should perform more than 100 and less
164 < * than 10000 basic computational steps. If tasks are too big, then
165 < * parallelism cannot improve throughput. If too small, then memory
166 < * and internal task maintenance overhead may overwhelm processing.
162 > * computation. Large tasks should be split into smaller subtasks,
163 > * usually via recursive decomposition. As a very rough rule of thumb,
164 > * a task should perform more than 100 and less than 10000 basic
165 > * computational steps, and should avoid indefinite looping. If tasks
166 > * are too big, then parallelism cannot improve throughput. If too
167 > * small, then memory and internal task maintenance overhead may
168 > * overwhelm processing.
169   *
170 < * <p>ForkJoinTasks are {@code Serializable}, which enables them
171 < * to be used in extensions such as remote execution frameworks. It is
172 < * in general sensible to serialize tasks only before or after, but
173 < * not during execution. Serialization is not relied on during
174 < * execution itself.
170 > * <p>This class provides {@code adapt} methods for {@link Runnable}
171 > * and {@link Callable}, that may be of use when mixing execution of
172 > * {@code ForkJoinTasks} with other kinds of tasks. When all tasks are
173 > * of this form, consider using a pool constructed in <em>asyncMode</em>.
174 > *
175 > * <p>ForkJoinTasks are {@code Serializable}, which enables them to be
176 > * used in extensions such as remote execution frameworks. It is
177 > * sensible to serialize tasks only before or after, but not during,
178 > * execution. Serialization is not relied on during execution itself.
179   *
180   * @since 1.7
181   * @author Doug Lea
182   */
183   public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
184  
185 <    /**
186 <     * Run control status bits packed into a single int to minimize
187 <     * footprint and to ensure atomicity (via CAS).  Status is
188 <     * initially zero, and takes on nonnegative values until
189 <     * completed, upon which status holds COMPLETED. CANCELLED, or
190 <     * EXCEPTIONAL, which use the top 3 bits.  Tasks undergoing
191 <     * blocking waits by other threads have SIGNAL_MASK bits set --
192 <     * bit 15 for external (nonFJ) waits, and the rest a count of
193 <     * waiting FJ threads.  (This representation relies on
194 <     * ForkJoinPool max thread limits). Completion of a stolen task
195 <     * with SIGNAL_MASK bits set awakens waiter via notifyAll. Even
196 <     * though suboptimal for some purposes, we use basic builtin
197 <     * wait/notify to take advantage of "monitor inflation" in JVMs
198 <     * that we would otherwise need to emulate to avoid adding further
199 <     * per-task bookkeeping overhead. Note that bits 16-28 are
200 <     * currently unused. Also value 0x80000000 is available as spare
201 <     * completion value.
185 >    /*
186 >     * See the internal documentation of class ForkJoinPool for a
187 >     * general implementation overview.  ForkJoinTasks are mainly
188 >     * responsible for maintaining their "status" field amidst relays
189 >     * to methods in ForkJoinWorkerThread and ForkJoinPool.
190 >     *
191 >     * The methods of this class are more-or-less layered into
192 >     * (1) basic status maintenance
193 >     * (2) execution and awaiting completion
194 >     * (3) user-level methods that additionally report results.
195 >     * This is sometimes hard to see because this file orders exported
196 >     * methods in a way that flows well in javadocs.
197 >     */
198 >
199 >    /*
200 >     * The status field holds run control status bits packed into a
201 >     * single int to minimize footprint and to ensure atomicity (via
202 >     * CAS).  Status is initially zero, and takes on nonnegative
203 >     * values until completed, upon which status (anded with
204 >     * DONE_MASK) holds value NORMAL, CANCELLED, or EXCEPTIONAL. Tasks
205 >     * undergoing blocking waits by other threads have the SIGNAL bit
206 >     * set.  Completion of a stolen task with SIGNAL set awakens any
207 >     * waiters via notifyAll. Even though suboptimal for some
208 >     * purposes, we use basic builtin wait/notify to take advantage of
209 >     * "monitor inflation" in JVMs that we would otherwise need to
210 >     * emulate to avoid adding further per-task bookkeeping overhead.
211 >     * We want these monitors to be "fat", i.e., not use biasing or
212 >     * thin-lock techniques, so use some odd coding idioms that tend
213 >     * to avoid them, mainly by arranging that every synchronized
214 >     * block performs a wait, notifyAll or both.
215 >     *
216 >     * These control bits occupy only (some of) the upper half (16
217 >     * bits) of status field. The lower bits are used for user-defined
218 >     * tags.
219       */
136    volatile int status; // accessed directly by pool and workers
220  
221 <    static final int COMPLETION_MASK      = 0xe0000000;
222 <    static final int NORMAL               = 0xe0000000; // == mask
223 <    static final int CANCELLED            = 0xc0000000;
224 <    static final int EXCEPTIONAL          = 0xa0000000;
225 <    static final int SIGNAL_MASK          = 0x0000ffff;
226 <    static final int INTERNAL_SIGNAL_MASK = 0x00007fff;
227 <    static final int EXTERNAL_SIGNAL      = 0x00008000; // top bit of low word
228 <
146 <    /**
147 <     * Table of exceptions thrown by tasks, to enable reporting by
148 <     * callers. Because exceptions are rare, we don't directly keep
149 <     * them with task objects, but instead use a weak ref table.  Note
150 <     * that cancellation exceptions don't appear in the table, but are
151 <     * instead recorded as status values.
152 <     * TODO: Use ConcurrentReferenceHashMap
153 <     */
154 <    static final Map<ForkJoinTask<?>, Throwable> exceptionMap =
155 <        Collections.synchronizedMap
156 <        (new WeakHashMap<ForkJoinTask<?>, Throwable>());
157 <
158 <    // within-package utilities
159 <
160 <    /**
161 <     * Gets current worker thread, or null if not a worker thread.
162 <     */
163 <    static ForkJoinWorkerThread getWorker() {
164 <        Thread t = Thread.currentThread();
165 <        return ((t instanceof ForkJoinWorkerThread)?
166 <                (ForkJoinWorkerThread)t : null);
167 <    }
168 <
169 <    final boolean casStatus(int cmp, int val) {
170 <        return UNSAFE.compareAndSwapInt(this, statusOffset, cmp, val);
171 <    }
172 <
173 <    /**
174 <     * Workaround for not being able to rethrow unchecked exceptions.
175 <     */
176 <    static void rethrowException(Throwable ex) {
177 <        if (ex != null)
178 <            UNSAFE.throwException(ex);
179 <    }
180 <
181 <    // Setting completion status
221 >    /** The run status of this task */
222 >    volatile int status; // accessed directly by pool and workers
223 >    static final int DONE_MASK   = 0xf0000000;  // mask out non-completion bits
224 >    static final int NORMAL      = 0xf0000000;  // must be negative
225 >    static final int CANCELLED   = 0xc0000000;  // must be < NORMAL
226 >    static final int EXCEPTIONAL = 0x80000000;  // must be < CANCELLED
227 >    static final int SIGNAL      = 0x00010000;  // must be >= 1 << 16
228 >    static final int SMASK       = 0x0000ffff;  // short bits for tags
229  
230      /**
231 <     * Marks completion and wakes up threads waiting to join this task.
231 >     * Marks completion and wakes up threads waiting to join this
232 >     * task.
233       *
234       * @param completion one of NORMAL, CANCELLED, EXCEPTIONAL
235 +     * @return completion status on exit
236       */
237 <    final void setCompletion(int completion) {
238 <        ForkJoinPool pool = getPool();
239 <        if (pool != null) {
240 <            int s; // Clear signal bits while setting completion status
241 <            do;while ((s = status) >= 0 && !casStatus(s, completion));
242 <
243 <            if ((s & SIGNAL_MASK) != 0) {
244 <                if ((s &= INTERNAL_SIGNAL_MASK) != 0)
196 <                    pool.updateRunningCount(s);
197 <                synchronized(this) { notifyAll(); }
237 >    private int setCompletion(int completion) {
238 >        for (int s;;) {
239 >            if ((s = status) < 0)
240 >                return s;
241 >            if (U.compareAndSwapInt(this, STATUS, s, s | completion)) {
242 >                if ((s >>> 16) != 0)
243 >                    synchronized (this) { notifyAll(); }
244 >                return completion;
245              }
246          }
200        else
201            externallySetCompletion(completion);
202    }
203
204    /**
205     * Version of setCompletion for non-FJ threads.  Leaves signal
206     * bits for unblocked threads to adjust, and always notifies.
207     */
208    private void externallySetCompletion(int completion) {
209        int s;
210        do;while ((s = status) >= 0 &&
211                  !casStatus(s, (s & SIGNAL_MASK) | completion));
212        synchronized(this) { notifyAll(); }
247      }
248  
249      /**
250 <     * Sets status to indicate normal completion
251 <     */
252 <    final void setNormalCompletion() {
253 <        // Try typical fast case -- single CAS, no signal, not already done.
254 <        // Manually expand casStatus to improve chances of inlining it
255 <        if (!UNSAFE.compareAndSwapInt(this, statusOffset, 0, NORMAL))
256 <            setCompletion(NORMAL);
257 <    }
258 <
259 <    // internal waiting and notification
260 <
261 <    /**
262 <     * Performs the actual monitor wait for awaitDone
263 <     */
264 <    private void doAwaitDone() {
265 <        // Minimize lock bias and in/de-flation effects by maximizing
232 <        // chances of waiting inside sync
233 <        try {
234 <            while (status >= 0)
235 <                synchronized(this) { if (status >= 0) wait(); }
236 <        } catch (InterruptedException ie) {
237 <            onInterruptedWait();
250 >     * Primary execution method for stolen tasks. Unless done, calls
251 >     * exec and records status if completed, but doesn't wait for
252 >     * completion otherwise.
253 >     *
254 >     * @return status on exit from this method
255 >     */
256 >    final int doExec() {
257 >        int s; boolean completed;
258 >        if ((s = status) >= 0) {
259 >            try {
260 >                completed = exec();
261 >            } catch (Throwable rex) {
262 >                return setExceptionalCompletion(rex);
263 >            }
264 >            if (completed)
265 >                s = setCompletion(NORMAL);
266          }
267 +        return s;
268      }
269  
270      /**
271 <     * Performs the actual monitor wait for awaitDone
271 >     * Tries to set SIGNAL status unless already completed. Used by
272 >     * ForkJoinPool. Other variants are directly incorporated into
273 >     * externalAwaitDone etc.
274 >     *
275 >     * @return true if successful
276       */
277 <    private void doAwaitDone(long startTime, long nanos) {
278 <        synchronized(this) {
279 <            try {
247 <                while (status >= 0) {
248 <                    long nt = nanos - System.nanoTime() - startTime;
249 <                    if (nt <= 0)
250 <                        break;
251 <                    wait(nt / 1000000, (int)(nt % 1000000));
252 <                }
253 <            } catch (InterruptedException ie) {
254 <                onInterruptedWait();
255 <            }
256 <        }
277 >    final boolean trySetSignal() {
278 >        int s = status;
279 >        return s >= 0 && U.compareAndSwapInt(this, STATUS, s, s | SIGNAL);
280      }
281  
259    // Awaiting completion
260
282      /**
283 <     * Sets status to indicate there is joiner, then waits for join,
284 <     * surrounded with pool notifications.
264 <     *
265 <     * @return status upon exit
283 >     * Blocks a non-worker-thread until completion.
284 >     * @return status upon completion
285       */
286 <    private int awaitDone(ForkJoinWorkerThread w, boolean maintainParallelism) {
268 <        ForkJoinPool pool = w == null? null : w.pool;
286 >    private int externalAwaitDone() {
287          int s;
288 <        while ((s = status) >= 0) {
289 <            if (casStatus(s, pool == null? s|EXTERNAL_SIGNAL : s+1)) {
290 <                if (pool == null || !pool.preJoin(this, maintainParallelism))
291 <                    doAwaitDone();
292 <                if (((s = status) & INTERNAL_SIGNAL_MASK) != 0)
293 <                    adjustPoolCountsOnUnblock(pool);
294 <                break;
288 >        boolean interrupted = false;
289 >        if ((s = status) >= 0 && ForkJoinPool.tryUnsubmitFromCommonPool(this))
290 >            s = doExec();
291 >        while (s >= 0) {
292 >            if (U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
293 >                synchronized (this) {
294 >                    if (status >= 0) {
295 >                        try {
296 >                            wait();
297 >                        } catch (InterruptedException ie) {
298 >                            interrupted = true;
299 >                        }
300 >                    }
301 >                    else
302 >                        notifyAll();
303 >                }
304              }
305 +            s = status;
306          }
307 +        if (interrupted)
308 +            Thread.currentThread().interrupt();
309          return s;
310      }
311  
312      /**
313 <     * Timed version of awaitDone
284 <     * @return status upon exit
313 >     * Blocks a non-worker-thread until completion or interruption.
314       */
315 <    private int awaitDone(ForkJoinWorkerThread w, long nanos) {
316 <        ForkJoinPool pool = w == null? null : w.pool;
315 >    private int externalInterruptibleAwaitDone() throws InterruptedException {
316 >        if (Thread.interrupted())
317 >            throw new InterruptedException();
318          int s;
319 <        while ((s = status) >= 0) {
320 <            if (casStatus(s, pool == null? s|EXTERNAL_SIGNAL : s+1)) {
321 <                long startTime = System.nanoTime();
322 <                if (pool == null || !pool.preJoin(this, false))
323 <                    doAwaitDone(startTime, nanos);
324 <                if ((s = status) >= 0) {
325 <                    adjustPoolCountsOnCancelledWait(pool);
326 <                    s = status;
319 >        if ((s = status) >= 0 && ForkJoinPool.tryUnsubmitFromCommonPool(this))
320 >            s = doExec();
321 >        while (s >= 0) {
322 >            if (U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
323 >                synchronized (this) {
324 >                    if (status >= 0)
325 >                        wait();
326 >                    else
327 >                        notifyAll();
328                  }
298                if (s < 0 && (s & INTERNAL_SIGNAL_MASK) != 0)
299                    adjustPoolCountsOnUnblock(pool);
300                break;
329              }
330 +            s = status;
331          }
332          return s;
333      }
334  
335      /**
336 <     * Notifies pool that thread is unblocked. Called by signalled
337 <     * threads when woken by non-FJ threads (which is atypical).
336 >     * Implementation for join, get, quietlyJoin. Directly handles
337 >     * only cases of already-completed, external wait, and
338 >     * unfork+exec.  Others are relayed to ForkJoinPool.awaitJoin.
339 >     *
340 >     * @return status upon completion
341       */
342 <    private void adjustPoolCountsOnUnblock(ForkJoinPool pool) {
343 <        int s;
344 <        do;while ((s = status) < 0 && !casStatus(s, s & COMPLETION_MASK));
345 <        if (pool != null && (s &= INTERNAL_SIGNAL_MASK) != 0)
346 <            pool.updateRunningCount(s);
342 >    private int doJoin() {
343 >        int s; Thread t; ForkJoinWorkerThread wt; ForkJoinPool.WorkQueue w;
344 >        return (s = status) < 0 ? s :
345 >            ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
346 >            (w = (wt = (ForkJoinWorkerThread)t).workQueue).
347 >            tryUnpush(this) && (s = doExec()) < 0 ? s :
348 >            wt.pool.awaitJoin(w, this) :
349 >            externalAwaitDone();
350      }
351  
352      /**
353 <     * Notifies pool to adjust counts on cancelled or timed out wait.
353 >     * Implementation for invoke, quietlyInvoke.
354 >     *
355 >     * @return status upon completion
356       */
357 <    private void adjustPoolCountsOnCancelledWait(ForkJoinPool pool) {
358 <        if (pool != null) {
359 <            int s;
360 <            while ((s = status) >= 0 && (s & INTERNAL_SIGNAL_MASK) != 0) {
361 <                if (casStatus(s, s - 1)) {
362 <                    pool.updateRunningCount(1);
326 <                    break;
327 <                }
328 <            }
329 <        }
357 >    private int doInvoke() {
358 >        int s; Thread t; ForkJoinWorkerThread wt;
359 >        return (s = doExec()) < 0 ? s :
360 >            ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
361 >            (wt = (ForkJoinWorkerThread)t).pool.awaitJoin(wt.workQueue, this) :
362 >            externalAwaitDone();
363      }
364  
365 +    // Exception table support
366 +
367      /**
368 <     * Handles interruptions during waits.
368 >     * Table of exceptions thrown by tasks, to enable reporting by
369 >     * callers. Because exceptions are rare, we don't directly keep
370 >     * them with task objects, but instead use a weak ref table.  Note
371 >     * that cancellation exceptions don't appear in the table, but are
372 >     * instead recorded as status values.
373 >     *
374 >     * Note: These statics are initialized below in static block.
375       */
376 <    private void onInterruptedWait() {
377 <        ForkJoinWorkerThread w = getWorker();
378 <        if (w == null)
338 <            Thread.currentThread().interrupt(); // re-interrupt
339 <        else if (w.isTerminating())
340 <            cancelIgnoringExceptions();
341 <        // else if FJworker, ignore interrupt
342 <    }
376 >    private static final ExceptionNode[] exceptionTable;
377 >    private static final ReentrantLock exceptionTableLock;
378 >    private static final ReferenceQueue<Object> exceptionTableRefQueue;
379  
380 <    // Recording and reporting exceptions
380 >    /**
381 >     * Fixed capacity for exceptionTable.
382 >     */
383 >    private static final int EXCEPTION_MAP_CAPACITY = 32;
384  
385 <    private void setDoneExceptionally(Throwable rex) {
386 <        exceptionMap.put(this, rex);
387 <        setCompletion(EXCEPTIONAL);
385 >    /**
386 >     * Key-value nodes for exception table.  The chained hash table
387 >     * uses identity comparisons, full locking, and weak references
388 >     * for keys. The table has a fixed capacity because it only
389 >     * maintains task exceptions long enough for joiners to access
390 >     * them, so should never become very large for sustained
391 >     * periods. However, since we do not know when the last joiner
392 >     * completes, we must use weak references and expunge them. We do
393 >     * so on each operation (hence full locking). Also, some thread in
394 >     * any ForkJoinPool will call helpExpungeStaleExceptions when its
395 >     * pool becomes isQuiescent.
396 >     */
397 >    static final class ExceptionNode extends WeakReference<ForkJoinTask<?>> {
398 >        final Throwable ex;
399 >        ExceptionNode next;
400 >        final long thrower;  // use id not ref to avoid weak cycles
401 >        ExceptionNode(ForkJoinTask<?> task, Throwable ex, ExceptionNode next) {
402 >            super(task, exceptionTableRefQueue);
403 >            this.ex = ex;
404 >            this.next = next;
405 >            this.thrower = Thread.currentThread().getId();
406 >        }
407      }
408  
409      /**
410 <     * Throws the exception associated with status s.
410 >     * Records exception and sets status.
411       *
412 <     * @throws the exception
412 >     * @return status on exit
413       */
414 <    private void reportException(int s) {
415 <        if ((s &= COMPLETION_MASK) < NORMAL) {
416 <            if (s == CANCELLED)
417 <                throw new CancellationException();
418 <            else
419 <                rethrowException(exceptionMap.get(this));
414 >    final int recordExceptionalCompletion(Throwable ex) {
415 >        int s;
416 >        if ((s = status) >= 0) {
417 >            int h = System.identityHashCode(this);
418 >            final ReentrantLock lock = exceptionTableLock;
419 >            lock.lock();
420 >            try {
421 >                expungeStaleExceptions();
422 >                ExceptionNode[] t = exceptionTable;
423 >                int i = h & (t.length - 1);
424 >                for (ExceptionNode e = t[i]; ; e = e.next) {
425 >                    if (e == null) {
426 >                        t[i] = new ExceptionNode(this, ex, t[i]);
427 >                        break;
428 >                    }
429 >                    if (e.get() == this) // already present
430 >                        break;
431 >                }
432 >            } finally {
433 >                lock.unlock();
434 >            }
435 >            s = setCompletion(EXCEPTIONAL);
436          }
437 +        return s;
438      }
439  
440      /**
441 <     * Returns result or throws exception using j.u.c.Future conventions.
442 <     * Only call when isDone known to be true.
441 >     * Records exception and possibly propagates
442 >     *
443 >     * @return status on exit
444       */
445 <    private V reportFutureResult()
446 <        throws ExecutionException, InterruptedException {
447 <        int s = status & COMPLETION_MASK;
448 <        if (s < NORMAL) {
449 <            Throwable ex;
374 <            if (s == CANCELLED)
375 <                throw new CancellationException();
376 <            if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
377 <                throw new ExecutionException(ex);
378 <            if (Thread.interrupted())
379 <                throw new InterruptedException();
380 <        }
381 <        return getRawResult();
445 >    private int setExceptionalCompletion(Throwable ex) {
446 >        int s = recordExceptionalCompletion(ex);
447 >        if ((s & DONE_MASK) == EXCEPTIONAL)
448 >            internalPropagateException(ex);
449 >        return s;
450      }
451  
452      /**
453 <     * Returns result or throws exception using j.u.c.Future conventions
386 <     * with timeouts.
453 >     * Hook for exception propagation support for tasks with completers.
454       */
455 <    private V reportTimedFutureResult()
389 <        throws InterruptedException, ExecutionException, TimeoutException {
390 <        Throwable ex;
391 <        int s = status & COMPLETION_MASK;
392 <        if (s == NORMAL)
393 <            return getRawResult();
394 <        if (s == CANCELLED)
395 <            throw new CancellationException();
396 <        if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
397 <            throw new ExecutionException(ex);
398 <        if (Thread.interrupted())
399 <            throw new InterruptedException();
400 <        throw new TimeoutException();
455 >    void internalPropagateException(Throwable ex) {
456      }
457  
403    // internal execution methods
404
458      /**
459 <     * Calls exec, recording completion, and rethrowing exception if
460 <     * encountered. Caller should normally check status before calling.
461 <     *
462 <     * @return true if completed normally
459 >     * Cancels, ignoring any exceptions thrown by cancel. Used during
460 >     * worker and pool shutdown. Cancel is spec'ed not to throw any
461 >     * exceptions, but if it does anyway, we have no recourse during
462 >     * shutdown, so guard against this case.
463       */
464 <    private boolean tryExec() {
465 <        try { // try block must contain only call to exec
466 <            if (!exec())
467 <                return false;
468 <        } catch (Throwable rex) {
469 <            setDoneExceptionally(rex);
417 <            rethrowException(rex);
418 <            return false; // not reached
464 >    static final void cancelIgnoringExceptions(ForkJoinTask<?> t) {
465 >        if (t != null && t.status >= 0) {
466 >            try {
467 >                t.cancel(false);
468 >            } catch (Throwable ignore) {
469 >            }
470          }
420        setNormalCompletion();
421        return true;
471      }
472  
473      /**
474 <     * Main execution method used by worker threads. Invokes
426 <     * base computation unless already complete.
474 >     * Removes exception node and clears status
475       */
476 <    final void quietlyExec() {
477 <        if (status >= 0) {
478 <            try {
479 <                if (!exec())
480 <                    return;
481 <            } catch(Throwable rex) {
482 <                setDoneExceptionally(rex);
483 <                return;
476 >    private void clearExceptionalCompletion() {
477 >        int h = System.identityHashCode(this);
478 >        final ReentrantLock lock = exceptionTableLock;
479 >        lock.lock();
480 >        try {
481 >            ExceptionNode[] t = exceptionTable;
482 >            int i = h & (t.length - 1);
483 >            ExceptionNode e = t[i];
484 >            ExceptionNode pred = null;
485 >            while (e != null) {
486 >                ExceptionNode next = e.next;
487 >                if (e.get() == this) {
488 >                    if (pred == null)
489 >                        t[i] = next;
490 >                    else
491 >                        pred.next = next;
492 >                    break;
493 >                }
494 >                pred = e;
495 >                e = next;
496              }
497 <            setNormalCompletion();
497 >            expungeStaleExceptions();
498 >            status = 0;
499 >        } finally {
500 >            lock.unlock();
501          }
502      }
503  
504      /**
505 <     * Calls exec(), recording but not rethrowing exception.
506 <     * Caller should normally check status before calling.
505 >     * Returns a rethrowable exception for the given task, if
506 >     * available. To provide accurate stack traces, if the exception
507 >     * was not thrown by the current thread, we try to create a new
508 >     * exception of the same type as the one thrown, but with the
509 >     * recorded exception as its cause. If there is no such
510 >     * constructor, we instead try to use a no-arg constructor,
511 >     * followed by initCause, to the same effect. If none of these
512 >     * apply, or any fail due to other exceptions, we return the
513 >     * recorded exception, which is still correct, although it may
514 >     * contain a misleading stack trace.
515       *
516 <     * @return true if completed normally
516 >     * @return the exception, or null if none
517       */
518 <    private boolean tryQuietlyInvoke() {
518 >    private Throwable getThrowableException() {
519 >        if ((status & DONE_MASK) != EXCEPTIONAL)
520 >            return null;
521 >        int h = System.identityHashCode(this);
522 >        ExceptionNode e;
523 >        final ReentrantLock lock = exceptionTableLock;
524 >        lock.lock();
525          try {
526 <            if (!exec())
527 <                return false;
528 <        } catch (Throwable rex) {
529 <            setDoneExceptionally(rex);
530 <            return false;
526 >            expungeStaleExceptions();
527 >            ExceptionNode[] t = exceptionTable;
528 >            e = t[h & (t.length - 1)];
529 >            while (e != null && e.get() != this)
530 >                e = e.next;
531 >        } finally {
532 >            lock.unlock();
533          }
534 <        setNormalCompletion();
535 <        return true;
534 >        Throwable ex;
535 >        if (e == null || (ex = e.ex) == null)
536 >            return null;
537 >        if (false && e.thrower != Thread.currentThread().getId()) {
538 >            Class<? extends Throwable> ec = ex.getClass();
539 >            try {
540 >                Constructor<?> noArgCtor = null;
541 >                Constructor<?>[] cs = ec.getConstructors();// public ctors only
542 >                for (int i = 0; i < cs.length; ++i) {
543 >                    Constructor<?> c = cs[i];
544 >                    Class<?>[] ps = c.getParameterTypes();
545 >                    if (ps.length == 0)
546 >                        noArgCtor = c;
547 >                    else if (ps.length == 1 && ps[0] == Throwable.class)
548 >                        return (Throwable)(c.newInstance(ex));
549 >                }
550 >                if (noArgCtor != null) {
551 >                    Throwable wx = (Throwable)(noArgCtor.newInstance());
552 >                    wx.initCause(ex);
553 >                    return wx;
554 >                }
555 >            } catch (Exception ignore) {
556 >            }
557 >        }
558 >        return ex;
559      }
560  
561      /**
562 <     * Cancels, ignoring any exceptions it throws.
562 >     * Poll stale refs and remove them. Call only while holding lock.
563       */
564 <    final void cancelIgnoringExceptions() {
565 <        try {
566 <            cancel(false);
567 <        } catch(Throwable ignore) {
564 >    private static void expungeStaleExceptions() {
565 >        for (Object x; (x = exceptionTableRefQueue.poll()) != null;) {
566 >            if (x instanceof ExceptionNode) {
567 >                ForkJoinTask<?> key = ((ExceptionNode)x).get();
568 >                ExceptionNode[] t = exceptionTable;
569 >                int i = System.identityHashCode(key) & (t.length - 1);
570 >                ExceptionNode e = t[i];
571 >                ExceptionNode pred = null;
572 >                while (e != null) {
573 >                    ExceptionNode next = e.next;
574 >                    if (e == x) {
575 >                        if (pred == null)
576 >                            t[i] = next;
577 >                        else
578 >                            pred.next = next;
579 >                        break;
580 >                    }
581 >                    pred = e;
582 >                    e = next;
583 >                }
584 >            }
585          }
586      }
587  
588      /**
589 <     * Main implementation of helpJoin
589 >     * If lock is available, poll stale refs and remove them.
590 >     * Called from ForkJoinPool when pools become quiescent.
591       */
592 <    private int busyJoin(ForkJoinWorkerThread w) {
593 <        int s;
594 <        ForkJoinTask<?> t;
595 <        while ((s = status) >= 0 && (t = w.scanWhileJoining(this)) != null)
596 <            t.quietlyExec();
597 <        return (s >= 0)? awaitDone(w, false) : s; // block if no work
592 >    static final void helpExpungeStaleExceptions() {
593 >        final ReentrantLock lock = exceptionTableLock;
594 >        if (lock.tryLock()) {
595 >            try {
596 >                expungeStaleExceptions();
597 >            } finally {
598 >                lock.unlock();
599 >            }
600 >        }
601 >    }
602 >
603 >    /**
604 >     * Throws exception, if any, associated with the given status.
605 >     */
606 >    private void reportException(int s) {
607 >        Throwable ex = ((s == CANCELLED) ?  new CancellationException() :
608 >                        (s == EXCEPTIONAL) ? getThrowableException() :
609 >                        null);
610 >        if (ex != null)
611 >            U.throwException(ex);
612      }
613  
614      // public methods
615  
616      /**
617 <     * Arranges to asynchronously execute this task.  While it is not
618 <     * necessarily enforced, it is a usage error to fork a task more
619 <     * than once unless it has completed and been reinitialized.  This
620 <     * method may be invoked only from within ForkJoinTask
621 <     * computations (as may be determined using method {@link
622 <     * #inForkJoinPool}). Attempts to invoke in other contexts result
623 <     * in exceptions or errors possibly including ClassCastException.
624 <     */
625 <    public final void fork() {
626 <        ((ForkJoinWorkerThread)(Thread.currentThread())).pushTask(this);
617 >     * Arranges to asynchronously execute this task in the pool the
618 >     * current task is running in, if applicable, or using the {@link
619 >     * ForkJoinPool#commonPool} if not {@link #inForkJoinPool}.  While
620 >     * it is not necessarily enforced, it is a usage error to fork a
621 >     * task more than once unless it has completed and been
622 >     * reinitialized.  Subsequent modifications to the state of this
623 >     * task or any data it operates on are not necessarily
624 >     * consistently observable by any thread other than the one
625 >     * executing it unless preceded by a call to {@link #join} or
626 >     * related methods, or a call to {@link #isDone} returning {@code
627 >     * true}.
628 >     *
629 >     * @return {@code this}, to simplify usage
630 >     */
631 >    public final ForkJoinTask<V> fork() {
632 >        Thread t;
633 >        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
634 >            ((ForkJoinWorkerThread)t).workQueue.push(this);
635 >        else
636 >            ForkJoinPool.submitToCommonPool(this);
637 >        return this;
638      }
639  
640      /**
641 <     * Returns the result of the computation when it is ready.
642 <     * This method differs from {@code get} in that abnormal
643 <     * completion results in RuntimeExceptions or Errors, not
644 <     * ExecutionExceptions.
641 >     * Returns the result of the computation when it {@link #isDone is
642 >     * done}.  This method differs from {@link #get()} in that
643 >     * abnormal completion results in {@code RuntimeException} or
644 >     * {@code Error}, not {@code ExecutionException}, and that
645 >     * interrupts of the calling thread do <em>not</em> cause the
646 >     * method to abruptly return by throwing {@code
647 >     * InterruptedException}.
648       *
649       * @return the computed result
650       */
651      public final V join() {
652 <        ForkJoinWorkerThread w = getWorker();
653 <        if (w == null || status < 0 || !w.unpushTask(this) || !tryExec())
654 <            reportException(awaitDone(w, true));
652 >        int s;
653 >        if ((s = doJoin() & DONE_MASK) != NORMAL)
654 >            reportException(s);
655          return getRawResult();
656      }
657  
658      /**
659       * Commences performing this task, awaits its completion if
660 <     * necessary, and return its result.
660 >     * necessary, and returns its result, or throws an (unchecked)
661 >     * {@code RuntimeException} or {@code Error} if the underlying
662 >     * computation did so.
663       *
514     * @throws Throwable (a RuntimeException, Error, or unchecked
515     * exception) if the underlying computation did so
664       * @return the computed result
665       */
666      public final V invoke() {
667 <        if (status >= 0 && tryExec())
668 <            return getRawResult();
669 <        else
670 <            return join();
667 >        int s;
668 >        if ((s = doInvoke() & DONE_MASK) != NORMAL)
669 >            reportException(s);
670 >        return getRawResult();
671      }
672  
673      /**
674 <     * Forks both tasks, returning when {@code isDone} holds for
675 <     * both of them or an exception is encountered. This method may be
676 <     * invoked only from within ForkJoinTask computations (as may be
677 <     * determined using method {@link #inForkJoinPool}). Attempts to
678 <     * invoke in other contexts result in exceptions or errors
679 <     * possibly including ClassCastException.
680 <     *
681 <     * @param t1 one task
682 <     * @param t2 the other task
683 <     * @throws NullPointerException if t1 or t2 are null
684 <     * @throws RuntimeException or Error if either task did so
674 >     * Forks the given tasks, returning when {@code isDone} holds for
675 >     * each task or an (unchecked) exception is encountered, in which
676 >     * case the exception is rethrown. If more than one task
677 >     * encounters an exception, then this method throws any one of
678 >     * these exceptions. If any task encounters an exception, the
679 >     * other may be cancelled. However, the execution status of
680 >     * individual tasks is not guaranteed upon exceptional return. The
681 >     * status of each task may be obtained using {@link
682 >     * #getException()} and related methods to check if they have been
683 >     * cancelled, completed normally or exceptionally, or left
684 >     * unprocessed.
685 >     *
686 >     * @param t1 the first task
687 >     * @param t2 the second task
688 >     * @throws NullPointerException if any task is null
689       */
690 <    public static void invokeAll(ForkJoinTask<?>t1, ForkJoinTask<?> t2) {
690 >    public static void invokeAll(ForkJoinTask<?> t1, ForkJoinTask<?> t2) {
691 >        int s1, s2;
692          t2.fork();
693 <        t1.invoke();
694 <        t2.join();
693 >        if ((s1 = t1.doInvoke() & DONE_MASK) != NORMAL)
694 >            t1.reportException(s1);
695 >        if ((s2 = t2.doJoin() & DONE_MASK) != NORMAL)
696 >            t2.reportException(s2);
697      }
698  
699      /**
700 <     * Forks the given tasks, returning when {@code isDone} holds
701 <     * for all of them. If any task encounters an exception, others
702 <     * may be cancelled.  This method may be invoked only from within
703 <     * ForkJoinTask computations (as may be determined using method
704 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
705 <     * result in exceptions or errors possibly including
706 <     * ClassCastException.
707 <     * @param tasks the array of tasks
708 <     * @throws NullPointerException if tasks or any element are null
709 <     * @throws RuntimeException or Error if any task did so
700 >     * Forks the given tasks, returning when {@code isDone} holds for
701 >     * each task or an (unchecked) exception is encountered, in which
702 >     * case the exception is rethrown. If more than one task
703 >     * encounters an exception, then this method throws any one of
704 >     * these exceptions. If any task encounters an exception, others
705 >     * may be cancelled. However, the execution status of individual
706 >     * tasks is not guaranteed upon exceptional return. The status of
707 >     * each task may be obtained using {@link #getException()} and
708 >     * related methods to check if they have been cancelled, completed
709 >     * normally or exceptionally, or left unprocessed.
710 >     *
711 >     * @param tasks the tasks
712 >     * @throws NullPointerException if any task is null
713       */
714      public static void invokeAll(ForkJoinTask<?>... tasks) {
715          Throwable ex = null;
# Line 564 | Line 722 | public abstract class ForkJoinTask<V> im
722              }
723              else if (i != 0)
724                  t.fork();
725 <            else {
726 <                t.quietlyInvoke();
569 <                if (ex == null)
570 <                    ex = t.getException();
571 <            }
725 >            else if (t.doInvoke() < NORMAL && ex == null)
726 >                ex = t.getException();
727          }
728          for (int i = 1; i <= last; ++i) {
729              ForkJoinTask<?> t = tasks[i];
730              if (t != null) {
731                  if (ex != null)
732                      t.cancel(false);
733 <                else {
734 <                    t.quietlyJoin();
580 <                    if (ex == null)
581 <                        ex = t.getException();
582 <                }
733 >                else if (t.doJoin() < NORMAL)
734 >                    ex = t.getException();
735              }
736          }
737          if (ex != null)
738 <            rethrowException(ex);
738 >            U.throwException(ex);
739      }
740  
741      /**
742 <     * Forks all tasks in the collection, returning when
743 <     * {@code isDone} holds for all of them. If any task
744 <     * encounters an exception, others may be cancelled.  This method
745 <     * may be invoked only from within ForkJoinTask computations (as
746 <     * may be determined using method {@link
747 <     * #inForkJoinPool}). Attempts to invoke in other contexts resul!t
748 <     * in exceptions or errors possibly including ClassCastException.
742 >     * Forks all tasks in the specified collection, returning when
743 >     * {@code isDone} holds for each task or an (unchecked) exception
744 >     * is encountered, in which case the exception is rethrown. If
745 >     * more than one task encounters an exception, then this method
746 >     * throws any one of these exceptions. If any task encounters an
747 >     * exception, others may be cancelled. However, the execution
748 >     * status of individual tasks is not guaranteed upon exceptional
749 >     * return. The status of each task may be obtained using {@link
750 >     * #getException()} and related methods to check if they have been
751 >     * cancelled, completed normally or exceptionally, or left
752 >     * unprocessed.
753       *
754       * @param tasks the collection of tasks
755 +     * @return the tasks argument, to simplify usage
756       * @throws NullPointerException if tasks or any element are null
600     * @throws RuntimeException or Error if any task did so
757       */
758 <    public static void invokeAll(Collection<? extends ForkJoinTask<?>> tasks) {
759 <        if (!(tasks instanceof List)) {
760 <            invokeAll(tasks.toArray(new ForkJoinTask[tasks.size()]));
761 <            return;
758 >    public static <T extends ForkJoinTask<?>> Collection<T> invokeAll(Collection<T> tasks) {
759 >        if (!(tasks instanceof RandomAccess) || !(tasks instanceof List<?>)) {
760 >            invokeAll(tasks.toArray(new ForkJoinTask<?>[tasks.size()]));
761 >            return tasks;
762          }
763 +        @SuppressWarnings("unchecked")
764          List<? extends ForkJoinTask<?>> ts =
765 <            (List<? extends ForkJoinTask<?>>)tasks;
765 >            (List<? extends ForkJoinTask<?>>) tasks;
766          Throwable ex = null;
767          int last = ts.size() - 1;
768          for (int i = last; i >= 0; --i) {
# Line 616 | Line 773 | public abstract class ForkJoinTask<V> im
773              }
774              else if (i != 0)
775                  t.fork();
776 <            else {
777 <                t.quietlyInvoke();
621 <                if (ex == null)
622 <                    ex = t.getException();
623 <            }
776 >            else if (t.doInvoke() < NORMAL && ex == null)
777 >                ex = t.getException();
778          }
779          for (int i = 1; i <= last; ++i) {
780              ForkJoinTask<?> t = ts.get(i);
781              if (t != null) {
782                  if (ex != null)
783                      t.cancel(false);
784 <                else {
785 <                    t.quietlyJoin();
632 <                    if (ex == null)
633 <                        ex = t.getException();
634 <                }
784 >                else if (t.doJoin() < NORMAL)
785 >                    ex = t.getException();
786              }
787          }
788          if (ex != null)
789 <            rethrowException(ex);
789 >            U.throwException(ex);
790 >        return tasks;
791      }
792  
793      /**
794 <     * Returns true if the computation performed by this task has
795 <     * completed (or has been cancelled).
794 >     * Attempts to cancel execution of this task. This attempt will
795 >     * fail if the task has already completed or could not be
796 >     * cancelled for some other reason. If successful, and this task
797 >     * has not started when {@code cancel} is called, execution of
798 >     * this task is suppressed. After this method returns
799 >     * successfully, unless there is an intervening call to {@link
800 >     * #reinitialize}, subsequent calls to {@link #isCancelled},
801 >     * {@link #isDone}, and {@code cancel} will return {@code true}
802 >     * and calls to {@link #join} and related methods will result in
803 >     * {@code CancellationException}.
804       *
805 <     * @return true if this computation has completed
805 >     * <p>This method may be overridden in subclasses, but if so, must
806 >     * still ensure that these properties hold. In particular, the
807 >     * {@code cancel} method itself must not throw exceptions.
808 >     *
809 >     * <p>This method is designed to be invoked by <em>other</em>
810 >     * tasks. To terminate the current task, you can just return or
811 >     * throw an unchecked exception from its computation method, or
812 >     * invoke {@link #completeExceptionally}.
813 >     *
814 >     * @param mayInterruptIfRunning this value has no effect in the
815 >     * default implementation because interrupts are not used to
816 >     * control cancellation.
817 >     *
818 >     * @return {@code true} if this task is now cancelled
819       */
820 +    public boolean cancel(boolean mayInterruptIfRunning) {
821 +        return (setCompletion(CANCELLED) & DONE_MASK) == CANCELLED;
822 +    }
823 +
824      public final boolean isDone() {
825          return status < 0;
826      }
827  
651    /**
652     * Returns true if this task was cancelled.
653     *
654     * @return true if this task was cancelled
655     */
828      public final boolean isCancelled() {
829 <        return (status & COMPLETION_MASK) == CANCELLED;
829 >        return (status & DONE_MASK) == CANCELLED;
830      }
831  
832      /**
833 <     * Asserts that the results of this task's computation will not be
662 <     * used. If a cancellation occurs before attempting to execute this
663 <     * task, then execution will be suppressed, {@code isCancelled}
664 <     * will report true, and {@code join} will result in a
665 <     * {@code CancellationException} being thrown. Otherwise, when
666 <     * cancellation races with completion, there are no guarantees
667 <     * about whether {@code isCancelled} will report true, whether
668 <     * {@code join} will return normally or via an exception, or
669 <     * whether these behaviors will remain consistent upon repeated
670 <     * invocation.
833 >     * Returns {@code true} if this task threw an exception or was cancelled.
834       *
835 <     * <p>This method may be overridden in subclasses, but if so, must
673 <     * still ensure that these minimal properties hold. In particular,
674 <     * the cancel method itself must not throw exceptions.
675 <     *
676 <     * <p> This method is designed to be invoked by <em>other</em>
677 <     * tasks. To terminate the current task, you can just return or
678 <     * throw an unchecked exception from its computation method, or
679 <     * invoke {@code completeExceptionally}.
680 <     *
681 <     * @param mayInterruptIfRunning this value is ignored in the
682 <     * default implementation because tasks are not in general
683 <     * cancelled via interruption.
684 <     *
685 <     * @return true if this task is now cancelled
835 >     * @return {@code true} if this task threw an exception or was cancelled
836       */
837 <    public boolean cancel(boolean mayInterruptIfRunning) {
838 <        setCompletion(CANCELLED);
689 <        return (status & COMPLETION_MASK) == CANCELLED;
837 >    public final boolean isCompletedAbnormally() {
838 >        return status < NORMAL;
839      }
840  
841      /**
842 <     * Returns true if this task threw an exception or was cancelled.
842 >     * Returns {@code true} if this task completed without throwing an
843 >     * exception and was not cancelled.
844       *
845 <     * @return true if this task threw an exception or was cancelled
845 >     * @return {@code true} if this task completed without throwing an
846 >     * exception and was not cancelled
847       */
848 <    public final boolean isCompletedAbnormally() {
849 <        return (status & COMPLETION_MASK) < NORMAL;
848 >    public final boolean isCompletedNormally() {
849 >        return (status & DONE_MASK) == NORMAL;
850      }
851  
852      /**
853       * Returns the exception thrown by the base computation, or a
854 <     * CancellationException if cancelled, or null if none or if the
855 <     * method has not yet completed.
854 >     * {@code CancellationException} if cancelled, or {@code null} if
855 >     * none or if the method has not yet completed.
856       *
857 <     * @return the exception, or null if none
857 >     * @return the exception, or {@code null} if none
858       */
859      public final Throwable getException() {
860 <        int s = status & COMPLETION_MASK;
861 <        if (s >= NORMAL)
862 <            return null;
863 <        if (s == CANCELLED)
713 <            return new CancellationException();
714 <        return exceptionMap.get(this);
860 >        int s = status & DONE_MASK;
861 >        return ((s >= NORMAL)    ? null :
862 >                (s == CANCELLED) ? new CancellationException() :
863 >                getThrowableException());
864      }
865  
866      /**
# Line 720 | Line 869 | public abstract class ForkJoinTask<V> im
869       * {@code join} and related operations. This method may be used
870       * to induce exceptions in asynchronous tasks, or to force
871       * completion of tasks that would not otherwise complete.  Its use
872 <     * in other situations is likely to be wrong.  This method is
872 >     * in other situations is discouraged.  This method is
873       * overridable, but overridden versions must invoke {@code super}
874       * implementation to maintain guarantees.
875       *
876 <     * @param ex the exception to throw. If this exception is
877 <     * not a RuntimeException or Error, the actual exception thrown
878 <     * will be a RuntimeException with cause ex.
876 >     * @param ex the exception to throw. If this exception is not a
877 >     * {@code RuntimeException} or {@code Error}, the actual exception
878 >     * thrown will be a {@code RuntimeException} with cause {@code ex}.
879       */
880      public void completeExceptionally(Throwable ex) {
881 <        setDoneExceptionally((ex instanceof RuntimeException) ||
882 <                             (ex instanceof Error)? ex :
883 <                             new RuntimeException(ex));
881 >        setExceptionalCompletion((ex instanceof RuntimeException) ||
882 >                                 (ex instanceof Error) ? ex :
883 >                                 new RuntimeException(ex));
884      }
885  
886      /**
887       * Completes this task, and if not already aborted or cancelled,
888 <     * returning a {@code null} result upon {@code join} and related
889 <     * operations. This method may be used to provide results for
890 <     * asynchronous tasks, or to provide alternative handling for
891 <     * tasks that would not otherwise complete normally. Its use in
892 <     * other situations is likely to be wrong. This method is
893 <     * overridable, but overridden versions must invoke {@code super}
894 <     * implementation to maintain guarantees.
888 >     * returning the given value as the result of subsequent
889 >     * invocations of {@code join} and related operations. This method
890 >     * may be used to provide results for asynchronous tasks, or to
891 >     * provide alternative handling for tasks that would not otherwise
892 >     * complete normally. Its use in other situations is
893 >     * discouraged. This method is overridable, but overridden
894 >     * versions must invoke {@code super} implementation to maintain
895 >     * guarantees.
896       *
897       * @param value the result value for this task
898       */
899      public void complete(V value) {
900          try {
901              setRawResult(value);
902 <        } catch(Throwable rex) {
903 <            setDoneExceptionally(rex);
902 >        } catch (Throwable rex) {
903 >            setExceptionalCompletion(rex);
904              return;
905          }
906 <        setNormalCompletion();
757 <    }
758 <
759 <    public final V get() throws InterruptedException, ExecutionException {
760 <        ForkJoinWorkerThread w = getWorker();
761 <        if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
762 <            awaitDone(w, true);
763 <        return reportFutureResult();
906 >        setCompletion(NORMAL);
907      }
908  
909 <    public final V get(long timeout, TimeUnit unit)
910 <        throws InterruptedException, ExecutionException, TimeoutException {
911 <        ForkJoinWorkerThread w = getWorker();
912 <        if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
913 <            awaitDone(w, unit.toNanos(timeout));
914 <        return reportTimedFutureResult();
909 >    /**
910 >     * Completes this task normally without setting a value. The most
911 >     * recent value established by {@link #setRawResult} (or {@code
912 >     * null} by default) will be returned as the result of subsequent
913 >     * invocations of {@code join} and related operations.
914 >     *
915 >     * @since 1.8
916 >     */
917 >    public final void quietlyComplete() {
918 >        setCompletion(NORMAL);
919      }
920  
921      /**
922 <     * Possibly executes other tasks until this task is ready, then
923 <     * returns the result of the computation.  This method may be more
777 <     * efficient than {@code join}, but is only applicable when
778 <     * there are no potential dependencies between continuation of the
779 <     * current task and that of any other task that might be executed
780 <     * while helping. (This usually holds for pure divide-and-conquer
781 <     * tasks). This method may be invoked only from within
782 <     * ForkJoinTask computations (as may be determined using method
783 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
784 <     * resul!t in exceptions or errors possibly including
785 <     * ClassCastException.
922 >     * Waits if necessary for the computation to complete, and then
923 >     * retrieves its result.
924       *
925       * @return the computed result
926 +     * @throws CancellationException if the computation was cancelled
927 +     * @throws ExecutionException if the computation threw an
928 +     * exception
929 +     * @throws InterruptedException if the current thread is not a
930 +     * member of a ForkJoinPool and was interrupted while waiting
931       */
932 <    public final V helpJoin() {
933 <        ForkJoinWorkerThread w = (ForkJoinWorkerThread)(Thread.currentThread());
934 <        if (status < 0 || !w.unpushTask(this) || !tryExec())
935 <            reportException(busyJoin(w));
932 >    public final V get() throws InterruptedException, ExecutionException {
933 >        int s = (Thread.currentThread() instanceof ForkJoinWorkerThread) ?
934 >            doJoin() : externalInterruptibleAwaitDone();
935 >        Throwable ex;
936 >        if ((s &= DONE_MASK) == CANCELLED)
937 >            throw new CancellationException();
938 >        if (s == EXCEPTIONAL && (ex = getThrowableException()) != null)
939 >            throw new ExecutionException(ex);
940          return getRawResult();
941      }
942  
943      /**
944 <     * Possibly executes other tasks until this task is ready.  This
945 <     * method may be invoked only from within ForkJoinTask
946 <     * computations (as may be determined using method {@link
947 <     * #inForkJoinPool}). Attempts to invoke in other contexts resul!t
948 <     * in exceptions or errors possibly including ClassCastException.
944 >     * Waits if necessary for at most the given time for the computation
945 >     * to complete, and then retrieves its result, if available.
946 >     *
947 >     * @param timeout the maximum time to wait
948 >     * @param unit the time unit of the timeout argument
949 >     * @return the computed result
950 >     * @throws CancellationException if the computation was cancelled
951 >     * @throws ExecutionException if the computation threw an
952 >     * exception
953 >     * @throws InterruptedException if the current thread is not a
954 >     * member of a ForkJoinPool and was interrupted while waiting
955 >     * @throws TimeoutException if the wait timed out
956       */
957 <    public final void quietlyHelpJoin() {
958 <        if (status >= 0) {
959 <            ForkJoinWorkerThread w =
960 <                (ForkJoinWorkerThread)(Thread.currentThread());
961 <            if (!w.unpushTask(this) || !tryQuietlyInvoke())
962 <                busyJoin(w);
957 >    public final V get(long timeout, TimeUnit unit)
958 >        throws InterruptedException, ExecutionException, TimeoutException {
959 >        if (Thread.interrupted())
960 >            throw new InterruptedException();
961 >        // Messy in part because we measure in nanosecs, but wait in millisecs
962 >        int s; long ns, ms;
963 >        if ((s = status) >= 0 && (ns = unit.toNanos(timeout)) > 0L) {
964 >            long deadline = System.nanoTime() + ns;
965 >            ForkJoinPool p = null;
966 >            ForkJoinPool.WorkQueue w = null;
967 >            Thread t = Thread.currentThread();
968 >            if (t instanceof ForkJoinWorkerThread) {
969 >                ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;
970 >                p = wt.pool;
971 >                w = wt.workQueue;
972 >                s = p.helpJoinOnce(w, this); // no retries on failure
973 >            }
974 >            boolean canBlock = false;
975 >            boolean interrupted = false;
976 >            try {
977 >                while ((s = status) >= 0) {
978 >                    if (w != null && w.runState < 0)
979 >                        cancelIgnoringExceptions(this);
980 >                    else if (!canBlock) {
981 >                        if (p == null || p.tryCompensate(this, null))
982 >                            canBlock = true;
983 >                    }
984 >                    else {
985 >                        if ((ms = TimeUnit.NANOSECONDS.toMillis(ns)) > 0L &&
986 >                            U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
987 >                            synchronized (this) {
988 >                                if (status >= 0) {
989 >                                    try {
990 >                                        wait(ms);
991 >                                    } catch (InterruptedException ie) {
992 >                                        if (p == null)
993 >                                            interrupted = true;
994 >                                    }
995 >                                }
996 >                                else
997 >                                    notifyAll();
998 >                            }
999 >                        }
1000 >                        if ((s = status) < 0 || interrupted ||
1001 >                            (ns = deadline - System.nanoTime()) <= 0L)
1002 >                            break;
1003 >                    }
1004 >                }
1005 >            } finally {
1006 >                if (p != null && canBlock)
1007 >                    p.incrementActiveCount();
1008 >            }
1009 >            if (interrupted)
1010 >                throw new InterruptedException();
1011          }
1012 +        if ((s &= DONE_MASK) != NORMAL) {
1013 +            Throwable ex;
1014 +            if (s == CANCELLED)
1015 +                throw new CancellationException();
1016 +            if (s != EXCEPTIONAL)
1017 +                throw new TimeoutException();
1018 +            if ((ex = getThrowableException()) != null)
1019 +                throw new ExecutionException(ex);
1020 +        }
1021 +        return getRawResult();
1022      }
1023  
1024      /**
1025 <     * Joins this task, without returning its result or throwing an
1025 >     * Joins this task, without returning its result or throwing its
1026       * exception. This method may be useful when processing
1027       * collections of tasks when some have been cancelled or otherwise
1028       * known to have aborted.
1029       */
1030      public final void quietlyJoin() {
1031 <        if (status >= 0) {
820 <            ForkJoinWorkerThread w = getWorker();
821 <            if (w == null || !w.unpushTask(this) || !tryQuietlyInvoke())
822 <                awaitDone(w, true);
823 <        }
1031 >        doJoin();
1032      }
1033  
1034      /**
1035       * Commences performing this task and awaits its completion if
1036 <     * necessary, without returning its result or throwing an
1037 <     * exception. This method may be useful when processing
830 <     * collections of tasks when some have been cancelled or otherwise
831 <     * known to have aborted.
1036 >     * necessary, without returning its result or throwing its
1037 >     * exception.
1038       */
1039      public final void quietlyInvoke() {
1040 <        if (status >= 0 && !tryQuietlyInvoke())
835 <            quietlyJoin();
1040 >        doInvoke();
1041      }
1042  
1043      /**
1044       * Possibly executes tasks until the pool hosting the current task
1045 <     * {@link ForkJoinPool#isQuiescent}. This method may be of use in
1046 <     * designs in which many tasks are forked, but none are explicitly
1047 <     * joined, instead executing them until all are processed.
1045 >     * {@link ForkJoinPool#isQuiescent is quiescent}. This method may
1046 >     * be of use in designs in which many tasks are forked, but none
1047 >     * are explicitly joined, instead executing them until all are
1048 >     * processed.
1049       */
1050      public static void helpQuiesce() {
1051 <        ((ForkJoinWorkerThread)(Thread.currentThread())).
1052 <            helpQuiescePool();
1051 >        Thread t;
1052 >        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
1053 >            ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;
1054 >            wt.pool.helpQuiescePool(wt.workQueue);
1055 >        }
1056 >        else
1057 >            ForkJoinPool.externalHelpQuiescePool();
1058      }
1059  
1060      /**
# Line 852 | Line 1063 | public abstract class ForkJoinTask<V> im
1063       * this task, but only if reuse occurs when this task has either
1064       * never been forked, or has been forked, then completed and all
1065       * outstanding joins of this task have also completed. Effects
1066 <     * under any other usage conditions are not guaranteed, and are
1067 <     * almost surely wrong. This method may be useful when executing
1066 >     * under any other usage conditions are not guaranteed.
1067 >     * This method may be useful when executing
1068       * pre-constructed trees of subtasks in loops.
1069 +     *
1070 +     * <p>Upon completion of this method, {@code isDone()} reports
1071 +     * {@code false}, and {@code getException()} reports {@code
1072 +     * null}. However, the value returned by {@code getRawResult} is
1073 +     * unaffected. To clear this value, you can invoke {@code
1074 +     * setRawResult(null)}.
1075       */
1076      public void reinitialize() {
1077 <        if ((status & COMPLETION_MASK) == EXCEPTIONAL)
1078 <            exceptionMap.remove(this);
1079 <        status = 0;
1077 >        if ((status & DONE_MASK) == EXCEPTIONAL)
1078 >            clearExceptionalCompletion();
1079 >        else
1080 >            status = 0;
1081      }
1082  
1083      /**
1084       * Returns the pool hosting the current task execution, or null
1085       * if this task is executing outside of any ForkJoinPool.
1086       *
1087 <     * @return the pool, or null if none.
1087 >     * @see #inForkJoinPool
1088 >     * @return the pool, or {@code null} if none
1089       */
1090      public static ForkJoinPool getPool() {
1091          Thread t = Thread.currentThread();
1092 <        return ((t instanceof ForkJoinWorkerThread)?
1093 <                ((ForkJoinWorkerThread)t).pool : null);
1092 >        return (t instanceof ForkJoinWorkerThread) ?
1093 >            ((ForkJoinWorkerThread) t).pool : null;
1094      }
1095  
1096      /**
1097 <     * Returns true if the current thread is executing as a
1098 <     * ForkJoinPool computation.
1099 <     * @return <code>true</code> if the current thread is executing as a
1100 <     * ForkJoinPool computation, or false otherwise
1097 >     * Returns {@code true} if the current thread is a {@link
1098 >     * ForkJoinWorkerThread} executing as a ForkJoinPool computation.
1099 >     *
1100 >     * @return {@code true} if the current thread is a {@link
1101 >     * ForkJoinWorkerThread} executing as a ForkJoinPool computation,
1102 >     * or {@code false} otherwise
1103       */
1104      public static boolean inForkJoinPool() {
1105          return Thread.currentThread() instanceof ForkJoinWorkerThread;
# Line 886 | Line 1107 | public abstract class ForkJoinTask<V> im
1107  
1108      /**
1109       * Tries to unschedule this task for execution. This method will
1110 <     * typically succeed if this task is the most recently forked task
1111 <     * by the current thread, and has not commenced executing in
1112 <     * another thread.  This method may be useful when arranging
1113 <     * alternative local processing of tasks that could have been, but
1114 <     * were not, stolen. This method may be invoked only from within
894 <     * ForkJoinTask computations (as may be determined using method
895 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
896 <     * result in exceptions or errors possibly including
897 <     * ClassCastException.
1110 >     * typically (but is not guaranteed to) succeed if this task is
1111 >     * the most recently forked task by the current thread, and has
1112 >     * not commenced executing in another thread.  This method may be
1113 >     * useful when arranging alternative local processing of tasks
1114 >     * that could have been, but were not, stolen.
1115       *
1116 <     * @return true if unforked
1116 >     * @return {@code true} if unforked
1117       */
1118      public boolean tryUnfork() {
1119 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).unpushTask(this);
1119 >        Thread t;
1120 >        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1121 >            ((ForkJoinWorkerThread)t).workQueue.tryUnpush(this) :
1122 >            ForkJoinPool.tryUnsubmitFromCommonPool(this);
1123      }
1124  
1125      /**
# Line 911 | Line 1131 | public abstract class ForkJoinTask<V> im
1131       * @return the number of tasks
1132       */
1133      public static int getQueuedTaskCount() {
1134 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).
1135 <            getQueueSize();
1134 >        Thread t;
1135 >        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1136 >            ((ForkJoinWorkerThread)t).workQueue.queueSize() :
1137 >            ForkJoinPool.getEstimatedSubmitterQueueLength();
1138      }
1139  
1140      /**
1141       * Returns an estimate of how many more locally queued tasks are
1142       * held by the current worker thread than there are other worker
1143 <     * threads that might steal them.  This value may be useful for
1143 >     * threads that might steal them, or zero if this thread is not
1144 >     * operating in a ForkJoinPool. This value may be useful for
1145       * heuristic decisions about whether to fork other tasks. In many
1146       * usages of ForkJoinTasks, at steady state, each worker should
1147       * aim to maintain a small constant surplus (for example, 3) of
# Line 928 | Line 1151 | public abstract class ForkJoinTask<V> im
1151       * @return the surplus number of tasks, which may be negative
1152       */
1153      public static int getSurplusQueuedTaskCount() {
1154 <        return ((ForkJoinWorkerThread)(Thread.currentThread()))
1155 <            .getEstimatedSurplusTaskCount();
1154 >        /*
1155 >         * The aim of this method is to return a cheap heuristic guide
1156 >         * for task partitioning when programmers, frameworks, tools,
1157 >         * or languages have little or no idea about task granularity.
1158 >         * In essence by offering this method, we ask users only about
1159 >         * tradeoffs in overhead vs expected throughput and its
1160 >         * variance, rather than how finely to partition tasks.
1161 >         *
1162 >         * In a steady state strict (tree-structured) computation,
1163 >         * each thread makes available for stealing enough tasks for
1164 >         * other threads to remain active. Inductively, if all threads
1165 >         * play by the same rules, each thread should make available
1166 >         * only a constant number of tasks.
1167 >         *
1168 >         * The minimum useful constant is just 1. But using a value of
1169 >         * 1 would require immediate replenishment upon each steal to
1170 >         * maintain enough tasks, which is infeasible.  Further,
1171 >         * partitionings/granularities of offered tasks should
1172 >         * minimize steal rates, which in general means that threads
1173 >         * nearer the top of computation tree should generate more
1174 >         * than those nearer the bottom. In perfect steady state, each
1175 >         * thread is at approximately the same level of computation
1176 >         * tree. However, producing extra tasks amortizes the
1177 >         * uncertainty of progress and diffusion assumptions.
1178 >         *
1179 >         * So, users will want to use values larger, but not much
1180 >         * larger than 1 to both smooth over transient shortages and
1181 >         * hedge against uneven progress; as traded off against the
1182 >         * cost of extra task overhead. We leave the user to pick a
1183 >         * threshold value to compare with the results of this call to
1184 >         * guide decisions, but recommend values such as 3.
1185 >         *
1186 >         * When all threads are active, it is on average OK to
1187 >         * estimate surplus strictly locally. In steady-state, if one
1188 >         * thread is maintaining say 2 surplus tasks, then so are
1189 >         * others. So we can just use estimated queue length.
1190 >         * However, this strategy alone leads to serious mis-estimates
1191 >         * in some non-steady-state conditions (ramp-up, ramp-down,
1192 >         * other stalls). We can detect many of these by further
1193 >         * considering the number of "idle" threads, that are known to
1194 >         * have zero queued tasks, so compensate by a factor of
1195 >         * (#idle/#active) threads.
1196 >         */
1197 >        Thread t; ForkJoinWorkerThread wt;
1198 >        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1199 >            (wt = (ForkJoinWorkerThread)t).workQueue.queueSize() - wt.pool.idlePerActive() :
1200 >            0;
1201      }
1202  
1203      // Extension methods
1204  
1205      /**
1206 <     * Returns the result that would be returned by {@code join},
1207 <     * even if this task completed abnormally, or null if this task is
1208 <     * not known to have been completed.  This method is designed to
1209 <     * aid debugging, as well as to support extensions. Its use in any
1210 <     * other context is discouraged.
1206 >     * Returns the result that would be returned by {@link #join}, even
1207 >     * if this task completed abnormally, or {@code null} if this task
1208 >     * is not known to have been completed.  This method is designed
1209 >     * to aid debugging, as well as to support extensions. Its use in
1210 >     * any other context is discouraged.
1211       *
1212 <     * @return the result, or null if not completed
1212 >     * @return the result, or {@code null} if not completed
1213       */
1214      public abstract V getRawResult();
1215  
# Line 955 | Line 1223 | public abstract class ForkJoinTask<V> im
1223      protected abstract void setRawResult(V value);
1224  
1225      /**
1226 <     * Immediately performs the base action of this task.  This method
1227 <     * is designed to support extensions, and should not in general be
1228 <     * called otherwise. The return value controls whether this task
1229 <     * is considered to be done normally. It may return false in
1226 >     * Immediately performs the base action of this task and returns
1227 >     * true if, upon return from this method, this task is guaranteed
1228 >     * to have completed normally. This method may return false
1229 >     * otherwise, to indicate that this task is not necessarily
1230 >     * complete (or is not known to be complete), for example in
1231       * asynchronous actions that require explicit invocations of
1232 <     * {@code complete} to become joinable. It may throw exceptions
1233 <     * to indicate abnormal exit.
1232 >     * completion methods. This method may also throw an (unchecked)
1233 >     * exception to indicate abnormal exit. This method is designed to
1234 >     * support extensions, and should not in general be called
1235 >     * otherwise.
1236       *
1237 <     * @return true if completed normally
967 <     * @throws Error or RuntimeException if encountered during computation
1237 >     * @return {@code true} if this task is known to have completed normally
1238       */
1239      protected abstract boolean exec();
1240  
1241      /**
1242 <     * Returns, but does not unschedule or execute, the task queued by
1243 <     * the current thread but not yet executed, if one is
1244 <     * available. There is no guarantee that this task will actually
1245 <     * be polled or executed next.  This method is designed primarily
1246 <     * to support extensions, and is unlikely to be useful otherwise.
1247 <     * This method may be invoked only from within ForkJoinTask
1248 <     * computations (as may be determined using method {@link
1249 <     * #inForkJoinPool}). Attempts to invoke in other contexts result
1250 <     * in exceptions or errors possibly including ClassCastException.
1242 >     * Returns, but does not unschedule or execute, a task queued by
1243 >     * the current thread but not yet executed, if one is immediately
1244 >     * available and the current thread is operating in a
1245 >     * ForkJoinPool. There is no guarantee that this task will
1246 >     * actually be polled or executed next. Conversely, this method
1247 >     * may return null even if a task exists but cannot be accessed
1248 >     * without contention with other threads.  This method is designed
1249 >     * primarily to support extensions, and is unlikely to be useful
1250 >     * otherwise.
1251       *
1252 <     * @return the next task, or null if none are available
1252 >     * @return the next task, or {@code null} if none are available
1253       */
1254      protected static ForkJoinTask<?> peekNextLocalTask() {
1255 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).peekTask();
1255 >        Thread t;
1256 >        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1257 >            ((ForkJoinWorkerThread)t).workQueue.peek() :
1258 >            null;
1259      }
1260  
1261      /**
1262       * Unschedules and returns, without executing, the next task
1263 <     * queued by the current thread but not yet executed.  This method
1264 <     * is designed primarily to support extensions, and is unlikely to
1265 <     * be useful otherwise.  This method may be invoked only from
1266 <     * within ForkJoinTask computations (as may be determined using
994 <     * method {@link #inForkJoinPool}). Attempts to invoke in other
995 <     * contexts result in exceptions or errors possibly including
996 <     * ClassCastException.
1263 >     * queued by the current thread but not yet executed, if the
1264 >     * current thread is operating in a ForkJoinPool.  This method is
1265 >     * designed primarily to support extensions, and is unlikely to be
1266 >     * useful otherwise.
1267       *
1268 <     * @return the next task, or null if none are available
1268 >     * @return the next task, or {@code null} if none are available
1269       */
1270      protected static ForkJoinTask<?> pollNextLocalTask() {
1271 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).pollLocalTask();
1271 >        Thread t;
1272 >        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1273 >            ((ForkJoinWorkerThread)t).workQueue.nextLocalTask() :
1274 >            null;
1275      }
1276  
1277      /**
1278 <     * Unschedules and returns, without executing, the next task
1278 >     * If the current thread is operating in a ForkJoinPool,
1279 >     * unschedules and returns, without executing, the next task
1280       * queued by the current thread but not yet executed, if one is
1281       * available, or if not available, a task that was forked by some
1282       * other thread, if available. Availability may be transient, so a
1283 <     * {@code null} result does not necessarily imply quiescence
1284 <     * of the pool this task is operating in.  This method is designed
1283 >     * {@code null} result does not necessarily imply quiescence of
1284 >     * the pool this task is operating in.  This method is designed
1285       * primarily to support extensions, and is unlikely to be useful
1286 <     * otherwise.  This method may be invoked only from within
1013 <     * ForkJoinTask computations (as may be determined using method
1014 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
1015 <     * result in exceptions or errors possibly including
1016 <     * ClassCastException.
1286 >     * otherwise.
1287       *
1288 <     * @return a task, or null if none are available
1288 >     * @return a task, or {@code null} if none are available
1289       */
1290      protected static ForkJoinTask<?> pollTask() {
1291 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).
1292 <            pollTask();
1291 >        Thread t; ForkJoinWorkerThread wt;
1292 >        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1293 >            (wt = (ForkJoinWorkerThread)t).pool.nextTaskFor(wt.workQueue) :
1294 >            null;
1295 >    }
1296 >
1297 >    // tag operations
1298 >
1299 >    /**
1300 >     * Returns the tag for this task.
1301 >     *
1302 >     * @return the tag for this task
1303 >     * @since 1.8
1304 >     */
1305 >    public final short getForkJoinTaskTag() {
1306 >        return (short)status;
1307 >    }
1308 >
1309 >    /**
1310 >     * Atomically sets the tag value for this task.
1311 >     *
1312 >     * @param tag the tag value
1313 >     * @return the previous value of the tag
1314 >     * @since 1.8
1315 >     */
1316 >    public final short setForkJoinTaskTag(short tag) {
1317 >        for (int s;;) {
1318 >            if (U.compareAndSwapInt(this, STATUS, s = status,
1319 >                                    (s & ~SMASK) | (tag & SMASK)))
1320 >                return (short)s;
1321 >        }
1322 >    }
1323 >
1324 >    /**
1325 >     * Atomically conditionally sets the tag value for this task.
1326 >     * Among other applications, tags can be used as visit markers
1327 >     * in tasks operating on graphs, as in methods that check: {@code
1328 >     * if (task.compareAndSetForkJoinTaskTag((short)0, (short)1))}
1329 >     * before processing, otherwise exiting because the node has
1330 >     * already been visited.
1331 >     *
1332 >     * @param e the expected tag value
1333 >     * @param tag the new tag value
1334 >     * @return true if successful; i.e., the current value was
1335 >     * equal to e and is now tag.
1336 >     * @since 1.8
1337 >     */
1338 >    public final boolean compareAndSetForkJoinTaskTag(short e, short tag) {
1339 >        for (int s;;) {
1340 >            if ((short)(s = status) != e)
1341 >                return false;
1342 >            if (U.compareAndSwapInt(this, STATUS, s,
1343 >                                    (s & ~SMASK) | (tag & SMASK)))
1344 >                return true;
1345 >        }
1346 >    }
1347 >
1348 >    /**
1349 >     * Adaptor for Runnables. This implements RunnableFuture
1350 >     * to be compliant with AbstractExecutorService constraints
1351 >     * when used in ForkJoinPool.
1352 >     */
1353 >    static final class AdaptedRunnable<T> extends ForkJoinTask<T>
1354 >        implements RunnableFuture<T> {
1355 >        final Runnable runnable;
1356 >        T result;
1357 >        AdaptedRunnable(Runnable runnable, T result) {
1358 >            if (runnable == null) throw new NullPointerException();
1359 >            this.runnable = runnable;
1360 >            this.result = result; // OK to set this even before completion
1361 >        }
1362 >        public final T getRawResult() { return result; }
1363 >        public final void setRawResult(T v) { result = v; }
1364 >        public final boolean exec() { runnable.run(); return true; }
1365 >        public final void run() { invoke(); }
1366 >        private static final long serialVersionUID = 5232453952276885070L;
1367 >    }
1368 >
1369 >    /**
1370 >     * Adaptor for Runnables without results
1371 >     */
1372 >    static final class AdaptedRunnableAction extends ForkJoinTask<Void>
1373 >        implements RunnableFuture<Void> {
1374 >        final Runnable runnable;
1375 >        AdaptedRunnableAction(Runnable runnable) {
1376 >            if (runnable == null) throw new NullPointerException();
1377 >            this.runnable = runnable;
1378 >        }
1379 >        public final Void getRawResult() { return null; }
1380 >        public final void setRawResult(Void v) { }
1381 >        public final boolean exec() { runnable.run(); return true; }
1382 >        public final void run() { invoke(); }
1383 >        private static final long serialVersionUID = 5232453952276885070L;
1384 >    }
1385 >
1386 >    /**
1387 >     * Adaptor for Callables
1388 >     */
1389 >    static final class AdaptedCallable<T> extends ForkJoinTask<T>
1390 >        implements RunnableFuture<T> {
1391 >        final Callable<? extends T> callable;
1392 >        T result;
1393 >        AdaptedCallable(Callable<? extends T> callable) {
1394 >            if (callable == null) throw new NullPointerException();
1395 >            this.callable = callable;
1396 >        }
1397 >        public final T getRawResult() { return result; }
1398 >        public final void setRawResult(T v) { result = v; }
1399 >        public final boolean exec() {
1400 >            try {
1401 >                result = callable.call();
1402 >                return true;
1403 >            } catch (Error err) {
1404 >                throw err;
1405 >            } catch (RuntimeException rex) {
1406 >                throw rex;
1407 >            } catch (Exception ex) {
1408 >                throw new RuntimeException(ex);
1409 >            }
1410 >        }
1411 >        public final void run() { invoke(); }
1412 >        private static final long serialVersionUID = 2838392045355241008L;
1413 >    }
1414 >
1415 >    /**
1416 >     * Returns a new {@code ForkJoinTask} that performs the {@code run}
1417 >     * method of the given {@code Runnable} as its action, and returns
1418 >     * a null result upon {@link #join}.
1419 >     *
1420 >     * @param runnable the runnable action
1421 >     * @return the task
1422 >     */
1423 >    public static ForkJoinTask<?> adapt(Runnable runnable) {
1424 >        return new AdaptedRunnableAction(runnable);
1425 >    }
1426 >
1427 >    /**
1428 >     * Returns a new {@code ForkJoinTask} that performs the {@code run}
1429 >     * method of the given {@code Runnable} as its action, and returns
1430 >     * the given result upon {@link #join}.
1431 >     *
1432 >     * @param runnable the runnable action
1433 >     * @param result the result upon completion
1434 >     * @return the task
1435 >     */
1436 >    public static <T> ForkJoinTask<T> adapt(Runnable runnable, T result) {
1437 >        return new AdaptedRunnable<T>(runnable, result);
1438 >    }
1439 >
1440 >    /**
1441 >     * Returns a new {@code ForkJoinTask} that performs the {@code call}
1442 >     * method of the given {@code Callable} as its action, and returns
1443 >     * its result upon {@link #join}, translating any checked exceptions
1444 >     * encountered into {@code RuntimeException}.
1445 >     *
1446 >     * @param callable the callable action
1447 >     * @return the task
1448 >     */
1449 >    public static <T> ForkJoinTask<T> adapt(Callable<? extends T> callable) {
1450 >        return new AdaptedCallable<T>(callable);
1451      }
1452  
1453      // Serialization support
# Line 1027 | Line 1455 | public abstract class ForkJoinTask<V> im
1455      private static final long serialVersionUID = -7721805057305804111L;
1456  
1457      /**
1458 <     * Save the state to a stream.
1458 >     * Saves this task to a stream (that is, serializes it).
1459       *
1460       * @serialData the current run status and the exception thrown
1461 <     * during execution, or null if none
1034 <     * @param s the stream
1461 >     * during execution, or {@code null} if none
1462       */
1463      private void writeObject(java.io.ObjectOutputStream s)
1464          throws java.io.IOException {
# Line 1040 | Line 1467 | public abstract class ForkJoinTask<V> im
1467      }
1468  
1469      /**
1470 <     * Reconstitute the instance from a stream.
1044 <     *
1045 <     * @param s the stream
1470 >     * Reconstitutes this task from a stream (that is, deserializes it).
1471       */
1472      private void readObject(java.io.ObjectInputStream s)
1473          throws java.io.IOException, ClassNotFoundException {
1474          s.defaultReadObject();
1050        status &= ~INTERNAL_SIGNAL_MASK; // clear internal signal counts
1051        status |= EXTERNAL_SIGNAL; // conservatively set external signal
1475          Object ex = s.readObject();
1476          if (ex != null)
1477 <            setDoneExceptionally((Throwable)ex);
1477 >            setExceptionalCompletion((Throwable)ex);
1478      }
1479  
1480 <    // Temporary Unsafe mechanics for preliminary release
1481 <    private static Unsafe getUnsafe() throws Throwable {
1480 >    // Unsafe mechanics
1481 >    private static final sun.misc.Unsafe U;
1482 >    private static final long STATUS;
1483 >    static {
1484 >        exceptionTableLock = new ReentrantLock();
1485 >        exceptionTableRefQueue = new ReferenceQueue<Object>();
1486 >        exceptionTable = new ExceptionNode[EXCEPTION_MAP_CAPACITY];
1487          try {
1488 <            return Unsafe.getUnsafe();
1488 >            U = getUnsafe();
1489 >            STATUS = U.objectFieldOffset
1490 >                (ForkJoinTask.class.getDeclaredField("status"));
1491 >        } catch (Exception e) {
1492 >            throw new Error(e);
1493 >        }
1494 >    }
1495 >
1496 >    /**
1497 >     * Returns a sun.misc.Unsafe.  Suitable for use in a 3rd party package.
1498 >     * Replace with a simple call to Unsafe.getUnsafe when integrating
1499 >     * into a jdk.
1500 >     *
1501 >     * @return a sun.misc.Unsafe
1502 >     */
1503 >    private static sun.misc.Unsafe getUnsafe() {
1504 >        try {
1505 >            return sun.misc.Unsafe.getUnsafe();
1506          } catch (SecurityException se) {
1507              try {
1508                  return java.security.AccessController.doPrivileged
1509 <                    (new java.security.PrivilegedExceptionAction<Unsafe>() {
1510 <                        public Unsafe run() throws Exception {
1511 <                            return getUnsafePrivileged();
1509 >                    (new java.security
1510 >                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
1511 >                        public sun.misc.Unsafe run() throws Exception {
1512 >                            java.lang.reflect.Field f = sun.misc
1513 >                                .Unsafe.class.getDeclaredField("theUnsafe");
1514 >                            f.setAccessible(true);
1515 >                            return (sun.misc.Unsafe) f.get(null);
1516                          }});
1517              } catch (java.security.PrivilegedActionException e) {
1518 <                throw e.getCause();
1518 >                throw new RuntimeException("Could not initialize intrinsics",
1519 >                                           e.getCause());
1520              }
1521          }
1522      }
1073
1074    private static Unsafe getUnsafePrivileged()
1075            throws NoSuchFieldException, IllegalAccessException {
1076        Field f = Unsafe.class.getDeclaredField("theUnsafe");
1077        f.setAccessible(true);
1078        return (Unsafe) f.get(null);
1079    }
1080
1081    private static long fieldOffset(String fieldName)
1082            throws NoSuchFieldException {
1083        return UNSAFE.objectFieldOffset
1084            (ForkJoinTask.class.getDeclaredField(fieldName));
1085    }
1086
1087    static final Unsafe UNSAFE;
1088    static final long statusOffset;
1089
1090    static {
1091        try {
1092            UNSAFE = getUnsafe();
1093            statusOffset = fieldOffset("status");
1094        } catch (Throwable e) {
1095            throw new RuntimeException("Could not initialize intrinsics", e);
1096        }
1097    }
1098
1523   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines