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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines