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.30 by dl, Sun Aug 2 22:28:23 2009 UTC vs.
Revision 1.52 by dl, Sat Jul 24 20:28:18 2010 UTC

# Line 12 | Line 12 | 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  
# Line 54 | Line 55 | import java.util.WeakHashMap;
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 join them. These exceptions may
59 < * additionally include RejectedExecutionExceptions stemming from
60 < * internal resource exhaustion such as failure to allocate internal
61 < * task queues.
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
70 < * equivalent to {@code fork(); join()} but always attempts to
71 < * begin execution in the current thread. The "<em>quiet</em>" forms
72 < * 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 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, typically {@link
# Line 85 | Line 95 | import java.util.WeakHashMap;
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 (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   * 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 < * {@link #exec}, {@link #setRawResult}, and
111 < * {@link #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
104 < * 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>This class provides {@code adapt} methods for {@link
124 < * java.lang.Runnable} and {@link java.util.concurrent.Callable}, that
125 < * may be of use when mixing execution of ForkJoinTasks with other
126 < * kinds of tasks. When all tasks are of this form, consider using a
117 < * pool in {@link ForkJoinPool#setAsyncMode}.
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
129 < * to be used in extensions such as remote execution frameworks. It is
130 < * in general sensible to serialize tasks only before or after, but
131 < * not during execution. Serialization is not relied on during
123 < * execution itself.
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.
148 >     */
149 >
150 >    /*
151 >     * The status field holds run control status bits packed into a
152 >     * single int to minimize footprint and to ensure atomicity (via
153 >     * CAS).  Status is initially zero, and takes on nonnegative
154 >     * values until completed, upon which status holds value
155 >     * COMPLETED. CANCELLED, or EXCEPTIONAL. Tasks undergoing blocking
156 >     * waits by other threads have the SIGNAL bit set.  Completion of
157 >     * a stolen task with SIGNAL set awakens any waiters via
158 >     * notifyAll. Even though suboptimal for some purposes, we use
159 >     * basic builtin wait/notify to take advantage of "monitor
160 >     * inflation" in JVMs that we would otherwise need to emulate to
161 >     * avoid adding further per-task bookkeeping overhead.  We want
162 >     * these monitors to be "fat", i.e., not use biasing or thin-lock
163 >     * techniques, so use some odd coding idioms that tend to avoid
164 >     * them.
165       */
166 +
167 +    /** Run status of this task */
168      volatile int status; // accessed directly by pool and workers
169  
170 <    static final int COMPLETION_MASK      = 0xe0000000;
171 <    static final int NORMAL               = 0xe0000000; // == mask
172 <    static final int CANCELLED            = 0xc0000000;
173 <    static final int EXCEPTIONAL          = 0xa0000000;
154 <    static final int SIGNAL_MASK          = 0x0000ffff;
155 <    static final int INTERNAL_SIGNAL_MASK = 0x00007fff;
156 <    static final int EXTERNAL_SIGNAL      = 0x00008000; // top bit of low word
170 >    private static final int NORMAL      = -1;
171 >    private static final int CANCELLED   = -2;
172 >    private static final int EXCEPTIONAL = -3;
173 >    private static final int SIGNAL      =  1;
174  
175      /**
176       * Table of exceptions thrown by tasks, to enable reporting by
# Line 167 | Line 184 | public abstract class ForkJoinTask<V> im
184          Collections.synchronizedMap
185          (new WeakHashMap<ForkJoinTask<?>, Throwable>());
186  
187 <    // within-package utilities
187 >    // Maintaining completion status
188  
189      /**
190 <     * Gets current worker thread, or null if not a worker thread.
191 <     */
175 <    static ForkJoinWorkerThread getWorker() {
176 <        Thread t = Thread.currentThread();
177 <        return ((t instanceof ForkJoinWorkerThread) ?
178 <                (ForkJoinWorkerThread) t : null);
179 <    }
180 <
181 <    final boolean casStatus(int cmp, int val) {
182 <        return UNSAFE.compareAndSwapInt(this, statusOffset, cmp, val);
183 <    }
184 <
185 <    /**
186 <     * Workaround for not being able to rethrow unchecked exceptions.
187 <     */
188 <    static void rethrowException(Throwable ex) {
189 <        if (ex != null)
190 <            UNSAFE.throwException(ex);
191 <    }
192 <
193 <    // Setting completion status
194 <
195 <    /**
196 <     * Marks completion and wakes up threads waiting to join this task.
190 >     * Marks completion and wakes up threads waiting to join this task,
191 >     * also clearing signal request bits.
192       *
193       * @param completion one of NORMAL, CANCELLED, EXCEPTIONAL
194 +     * @return status on exit
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) {
207 <                if ((s &= INTERNAL_SIGNAL_MASK) != 0)
208 <                    pool.updateRunningCount(s);
209 <                synchronized (this) { notifyAll(); }
196 >    private int 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 >                return completion;
203              }
204          }
205 <        else
213 <            externallySetCompletion(completion);
214 <    }
215 <
216 <    /**
217 <     * Version of setCompletion for non-FJ threads.  Leaves signal
218 <     * bits for unblocked threads to adjust, and always notifies.
219 <     */
220 <    private void externallySetCompletion(int completion) {
221 <        int s;
222 <        do {} while ((s = status) >= 0 &&
223 <                     !casStatus(s, (s & SIGNAL_MASK) | completion));
224 <        synchronized (this) { notifyAll(); }
225 <    }
226 <
227 <    /**
228 <     * Sets status to indicate normal completion.
229 <     */
230 <    final void setNormalCompletion() {
231 <        // Try typical fast case -- single CAS, no signal, not already done.
232 <        // Manually expand casStatus to improve chances of inlining it
233 <        if (!UNSAFE.compareAndSwapInt(this, statusOffset, 0, NORMAL))
234 <            setCompletion(NORMAL);
205 >        return s;
206      }
207  
237    // internal waiting and notification
238
208      /**
209 <     * Performs the actual monitor wait for awaitDone.
209 >     * Record exception and set exceptional completion
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
245 <        try {
246 <            while (status >= 0)
247 <                synchronized (this) { if (status >= 0) wait(); }
248 <        } catch (InterruptedException ie) {
249 <            onInterruptedWait();
250 <        }
212 >    private int setExceptionalCompletion(Throwable rex) {
213 >        exceptionMap.put(this, rex);
214 >        return setCompletion(EXCEPTIONAL);
215      }
216  
217      /**
218 <     * Performs the actual timed monitor wait for awaitDone.
218 >     * Blocks a worker thread until completion. Called only by pool.
219       */
220 <    private void doAwaitDone(long startTime, long nanos) {
221 <        synchronized (this) {
220 >    final void internalAwaitDone() {
221 >        int s;         // the odd construction reduces lock bias effects
222 >        while ((s = status) >= 0) {
223              try {
224 <                while (status >= 0) {
225 <                    long nt = nanos - (System.nanoTime() - startTime);
226 <                    if (nt <= 0)
262 <                        break;
263 <                    wait(nt / 1000000, (int) (nt % 1000000));
224 >                synchronized(this) {
225 >                    if (UNSAFE.compareAndSwapInt(this, statusOffset, s,SIGNAL))
226 >                        wait();
227                  }
228              } catch (InterruptedException ie) {
229 <                onInterruptedWait();
229 >                cancelIfTerminating();
230              }
231          }
232      }
233  
271    // Awaiting completion
272
234      /**
235 <     * Sets status to indicate there is joiner, then waits for join,
236 <     * surrounded with pool notifications.
276 <     *
277 <     * @return status upon exit
235 >     * Blocks a non-worker-thread until completion.
236 >     * @return status on exit
237       */
238 <    private int awaitDone(ForkJoinWorkerThread w,
280 <                          boolean maintainParallelism) {
281 <        ForkJoinPool pool = (w == null) ? null : w.pool;
238 >    private int externalAwaitDone() {
239          int s;
240          while ((s = status) >= 0) {
241 <            if (casStatus(s, (pool == null) ? s|EXTERNAL_SIGNAL : s+1)) {
242 <                if (pool == null || !pool.preJoin(this, maintainParallelism))
243 <                    doAwaitDone();
244 <                if (((s = status) & INTERNAL_SIGNAL_MASK) != 0)
245 <                    adjustPoolCountsOnUnblock(pool);
246 <                break;
247 <            }
248 <        }
249 <        return s;
250 <    }
251 <
252 <    /**
253 <     * Timed version of awaitDone
297 <     *
298 <     * @return status upon exit
299 <     */
300 <    private int awaitDone(ForkJoinWorkerThread w, long nanos) {
301 <        ForkJoinPool pool = (w == null) ? null : w.pool;
302 <        int s;
303 <        while ((s = status) >= 0) {
304 <            if (casStatus(s, (pool == null) ? s|EXTERNAL_SIGNAL : s+1)) {
305 <                long startTime = System.nanoTime();
306 <                if (pool == null || !pool.preJoin(this, false))
307 <                    doAwaitDone(startTime, nanos);
308 <                if ((s = status) >= 0) {
309 <                    adjustPoolCountsOnCancelledWait(pool);
310 <                    s = status;
241 >            synchronized(this) {
242 >                if (UNSAFE.compareAndSwapInt(this, statusOffset, s, SIGNAL)){
243 >                    boolean interrupted = false;
244 >                    while ((s = status) >= 0) {
245 >                        try {
246 >                            wait();
247 >                        } catch (InterruptedException ie) {
248 >                            interrupted = true;
249 >                        }
250 >                    }
251 >                    if (interrupted)
252 >                        Thread.currentThread().interrupt();
253 >                    break;
254                  }
312                if (s < 0 && (s & INTERNAL_SIGNAL_MASK) != 0)
313                    adjustPoolCountsOnUnblock(pool);
314                break;
255              }
256          }
257          return s;
258      }
259  
260      /**
261 <     * Notifies pool that thread is unblocked. Called by signalled
262 <     * threads when woken by non-FJ threads (which is atypical).
261 >     * Unless done, calls exec and records status if completed, but
262 >     * doesn't wait for completion otherwise. Primary execution method
263 >     * for ForkJoinWorkerThread.
264       */
265 <    private void adjustPoolCountsOnUnblock(ForkJoinPool pool) {
266 <        int s;
267 <        do {} while ((s = status) < 0 && !casStatus(s, s & COMPLETION_MASK));
268 <        if (pool != null && (s &= INTERNAL_SIGNAL_MASK) != 0)
269 <            pool.updateRunningCount(s);
265 >    final void tryExec() {
266 >        try {
267 >            if (status < 0 || !exec())
268 >                return;
269 >        } catch (Throwable rex) {
270 >            setExceptionalCompletion(rex);
271 >            return;
272 >        }
273 >        setCompletion(NORMAL); // must be outside try block
274      }
275  
276      /**
277 <     * Notifies pool to adjust counts on cancelled or timed out wait.
278 <     */
279 <    private void adjustPoolCountsOnCancelledWait(ForkJoinPool pool) {
280 <        if (pool != null) {
281 <            int s;
282 <            while ((s = status) >= 0 && (s & INTERNAL_SIGNAL_MASK) != 0) {
283 <                if (casStatus(s, s - 1)) {
284 <                    pool.updateRunningCount(1);
285 <                    break;
277 >     * If not done and this task is next in worker queue, runs it,
278 >     * else waits for it.
279 >     * @return status on exit
280 >     */
281 >    private int doJoin() {
282 >        int stat;
283 >        Thread t;
284 >        ForkJoinWorkerThread w;
285 >        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
286 >            if ((stat = status) < 0)
287 >                return stat;
288 >            if ((w = (ForkJoinWorkerThread) t).unpushTask(this)) {
289 >                boolean completed;
290 >                try {
291 >                    completed = exec();
292 >                } catch (Throwable rex) {
293 >                    return setExceptionalCompletion(rex);
294                  }
295 +                if (completed)
296 +                    return setCompletion(NORMAL);
297              }
298 +            return w.joinTask(this);
299          }
300 +        return externalAwaitDone();
301      }
302  
303      /**
304 <     * Handles interruptions during waits.
305 <     */
306 <    private void onInterruptedWait() {
350 <        ForkJoinWorkerThread w = getWorker();
351 <        if (w == null)
352 <            Thread.currentThread().interrupt(); // re-interrupt
353 <        else if (w.isTerminating())
354 <            cancelIgnoringExceptions();
355 <        // else if FJworker, ignore interrupt
356 <    }
357 <
358 <    // Recording and reporting exceptions
359 <
360 <    private void setDoneExceptionally(Throwable rex) {
361 <        exceptionMap.put(this, rex);
362 <        setCompletion(EXCEPTIONAL);
363 <    }
364 <
365 <    /**
366 <     * Throws the exception associated with status s.
367 <     *
368 <     * @throws the exception
369 <     */
370 <    private void reportException(int s) {
371 <        if ((s &= COMPLETION_MASK) < NORMAL) {
372 <            if (s == CANCELLED)
373 <                throw new CancellationException();
374 <            else
375 <                rethrowException(exceptionMap.get(this));
376 <        }
377 <    }
378 <
379 <    /**
380 <     * Returns result or throws exception using j.u.c.Future conventions.
381 <     * Only call when {@code isDone} known to be true.
382 <     */
383 <    private V reportFutureResult()
384 <        throws ExecutionException, InterruptedException {
385 <        int s = status & COMPLETION_MASK;
386 <        if (s < NORMAL) {
387 <            Throwable ex;
388 <            if (s == CANCELLED)
389 <                throw new CancellationException();
390 <            if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
391 <                throw new ExecutionException(ex);
392 <            if (Thread.interrupted())
393 <                throw new InterruptedException();
394 <        }
395 <        return getRawResult();
396 <    }
397 <
398 <    /**
399 <     * Returns result or throws exception using j.u.c.Future conventions
400 <     * with timeouts.
304 >     * Unless done, calls exec and records status if completed, or
305 >     * waits for completion otherwise.
306 >     * @return status on exit
307       */
308 <    private V reportTimedFutureResult()
309 <        throws InterruptedException, ExecutionException, TimeoutException {
310 <        Throwable ex;
311 <        int s = status & COMPLETION_MASK;
406 <        if (s == NORMAL)
407 <            return getRawResult();
408 <        if (s == CANCELLED)
409 <            throw new CancellationException();
410 <        if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
411 <            throw new ExecutionException(ex);
412 <        if (Thread.interrupted())
413 <            throw new InterruptedException();
414 <        throw new TimeoutException();
415 <    }
416 <
417 <    // internal execution methods
418 <
419 <    /**
420 <     * Calls exec, recording completion, and rethrowing exception if
421 <     * encountered. Caller should normally check status before calling.
422 <     *
423 <     * @return true if completed normally
424 <     */
425 <    private boolean tryExec() {
426 <        try { // try block must contain only call to exec
427 <            if (!exec())
428 <                return false;
429 <        } catch (Throwable rex) {
430 <            setDoneExceptionally(rex);
431 <            rethrowException(rex);
432 <            return false; // not reached
433 <        }
434 <        setNormalCompletion();
435 <        return true;
436 <    }
437 <
438 <    /**
439 <     * Main execution method used by worker threads. Invokes
440 <     * base computation unless already complete.
441 <     */
442 <    final void quietlyExec() {
443 <        if (status >= 0) {
308 >    private int doInvoke() {
309 >        int stat;
310 >        if ((stat = status) >= 0) {
311 >            boolean completed;
312              try {
313 <                if (!exec())
446 <                    return;
313 >                completed = exec();
314              } catch (Throwable rex) {
315 <                setDoneExceptionally(rex);
449 <                return;
315 >                return setExceptionalCompletion(rex);
316              }
317 <            setNormalCompletion();
452 <        }
453 <    }
454 <
455 <    /**
456 <     * Calls exec(), recording but not rethrowing exception.
457 <     * Caller should normally check status before calling.
458 <     *
459 <     * @return true if completed normally
460 <     */
461 <    private boolean tryQuietlyInvoke() {
462 <        try {
463 <            if (!exec())
464 <                return false;
465 <        } catch (Throwable rex) {
466 <            setDoneExceptionally(rex);
467 <            return false;
317 >            stat = completed ? setCompletion(NORMAL) : doJoin();
318          }
319 <        setNormalCompletion();
470 <        return true;
319 >        return stat;
320      }
321  
322      /**
323 <     * Cancels, ignoring any exceptions it throws.
323 >     * Returns result or throws exception associated with given status.
324 >     * @param s the status
325       */
326 <    final void cancelIgnoringExceptions() {
327 <        try {
328 <            cancel(false);
329 <        } catch (Throwable ignore) {
330 <        }
481 <    }
482 <
483 <    /**
484 <     * Main implementation of helpJoin
485 <     */
486 <    private int busyJoin(ForkJoinWorkerThread w) {
487 <        int s;
488 <        ForkJoinTask<?> t;
489 <        while ((s = status) >= 0 && (t = w.scanWhileJoining(this)) != null)
490 <            t.quietlyExec();
491 <        return (s >= 0) ? awaitDone(w, false) : s; // block if no work
326 >    private V reportResult(int s) {
327 >        Throwable ex;
328 >        if (s < NORMAL && (ex = getException()) != null)
329 >            UNSAFE.throwException(ex);
330 >        return getRawResult();
331      }
332  
333      // public methods
# Line 496 | Line 335 | public abstract class ForkJoinTask<V> im
335      /**
336       * Arranges to asynchronously execute this task.  While it is not
337       * necessarily enforced, it is a usage error to fork a task more
338 <     * than once unless it has completed and been reinitialized.  This
339 <     * method may be invoked only from within ForkJoinTask
340 <     * computations (as may be determined using method {@link
341 <     * #inForkJoinPool}). Attempts to invoke in other contexts result
342 <     * in exceptions or errors, possibly including ClassCastException.
338 >     * than once unless it has completed and been reinitialized.
339 >     * Subsequent modifications to the state of this task or any data
340 >     * it operates on are not necessarily consistently observable by
341 >     * any thread other than the one executing it unless preceded by a
342 >     * call to {@link #join} or related methods, or a call to {@link
343 >     * #isDone} returning {@code true}.
344 >     *
345 >     * <p>This method may be invoked only from within {@code
346 >     * ForkJoinTask} computations (as may be determined using method
347 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
348 >     * result in exceptions or errors, possibly including {@code
349 >     * ClassCastException}.
350       *
351 <     * @return {@code this}, to simplify usage.
351 >     * @return {@code this}, to simplify usage
352       */
353      public final ForkJoinTask<V> fork() {
354          ((ForkJoinWorkerThread) Thread.currentThread())
# Line 511 | Line 357 | public abstract class ForkJoinTask<V> im
357      }
358  
359      /**
360 <     * Returns the result of the computation when it is ready.
361 <     * This method differs from {@code get} in that abnormal
362 <     * completion results in RuntimeExceptions or Errors, not
363 <     * ExecutionExceptions.
360 >     * Returns the result of the computation when it {@link #isDone is done}.
361 >     * This method differs from {@link #get()} in that
362 >     * abnormal completion results in {@code RuntimeException} or
363 >     * {@code Error}, not {@code ExecutionException}.
364       *
365       * @return the computed result
366       */
367      public final V join() {
368 <        ForkJoinWorkerThread w = getWorker();
523 <        if (w == null || status < 0 || !w.unpushTask(this) || !tryExec())
524 <            reportException(awaitDone(w, true));
525 <        return getRawResult();
368 >        return reportResult(doJoin());
369      }
370  
371      /**
372       * Commences performing this task, awaits its completion if
373 <     * necessary, and return its result.
373 >     * necessary, and return its result, or throws an (unchecked)
374 >     * exception if the underlying computation did so.
375       *
532     * @throws Throwable (a RuntimeException, Error, or unchecked
533     * exception) if the underlying computation did so
376       * @return the computed result
377       */
378      public final V invoke() {
379 <        if (status >= 0 && tryExec())
538 <            return getRawResult();
539 <        else
540 <            return join();
379 >        return reportResult(doInvoke());
380      }
381  
382      /**
383       * Forks the given tasks, returning when {@code isDone} holds for
384 <     * each task or an exception is encountered. This method may be
385 <     * invoked only from within ForkJoinTask computations (as may be
386 <     * determined using method {@link #inForkJoinPool}). Attempts to
387 <     * invoke in other contexts result in exceptions or errors,
388 <     * possibly including ClassCastException.
384 >     * each task or an (unchecked) exception is encountered, in which
385 >     * case the exception is rethrown.  If either task encounters an
386 >     * exception, the other one may be, but is not guaranteed to be,
387 >     * cancelled.  If both tasks throw an exception, then this method
388 >     * throws one of them.  The individual status of each task may be
389 >     * checked using {@link #getException()} and related methods.
390 >     *
391 >     * <p>This method may be invoked only from within {@code
392 >     * ForkJoinTask} computations (as may be determined using method
393 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
394 >     * result in exceptions or errors, possibly including {@code
395 >     * ClassCastException}.
396       *
397       * @param t1 the first task
398       * @param t2 the second task
399       * @throws NullPointerException if any task is null
554     * @throws RuntimeException or Error if a task did so
400       */
401 <    public static void invokeAll(ForkJoinTask<?>t1, ForkJoinTask<?> t2) {
401 >    public static void invokeAll(ForkJoinTask<?> t1, ForkJoinTask<?> t2) {
402          t2.fork();
403          t1.invoke();
404          t2.join();
# Line 561 | Line 406 | public abstract class ForkJoinTask<V> im
406  
407      /**
408       * Forks the given tasks, returning when {@code isDone} holds for
409 <     * each task or an exception is encountered. If any task
410 <     * encounters an exception, others may be, but are not guaranteed
411 <     * to be, cancelled.  This method may be invoked only from within
412 <     * ForkJoinTask computations (as may be determined using method
413 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
414 <     * result in exceptions or errors, possibly including
415 <     * ClassCastException.
416 <     *
417 <     * Overloadings of this method exist for the special cases
418 <     * of one to four arguments.
409 >     * each task or an (unchecked) exception is encountered, in which
410 >     * case the exception is rethrown. If any task encounters an
411 >     * exception, others may be, but are not guaranteed to be,
412 >     * cancelled.  If more than one task encounters an exception, then
413 >     * this method throws any one of these exceptions.  The individual
414 >     * status of each task may be checked using {@link #getException()}
415 >     * and related methods.
416 >     *
417 >     * <p>This method may be invoked only from within {@code
418 >     * ForkJoinTask} computations (as may be determined using method
419 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
420 >     * result in exceptions or errors, possibly including {@code
421 >     * ClassCastException}.
422       *
423       * @param tasks the tasks
424 <     * @throws NullPointerException if tasks or any element are null
577 <     * @throws RuntimeException or Error if any task did so
424 >     * @throws NullPointerException if any task is null
425       */
426      public static void invokeAll(ForkJoinTask<?>... tasks) {
427          Throwable ex = null;
# Line 587 | Line 434 | public abstract class ForkJoinTask<V> im
434              }
435              else if (i != 0)
436                  t.fork();
437 <            else {
438 <                t.quietlyInvoke();
592 <                if (ex == null)
593 <                    ex = t.getException();
594 <            }
437 >            else if (t.doInvoke() < NORMAL && ex == null)
438 >                ex = t.getException();
439          }
440          for (int i = 1; i <= last; ++i) {
441              ForkJoinTask<?> t = tasks[i];
442              if (t != null) {
443                  if (ex != null)
444                      t.cancel(false);
445 <                else {
446 <                    t.quietlyJoin();
603 <                    if (ex == null)
604 <                        ex = t.getException();
605 <                }
445 >                else if (t.doJoin() < NORMAL && ex == null)
446 >                    ex = t.getException();
447              }
448          }
449          if (ex != null)
450 <            rethrowException(ex);
450 >            UNSAFE.throwException(ex);
451      }
452  
453      /**
454 <     * Forks all tasks in the collection, returning when {@code
455 <     * isDone} holds for each task or an exception is encountered. If
456 <     * any task encounters an exception, others may be, but are not
457 <     * guaranteed to be, cancelled.  This method may be invoked only
458 <     * from within ForkJoinTask computations (as may be determined
459 <     * using method {@link #inForkJoinPool}). Attempts to invoke in
460 <     * other contexts result in exceptions or errors, possibly
461 <     * including ClassCastException.
454 >     * Forks all tasks in the specified collection, returning when
455 >     * {@code isDone} holds for each task or an (unchecked) exception
456 >     * is encountered.  If any task encounters an exception, others
457 >     * may be, but are not guaranteed to be, cancelled.  If more than
458 >     * one task encounters an exception, then this method throws any
459 >     * one of these exceptions.  The individual status of each task
460 >     * may be checked using {@link #getException()} and related
461 >     * methods.  The behavior of this operation is undefined if the
462 >     * specified collection is modified while the operation is in
463 >     * progress.
464 >     *
465 >     * <p>This method may be invoked only from within {@code
466 >     * ForkJoinTask} computations (as may be determined using method
467 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
468 >     * result in exceptions or errors, possibly including {@code
469 >     * ClassCastException}.
470       *
471       * @param tasks the collection of tasks
472       * @return the tasks argument, to simplify usage
473       * @throws NullPointerException if tasks or any element are null
625     * @throws RuntimeException or Error if any task did so
474       */
475      public static <T extends ForkJoinTask<?>> Collection<T> invokeAll(Collection<T> tasks) {
476 <        if (!(tasks instanceof List<?>)) {
476 >        if (!(tasks instanceof RandomAccess) || !(tasks instanceof List<?>)) {
477              invokeAll(tasks.toArray(new ForkJoinTask<?>[tasks.size()]));
478              return tasks;
479          }
# Line 642 | Line 490 | public abstract class ForkJoinTask<V> im
490              }
491              else if (i != 0)
492                  t.fork();
493 <            else {
494 <                t.quietlyInvoke();
647 <                if (ex == null)
648 <                    ex = t.getException();
649 <            }
493 >            else if (t.doInvoke() < NORMAL && ex == null)
494 >                ex = t.getException();
495          }
496          for (int i = 1; i <= last; ++i) {
497              ForkJoinTask<?> t = ts.get(i);
498              if (t != null) {
499                  if (ex != null)
500                      t.cancel(false);
501 <                else {
502 <                    t.quietlyJoin();
658 <                    if (ex == null)
659 <                        ex = t.getException();
660 <                }
501 >                else if (t.doJoin() < NORMAL && ex == null)
502 >                    ex = t.getException();
503              }
504          }
505          if (ex != null)
506 <            rethrowException(ex);
506 >            UNSAFE.throwException(ex);
507          return tasks;
508      }
509  
510      /**
511 <     * Returns {@code true} if the computation performed by this task
512 <     * has completed (or has been cancelled).
513 <     *
514 <     * @return {@code true} if this computation has completed
515 <     */
516 <    public final boolean isDone() {
517 <        return status < 0;
676 <    }
677 <
678 <    /**
679 <     * Returns {@code true} if this task was cancelled.
680 <     *
681 <     * @return {@code true} if this task was cancelled
682 <     */
683 <    public final boolean isCancelled() {
684 <        return (status & COMPLETION_MASK) == CANCELLED;
685 <    }
686 <
687 <    /**
688 <     * Asserts that the results of this task's computation will not be
689 <     * used. If a cancellation occurs before attempting to execute this
690 <     * task, execution will be suppressed, {@link #isCancelled}
691 <     * will report true, and {@link #join} will result in a
692 <     * {@code CancellationException} being thrown. Otherwise, when
693 <     * cancellation races with completion, there are no guarantees
694 <     * about whether {@code isCancelled} will report {@code true},
695 <     * whether {@code join} will return normally or via an exception,
696 <     * or whether these behaviors will remain consistent upon repeated
697 <     * invocation.
511 >     * Attempts to cancel execution of this task. This attempt will
512 >     * fail if the task has already completed, has already been
513 >     * cancelled, or could not be cancelled for some other reason. If
514 >     * successful, and this task has not started when cancel is
515 >     * called, execution of this task is suppressed, {@link
516 >     * #isCancelled} will report true, and {@link #join} will result
517 >     * in a {@code CancellationException} being thrown.
518       *
519       * <p>This method may be overridden in subclasses, but if so, must
520       * still ensure that these minimal properties hold. In particular,
# Line 706 | Line 526 | public abstract class ForkJoinTask<V> im
526       * invoke {@link #completeExceptionally}.
527       *
528       * @param mayInterruptIfRunning this value is ignored in the
529 <     * default implementation because tasks are not in general
529 >     * default implementation because tasks are not
530       * cancelled via interruption
531       *
532       * @return {@code true} if this task is now cancelled
533       */
534      public boolean cancel(boolean mayInterruptIfRunning) {
535 <        setCompletion(CANCELLED);
536 <        return (status & COMPLETION_MASK) == CANCELLED;
535 >        return setCompletion(CANCELLED) == CANCELLED;
536 >    }
537 >
538 >    /**
539 >     * Cancels, ignoring any exceptions thrown by cancel. Used during
540 >     * worker and pool shutdown. Cancel is spec'ed not to throw any
541 >     * exceptions, but if it does anyway, we have no recourse during
542 >     * shutdown, so guard against this case.
543 >     */
544 >    final void cancelIgnoringExceptions() {
545 >        try {
546 >            cancel(false);
547 >        } catch (Throwable ignore) {
548 >        }
549 >    }
550 >
551 >    /**
552 >     * Cancels ignoring exceptions if worker is terminating
553 >     */
554 >    final void cancelIfTerminating() {
555 >        Thread t = Thread.currentThread();
556 >        if ((t instanceof ForkJoinWorkerThread) &&
557 >            ((ForkJoinWorkerThread) t).isTerminating()) {
558 >            try {
559 >                cancel(false);
560 >            } catch (Throwable ignore) {
561 >            }
562 >        }
563 >    }
564 >
565 >    public final boolean isDone() {
566 >        return status < 0;
567 >    }
568 >
569 >    public final boolean isCancelled() {
570 >        return status == CANCELLED;
571      }
572  
573      /**
# Line 722 | Line 576 | public abstract class ForkJoinTask<V> im
576       * @return {@code true} if this task threw an exception or was cancelled
577       */
578      public final boolean isCompletedAbnormally() {
579 <        return (status & COMPLETION_MASK) < NORMAL;
579 >        return status < NORMAL;
580 >    }
581 >
582 >    /**
583 >     * Returns {@code true} if this task completed without throwing an
584 >     * exception and was not cancelled.
585 >     *
586 >     * @return {@code true} if this task completed without throwing an
587 >     * exception and was not cancelled
588 >     */
589 >    public final boolean isCompletedNormally() {
590 >        return status == NORMAL;
591      }
592  
593      /**
# Line 733 | Line 598 | public abstract class ForkJoinTask<V> im
598       * @return the exception, or {@code null} if none
599       */
600      public final Throwable getException() {
601 <        int s = status & COMPLETION_MASK;
602 <        if (s >= NORMAL)
603 <            return null;
604 <        if (s == CANCELLED)
740 <            return new CancellationException();
741 <        return exceptionMap.get(this);
601 >        int s = status;
602 >        return ((s >= NORMAL)    ? null :
603 >                (s == CANCELLED) ? new CancellationException() :
604 >                exceptionMap.get(this));
605      }
606  
607      /**
# Line 751 | Line 614 | public abstract class ForkJoinTask<V> im
614       * overridable, but overridden versions must invoke {@code super}
615       * implementation to maintain guarantees.
616       *
617 <     * @param ex the exception to throw. If this exception is
618 <     * not a RuntimeException or Error, the actual exception thrown
619 <     * will be a RuntimeException with cause ex.
617 >     * @param ex the exception to throw. If this exception is not a
618 >     * {@code RuntimeException} or {@code Error}, the actual exception
619 >     * thrown will be a {@code RuntimeException} with cause {@code ex}.
620       */
621      public void completeExceptionally(Throwable ex) {
622 <        setDoneExceptionally((ex instanceof RuntimeException) ||
623 <                             (ex instanceof Error) ? ex :
624 <                             new RuntimeException(ex));
622 >        setExceptionalCompletion((ex instanceof RuntimeException) ||
623 >                                 (ex instanceof Error) ? ex :
624 >                                 new RuntimeException(ex));
625      }
626  
627      /**
# Line 777 | Line 640 | public abstract class ForkJoinTask<V> im
640          try {
641              setRawResult(value);
642          } catch (Throwable rex) {
643 <            setDoneExceptionally(rex);
643 >            setExceptionalCompletion(rex);
644              return;
645          }
646 <        setNormalCompletion();
646 >        setCompletion(NORMAL);
647      }
648  
649      public final V get() throws InterruptedException, ExecutionException {
650 <        ForkJoinWorkerThread w = getWorker();
651 <        if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
652 <            awaitDone(w, true);
653 <        return reportFutureResult();
650 >        int s = doJoin();
651 >        if (Thread.interrupted())
652 >            throw new InterruptedException();
653 >        if (s < NORMAL) {
654 >            Throwable ex;
655 >            if (s == CANCELLED)
656 >                throw new CancellationException();
657 >            if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
658 >                throw new ExecutionException(ex);
659 >        }
660 >        return getRawResult();
661      }
662  
663      public final V get(long timeout, TimeUnit unit)
664          throws InterruptedException, ExecutionException, TimeoutException {
665 <        long nanos = unit.toNanos(timeout);
666 <        ForkJoinWorkerThread w = getWorker();
667 <        if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
668 <            awaitDone(w, nanos);
669 <        return reportTimedFutureResult();
670 <    }
671 <
672 <    /**
673 <     * Possibly executes other tasks until this task is ready, then
674 <     * returns the result of the computation.  This method may be more
675 <     * efficient than {@code join}, but is only applicable when
676 <     * there are no potential dependencies between continuation of the
677 <     * current task and that of any other task that might be executed
678 <     * while helping. (This usually holds for pure divide-and-conquer
679 <     * tasks). This method may be invoked only from within
680 <     * ForkJoinTask computations (as may be determined using method
681 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
682 <     * result in exceptions or errors, possibly including
683 <     * ClassCastException.
684 <     *
685 <     * @return the computed result
686 <     */
687 <    public final V helpJoin() {
688 <        ForkJoinWorkerThread w = (ForkJoinWorkerThread) Thread.currentThread();
689 <        if (status < 0 || !w.unpushTask(this) || !tryExec())
690 <            reportException(busyJoin(w));
691 <        return getRawResult();
692 <    }
693 <
694 <    /**
695 <     * Possibly executes other tasks until this task is ready.  This
696 <     * method may be invoked only from within ForkJoinTask
697 <     * computations (as may be determined using method {@link
698 <     * #inForkJoinPool}). Attempts to invoke in other contexts result
699 <     * in exceptions or errors, possibly including ClassCastException.
700 <     */
701 <    public final void quietlyHelpJoin() {
702 <        if (status >= 0) {
703 <            ForkJoinWorkerThread w =
704 <                (ForkJoinWorkerThread) Thread.currentThread();
705 <            if (!w.unpushTask(this) || !tryQuietlyInvoke())
706 <                busyJoin(w);
665 >        Thread t = Thread.currentThread();
666 >        ForkJoinPool pool;
667 >        if (t instanceof ForkJoinWorkerThread) {
668 >            ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
669 >            if (status >= 0 && w.unpushTask(this))
670 >                tryExec();
671 >            pool = w.pool;
672 >        }
673 >        else
674 >            pool = null;
675 >        /*
676 >         * Timed wait loop intermixes cases for FJ (pool != null) and
677 >         * non FJ threads. For FJ, decrement pool count but don't try
678 >         * for replacement; increment count on completion. For non-FJ,
679 >         * deal with interrupts. This is messy, but a little less so
680 >         * than is splitting the FJ and nonFJ cases.
681 >         */
682 >        boolean interrupted = false;
683 >        boolean dec = false; // true if pool count decremented
684 >        for (;;) {
685 >            if (Thread.interrupted() && pool == null) {
686 >                interrupted = true;
687 >                break;
688 >            }
689 >            int s = status;
690 >            if (s < 0)
691 >                break;
692 >            if (UNSAFE.compareAndSwapInt(this, statusOffset, s, SIGNAL)) {
693 >                long startTime = System.nanoTime();
694 >                long nanos = unit.toNanos(timeout);
695 >                long nt; // wait time
696 >                while (status >= 0 &&
697 >                       (nt = nanos - (System.nanoTime() - startTime)) > 0) {
698 >                    if (pool != null && !dec)
699 >                        dec = pool.tryDecrementRunningCount();
700 >                    else {
701 >                        long ms = nt / 1000000;
702 >                        int ns = (int) (nt % 1000000);
703 >                        try {
704 >                            synchronized(this) {
705 >                                if (status >= 0)
706 >                                    wait(ms, ns);
707 >                            }
708 >                        } catch (InterruptedException ie) {
709 >                            if (pool != null)
710 >                                cancelIfTerminating();
711 >                            else {
712 >                                interrupted = true;
713 >                                break;
714 >                            }
715 >                        }
716 >                    }
717 >                }
718 >                break;
719 >            }
720 >        }
721 >        if (pool != null && dec)
722 >            pool.incrementRunningCount();
723 >        if (interrupted)
724 >            throw new InterruptedException();
725 >        int es = status;
726 >        if (es != NORMAL) {
727 >            Throwable ex;
728 >            if (es == CANCELLED)
729 >                throw new CancellationException();
730 >            if (es == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
731 >                throw new ExecutionException(ex);
732 >            throw new TimeoutException();
733          }
734 +        return getRawResult();
735      }
736  
737      /**
# Line 844 | Line 741 | public abstract class ForkJoinTask<V> im
741       * known to have aborted.
742       */
743      public final void quietlyJoin() {
744 <        if (status >= 0) {
848 <            ForkJoinWorkerThread w = getWorker();
849 <            if (w == null || !w.unpushTask(this) || !tryQuietlyInvoke())
850 <                awaitDone(w, true);
851 <        }
744 >        doJoin();
745      }
746  
747      /**
# Line 859 | Line 752 | public abstract class ForkJoinTask<V> im
752       * known to have aborted.
753       */
754      public final void quietlyInvoke() {
755 <        if (status >= 0 && !tryQuietlyInvoke())
863 <            quietlyJoin();
755 >        doInvoke();
756      }
757  
758      /**
759       * Possibly executes tasks until the pool hosting the current task
760 <     * {@link ForkJoinPool#isQuiescent}. This method may be of use in
761 <     * designs in which many tasks are forked, but none are explicitly
762 <     * joined, instead executing them until all are processed.  This
763 <     * method may be invoked only from within ForkJoinTask
764 <     * computations (as may be determined using method {@link
765 <     * #inForkJoinPool}). Attempts to invoke in other contexts result
766 <     * in exceptions or errors, possibly including ClassCastException.
760 >     * {@link ForkJoinPool#isQuiescent is quiescent}. This method may
761 >     * be of use in designs in which many tasks are forked, but none
762 >     * are explicitly joined, instead executing them until all are
763 >     * processed.
764 >     *
765 >     * <p>This method may be invoked only from within {@code
766 >     * ForkJoinTask} computations (as may be determined using method
767 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
768 >     * result in exceptions or errors, possibly including {@code
769 >     * ClassCastException}.
770       */
771      public static void helpQuiesce() {
772          ((ForkJoinWorkerThread) Thread.currentThread())
# Line 889 | Line 784 | public abstract class ForkJoinTask<V> im
784       * pre-constructed trees of subtasks in loops.
785       */
786      public void reinitialize() {
787 <        if ((status & COMPLETION_MASK) == EXCEPTIONAL)
787 >        if (status == EXCEPTIONAL)
788              exceptionMap.remove(this);
789          status = 0;
790      }
# Line 924 | Line 819 | public abstract class ForkJoinTask<V> im
819       * by the current thread, and has not commenced executing in
820       * another thread.  This method may be useful when arranging
821       * alternative local processing of tasks that could have been, but
822 <     * were not, stolen. This method may be invoked only from within
823 <     * ForkJoinTask computations (as may be determined using method
824 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
825 <     * result in exceptions or errors, possibly including
826 <     * ClassCastException.
822 >     * were not, stolen.
823 >     *
824 >     * <p>This method may be invoked only from within {@code
825 >     * ForkJoinTask} computations (as may be determined using method
826 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
827 >     * result in exceptions or errors, possibly including {@code
828 >     * ClassCastException}.
829       *
830       * @return {@code true} if unforked
831       */
# Line 941 | Line 838 | public abstract class ForkJoinTask<V> im
838       * Returns an estimate of the number of tasks that have been
839       * forked by the current worker thread but not yet executed. This
840       * value may be useful for heuristic decisions about whether to
841 <     * fork other tasks.  This method may be invoked only from within
842 <     * ForkJoinTask computations (as may be determined using method
843 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
844 <     * result in exceptions or errors, possibly including
845 <     * ClassCastException.
841 >     * fork other tasks.
842 >     *
843 >     * <p>This method may be invoked only from within {@code
844 >     * ForkJoinTask} computations (as may be determined using method
845 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
846 >     * result in exceptions or errors, possibly including {@code
847 >     * ClassCastException}.
848 >     *
849       * @return the number of tasks
850       */
851      public static int getQueuedTaskCount() {
# Line 961 | Line 861 | public abstract class ForkJoinTask<V> im
861       * usages of ForkJoinTasks, at steady state, each worker should
862       * aim to maintain a small constant surplus (for example, 3) of
863       * tasks, and to process computations locally if this threshold is
864 <     * exceeded.  This method may be invoked only from within
865 <     * ForkJoinTask computations (as may be determined using method
866 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
867 <     * result in exceptions or errors, possibly including
868 <     * ClassCastException.
864 >     * exceeded.
865 >     *
866 >     * <p>This method may be invoked only from within {@code
867 >     * ForkJoinTask} computations (as may be determined using method
868 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
869 >     * result in exceptions or errors, possibly including {@code
870 >     * ClassCastException}.
871 >     *
872       * @return the surplus number of tasks, which may be negative
873       */
874      public static int getSurplusQueuedTaskCount() {
# Line 1001 | Line 904 | public abstract class ForkJoinTask<V> im
904       * called otherwise. The return value controls whether this task
905       * is considered to be done normally. It may return false in
906       * asynchronous actions that require explicit invocations of
907 <     * {@link #complete} to become joinable. It may throw exceptions
908 <     * to indicate abnormal exit.
907 >     * {@link #complete} to become joinable. It may also throw an
908 >     * (unchecked) exception to indicate abnormal exit.
909       *
910       * @return {@code true} if completed normally
1008     * @throws Error or RuntimeException if encountered during computation
911       */
912      protected abstract boolean exec();
913  
# Line 1017 | Line 919 | public abstract class ForkJoinTask<V> im
919       * null even if a task exists but cannot be accessed without
920       * contention with other threads.  This method is designed
921       * primarily to support extensions, and is unlikely to be useful
922 <     * otherwise.  This method may be invoked only from within
923 <     * ForkJoinTask computations (as may be determined using method
924 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
925 <     * result in exceptions or errors, possibly including
926 <     * ClassCastException.
922 >     * otherwise.
923 >     *
924 >     * <p>This method may be invoked only from within {@code
925 >     * ForkJoinTask} computations (as may be determined using method
926 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
927 >     * result in exceptions or errors, possibly including {@code
928 >     * ClassCastException}.
929       *
930       * @return the next task, or {@code null} if none are available
931       */
# Line 1034 | Line 938 | public abstract class ForkJoinTask<V> im
938       * Unschedules and returns, without executing, the next task
939       * queued by the current thread but not yet executed.  This method
940       * is designed primarily to support extensions, and is unlikely to
941 <     * be useful otherwise.  This method may be invoked only from
942 <     * within ForkJoinTask computations (as may be determined using
943 <     * method {@link #inForkJoinPool}). Attempts to invoke in other
944 <     * contexts result in exceptions or errors, possibly including
945 <     * ClassCastException.
941 >     * be useful otherwise.
942 >     *
943 >     * <p>This method may be invoked only from within {@code
944 >     * ForkJoinTask} computations (as may be determined using method
945 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
946 >     * result in exceptions or errors, possibly including {@code
947 >     * ClassCastException}.
948       *
949       * @return the next task, or {@code null} if none are available
950       */
# Line 1055 | Line 961 | public abstract class ForkJoinTask<V> im
961       * {@code null} result does not necessarily imply quiescence
962       * of the pool this task is operating in.  This method is designed
963       * primarily to support extensions, and is unlikely to be useful
964 <     * otherwise.  This method may be invoked only from within
965 <     * ForkJoinTask computations (as may be determined using method
966 <     * {@link #inForkJoinPool}). Attempts to invoke in other contexts
967 <     * result in exceptions or errors, possibly including
968 <     * ClassCastException.
964 >     * otherwise.
965 >     *
966 >     * <p>This method may be invoked only from within {@code
967 >     * ForkJoinTask} computations (as may be determined using method
968 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
969 >     * result in exceptions or errors, possibly including {@code
970 >     * ClassCastException}.
971       *
972       * @return a task, or {@code null} if none are available
973       */
# Line 1124 | Line 1032 | public abstract class ForkJoinTask<V> im
1032      }
1033  
1034      /**
1035 <     * Returns a new ForkJoinTask that performs the {@code run}
1036 <     * method of the given Runnable as its action, and returns a null
1037 <     * result upon {@code join}.
1035 >     * Returns a new {@code ForkJoinTask} that performs the {@code run}
1036 >     * method of the given {@code Runnable} as its action, and returns
1037 >     * a null result upon {@link #join}.
1038       *
1039       * @param runnable the runnable action
1040       * @return the task
# Line 1136 | Line 1044 | public abstract class ForkJoinTask<V> im
1044      }
1045  
1046      /**
1047 <     * Returns a new ForkJoinTask that performs the {@code run}
1048 <     * method of the given Runnable as its action, and returns the
1049 <     * given result upon {@code join}.
1047 >     * Returns a new {@code ForkJoinTask} that performs the {@code run}
1048 >     * method of the given {@code Runnable} as its action, and returns
1049 >     * the given result upon {@link #join}.
1050       *
1051       * @param runnable the runnable action
1052       * @param result the result upon completion
# Line 1149 | Line 1057 | public abstract class ForkJoinTask<V> im
1057      }
1058  
1059      /**
1060 <     * Returns a new ForkJoinTask that performs the {@code call}
1061 <     * method of the given Callable as its action, and returns its
1062 <     * result upon {@code join}, translating any checked
1063 <     * exceptions encountered into {@code RuntimeException}.
1060 >     * Returns a new {@code ForkJoinTask} that performs the {@code call}
1061 >     * method of the given {@code Callable} as its action, and returns
1062 >     * its result upon {@link #join}, translating any checked exceptions
1063 >     * encountered into {@code RuntimeException}.
1064       *
1065       * @param callable the callable action
1066       * @return the task
# Line 1166 | Line 1074 | public abstract class ForkJoinTask<V> im
1074      private static final long serialVersionUID = -7721805057305804111L;
1075  
1076      /**
1077 <     * Save the state to a stream.
1077 >     * Saves the state to a stream.
1078       *
1079       * @serialData the current run status and the exception thrown
1080       * during execution, or {@code null} if none
# Line 1179 | Line 1087 | public abstract class ForkJoinTask<V> im
1087      }
1088  
1089      /**
1090 <     * Reconstitute the instance from a stream.
1090 >     * Reconstitutes the instance from a stream.
1091       *
1092       * @param s the stream
1093       */
1094      private void readObject(java.io.ObjectInputStream s)
1095          throws java.io.IOException, ClassNotFoundException {
1096          s.defaultReadObject();
1189        status &= ~INTERNAL_SIGNAL_MASK; // clear internal signal counts
1190        status |= EXTERNAL_SIGNAL; // conservatively set external signal
1097          Object ex = s.readObject();
1098          if (ex != null)
1099 <            setDoneExceptionally((Throwable) ex);
1099 >            setExceptionalCompletion((Throwable) ex);
1100      }
1101  
1102      // Unsafe mechanics

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines