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.10 by jsr166, Tue Jul 21 00:15:13 2009 UTC vs.
Revision 1.57 by dl, Sat Sep 4 11:33:53 2010 UTC

# Line 5 | Line 5
5   */
6  
7   package jsr166y;
8 < import java.io.Serializable;
9 < import java.util.*;
8 >
9   import java.util.concurrent.*;
10 < import java.util.concurrent.atomic.*;
11 < import sun.misc.Unsafe;
12 < import java.lang.reflect.*;
10 >
11 > import java.io.Serializable;
12 > import java.util.Collection;
13 > import java.util.Collections;
14 > import java.util.List;
15 > import java.util.RandomAccess;
16 > import java.util.Map;
17 > import java.util.WeakHashMap;
18  
19   /**
20 < * Abstract base class for tasks that run within a {@link
21 < * ForkJoinPool}.  A ForkJoinTask is a thread-like entity that is much
20 > * Abstract base class for tasks that run within a {@link ForkJoinPool}.
21 > * A {@code ForkJoinTask} is a thread-like entity that is much
22   * lighter weight than a normal thread.  Huge numbers of tasks and
23   * subtasks may be hosted by a small number of actual threads in a
24   * ForkJoinPool, at the price of some usage limitations.
25   *
26 < * <p> A "main" ForkJoinTask begins execution when submitted to a
27 < * {@link ForkJoinPool}. Once started, it will usually in turn start
28 < * other subtasks.  As indicated by the name of this class, many
29 < * programs using ForkJoinTasks employ only methods {@code fork}
30 < * and {@code join}, or derivatives such as
31 < * {@code invokeAll}.  However, this class also provides a number
32 < * of other methods that can come into play in advanced usages, as
33 < * well as extension mechanics that allow support of new forms of
34 < * fork/join processing.
26 > * <p>A "main" {@code ForkJoinTask} begins execution when submitted
27 > * to a {@link ForkJoinPool}.  Once started, it will usually in turn
28 > * start other subtasks.  As indicated by the name of this class,
29 > * many programs using {@code ForkJoinTask} employ only methods
30 > * {@link #fork} and {@link #join}, or derivatives such as {@link
31 > * #invokeAll}.  However, this class also provides a number of other
32 > * methods that can come into play in advanced usages, as well as
33 > * extension mechanics that allow support of new forms of fork/join
34 > * processing.
35   *
36 < * <p>A ForkJoinTask is a lightweight form of {@link Future}.  The
37 < * efficiency of ForkJoinTasks stems from a set of restrictions (that
38 < * are only partially statically enforceable) reflecting their
39 < * intended use as computational tasks calculating pure functions or
40 < * operating on purely isolated objects.  The primary coordination
41 < * mechanisms are {@link #fork}, that arranges asynchronous execution,
42 < * and {@link #join}, that doesn't proceed until the task's result has
43 < * been computed.  Computations should avoid {@code synchronized}
44 < * methods or blocks, and should minimize other blocking
45 < * synchronization apart from joining other tasks or using
46 < * synchronizers such as Phasers that are advertised to cooperate with
47 < * fork/join scheduling. Tasks should also not perform blocking IO,
48 < * and should ideally access variables that are completely independent
49 < * of those accessed by other running tasks. Minor breaches of these
50 < * restrictions, for example using shared output streams, may be
51 < * tolerable in practice, but frequent use may result in poor
52 < * performance, and the potential to indefinitely stall if the number
53 < * of threads not waiting for IO or other external synchronization
54 < * becomes exhausted. This usage restriction is in part enforced by
55 < * not permitting checked exceptions such as {@code IOExceptions}
56 < * to be thrown. However, computations may still encounter unchecked
57 < * exceptions, that are rethrown to callers attempting join
58 < * them. These exceptions may additionally include
59 < * RejectedExecutionExceptions stemming from internal resource
60 < * exhaustion such as failure to allocate internal task queues.
36 > * <p>A {@code ForkJoinTask} is a lightweight form of {@link Future}.
37 > * The efficiency of {@code ForkJoinTask}s stems from a set of
38 > * restrictions (that are only partially statically enforceable)
39 > * reflecting their intended use as computational tasks calculating
40 > * pure functions or operating on purely isolated objects.  The
41 > * primary coordination mechanisms are {@link #fork}, that arranges
42 > * asynchronous execution, and {@link #join}, that doesn't proceed
43 > * until the task's result has been computed.  Computations should
44 > * avoid {@code synchronized} methods or blocks, and should minimize
45 > * other blocking synchronization apart from joining other tasks or
46 > * using synchronizers such as Phasers that are advertised to
47 > * cooperate with fork/join scheduling. Tasks should also not perform
48 > * blocking IO, and should ideally access variables that are
49 > * completely independent of those accessed by other running
50 > * tasks. Minor breaches of these restrictions, for example using
51 > * shared output streams, may be tolerable in practice, but frequent
52 > * use may result in poor performance, and the potential to
53 > * indefinitely stall if the number of threads not waiting for IO or
54 > * other external synchronization becomes exhausted. This usage
55 > * restriction is in part enforced by not permitting checked
56 > * exceptions such as {@code IOExceptions} to be thrown. However,
57 > * computations may still encounter unchecked exceptions, that are
58 > * rethrown to callers attempting to join them. These exceptions may
59 > * additionally include {@link RejectedExecutionException} stemming
60 > * from internal resource exhaustion, such as failure to allocate
61 > * internal task queues.
62   *
63   * <p>The primary method for awaiting completion and extracting
64   * results of a task is {@link #join}, but there are several variants:
65   * The {@link Future#get} methods support interruptible and/or timed
66   * waits for completion and report results using {@code Future}
67 < * 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
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
67 > * conventions. Method {@link #invoke} is semantically
68 > * equivalent to {@code fork(); join()} but always attempts to begin
69 > * execution in the current thread. The "<em>quiet</em>" forms of
70 > * these methods do not extract results or report exceptions. These
71   * may be useful when a set of tasks are being executed, and you need
72   * to delay processing of results or exceptions until all complete.
73   * Method {@code invokeAll} (available in multiple versions)
74   * performs the most common form of parallel invocation: forking a set
75   * of tasks and joining them all.
76   *
77 < * <p> The ForkJoinTask class is not usually directly subclassed.
77 > * <p>The execution status of tasks may be queried at several levels
78 > * of detail: {@link #isDone} is true if a task completed in any way
79 > * (including the case where a task was cancelled without executing);
80 > * {@link #isCompletedNormally} is true if a task completed without
81 > * cancellation or encountering an exception; {@link #isCancelled} is
82 > * true if the task was cancelled (in which case {@link #getException}
83 > * returns a {@link java.util.concurrent.CancellationException}); and
84 > * {@link #isCompletedAbnormally} is true if a task was either
85 > * cancelled or encountered an exception, in which case {@link
86 > * #getException} will return either the encountered exception or
87 > * {@link java.util.concurrent.CancellationException}.
88 > *
89 > * <p>The ForkJoinTask class is not usually directly subclassed.
90   * Instead, you subclass one of the abstract classes that support a
91 < * particular style of fork/join processing.  Normally, a concrete
91 > * particular style of fork/join processing, typically {@link
92 > * RecursiveAction} for computations that do not return results, or
93 > * {@link RecursiveTask} for those that do.  Normally, a concrete
94   * ForkJoinTask subclass declares fields comprising its parameters,
95   * established in a constructor, and then defines a {@code compute}
96   * method that somehow uses the control methods supplied by this base
97   * class. While these methods have {@code public} access (to allow
98 < * instances of different task subclasses to call each others
98 > * instances of different task subclasses to call each other's
99   * methods), some of them may only be called from within other
100 < * ForkJoinTasks. Attempts to invoke them in other contexts result in
101 < * exceptions or errors possibly including ClassCastException.
100 > * ForkJoinTasks (as may be determined using method {@link
101 > * #inForkJoinPool}).  Attempts to invoke them in other contexts
102 > * result in exceptions or errors, possibly including
103 > * {@code ClassCastException}.
104   *
105 < * <p>Most base support methods are {@code final} because their
106 < * implementations are intrinsically tied to the underlying
107 < * lightweight task scheduling framework, and so cannot be overridden.
108 < * Developers creating new basic styles of fork/join processing should
109 < * minimally implement {@code protected} methods
110 < * {@code exec}, {@code setRawResult}, and
111 < * {@code getRawResult}, while also introducing an abstract
112 < * computational method that can be implemented in its subclasses,
113 < * possibly relying on other {@code protected} methods provided
96 < * by this class.
105 > * <p>Most base support methods are {@code final}, to prevent
106 > * overriding of implementations that are intrinsically tied to the
107 > * underlying lightweight task scheduling framework.  Developers
108 > * creating new basic styles of fork/join processing should minimally
109 > * implement {@code protected} methods {@link #exec}, {@link
110 > * #setRawResult}, and {@link #getRawResult}, while also introducing
111 > * an abstract computational method that can be implemented in its
112 > * subclasses, possibly relying on other {@code protected} methods
113 > * provided by this class.
114   *
115   * <p>ForkJoinTasks should perform relatively small amounts of
116 < * computations, otherwise splitting into smaller tasks. As a very
117 < * rough rule of thumb, a task should perform more than 100 and less
118 < * than 10000 basic computational steps. If tasks are too big, then
119 < * parallelism cannot improve throughput. If too small, then memory
120 < * and internal task maintenance overhead may overwhelm processing.
116 > * computation. Large tasks should be split into smaller subtasks,
117 > * usually via recursive decomposition. As a very rough rule of thumb,
118 > * a task should perform more than 100 and less than 10000 basic
119 > * computational steps. If tasks are too big, then parallelism cannot
120 > * improve throughput. If too small, then memory and internal task
121 > * maintenance overhead may overwhelm processing.
122   *
123 < * <p>ForkJoinTasks are {@code Serializable}, which enables them
124 < * to be used in extensions such as remote execution frameworks. It is
125 < * in general sensible to serialize tasks only before or after, but
126 < * not during execution. Serialization is not relied on during
127 < * execution itself.
123 > * <p>This class provides {@code adapt} methods for {@link Runnable}
124 > * and {@link Callable}, that may be of use when mixing execution of
125 > * {@code ForkJoinTasks} with other kinds of tasks. When all tasks are
126 > * of this form, consider using a pool constructed in <em>asyncMode</em>.
127 > *
128 > * <p>ForkJoinTasks are {@code Serializable}, which enables them to be
129 > * used in extensions such as remote execution frameworks. It is
130 > * sensible to serialize tasks only before or after, but not during,
131 > * execution. Serialization is not relied on during execution itself.
132 > *
133 > * @since 1.7
134 > * @author Doug Lea
135   */
136   public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
137  
138 <    /**
139 <     * Run control status bits packed into a single int to minimize
140 <     * footprint and to ensure atomicity (via CAS).  Status is
141 <     * initially zero, and takes on nonnegative values until
142 <     * completed, upon which status holds COMPLETED. CANCELLED, or
143 <     * EXCEPTIONAL, which use the top 3 bits.  Tasks undergoing
144 <     * blocking waits by other threads have SIGNAL_MASK bits set --
145 <     * bit 15 for external (nonFJ) waits, and the rest a count of
146 <     * waiting FJ threads.  (This representation relies on
147 <     * ForkJoinPool max thread limits). Completion of a stolen task
148 <     * with SIGNAL_MASK bits set awakens waiter via notifyAll. Even
149 <     * though suboptimal for some purposes, we use basic builtin
150 <     * wait/notify to take advantage of "monitor inflation" in JVMs
151 <     * that we would otherwise need to emulate to avoid adding further
152 <     * per-task bookkeeping overhead. Note that bits 16-28 are
153 <     * currently unused. Also value 0x80000000 is available as spare
154 <     * completion value.
138 >    /*
139 >     * See the internal documentation of class ForkJoinPool for a
140 >     * general implementation overview.  ForkJoinTasks are mainly
141 >     * responsible for maintaining their "status" field amidst relays
142 >     * to methods in ForkJoinWorkerThread and ForkJoinPool. The
143 >     * methods of this class are more-or-less layered into (1) basic
144 >     * status maintenance (2) execution and awaiting completion (3)
145 >     * user-level methods that additionally report results. This is
146 >     * sometimes hard to see because this file orders exported methods
147 >     * in a way that flows well in javadocs. In particular, most
148 >     * join mechanics are in method quietlyJoin, below.
149 >     */
150 >
151 >    /*
152 >     * The status field holds run control status bits packed into a
153 >     * single int to minimize footprint and to ensure atomicity (via
154 >     * CAS).  Status is initially zero, and takes on nonnegative
155 >     * values until completed, upon which status holds value
156 >     * NORMAL. CANCELLED, or EXCEPTIONAL. Tasks undergoing blocking
157 >     * waits by other threads have the SIGNAL bit set.  Completion of
158 >     * a stolen task with SIGNAL set awakens any waiters via
159 >     * notifyAll. Even though suboptimal for some purposes, we use
160 >     * basic builtin wait/notify to take advantage of "monitor
161 >     * inflation" in JVMs that we would otherwise need to emulate to
162 >     * avoid adding further per-task bookkeeping overhead.  We want
163 >     * these monitors to be "fat", i.e., not use biasing or thin-lock
164 >     * techniques, so use some odd coding idioms that tend to avoid
165 >     * them.
166       */
167 +
168 +    /** The run status of this task */
169      volatile int status; // accessed directly by pool and workers
170  
171 <    static final int COMPLETION_MASK      = 0xe0000000;
172 <    static final int NORMAL               = 0xe0000000; // == mask
173 <    static final int CANCELLED            = 0xc0000000;
174 <    static final int EXCEPTIONAL          = 0xa0000000;
137 <    static final int SIGNAL_MASK          = 0x0000ffff;
138 <    static final int INTERNAL_SIGNAL_MASK = 0x00007fff;
139 <    static final int EXTERNAL_SIGNAL      = 0x00008000; // top bit of low word
171 >    private static final int NORMAL      = -1;
172 >    private static final int CANCELLED   = -2;
173 >    private static final int EXCEPTIONAL = -3;
174 >    private static final int SIGNAL      =  1;
175  
176      /**
177       * Table of exceptions thrown by tasks, to enable reporting by
# Line 150 | Line 185 | public abstract class ForkJoinTask<V> im
185          Collections.synchronizedMap
186          (new WeakHashMap<ForkJoinTask<?>, Throwable>());
187  
188 <    // within-package utilities
154 <
155 <    /**
156 <     * Gets current worker thread, or null if not a worker thread.
157 <     */
158 <    static ForkJoinWorkerThread getWorker() {
159 <        Thread t = Thread.currentThread();
160 <        return ((t instanceof ForkJoinWorkerThread)?
161 <                (ForkJoinWorkerThread)t : null);
162 <    }
163 <
164 <    final boolean casStatus(int cmp, int val) {
165 <        return _unsafe.compareAndSwapInt(this, statusOffset, cmp, val);
166 <    }
167 <
168 <    /**
169 <     * Workaround for not being able to rethrow unchecked exceptions.
170 <     */
171 <    static void rethrowException(Throwable ex) {
172 <        if (ex != null)
173 <            _unsafe.throwException(ex);
174 <    }
175 <
176 <    // Setting completion status
188 >    // Maintaining completion status
189  
190      /**
191 <     * Marks completion and wakes up threads waiting to join this task.
191 >     * Marks completion and wakes up threads waiting to join this task,
192 >     * also clearing signal request bits.
193       *
194       * @param completion one of NORMAL, CANCELLED, EXCEPTIONAL
195       */
196 <    final void setCompletion(int completion) {
197 <        ForkJoinPool pool = getPool();
198 <        if (pool != null) {
199 <            int s; // Clear signal bits while setting completion status
200 <            do;while ((s = status) >= 0 && !casStatus(s, completion));
201 <
202 <            if ((s & SIGNAL_MASK) != 0) {
190 <                if ((s &= INTERNAL_SIGNAL_MASK) != 0)
191 <                    pool.updateRunningCount(s);
192 <                synchronized(this) { notifyAll(); }
196 >    private void setCompletion(int completion) {
197 >        int s;
198 >        while ((s = status) >= 0) {
199 >            if (UNSAFE.compareAndSwapInt(this, statusOffset, s, completion)) {
200 >                if (s != 0)
201 >                    synchronized (this) { notifyAll(); }
202 >                break;
203              }
204          }
195        else
196            externallySetCompletion(completion);
197    }
198
199    /**
200     * Version of setCompletion for non-FJ threads.  Leaves signal
201     * bits for unblocked threads to adjust, and always notifies.
202     */
203    private void externallySetCompletion(int completion) {
204        int s;
205        do;while ((s = status) >= 0 &&
206                  !casStatus(s, (s & SIGNAL_MASK) | completion));
207        synchronized(this) { notifyAll(); }
205      }
206  
207      /**
208 <     * Sets status to indicate normal completion
209 <     */
210 <    final void setNormalCompletion() {
214 <        // Try typical fast case -- single CAS, no signal, not already done.
215 <        // Manually expand casStatus to improve chances of inlining it
216 <        if (!_unsafe.compareAndSwapInt(this, statusOffset, 0, NORMAL))
217 <            setCompletion(NORMAL);
218 <    }
219 <
220 <    // internal waiting and notification
221 <
222 <    /**
223 <     * Performs the actual monitor wait for awaitDone
208 >     * Records exception and sets exceptional completion.
209 >     *
210 >     * @return status on exit
211       */
212 <    private void doAwaitDone() {
213 <        // Minimize lock bias and in/de-flation effects by maximizing
214 <        // chances of waiting inside sync
228 <        try {
229 <            while (status >= 0)
230 <                synchronized(this) { if (status >= 0) wait(); }
231 <        } catch (InterruptedException ie) {
232 <            onInterruptedWait();
233 <        }
212 >    private void setExceptionalCompletion(Throwable rex) {
213 >        exceptionMap.put(this, rex);
214 >        setCompletion(EXCEPTIONAL);
215      }
216  
217      /**
218 <     * Performs the actual monitor wait for awaitDone
218 >     * Blocks a worker thread until completion. Called only by
219 >     * pool. Currently unused -- pool-based waits use timeout
220 >     * version below.
221       */
222 <    private void doAwaitDone(long startTime, long nanos) {
223 <        synchronized(this) {
222 >    final void internalAwaitDone() {
223 >        int s;         // the odd construction reduces lock bias effects
224 >        while ((s = status) >= 0) {
225              try {
226 <                while (status >= 0) {
227 <                    long nt = nanos - System.nanoTime() - startTime;
228 <                    if (nt <= 0)
245 <                        break;
246 <                    wait(nt / 1000000, (int)(nt % 1000000));
226 >                synchronized(this) {
227 >                    if (UNSAFE.compareAndSwapInt(this, statusOffset, s,SIGNAL))
228 >                        wait();
229                  }
230              } catch (InterruptedException ie) {
231 <                onInterruptedWait();
231 >                cancelIfTerminating();
232              }
233          }
234      }
235  
254    // Awaiting completion
255
236      /**
237 <     * Sets status to indicate there is joiner, then waits for join,
238 <     * surrounded with pool notifications.
237 >     * Blocks a worker thread until completed or timed out.  Called
238 >     * only by pool.
239       *
240 <     * @return status upon exit
261 <     */
262 <    private int awaitDone(ForkJoinWorkerThread w, boolean maintainParallelism) {
263 <        ForkJoinPool pool = w == null? null : w.pool;
264 <        int s;
265 <        while ((s = status) >= 0) {
266 <            if (casStatus(s, pool == null? s|EXTERNAL_SIGNAL : s+1)) {
267 <                if (pool == null || !pool.preJoin(this, maintainParallelism))
268 <                    doAwaitDone();
269 <                if (((s = status) & INTERNAL_SIGNAL_MASK) != 0)
270 <                    adjustPoolCountsOnUnblock(pool);
271 <                break;
272 <            }
273 <        }
274 <        return s;
275 <    }
276 <
277 <    /**
278 <     * Timed version of awaitDone
279 <     * @return status upon exit
240 >     * @return status on exit
241       */
242 <    private int awaitDone(ForkJoinWorkerThread w, long nanos) {
282 <        ForkJoinPool pool = w == null? null : w.pool;
242 >    final int internalAwaitDone(long millis) {
243          int s;
244 <        while ((s = status) >= 0) {
245 <            if (casStatus(s, pool == null? s|EXTERNAL_SIGNAL : s+1)) {
246 <                long startTime = System.nanoTime();
247 <                if (pool == null || !pool.preJoin(this, false))
248 <                    doAwaitDone(startTime, nanos);
289 <                if ((s = status) >= 0) {
290 <                    adjustPoolCountsOnCancelledWait(pool);
291 <                    s = status;
244 >        if ((s = status) >= 0) {
245 >            try {
246 >                synchronized(this) {
247 >                    if (UNSAFE.compareAndSwapInt(this, statusOffset, s,SIGNAL))
248 >                        wait(millis, 0);
249                  }
250 <                if (s < 0 && (s & INTERNAL_SIGNAL_MASK) != 0)
251 <                    adjustPoolCountsOnUnblock(pool);
295 <                break;
250 >            } catch (InterruptedException ie) {
251 >                cancelIfTerminating();
252              }
253 +            s = status;
254          }
255          return s;
256      }
257  
258      /**
259 <     * Notifies pool that thread is unblocked. Called by signalled
303 <     * threads when woken by non-FJ threads (which is atypical).
259 >     * Blocks a non-worker-thread until completion.
260       */
261 <    private void adjustPoolCountsOnUnblock(ForkJoinPool pool) {
261 >    private void externalAwaitDone() {
262          int s;
263 <        do;while ((s = status) < 0 && !casStatus(s, s & COMPLETION_MASK));
264 <        if (pool != null && (s &= INTERNAL_SIGNAL_MASK) != 0)
265 <            pool.updateRunningCount(s);
266 <    }
267 <
268 <    /**
269 <     * Notifies pool to adjust counts on cancelled or timed out wait.
270 <     */
271 <    private void adjustPoolCountsOnCancelledWait(ForkJoinPool pool) {
272 <        if (pool != null) {
273 <            int s;
274 <            while ((s = status) >= 0 && (s & INTERNAL_SIGNAL_MASK) != 0) {
275 <                if (casStatus(s, s - 1)) {
320 <                    pool.updateRunningCount(1);
263 >        while ((s = status) >= 0) {
264 >            synchronized(this) {
265 >                if (UNSAFE.compareAndSwapInt(this, statusOffset, s, SIGNAL)){
266 >                    boolean interrupted = false;
267 >                    while (status >= 0) {
268 >                        try {
269 >                            wait();
270 >                        } catch (InterruptedException ie) {
271 >                            interrupted = true;
272 >                        }
273 >                    }
274 >                    if (interrupted)
275 >                        Thread.currentThread().interrupt();
276                      break;
277                  }
278              }
# Line 325 | Line 280 | public abstract class ForkJoinTask<V> im
280      }
281  
282      /**
283 <     * Handles interruptions during waits.
284 <     */
285 <    private void onInterruptedWait() {
331 <        ForkJoinWorkerThread w = getWorker();
332 <        if (w == null)
333 <            Thread.currentThread().interrupt(); // re-interrupt
334 <        else if (w.isTerminating())
335 <            cancelIgnoringExceptions();
336 <        // else if FJworker, ignore interrupt
337 <    }
338 <
339 <    // Recording and reporting exceptions
340 <
341 <    private void setDoneExceptionally(Throwable rex) {
342 <        exceptionMap.put(this, rex);
343 <        setCompletion(EXCEPTIONAL);
344 <    }
345 <
346 <    /**
347 <     * Throws the exception associated with status s.
348 <     *
349 <     * @throws the exception
350 <     */
351 <    private void reportException(int s) {
352 <        if ((s &= COMPLETION_MASK) < NORMAL) {
353 <            if (s == CANCELLED)
354 <                throw new CancellationException();
355 <            else
356 <                rethrowException(exceptionMap.get(this));
357 <        }
358 <    }
359 <
360 <    /**
361 <     * Returns result or throws exception using j.u.c.Future conventions.
362 <     * Only call when isDone known to be true.
363 <     */
364 <    private V reportFutureResult()
365 <        throws ExecutionException, InterruptedException {
366 <        int s = status & COMPLETION_MASK;
367 <        if (s < NORMAL) {
368 <            Throwable ex;
369 <            if (s == CANCELLED)
370 <                throw new CancellationException();
371 <            if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
372 <                throw new ExecutionException(ex);
373 <            if (Thread.interrupted())
374 <                throw new InterruptedException();
375 <        }
376 <        return getRawResult();
377 <    }
378 <
379 <    /**
380 <     * Returns result or throws exception using j.u.c.Future conventions
381 <     * with timeouts.
382 <     */
383 <    private V reportTimedFutureResult()
384 <        throws InterruptedException, ExecutionException, TimeoutException {
385 <        Throwable ex;
386 <        int s = status & COMPLETION_MASK;
387 <        if (s == NORMAL)
388 <            return getRawResult();
389 <        if (s == CANCELLED)
390 <            throw new CancellationException();
391 <        if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
392 <            throw new ExecutionException(ex);
393 <        if (Thread.interrupted())
394 <            throw new InterruptedException();
395 <        throw new TimeoutException();
396 <    }
397 <
398 <    // internal execution methods
399 <
400 <    /**
401 <     * Calls exec, recording completion, and rethrowing exception if
402 <     * encountered. Caller should normally check status before calling.
403 <     *
404 <     * @return true if completed normally
405 <     */
406 <    private boolean tryExec() {
407 <        try { // try block must contain only call to exec
408 <            if (!exec())
409 <                return false;
410 <        } catch (Throwable rex) {
411 <            setDoneExceptionally(rex);
412 <            rethrowException(rex);
413 <            return false; // not reached
414 <        }
415 <        setNormalCompletion();
416 <        return true;
417 <    }
418 <
419 <    /**
420 <     * Main execution method used by worker threads. Invokes
421 <     * base computation unless already complete.
283 >     * Unless done, calls exec and records status if completed, but
284 >     * doesn't wait for completion otherwise. Primary execution method
285 >     * for ForkJoinWorkerThread.
286       */
287      final void quietlyExec() {
424        if (status >= 0) {
425            try {
426                if (!exec())
427                    return;
428            } catch(Throwable rex) {
429                setDoneExceptionally(rex);
430                return;
431            }
432            setNormalCompletion();
433        }
434    }
435
436    /**
437     * Calls exec(), recording but not rethrowing exception.
438     * Caller should normally check status before calling.
439     *
440     * @return true if completed normally
441     */
442    private boolean tryQuietlyInvoke() {
288          try {
289 <            if (!exec())
290 <                return false;
289 >            if (status < 0 || !exec())
290 >                return;
291          } catch (Throwable rex) {
292 <            setDoneExceptionally(rex);
293 <            return false;
449 <        }
450 <        setNormalCompletion();
451 <        return true;
452 <    }
453 <
454 <    /**
455 <     * Cancels, ignoring any exceptions it throws.
456 <     */
457 <    final void cancelIgnoringExceptions() {
458 <        try {
459 <            cancel(false);
460 <        } catch(Throwable ignore) {
292 >            setExceptionalCompletion(rex);
293 >            return;
294          }
295 <    }
463 <
464 <    /**
465 <     * Main implementation of helpJoin
466 <     */
467 <    private int busyJoin(ForkJoinWorkerThread w) {
468 <        int s;
469 <        ForkJoinTask<?> t;
470 <        while ((s = status) >= 0 && (t = w.scanWhileJoining(this)) != null)
471 <            t.quietlyExec();
472 <        return (s >= 0)? awaitDone(w, false) : s; // block if no work
295 >        setCompletion(NORMAL); // must be outside try block
296      }
297  
298      // public methods
# Line 477 | Line 300 | public abstract class ForkJoinTask<V> im
300      /**
301       * Arranges to asynchronously execute this task.  While it is not
302       * necessarily enforced, it is a usage error to fork a task more
303 <     * than once unless it has completed and been reinitialized.  This
304 <     * method may be invoked only from within ForkJoinTask
305 <     * computations. Attempts to invoke in other contexts result in
306 <     * exceptions or errors possibly including ClassCastException.
307 <     */
308 <    public final void fork() {
309 <        ((ForkJoinWorkerThread)(Thread.currentThread())).pushTask(this);
303 >     * than once unless it has completed and been reinitialized.
304 >     * Subsequent modifications to the state of this task or any data
305 >     * it operates on are not necessarily consistently observable by
306 >     * any thread other than the one executing it unless preceded by a
307 >     * call to {@link #join} or related methods, or a call to {@link
308 >     * #isDone} returning {@code true}.
309 >     *
310 >     * <p>This method may be invoked only from within {@code
311 >     * ForkJoinTask} computations (as may be determined using method
312 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
313 >     * result in exceptions or errors, possibly including {@code
314 >     * ClassCastException}.
315 >     *
316 >     * @return {@code this}, to simplify usage
317 >     */
318 >    public final ForkJoinTask<V> fork() {
319 >        ((ForkJoinWorkerThread) Thread.currentThread())
320 >            .pushTask(this);
321 >        return this;
322      }
323  
324      /**
325 <     * Returns the result of the computation when it is ready.
326 <     * This method differs from {@code get} in that abnormal
327 <     * completion results in RuntimeExceptions or Errors, not
328 <     * ExecutionExceptions.
325 >     * Returns the result of the computation when it {@link #isDone is done}.
326 >     * This method differs from {@link #get()} in that
327 >     * abnormal completion results in {@code RuntimeException} or
328 >     * {@code Error}, not {@code ExecutionException}.
329       *
330       * @return the computed result
331       */
332      public final V join() {
333 <        ForkJoinWorkerThread w = getWorker();
334 <        if (w == null || status < 0 || !w.unpushTask(this) || !tryExec())
335 <            reportException(awaitDone(w, true));
333 >        quietlyJoin();
334 >        Throwable ex;
335 >        if (status < NORMAL && (ex = getException()) != null)
336 >            UNSAFE.throwException(ex);
337          return getRawResult();
338      }
339  
340      /**
341       * Commences performing this task, awaits its completion if
342 <     * necessary, and return its result.
342 >     * necessary, and returns its result, or throws an (unchecked)
343 >     * {@code RuntimeException} or {@code Error} if the underlying
344 >     * computation did so.
345       *
508     * @throws Throwable (a RuntimeException, Error, or unchecked
509     * exception) if the underlying computation did so
346       * @return the computed result
347       */
348      public final V invoke() {
349 <        if (status >= 0 && tryExec())
350 <            return getRawResult();
351 <        else
352 <            return join();
349 >        quietlyInvoke();
350 >        Throwable ex;
351 >        if (status < NORMAL && (ex = getException()) != null)
352 >            UNSAFE.throwException(ex);
353 >        return getRawResult();
354      }
355  
356      /**
357 <     * Forks both tasks, returning when {@code isDone} holds for
358 <     * both of them or an exception is encountered. This method may be
359 <     * invoked only from within ForkJoinTask computations. Attempts to
360 <     * invoke in other contexts result in exceptions or errors
361 <     * possibly including ClassCastException.
362 <     *
363 <     * @param t1 one task
364 <     * @param t2 the other task
365 <     * @throws NullPointerException if t1 or t2 are null
366 <     * @throws RuntimeException or Error if either task did so
357 >     * Forks the given tasks, returning when {@code isDone} holds for
358 >     * each task or an (unchecked) exception is encountered, in which
359 >     * case the exception is rethrown. If more than one task
360 >     * encounters an exception, then this method throws any one of
361 >     * these exceptions. If any task encounters an exception, the
362 >     * other may be cancelled. However, the execution status of
363 >     * individual tasks is not guaranteed upon exceptional return. The
364 >     * status of each task may be obtained using {@link
365 >     * #getException()} and related methods to check if they have been
366 >     * cancelled, completed normally or exceptionally, or left
367 >     * unprocessed.
368 >     *
369 >     * <p>This method may be invoked only from within {@code
370 >     * ForkJoinTask} computations (as may be determined using method
371 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
372 >     * result in exceptions or errors, possibly including {@code
373 >     * ClassCastException}.
374 >     *
375 >     * @param t1 the first task
376 >     * @param t2 the second task
377 >     * @throws NullPointerException if any task is null
378       */
379 <    public static void invokeAll(ForkJoinTask<?>t1, ForkJoinTask<?> t2) {
379 >    public static void invokeAll(ForkJoinTask<?> t1, ForkJoinTask<?> t2) {
380          t2.fork();
381          t1.invoke();
382          t2.join();
383      }
384  
385      /**
386 <     * Forks the given tasks, returning when {@code isDone} holds
387 <     * for all of them. If any task encounters an exception, others
388 <     * may be cancelled.  This method may be invoked only from within
389 <     * ForkJoinTask computations. Attempts to invoke in other contexts
390 <     * result in exceptions or errors possibly including ClassCastException.
386 >     * Forks the given tasks, returning when {@code isDone} holds for
387 >     * each task or an (unchecked) exception is encountered, in which
388 >     * case the exception is rethrown. If more than one task
389 >     * encounters an exception, then this method throws any one of
390 >     * these exceptions. If any task encounters an exception, others
391 >     * may be cancelled. However, the execution status of individual
392 >     * tasks is not guaranteed upon exceptional return. The status of
393 >     * each task may be obtained using {@link #getException()} and
394 >     * related methods to check if they have been cancelled, completed
395 >     * normally or exceptionally, or left unprocessed.
396 >     *
397 >     * <p>This method may be invoked only from within {@code
398 >     * ForkJoinTask} computations (as may be determined using method
399 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
400 >     * result in exceptions or errors, possibly including {@code
401 >     * ClassCastException}.
402       *
403 <     * @param tasks the array of tasks
404 <     * @throws NullPointerException if tasks or any element are null
546 <     * @throws RuntimeException or Error if any task did so
403 >     * @param tasks the tasks
404 >     * @throws NullPointerException if any task is null
405       */
406      public static void invokeAll(ForkJoinTask<?>... tasks) {
407          Throwable ex = null;
# Line 558 | Line 416 | public abstract class ForkJoinTask<V> im
416                  t.fork();
417              else {
418                  t.quietlyInvoke();
419 <                if (ex == null)
419 >                if (ex == null && t.status < NORMAL)
420                      ex = t.getException();
421              }
422          }
# Line 569 | Line 427 | public abstract class ForkJoinTask<V> im
427                      t.cancel(false);
428                  else {
429                      t.quietlyJoin();
430 <                    if (ex == null)
430 >                    if (ex == null && t.status < NORMAL)
431                          ex = t.getException();
432                  }
433              }
434          }
435          if (ex != null)
436 <            rethrowException(ex);
436 >            UNSAFE.throwException(ex);
437      }
438  
439      /**
440 <     * Forks all tasks in the collection, returning when
441 <     * {@code isDone} holds for all of them. If any task
442 <     * encounters an exception, others may be cancelled.  This method
443 <     * may be invoked only from within ForkJoinTask
444 <     * computations. Attempts to invoke in other contexts result in
445 <     * exceptions or errors possibly including ClassCastException.
440 >     * Forks all tasks in the specified collection, returning when
441 >     * {@code isDone} holds for each task or an (unchecked) exception
442 >     * is encountered, in which case the exception is rethrown. If
443 >     * more than one task encounters an exception, then this method
444 >     * throws any one of these exceptions. If any task encounters an
445 >     * exception, others may be cancelled. However, the execution
446 >     * status of individual tasks is not guaranteed upon exceptional
447 >     * return. The status of each task may be obtained using {@link
448 >     * #getException()} and related methods to check if they have been
449 >     * cancelled, completed normally or exceptionally, or left
450 >     * unprocessed.
451 >     *
452 >     * <p>This method may be invoked only from within {@code
453 >     * ForkJoinTask} computations (as may be determined using method
454 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
455 >     * result in exceptions or errors, possibly including {@code
456 >     * ClassCastException}.
457       *
458       * @param tasks the collection of tasks
459 +     * @return the tasks argument, to simplify usage
460       * @throws NullPointerException if tasks or any element are null
591     * @throws RuntimeException or Error if any task did so
461       */
462 <    public static void invokeAll(Collection<? extends ForkJoinTask<?>> tasks) {
463 <        if (!(tasks instanceof List)) {
464 <            invokeAll(tasks.toArray(new ForkJoinTask[tasks.size()]));
465 <            return;
462 >    public static <T extends ForkJoinTask<?>> Collection<T> invokeAll(Collection<T> tasks) {
463 >        if (!(tasks instanceof RandomAccess) || !(tasks instanceof List<?>)) {
464 >            invokeAll(tasks.toArray(new ForkJoinTask<?>[tasks.size()]));
465 >            return tasks;
466          }
467 +        @SuppressWarnings("unchecked")
468          List<? extends ForkJoinTask<?>> ts =
469 <            (List<? extends ForkJoinTask<?>>)tasks;
469 >            (List<? extends ForkJoinTask<?>>) tasks;
470          Throwable ex = null;
471          int last = ts.size() - 1;
472          for (int i = last; i >= 0; --i) {
# Line 609 | Line 479 | public abstract class ForkJoinTask<V> im
479                  t.fork();
480              else {
481                  t.quietlyInvoke();
482 <                if (ex == null)
482 >                if (ex == null && t.status < NORMAL)
483                      ex = t.getException();
484              }
485          }
# Line 620 | Line 490 | public abstract class ForkJoinTask<V> im
490                      t.cancel(false);
491                  else {
492                      t.quietlyJoin();
493 <                    if (ex == null)
493 >                    if (ex == null && t.status < NORMAL)
494                          ex = t.getException();
495                  }
496              }
497          }
498          if (ex != null)
499 <            rethrowException(ex);
500 <    }
631 <
632 <    /**
633 <     * Returns true if the computation performed by this task has
634 <     * completed (or has been cancelled).
635 <     *
636 <     * @return true if this computation has completed
637 <     */
638 <    public final boolean isDone() {
639 <        return status < 0;
640 <    }
641 <
642 <    /**
643 <     * Returns true if this task was cancelled.
644 <     *
645 <     * @return true if this task was cancelled
646 <     */
647 <    public final boolean isCancelled() {
648 <        return (status & COMPLETION_MASK) == CANCELLED;
499 >            UNSAFE.throwException(ex);
500 >        return tasks;
501      }
502  
503      /**
504 <     * Asserts that the results of this task's computation will not be
505 <     * used. If a cancellation occurs before attempting to execute this
506 <     * task, then execution will be suppressed, {@code isCancelled}
507 <     * will report true, and {@code join} will result in a
508 <     * {@code CancellationException} being thrown. Otherwise, when
509 <     * cancellation races with completion, there are no guarantees
510 <     * about whether {@code isCancelled} will report true, whether
659 <     * {@code join} will return normally or via an exception, or
660 <     * whether these behaviors will remain consistent upon repeated
661 <     * invocation.
504 >     * Attempts to cancel execution of this task. This attempt will
505 >     * fail if the task has already completed, has already been
506 >     * cancelled, or could not be cancelled for some other reason. If
507 >     * successful, and this task has not started when cancel is
508 >     * called, execution of this task is suppressed, {@link
509 >     * #isCancelled} will report true, and {@link #join} will result
510 >     * in a {@code CancellationException} being thrown.
511       *
512       * <p>This method may be overridden in subclasses, but if so, must
513       * still ensure that these minimal properties hold. In particular,
514 <     * the cancel method itself must not throw exceptions.
514 >     * the {@code cancel} method itself must not throw exceptions.
515       *
516 <     * <p> This method is designed to be invoked by <em>other</em>
516 >     * <p>This method is designed to be invoked by <em>other</em>
517       * tasks. To terminate the current task, you can just return or
518       * throw an unchecked exception from its computation method, or
519 <     * invoke {@code completeExceptionally}.
519 >     * invoke {@link #completeExceptionally}.
520       *
521       * @param mayInterruptIfRunning this value is ignored in the
522 <     * default implementation because tasks are not in general
523 <     * cancelled via interruption.
522 >     * default implementation because tasks are not
523 >     * cancelled via interruption
524       *
525 <     * @return true if this task is now cancelled
525 >     * @return {@code true} if this task is now cancelled
526       */
527      public boolean cancel(boolean mayInterruptIfRunning) {
528          setCompletion(CANCELLED);
529 <        return (status & COMPLETION_MASK) == CANCELLED;
529 >        return status == CANCELLED;
530 >    }
531 >
532 >    /**
533 >     * Cancels, ignoring any exceptions thrown by cancel. Used during
534 >     * worker and pool shutdown. Cancel is spec'ed not to throw any
535 >     * exceptions, but if it does anyway, we have no recourse during
536 >     * shutdown, so guard against this case.
537 >     */
538 >    final void cancelIgnoringExceptions() {
539 >        try {
540 >            cancel(false);
541 >        } catch (Throwable ignore) {
542 >        }
543 >    }
544 >
545 >    /**
546 >     * Cancels if current thread is a terminating worker thread,
547 >     * ignoring any exceptions thrown by cancel.
548 >     */
549 >    final void cancelIfTerminating() {
550 >        Thread t = Thread.currentThread();
551 >        if ((t instanceof ForkJoinWorkerThread) &&
552 >            ((ForkJoinWorkerThread) t).isTerminating()) {
553 >            try {
554 >                cancel(false);
555 >            } catch (Throwable ignore) {
556 >            }
557 >        }
558 >    }
559 >
560 >    public final boolean isDone() {
561 >        return status < 0;
562 >    }
563 >
564 >    public final boolean isCancelled() {
565 >        return status == CANCELLED;
566      }
567  
568      /**
569 <     * Returns true if this task threw an exception or was cancelled.
569 >     * Returns {@code true} if this task threw an exception or was cancelled.
570       *
571 <     * @return true if this task threw an exception or was cancelled
571 >     * @return {@code true} if this task threw an exception or was cancelled
572       */
573      public final boolean isCompletedAbnormally() {
574 <        return (status & COMPLETION_MASK) < NORMAL;
574 >        return status < NORMAL;
575 >    }
576 >
577 >    /**
578 >     * Returns {@code true} if this task completed without throwing an
579 >     * exception and was not cancelled.
580 >     *
581 >     * @return {@code true} if this task completed without throwing an
582 >     * exception and was not cancelled
583 >     */
584 >    public final boolean isCompletedNormally() {
585 >        return status == NORMAL;
586      }
587  
588      /**
589       * Returns the exception thrown by the base computation, or a
590 <     * CancellationException if cancelled, or null if none or if the
591 <     * method has not yet completed.
590 >     * {@code CancellationException} if cancelled, or {@code null} if
591 >     * none or if the method has not yet completed.
592       *
593 <     * @return the exception, or null if none
593 >     * @return the exception, or {@code null} if none
594       */
595      public final Throwable getException() {
596 <        int s = status & COMPLETION_MASK;
597 <        if (s >= NORMAL)
598 <            return null;
599 <        if (s == CANCELLED)
704 <            return new CancellationException();
705 <        return exceptionMap.get(this);
596 >        int s = status;
597 >        return ((s >= NORMAL)    ? null :
598 >                (s == CANCELLED) ? new CancellationException() :
599 >                exceptionMap.get(this));
600      }
601  
602      /**
# Line 711 | Line 605 | public abstract class ForkJoinTask<V> im
605       * {@code join} and related operations. This method may be used
606       * to induce exceptions in asynchronous tasks, or to force
607       * completion of tasks that would not otherwise complete.  Its use
608 <     * in other situations is likely to be wrong.  This method is
608 >     * in other situations is discouraged.  This method is
609       * overridable, but overridden versions must invoke {@code super}
610       * implementation to maintain guarantees.
611       *
612 <     * @param ex the exception to throw. If this exception is
613 <     * not a RuntimeException or Error, the actual exception thrown
614 <     * will be a RuntimeException with cause ex.
612 >     * @param ex the exception to throw. If this exception is not a
613 >     * {@code RuntimeException} or {@code Error}, the actual exception
614 >     * thrown will be a {@code RuntimeException} with cause {@code ex}.
615       */
616      public void completeExceptionally(Throwable ex) {
617 <        setDoneExceptionally((ex instanceof RuntimeException) ||
618 <                             (ex instanceof Error)? ex :
619 <                             new RuntimeException(ex));
617 >        setExceptionalCompletion((ex instanceof RuntimeException) ||
618 >                                 (ex instanceof Error) ? ex :
619 >                                 new RuntimeException(ex));
620      }
621  
622      /**
# Line 731 | Line 625 | public abstract class ForkJoinTask<V> im
625       * operations. This method may be used to provide results for
626       * asynchronous tasks, or to provide alternative handling for
627       * tasks that would not otherwise complete normally. Its use in
628 <     * other situations is likely to be wrong. This method is
628 >     * other situations is discouraged. This method is
629       * overridable, but overridden versions must invoke {@code super}
630       * implementation to maintain guarantees.
631       *
# Line 740 | Line 634 | public abstract class ForkJoinTask<V> im
634      public void complete(V value) {
635          try {
636              setRawResult(value);
637 <        } catch(Throwable rex) {
638 <            setDoneExceptionally(rex);
637 >        } catch (Throwable rex) {
638 >            setExceptionalCompletion(rex);
639              return;
640          }
641 <        setNormalCompletion();
641 >        setCompletion(NORMAL);
642      }
643  
644      public final V get() throws InterruptedException, ExecutionException {
645 <        ForkJoinWorkerThread w = getWorker();
646 <        if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
647 <            awaitDone(w, true);
648 <        return reportFutureResult();
645 >        quietlyJoin();
646 >        if (Thread.interrupted())
647 >            throw new InterruptedException();
648 >        int s = status;
649 >        if (s < NORMAL) {
650 >            Throwable ex;
651 >            if (s == CANCELLED)
652 >                throw new CancellationException();
653 >            if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
654 >                throw new ExecutionException(ex);
655 >        }
656 >        return getRawResult();
657      }
658  
659      public final V get(long timeout, TimeUnit unit)
660          throws InterruptedException, ExecutionException, TimeoutException {
661 <        ForkJoinWorkerThread w = getWorker();
662 <        if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
663 <            awaitDone(w, unit.toNanos(timeout));
664 <        return reportTimedFutureResult();
665 <    }
666 <
667 <    /**
668 <     * Possibly executes other tasks until this task is ready, then
669 <     * returns the result of the computation.  This method may be more
670 <     * efficient than {@code join}, but is only applicable when
671 <     * there are no potential dependencies between continuation of the
672 <     * current task and that of any other task that might be executed
673 <     * while helping. (This usually holds for pure divide-and-conquer
674 <     * tasks). This method may be invoked only from within
675 <     * ForkJoinTask computations. Attempts to invoke in other contexts
676 <     * result in exceptions or errors possibly including ClassCastException.
677 <     *
678 <     * @return the computed result
679 <     */
680 <    public final V helpJoin() {
681 <        ForkJoinWorkerThread w = (ForkJoinWorkerThread)(Thread.currentThread());
682 <        if (status < 0 || !w.unpushTask(this) || !tryExec())
683 <            reportException(busyJoin(w));
684 <        return getRawResult();
685 <    }
686 <
687 <    /**
688 <     * Possibly executes other tasks until this task is ready.  This
689 <     * method may be invoked only from within ForkJoinTask
690 <     * computations. Attempts to invoke in other contexts result in
691 <     * exceptions or errors possibly including ClassCastException.
692 <     */
693 <    public final void quietlyHelpJoin() {
694 <        if (status >= 0) {
695 <            ForkJoinWorkerThread w =
696 <                (ForkJoinWorkerThread)(Thread.currentThread());
697 <            if (!w.unpushTask(this) || !tryQuietlyInvoke())
698 <                busyJoin(w);
661 >        Thread t = Thread.currentThread();
662 >        ForkJoinPool pool;
663 >        if (t instanceof ForkJoinWorkerThread) {
664 >            ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
665 >            if (status >= 0 && w.unpushTask(this))
666 >                quietlyExec();
667 >            pool = w.pool;
668 >        }
669 >        else
670 >            pool = null;
671 >        /*
672 >         * Timed wait loop intermixes cases for FJ (pool != null) and
673 >         * non FJ threads. For FJ, decrement pool count but don't try
674 >         * for replacement; increment count on completion. For non-FJ,
675 >         * deal with interrupts. This is messy, but a little less so
676 >         * than is splitting the FJ and nonFJ cases.
677 >         */
678 >        boolean interrupted = false;
679 >        boolean dec = false; // true if pool count decremented
680 >        long nanos = unit.toNanos(timeout);
681 >        for (;;) {
682 >            if (Thread.interrupted() && pool == null) {
683 >                interrupted = true;
684 >                break;
685 >            }
686 >            int s = status;
687 >            if (s < 0)
688 >                break;
689 >            if (UNSAFE.compareAndSwapInt(this, statusOffset, s, SIGNAL)) {
690 >                long startTime = System.nanoTime();
691 >                long nt; // wait time
692 >                while (status >= 0 &&
693 >                       (nt = nanos - (System.nanoTime() - startTime)) > 0) {
694 >                    if (pool != null && !dec)
695 >                        dec = pool.tryDecrementRunningCount();
696 >                    else {
697 >                        long ms = nt / 1000000;
698 >                        int ns = (int) (nt % 1000000);
699 >                        try {
700 >                            synchronized(this) {
701 >                                if (status >= 0)
702 >                                    wait(ms, ns);
703 >                            }
704 >                        } catch (InterruptedException ie) {
705 >                            if (pool != null)
706 >                                cancelIfTerminating();
707 >                            else {
708 >                                interrupted = true;
709 >                                break;
710 >                            }
711 >                        }
712 >                    }
713 >                }
714 >                break;
715 >            }
716          }
717 +        if (pool != null && dec)
718 +            pool.incrementRunningCount();
719 +        if (interrupted)
720 +            throw new InterruptedException();
721 +        int es = status;
722 +        if (es != NORMAL) {
723 +            Throwable ex;
724 +            if (es == CANCELLED)
725 +                throw new CancellationException();
726 +            if (es == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
727 +                throw new ExecutionException(ex);
728 +            throw new TimeoutException();
729 +        }
730 +        return getRawResult();
731      }
732  
733      /**
734 <     * Joins this task, without returning its result or throwing an
734 >     * Joins this task, without returning its result or throwing its
735       * exception. This method may be useful when processing
736       * collections of tasks when some have been cancelled or otherwise
737       * known to have aborted.
738       */
739      public final void quietlyJoin() {
740 <        if (status >= 0) {
741 <            ForkJoinWorkerThread w = getWorker();
742 <            if (w == null || !w.unpushTask(this) || !tryQuietlyInvoke())
743 <                awaitDone(w, true);
740 >        Thread t;
741 >        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
742 >            ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
743 >            if (status >= 0) {
744 >                if (w.unpushTask(this)) {
745 >                    boolean completed;
746 >                    try {
747 >                        completed = exec();
748 >                    } catch (Throwable rex) {
749 >                        setExceptionalCompletion(rex);
750 >                        return;
751 >                    }
752 >                    if (completed) {
753 >                        setCompletion(NORMAL);
754 >                        return;
755 >                    }
756 >                }
757 >                w.joinTask(this);
758 >            }
759          }
760 +        else
761 +            externalAwaitDone();
762      }
763  
764      /**
765       * Commences performing this task and awaits its completion if
766 <     * necessary, without returning its result or throwing an
766 >     * necessary, without returning its result or throwing its
767       * exception. This method may be useful when processing
768       * collections of tasks when some have been cancelled or otherwise
769       * known to have aborted.
770       */
771      public final void quietlyInvoke() {
772 <        if (status >= 0 && !tryQuietlyInvoke())
773 <            quietlyJoin();
772 >        if (status >= 0) {
773 >            boolean completed;
774 >            try {
775 >                completed = exec();
776 >            } catch (Throwable rex) {
777 >                setExceptionalCompletion(rex);
778 >                return;
779 >            }
780 >            if (completed)
781 >                setCompletion(NORMAL);
782 >            else
783 >                quietlyJoin();
784 >        }
785      }
786  
787      /**
788       * Possibly executes tasks until the pool hosting the current task
789 <     * {@link ForkJoinPool#isQuiescent}. This method may be of use in
790 <     * designs in which many tasks are forked, but none are explicitly
791 <     * joined, instead executing them until all are processed.
789 >     * {@link ForkJoinPool#isQuiescent is quiescent}. This method may
790 >     * be of use in designs in which many tasks are forked, but none
791 >     * are explicitly joined, instead executing them until all are
792 >     * processed.
793 >     *
794 >     * <p>This method may be invoked only from within {@code
795 >     * ForkJoinTask} computations (as may be determined using method
796 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
797 >     * result in exceptions or errors, possibly including {@code
798 >     * ClassCastException}.
799       */
800      public static void helpQuiesce() {
801 <        ((ForkJoinWorkerThread)(Thread.currentThread())).
802 <            helpQuiescePool();
801 >        ((ForkJoinWorkerThread) Thread.currentThread())
802 >            .helpQuiescePool();
803      }
804  
805      /**
# Line 840 | Line 808 | public abstract class ForkJoinTask<V> im
808       * this task, but only if reuse occurs when this task has either
809       * never been forked, or has been forked, then completed and all
810       * outstanding joins of this task have also completed. Effects
811 <     * under any other usage conditions are not guaranteed, and are
812 <     * almost surely wrong. This method may be useful when executing
811 >     * under any other usage conditions are not guaranteed.
812 >     * This method may be useful when executing
813       * pre-constructed trees of subtasks in loops.
814       */
815      public void reinitialize() {
816 <        if ((status & COMPLETION_MASK) == EXCEPTIONAL)
816 >        if (status == EXCEPTIONAL)
817              exceptionMap.remove(this);
818          status = 0;
819      }
820  
821      /**
822       * Returns the pool hosting the current task execution, or null
823 <     * if this task is executing outside of any pool.
823 >     * if this task is executing outside of any ForkJoinPool.
824       *
825 <     * @return the pool, or null if none
825 >     * @see #inForkJoinPool
826 >     * @return the pool, or {@code null} if none
827       */
828      public static ForkJoinPool getPool() {
829          Thread t = Thread.currentThread();
830 <        return ((t instanceof ForkJoinWorkerThread)?
831 <                ((ForkJoinWorkerThread)t).pool : null);
830 >        return (t instanceof ForkJoinWorkerThread) ?
831 >            ((ForkJoinWorkerThread) t).pool : null;
832 >    }
833 >
834 >    /**
835 >     * Returns {@code true} if the current thread is executing as a
836 >     * ForkJoinPool computation.
837 >     *
838 >     * @return {@code true} if the current thread is executing as a
839 >     * ForkJoinPool computation, or false otherwise
840 >     */
841 >    public static boolean inForkJoinPool() {
842 >        return Thread.currentThread() instanceof ForkJoinWorkerThread;
843      }
844  
845      /**
# Line 868 | Line 848 | public abstract class ForkJoinTask<V> im
848       * by the current thread, and has not commenced executing in
849       * another thread.  This method may be useful when arranging
850       * alternative local processing of tasks that could have been, but
851 <     * were not, stolen. This method may be invoked only from within
852 <     * ForkJoinTask computations. Attempts to invoke in other contexts
853 <     * result in exceptions or errors possibly including ClassCastException.
851 >     * were not, stolen.
852 >     *
853 >     * <p>This method may be invoked only from within {@code
854 >     * ForkJoinTask} computations (as may be determined using method
855 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
856 >     * result in exceptions or errors, possibly including {@code
857 >     * ClassCastException}.
858       *
859 <     * @return true if unforked
859 >     * @return {@code true} if unforked
860       */
861      public boolean tryUnfork() {
862 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).unpushTask(this);
862 >        return ((ForkJoinWorkerThread) Thread.currentThread())
863 >            .unpushTask(this);
864      }
865  
866      /**
# Line 884 | Line 869 | public abstract class ForkJoinTask<V> im
869       * value may be useful for heuristic decisions about whether to
870       * fork other tasks.
871       *
872 +     * <p>This method may be invoked only from within {@code
873 +     * ForkJoinTask} computations (as may be determined using method
874 +     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
875 +     * result in exceptions or errors, possibly including {@code
876 +     * ClassCastException}.
877 +     *
878       * @return the number of tasks
879       */
880      public static int getQueuedTaskCount() {
881 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).
882 <            getQueueSize();
881 >        return ((ForkJoinWorkerThread) Thread.currentThread())
882 >            .getQueueSize();
883      }
884  
885      /**
# Line 901 | Line 892 | public abstract class ForkJoinTask<V> im
892       * tasks, and to process computations locally if this threshold is
893       * exceeded.
894       *
895 +     * <p>This method may be invoked only from within {@code
896 +     * ForkJoinTask} computations (as may be determined using method
897 +     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
898 +     * result in exceptions or errors, possibly including {@code
899 +     * ClassCastException}.
900 +     *
901       * @return the surplus number of tasks, which may be negative
902       */
903      public static int getSurplusQueuedTaskCount() {
904 <        return ((ForkJoinWorkerThread)(Thread.currentThread()))
904 >        return ((ForkJoinWorkerThread) Thread.currentThread())
905              .getEstimatedSurplusTaskCount();
906      }
907  
908      // Extension methods
909  
910      /**
911 <     * Returns the result that would be returned by {@code join},
912 <     * even if this task completed abnormally, or null if this task is
913 <     * not known to have been completed.  This method is designed to
914 <     * aid debugging, as well as to support extensions. Its use in any
915 <     * other context is discouraged.
911 >     * Returns the result that would be returned by {@link #join}, even
912 >     * if this task completed abnormally, or {@code null} if this task
913 >     * is not known to have been completed.  This method is designed
914 >     * to aid debugging, as well as to support extensions. Its use in
915 >     * any other context is discouraged.
916       *
917 <     * @return the result, or null if not completed
917 >     * @return the result, or {@code null} if not completed
918       */
919      public abstract V getRawResult();
920  
# Line 936 | Line 933 | public abstract class ForkJoinTask<V> im
933       * called otherwise. The return value controls whether this task
934       * is considered to be done normally. It may return false in
935       * asynchronous actions that require explicit invocations of
936 <     * {@code complete} to become joinable. It may throw exceptions
937 <     * to indicate abnormal exit.
936 >     * {@link #complete} to become joinable. It may also throw an
937 >     * (unchecked) exception to indicate abnormal exit.
938       *
939 <     * @return true if completed normally
943 <     * @throws Error or RuntimeException if encountered during computation
939 >     * @return {@code true} if completed normally
940       */
941      protected abstract boolean exec();
942  
943      /**
944 <     * Returns, but does not unschedule or execute, the task queued by
945 <     * the current thread but not yet executed, if one is
944 >     * Returns, but does not unschedule or execute, a task queued by
945 >     * the current thread but not yet executed, if one is immediately
946       * available. There is no guarantee that this task will actually
947 <     * be polled or executed next.  This method is designed primarily
948 <     * to support extensions, and is unlikely to be useful otherwise.
949 <     * This method may be invoked only from within ForkJoinTask
950 <     * computations. Attempts to invoke in other contexts result in
951 <     * exceptions or errors possibly including ClassCastException.
947 >     * be polled or executed next. Conversely, this method may return
948 >     * null even if a task exists but cannot be accessed without
949 >     * contention with other threads.  This method is designed
950 >     * primarily to support extensions, and is unlikely to be useful
951 >     * otherwise.
952 >     *
953 >     * <p>This method may be invoked only from within {@code
954 >     * ForkJoinTask} computations (as may be determined using method
955 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
956 >     * result in exceptions or errors, possibly including {@code
957 >     * ClassCastException}.
958       *
959 <     * @return the next task, or null if none are available
959 >     * @return the next task, or {@code null} if none are available
960       */
961      protected static ForkJoinTask<?> peekNextLocalTask() {
962 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).peekTask();
962 >        return ((ForkJoinWorkerThread) Thread.currentThread())
963 >            .peekTask();
964      }
965  
966      /**
967       * Unschedules and returns, without executing, the next task
968       * queued by the current thread but not yet executed.  This method
969       * is designed primarily to support extensions, and is unlikely to
970 <     * be useful otherwise.  This method may be invoked only from
968 <     * within ForkJoinTask computations. Attempts to invoke in other
969 <     * contexts result in exceptions or errors possibly including
970 <     * ClassCastException.
970 >     * be useful otherwise.
971       *
972 <     * @return the next task, or null if none are available
972 >     * <p>This method may be invoked only from within {@code
973 >     * ForkJoinTask} computations (as may be determined using method
974 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
975 >     * result in exceptions or errors, possibly including {@code
976 >     * ClassCastException}.
977 >     *
978 >     * @return the next task, or {@code null} if none are available
979       */
980      protected static ForkJoinTask<?> pollNextLocalTask() {
981 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).pollLocalTask();
981 >        return ((ForkJoinWorkerThread) Thread.currentThread())
982 >            .pollLocalTask();
983      }
984  
985      /**
# Line 983 | Line 990 | public abstract class ForkJoinTask<V> im
990       * {@code null} result does not necessarily imply quiescence
991       * of the pool this task is operating in.  This method is designed
992       * primarily to support extensions, and is unlikely to be useful
993 <     * otherwise.  This method may be invoked only from within
994 <     * ForkJoinTask computations. Attempts to invoke in other contexts
995 <     * result in exceptions or errors possibly including
996 <     * ClassCastException.
993 >     * otherwise.
994 >     *
995 >     * <p>This method may be invoked only from within {@code
996 >     * ForkJoinTask} computations (as may be determined using method
997 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
998 >     * result in exceptions or errors, possibly including {@code
999 >     * ClassCastException}.
1000       *
1001 <     * @return a task, or null if none are available
1001 >     * @return a task, or {@code null} if none are available
1002       */
1003      protected static ForkJoinTask<?> pollTask() {
1004 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).
1005 <            pollTask();
1004 >        return ((ForkJoinWorkerThread) Thread.currentThread())
1005 >            .pollTask();
1006 >    }
1007 >
1008 >    /**
1009 >     * Adaptor for Runnables. This implements RunnableFuture
1010 >     * to be compliant with AbstractExecutorService constraints
1011 >     * when used in ForkJoinPool.
1012 >     */
1013 >    static final class AdaptedRunnable<T> extends ForkJoinTask<T>
1014 >        implements RunnableFuture<T> {
1015 >        final Runnable runnable;
1016 >        final T resultOnCompletion;
1017 >        T result;
1018 >        AdaptedRunnable(Runnable runnable, T result) {
1019 >            if (runnable == null) throw new NullPointerException();
1020 >            this.runnable = runnable;
1021 >            this.resultOnCompletion = result;
1022 >        }
1023 >        public T getRawResult() { return result; }
1024 >        public void setRawResult(T v) { result = v; }
1025 >        public boolean exec() {
1026 >            runnable.run();
1027 >            result = resultOnCompletion;
1028 >            return true;
1029 >        }
1030 >        public void run() { invoke(); }
1031 >        private static final long serialVersionUID = 5232453952276885070L;
1032 >    }
1033 >
1034 >    /**
1035 >     * Adaptor for Callables
1036 >     */
1037 >    static final class AdaptedCallable<T> extends ForkJoinTask<T>
1038 >        implements RunnableFuture<T> {
1039 >        final Callable<? extends T> callable;
1040 >        T result;
1041 >        AdaptedCallable(Callable<? extends T> callable) {
1042 >            if (callable == null) throw new NullPointerException();
1043 >            this.callable = callable;
1044 >        }
1045 >        public T getRawResult() { return result; }
1046 >        public void setRawResult(T v) { result = v; }
1047 >        public boolean exec() {
1048 >            try {
1049 >                result = callable.call();
1050 >                return true;
1051 >            } catch (Error err) {
1052 >                throw err;
1053 >            } catch (RuntimeException rex) {
1054 >                throw rex;
1055 >            } catch (Exception ex) {
1056 >                throw new RuntimeException(ex);
1057 >            }
1058 >        }
1059 >        public void run() { invoke(); }
1060 >        private static final long serialVersionUID = 2838392045355241008L;
1061 >    }
1062 >
1063 >    /**
1064 >     * Returns a new {@code ForkJoinTask} that performs the {@code run}
1065 >     * method of the given {@code Runnable} as its action, and returns
1066 >     * a null result upon {@link #join}.
1067 >     *
1068 >     * @param runnable the runnable action
1069 >     * @return the task
1070 >     */
1071 >    public static ForkJoinTask<?> adapt(Runnable runnable) {
1072 >        return new AdaptedRunnable<Void>(runnable, null);
1073 >    }
1074 >
1075 >    /**
1076 >     * Returns a new {@code ForkJoinTask} that performs the {@code run}
1077 >     * method of the given {@code Runnable} as its action, and returns
1078 >     * the given result upon {@link #join}.
1079 >     *
1080 >     * @param runnable the runnable action
1081 >     * @param result the result upon completion
1082 >     * @return the task
1083 >     */
1084 >    public static <T> ForkJoinTask<T> adapt(Runnable runnable, T result) {
1085 >        return new AdaptedRunnable<T>(runnable, result);
1086 >    }
1087 >
1088 >    /**
1089 >     * Returns a new {@code ForkJoinTask} that performs the {@code call}
1090 >     * method of the given {@code Callable} as its action, and returns
1091 >     * its result upon {@link #join}, translating any checked exceptions
1092 >     * encountered into {@code RuntimeException}.
1093 >     *
1094 >     * @param callable the callable action
1095 >     * @return the task
1096 >     */
1097 >    public static <T> ForkJoinTask<T> adapt(Callable<? extends T> callable) {
1098 >        return new AdaptedCallable<T>(callable);
1099      }
1100  
1101      // Serialization support
# Line 1000 | Line 1103 | public abstract class ForkJoinTask<V> im
1103      private static final long serialVersionUID = -7721805057305804111L;
1104  
1105      /**
1106 <     * Save the state to a stream.
1106 >     * Saves the state to a stream (that is, serializes it).
1107       *
1108       * @serialData the current run status and the exception thrown
1109 <     * during execution, or null if none
1109 >     * during execution, or {@code null} if none
1110       * @param s the stream
1111       */
1112      private void writeObject(java.io.ObjectOutputStream s)
# Line 1013 | Line 1116 | public abstract class ForkJoinTask<V> im
1116      }
1117  
1118      /**
1119 <     * Reconstitute the instance from a stream.
1119 >     * Reconstitutes the instance from a stream (that is, deserializes it).
1120       *
1121       * @param s the stream
1122       */
1123      private void readObject(java.io.ObjectInputStream s)
1124          throws java.io.IOException, ClassNotFoundException {
1125          s.defaultReadObject();
1023        status &= ~INTERNAL_SIGNAL_MASK; // clear internal signal counts
1024        status |= EXTERNAL_SIGNAL; // conservatively set external signal
1126          Object ex = s.readObject();
1127          if (ex != null)
1128 <            setDoneExceptionally((Throwable)ex);
1128 >            setExceptionalCompletion((Throwable) ex);
1129 >    }
1130 >
1131 >    // Unsafe mechanics
1132 >
1133 >    private static final sun.misc.Unsafe UNSAFE = getUnsafe();
1134 >    private static final long statusOffset =
1135 >        objectFieldOffset("status", ForkJoinTask.class);
1136 >
1137 >    private static long objectFieldOffset(String field, Class<?> klazz) {
1138 >        try {
1139 >            return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field));
1140 >        } catch (NoSuchFieldException e) {
1141 >            // Convert Exception to corresponding Error
1142 >            NoSuchFieldError error = new NoSuchFieldError(field);
1143 >            error.initCause(e);
1144 >            throw error;
1145 >        }
1146      }
1147  
1148 <    // Temporary Unsafe mechanics for preliminary release
1149 <    private static Unsafe getUnsafe() throws Throwable {
1148 >    /**
1149 >     * Returns a sun.misc.Unsafe.  Suitable for use in a 3rd party package.
1150 >     * Replace with a simple call to Unsafe.getUnsafe when integrating
1151 >     * into a jdk.
1152 >     *
1153 >     * @return a sun.misc.Unsafe
1154 >     */
1155 >    private static sun.misc.Unsafe getUnsafe() {
1156          try {
1157 <            return Unsafe.getUnsafe();
1157 >            return sun.misc.Unsafe.getUnsafe();
1158          } catch (SecurityException se) {
1159              try {
1160                  return java.security.AccessController.doPrivileged
1161 <                    (new java.security.PrivilegedExceptionAction<Unsafe>() {
1162 <                        public Unsafe run() throws Exception {
1163 <                            return getUnsafePrivileged();
1161 >                    (new java.security
1162 >                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
1163 >                        public sun.misc.Unsafe run() throws Exception {
1164 >                            java.lang.reflect.Field f = sun.misc
1165 >                                .Unsafe.class.getDeclaredField("theUnsafe");
1166 >                            f.setAccessible(true);
1167 >                            return (sun.misc.Unsafe) f.get(null);
1168                          }});
1169              } catch (java.security.PrivilegedActionException e) {
1170 <                throw e.getCause();
1170 >                throw new RuntimeException("Could not initialize intrinsics",
1171 >                                           e.getCause());
1172              }
1173          }
1174      }
1046
1047    private static Unsafe getUnsafePrivileged()
1048            throws NoSuchFieldException, IllegalAccessException {
1049        Field f = Unsafe.class.getDeclaredField("theUnsafe");
1050        f.setAccessible(true);
1051        return (Unsafe) f.get(null);
1052    }
1053
1054    private static long fieldOffset(String fieldName)
1055            throws NoSuchFieldException {
1056        return _unsafe.objectFieldOffset
1057            (ForkJoinTask.class.getDeclaredField(fieldName));
1058    }
1059
1060    static final Unsafe _unsafe;
1061    static final long statusOffset;
1062
1063    static {
1064        try {
1065            _unsafe = getUnsafe();
1066            statusOffset = fieldOffset("status");
1067        } catch (Throwable e) {
1068            throw new RuntimeException("Could not initialize intrinsics", e);
1069        }
1070    }
1071
1175   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines