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.1 by dl, Tue Jan 6 14:30:31 2009 UTC vs.
Revision 1.43 by dl, Wed Aug 19 11:24:58 2009 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 ForkJoinPool.  A
21 < * ForkJoinTask is a thread-like entity that is much lighter weight
22 < * than a normal thread.  Huge numbers of tasks and subtasks may be
23 < * hosted by a small number of actual threads in a ForkJoinPool,
24 < * at the price of some usage limitations.
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" {@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 {@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 RejectedExecutionExceptions stemming from
60 > * internal resource exhaustion such as failure to allocate internal
61 > * 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
71 > * equivalent to {@code fork(); join()} but always attempts to begin
72 > * execution in the current thread. The "<em>quiet</em>" forms of
73 > * these methods do not extract results or report exceptions. These
74 > * may be useful when a set of tasks are being executed, and you need
75 > * to delay processing of results or exceptions until all complete.
76 > * Method {@code invokeAll} (available in multiple versions)
77 > * performs the most common form of parallel invocation: forking a set
78 > * of tasks and joining them all.
79   *
80 < * <p> ForkJoinTasks are forms of <tt>Futures</tt> supporting a
81 < * limited range of use.  The "lightness" of ForkJoinTasks is due to a
82 < * set of restrictions (that are only partially statically
83 < * enforceable) reflecting their intended use as computational tasks
84 < * calculating pure functions or operating on purely isolated objects.
85 < * The primary coordination mechanisms supported for ForkJoinTasks are
86 < * <tt>fork</tt>, that arranges asynchronous execution, and
87 < * <tt>join</tt>, that doesn't proceed until the task's result has
88 < * been computed. (Cancellation is also supported).  The computation
89 < * defined in the <tt>compute</tt> method should avoid
90 < * <tt>synchronized</tt> methods or blocks, and should minimize
33 < * blocking synchronization apart from joining other tasks or using
34 < * synchronizers such as Phasers that are advertised to cooperate with
35 < * fork/join scheduling. Tasks should also not perform blocking IO,
36 < * and should ideally access variables that are completely independent
37 < * of those accessed by other running tasks. Minor breaches of these
38 < * restrictions, for example using shared output streams, may be
39 < * tolerable in practice, but frequent use may result in poor
40 < * performance, and the potential to indefinitely stall if the number
41 < * of threads not waiting for external synchronization becomes
42 < * exhausted. This usage restriction is in part enforced by not
43 < * permitting checked exceptions such as IOExceptions to be
44 < * thrown. However, computations may still encounter unchecked
45 < * exceptions, that are rethrown to callers attempting join
46 < * them. These exceptions may additionally include
47 < * RejectedExecutionExceptions stemming from internal resource
48 < * exhaustion such as failure to allocate internal task queues.
80 > * <p>The execution status of tasks may be queried at several levels
81 > * of detail: {@link #isDone} is true if a task completed in any way
82 > * (including the case where a task was cancelled without executing);
83 > * {@link #isCompletedNormally} is true if a task completed without
84 > * cancellation or encountering an exception; {@link #isCancelled} is
85 > * true if the task was cancelled (in which case {@link #getException}
86 > * returns a {@link java.util.concurrent.CancellationException}); and
87 > * {@link #isCompletedAbnormally} is true if a task was either
88 > * cancelled or encountered an exception, in which case {@link
89 > * #getException} will return either the encountered exception or
90 > * {@link java.util.concurrent.CancellationException}.
91   *
92 < * <p> The <tt>ForkJoinTask</tt> class is not usually directly
93 < * subclassed.  Instead, you subclass one of the abstract classes that
94 < * support different styles of fork/join processing.  Normally, a
95 < * concrete ForkJoinTask subclass declares fields comprising its
96 < * parameters, established in a constructor, and then defines a
97 < * <tt>compute</tt> method that somehow uses the control methods
98 < * supplied by this base class. While these methods have
99 < * <tt>public</tt> access, some of them may only be called from within
100 < * other ForkJoinTasks. Attempts to invoke them in other contexts
101 < * result in exceptions or errors including ClassCastException.  The
102 < * only way to invoke a "main" driver task is to submit it to a
103 < * ForkJoinPool. Once started, this will usually in turn start other
104 < * subtasks.
92 > * <p>The ForkJoinTask class is not usually directly subclassed.
93 > * Instead, you subclass one of the abstract classes that support a
94 > * particular style of fork/join processing, typically {@link
95 > * RecursiveAction} for computations that do not return results, or
96 > * {@link RecursiveTask} for those that do.  Normally, a concrete
97 > * ForkJoinTask subclass declares fields comprising its parameters,
98 > * established in a constructor, and then defines a {@code compute}
99 > * method that somehow uses the control methods supplied by this base
100 > * class. While these methods have {@code public} access (to allow
101 > * instances of different task subclasses to call each other's
102 > * methods), some of them may only be called from within other
103 > * ForkJoinTasks (as may be determined using method {@link
104 > * #inForkJoinPool}).  Attempts to invoke them in other contexts
105 > * result in exceptions or errors, possibly including
106 > * ClassCastException.
107   *
108 < * <p>Most base support methods are <tt>final</tt> because their
109 < * implementations are intrinsically tied to the underlying
110 < * lightweight task scheduling framework, and so cannot be overridden.
111 < * Developers creating new basic styles of fork/join processing should
112 < * minimally implement protected methods <tt>exec</tt>,
113 < * <tt>setRawResult</tt>, and <tt>getRawResult</tt>, while also
114 < * introducing an abstract computational method that can be
115 < * implemented in its subclasses. To support such extensions,
116 < * instances of ForkJoinTasks maintain an atomically updated
73 < * <tt>short</tt> representing user-defined control state.  Control
74 < * state is guaranteed initially to be zero, and to be negative upon
75 < * completion, but may otherwise be used for any other control
76 < * purposes, such as maintaining join counts.  The {@link
77 < * ForkJoinWorkerThread} class supports additional inspection and
78 < * tuning methods that can be useful when developing extensions.
108 > * <p>Most base support methods are {@code final}, to prevent
109 > * overriding of implementations that are intrinsically tied to the
110 > * underlying lightweight task scheduling framework.  Developers
111 > * creating new basic styles of fork/join processing should minimally
112 > * implement {@code protected} methods {@link #exec}, {@link
113 > * #setRawResult}, and {@link #getRawResult}, while also introducing
114 > * an abstract computational method that can be implemented in its
115 > * subclasses, possibly relying on other {@code protected} methods
116 > * provided by this class.
117   *
118   * <p>ForkJoinTasks should perform relatively small amounts of
119 < * computations, othewise splitting into smaller tasks. As a very
120 < * rough rule of thumb, a task should perform more than 100 and less
121 < * than 10000 basic computational steps. If tasks are too big, then
122 < * parellelism cannot improve throughput. If too small, then memory
123 < * and internal task maintenance overhead may overwhelm processing.
119 > * computation. Large tasks should be split into smaller subtasks,
120 > * usually via recursive decomposition. As a very rough rule of thumb,
121 > * a task should perform more than 100 and less than 10000 basic
122 > * computational steps. If tasks are too big, then parallelism cannot
123 > * improve throughput. If too small, then memory and internal task
124 > * maintenance overhead may overwhelm processing.
125   *
126 < * <p>ForkJoinTasks are <tt>Serializable</tt>, which enables them to
127 < * be used in extensions such as remote execution frameworks. However,
128 < * it is in general safe to serialize tasks only before or after, but
129 < * not during execution. Serialization is not relied on during
130 < * execution itself.
126 > * <p>This class provides {@code adapt} methods for {@link Runnable}
127 > * and {@link Callable}, that may be of use when mixing execution of
128 > * {@code ForkJoinTasks} with other kinds of tasks. When all tasks
129 > * are of this form, consider using a pool in
130 > * {@linkplain ForkJoinPool#setAsyncMode async mode}.
131 > *
132 > * <p>ForkJoinTasks are {@code Serializable}, which enables them to be
133 > * used in extensions such as remote execution frameworks. It is
134 > * sensible to serialize tasks only before or after, but not during,
135 > * execution. Serialization is not relied on during execution itself.
136 > *
137 > * @since 1.7
138 > * @author Doug Lea
139   */
140   public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
141 +
142      /**
143 <     * Status field holding all run status. We pack this into a single
144 <     * int both to minimize footprint overhead and to ensure atomicity
145 <     * (updates are via CAS).
98 <     *
99 <     * Status is initially zero, and takes on nonnegative values until
143 >     * Run control status bits packed into a single int to minimize
144 >     * footprint and to ensure atomicity (via CAS).  Status is
145 >     * initially zero, and takes on nonnegative values until
146       * completed, upon which status holds COMPLETED. CANCELLED, or
147       * EXCEPTIONAL, which use the top 3 bits.  Tasks undergoing
148       * blocking waits by other threads have SIGNAL_MASK bits set --
# Line 111 | Line 157 | public abstract class ForkJoinTask<V> im
157       * currently unused. Also value 0x80000000 is available as spare
158       * completion value.
159       */
160 <    volatile int status; // accessed directy by pool and workers
160 >    volatile int status; // accessed directly by pool and workers
161  
162      static final int COMPLETION_MASK      = 0xe0000000;
163      static final int NORMAL               = 0xe0000000; // == mask
# Line 124 | Line 170 | public abstract class ForkJoinTask<V> im
170      /**
171       * Table of exceptions thrown by tasks, to enable reporting by
172       * callers. Because exceptions are rare, we don't directly keep
173 <     * them with task objects, but instead us a weak ref table.  Note
173 >     * them with task objects, but instead use a weak ref table.  Note
174       * that cancellation exceptions don't appear in the table, but are
175       * instead recorded as status values.
176 <     * Todo: Use ConcurrentReferenceHashMap
176 >     * TODO: Use ConcurrentReferenceHashMap
177       */
178      static final Map<ForkJoinTask<?>, Throwable> exceptionMap =
179          Collections.synchronizedMap
# Line 136 | Line 182 | public abstract class ForkJoinTask<V> im
182      // within-package utilities
183  
184      /**
185 <     * Get current worker thread, or null if not a worker thread
185 >     * Gets current worker thread, or null if not a worker thread.
186       */
187      static ForkJoinWorkerThread getWorker() {
188          Thread t = Thread.currentThread();
189 <        return ((t instanceof ForkJoinWorkerThread)?
190 <                (ForkJoinWorkerThread)t : null);
145 <    }
146 <
147 <    /**
148 <     * Get pool of current worker thread, or null if not a worker thread
149 <     */
150 <    static ForkJoinPool getWorkerPool() {
151 <        Thread t = Thread.currentThread();
152 <        return ((t instanceof ForkJoinWorkerThread)?
153 <                ((ForkJoinWorkerThread)t).pool : null);
189 >        return ((t instanceof ForkJoinWorkerThread) ?
190 >                (ForkJoinWorkerThread) t : null);
191      }
192  
193      final boolean casStatus(int cmp, int val) {
194 <        return _unsafe.compareAndSwapInt(this, statusOffset, cmp, val);
194 >        return UNSAFE.compareAndSwapInt(this, statusOffset, cmp, val);
195      }
196  
197      /**
# Line 162 | Line 199 | public abstract class ForkJoinTask<V> im
199       */
200      static void rethrowException(Throwable ex) {
201          if (ex != null)
202 <            _unsafe.throwException(ex);
202 >            UNSAFE.throwException(ex);
203      }
204  
205      // Setting completion status
206  
207      /**
208 <     * Mark completion and wake up threads waiting to join this task.
208 >     * Marks completion and wakes up threads waiting to join this task.
209 >     *
210       * @param completion one of NORMAL, CANCELLED, EXCEPTIONAL
211       */
212      final void setCompletion(int completion) {
213 <        ForkJoinPool pool = getWorkerPool();
213 >        ForkJoinPool pool = getPool();
214          if (pool != null) {
215              int s; // Clear signal bits while setting completion status
216 <            do;while ((s = status) >= 0 && !casStatus(s, completion));
216 >            do {} while ((s = status) >= 0 && !casStatus(s, completion));
217  
218              if ((s & SIGNAL_MASK) != 0) {
219                  if ((s &= INTERNAL_SIGNAL_MASK) != 0)
220                      pool.updateRunningCount(s);
221 <                synchronized(this) { notifyAll(); }
221 >                synchronized (this) { notifyAll(); }
222              }
223          }
224          else
# Line 193 | Line 231 | public abstract class ForkJoinTask<V> im
231       */
232      private void externallySetCompletion(int completion) {
233          int s;
234 <        do;while ((s = status) >= 0 &&
235 <                  !casStatus(s, (s & SIGNAL_MASK) | completion));
236 <        synchronized(this) { notifyAll(); }
234 >        do {} while ((s = status) >= 0 &&
235 >                     !casStatus(s, (s & SIGNAL_MASK) | completion));
236 >        synchronized (this) { notifyAll(); }
237      }
238  
239      /**
240 <     * Sets status to indicate normal completion
240 >     * Sets status to indicate normal completion.
241       */
242      final void setNormalCompletion() {
243          // Try typical fast case -- single CAS, no signal, not already done.
244          // Manually expand casStatus to improve chances of inlining it
245 <        if (!_unsafe.compareAndSwapInt(this, statusOffset, 0, NORMAL))
245 >        if (!UNSAFE.compareAndSwapInt(this, statusOffset, 0, NORMAL))
246              setCompletion(NORMAL);
247      }
248  
249      // internal waiting and notification
250  
251      /**
252 <     * Performs the actual monitor wait for awaitDone
252 >     * Performs the actual monitor wait for awaitDone.
253       */
254      private void doAwaitDone() {
255          // Minimize lock bias and in/de-flation effects by maximizing
256          // chances of waiting inside sync
257          try {
258              while (status >= 0)
259 <                synchronized(this) { if (status >= 0) wait(); }
259 >                synchronized (this) { if (status >= 0) wait(); }
260          } catch (InterruptedException ie) {
261              onInterruptedWait();
262          }
263      }
264  
265      /**
266 <     * Performs the actual monitor wait for awaitDone
266 >     * Performs the actual timed monitor wait for awaitDone.
267       */
268      private void doAwaitDone(long startTime, long nanos) {
269 <        synchronized(this) {
269 >        synchronized (this) {
270              try {
271                  while (status >= 0) {
272 <                    long nt = nanos - System.nanoTime() - startTime;
272 >                    long nt = nanos - (System.nanoTime() - startTime);
273                      if (nt <= 0)
274                          break;
275 <                    wait(nt / 1000000, (int)(nt % 1000000));
275 >                    wait(nt / 1000000, (int) (nt % 1000000));
276                  }
277              } catch (InterruptedException ie) {
278                  onInterruptedWait();
# Line 247 | Line 285 | public abstract class ForkJoinTask<V> im
285      /**
286       * Sets status to indicate there is joiner, then waits for join,
287       * surrounded with pool notifications.
288 +     *
289       * @return status upon exit
290       */
291 <    final int awaitDone(ForkJoinWorkerThread w, boolean maintainParallelism) {
292 <        ForkJoinPool pool = w == null? null : w.pool;
291 >    private int awaitDone(ForkJoinWorkerThread w,
292 >                          boolean maintainParallelism) {
293 >        ForkJoinPool pool = (w == null) ? null : w.pool;
294          int s;
295          while ((s = status) >= 0) {
296 <            if (casStatus(s, pool == null? s|EXTERNAL_SIGNAL : s+1)) {
296 >            if (casStatus(s, (pool == null) ? s|EXTERNAL_SIGNAL : s+1)) {
297                  if (pool == null || !pool.preJoin(this, maintainParallelism))
298                      doAwaitDone();
299                  if (((s = status) & INTERNAL_SIGNAL_MASK) != 0)
# Line 266 | Line 306 | public abstract class ForkJoinTask<V> im
306  
307      /**
308       * Timed version of awaitDone
309 +     *
310       * @return status upon exit
311       */
312 <    final int awaitDone(ForkJoinWorkerThread w, long nanos) {
313 <        ForkJoinPool pool = w == null? null : w.pool;
312 >    private int awaitDone(ForkJoinWorkerThread w, long nanos) {
313 >        ForkJoinPool pool = (w == null) ? null : w.pool;
314          int s;
315          while ((s = status) >= 0) {
316 <            if (casStatus(s, pool == null? s|EXTERNAL_SIGNAL : s+1)) {
316 >            if (casStatus(s, (pool == null) ? s|EXTERNAL_SIGNAL : s+1)) {
317                  long startTime = System.nanoTime();
318                  if (pool == null || !pool.preJoin(this, false))
319                      doAwaitDone(startTime, nanos);
# Line 289 | Line 330 | public abstract class ForkJoinTask<V> im
330      }
331  
332      /**
333 <     * Notify pool that thread is unblocked. Called by signalled
333 >     * Notifies pool that thread is unblocked. Called by signalled
334       * threads when woken by non-FJ threads (which is atypical).
335       */
336      private void adjustPoolCountsOnUnblock(ForkJoinPool pool) {
337          int s;
338 <        do;while ((s = status) < 0 && !casStatus(s, s & COMPLETION_MASK));
338 >        do {} while ((s = status) < 0 && !casStatus(s, s & COMPLETION_MASK));
339          if (pool != null && (s &= INTERNAL_SIGNAL_MASK) != 0)
340              pool.updateRunningCount(s);
341      }
342  
343      /**
344 <     * Notify pool to adjust counts on cancelled or timed out wait
344 >     * Notifies pool to adjust counts on cancelled or timed out wait.
345       */
346      private void adjustPoolCountsOnCancelledWait(ForkJoinPool pool) {
347          if (pool != null) {
# Line 314 | Line 355 | public abstract class ForkJoinTask<V> im
355          }
356      }
357  
358 +    /**
359 +     * Handles interruptions during waits.
360 +     */
361      private void onInterruptedWait() {
362 <        Thread t = Thread.currentThread();
363 <        if (t instanceof ForkJoinWorkerThread) {
364 <            ForkJoinWorkerThread w = (ForkJoinWorkerThread)t;
365 <            if (w.isTerminating())
366 <                cancelIgnoreExceptions();
367 <        }
324 <        else { // re-interrupt
325 <            try {
326 <                t.interrupt();
327 <            } catch (SecurityException ignore) {
328 <            }
329 <        }
362 >        ForkJoinWorkerThread w = getWorker();
363 >        if (w == null)
364 >            Thread.currentThread().interrupt(); // re-interrupt
365 >        else if (w.isTerminating())
366 >            cancelIgnoringExceptions();
367 >        // else if FJworker, ignore interrupt
368      }
369  
370      // Recording and reporting exceptions
# Line 337 | Line 375 | public abstract class ForkJoinTask<V> im
375      }
376  
377      /**
378 <     * Throws the exception associated with status s;
378 >     * Throws the exception associated with status s.
379 >     *
380       * @throws the exception
381       */
382      private void reportException(int s) {
# Line 350 | Line 389 | public abstract class ForkJoinTask<V> im
389      }
390  
391      /**
392 <     * Returns result or throws exception using j.u.c.Future conventions
393 <     * Only call when isDone known to be true.
392 >     * Returns result or throws exception using j.u.c.Future conventions.
393 >     * Only call when {@code isDone} known to be true or thread known
394 >     * to be interrupted.
395       */
396      private V reportFutureResult()
397 <        throws ExecutionException, InterruptedException {
397 >        throws InterruptedException, ExecutionException {
398 >        if (Thread.interrupted())
399 >            throw new InterruptedException();
400          int s = status & COMPLETION_MASK;
401          if (s < NORMAL) {
402              Throwable ex;
# Line 362 | Line 404 | public abstract class ForkJoinTask<V> im
404                  throw new CancellationException();
405              if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
406                  throw new ExecutionException(ex);
365            if (Thread.interrupted())
366                throw new InterruptedException();
407          }
408          return getRawResult();
409      }
410  
411      /**
412       * Returns result or throws exception using j.u.c.Future conventions
413 <     * with timeouts
413 >     * with timeouts.
414       */
415      private V reportTimedFutureResult()
416          throws InterruptedException, ExecutionException, TimeoutException {
417 +        if (Thread.interrupted())
418 +            throw new InterruptedException();
419          Throwable ex;
420          int s = status & COMPLETION_MASK;
421          if (s == NORMAL)
422              return getRawResult();
423 <        if (s == CANCELLED)
423 >        else if (s == CANCELLED)
424              throw new CancellationException();
425 <        if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
425 >        else if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
426              throw new ExecutionException(ex);
427 <        if (Thread.interrupted())
428 <            throw new InterruptedException();
387 <        throw new TimeoutException();
427 >        else
428 >            throw new TimeoutException();
429      }
430  
431      // internal execution methods
432  
433      /**
434       * Calls exec, recording completion, and rethrowing exception if
435 <     * encountered. Caller should normally check status before calling
435 >     * encountered. Caller should normally check status before calling.
436 >     *
437       * @return true if completed normally
438       */
439      private boolean tryExec() {
# Line 409 | Line 451 | public abstract class ForkJoinTask<V> im
451  
452      /**
453       * Main execution method used by worker threads. Invokes
454 <     * base computation unless already complete
454 >     * base computation unless already complete.
455       */
456      final void quietlyExec() {
457          if (status >= 0) {
458              try {
459                  if (!exec())
460                      return;
461 <            } catch(Throwable rex) {
461 >            } catch (Throwable rex) {
462                  setDoneExceptionally(rex);
463                  return;
464              }
# Line 425 | Line 467 | public abstract class ForkJoinTask<V> im
467      }
468  
469      /**
470 <     * Calls exec, recording but not rethrowing exception
471 <     * Caller should normally check status before calling
470 >     * Calls exec(), recording but not rethrowing exception.
471 >     * Caller should normally check status before calling.
472 >     *
473       * @return true if completed normally
474       */
475      private boolean tryQuietlyInvoke() {
# Line 442 | Line 485 | public abstract class ForkJoinTask<V> im
485      }
486  
487      /**
488 <     * Cancel, ignoring any exceptions it throws
488 >     * Cancels, ignoring any exceptions it throws.
489       */
490 <    final void cancelIgnoreExceptions() {
490 >    final void cancelIgnoringExceptions() {
491          try {
492              cancel(false);
493 <        } catch(Throwable ignore) {
493 >        } catch (Throwable ignore) {
494          }
495      }
496  
497 +    /**
498 +     * Main implementation of helpJoin
499 +     */
500 +    private int busyJoin(ForkJoinWorkerThread w) {
501 +        int s;
502 +        ForkJoinTask<?> t;
503 +        while ((s = status) >= 0 && (t = w.scanWhileJoining(this)) != null)
504 +            t.quietlyExec();
505 +        return (s >= 0) ? awaitDone(w, false) : s; // block if no work
506 +    }
507 +
508      // public methods
509  
510      /**
511       * Arranges to asynchronously execute this task.  While it is not
512       * necessarily enforced, it is a usage error to fork a task more
513 <     * than once unless it has completed and been reinitialized.  This
514 <     * method may be invoked only from within other ForkJoinTask
515 <     * computations. Attempts to invoke in other contexts result in
516 <     * exceptions or errors including ClassCastException.
513 >     * than once unless it has completed and been reinitialized.
514 >     * Subsequent modifications to the state of this task or any data
515 >     * it operates on are not necessarily consistently observable by
516 >     * any thread other than the one executing it unless preceded by a
517 >     * call to {@link #join} or related methods, or a call to {@link
518 >     * #isDone} returning {@code true}.
519 >     *
520 >     * <p>This method may be invoked only from within {@code
521 >     * ForkJoinTask} computations (as may be determined using method
522 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
523 >     * result in exceptions or errors, possibly including {@code
524 >     * ClassCastException}.
525 >     *
526 >     * @return {@code this}, to simplify usage
527       */
528 <    public final void fork() {
529 <        ((ForkJoinWorkerThread)(Thread.currentThread())).pushTask(this);
528 >    public final ForkJoinTask<V> fork() {
529 >        ((ForkJoinWorkerThread) Thread.currentThread())
530 >            .pushTask(this);
531 >        return this;
532      }
533  
534      /**
535 <     * Returns the result of the computation when it is ready.
536 <     * This method differs from <tt>get</tt> in that abnormal
537 <     * completion results in RuntimeExceptions or Errors, not
538 <     * ExecutionExceptions.
535 >     * Returns the result of the computation when it {@link #isDone is done}.
536 >     * This method differs from {@link #get()} in that
537 >     * abnormal completion results in {@code RuntimeException} or
538 >     * {@code Error}, not {@code ExecutionException}.
539       *
540       * @return the computed result
541       */
# Line 480 | Line 546 | public abstract class ForkJoinTask<V> im
546          return getRawResult();
547      }
548  
483    public final V get() throws InterruptedException, ExecutionException {
484        ForkJoinWorkerThread w = getWorker();
485        if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
486            awaitDone(w, true);
487        return reportFutureResult();
488    }
489
490    public final V get(long timeout, TimeUnit unit)
491        throws InterruptedException, ExecutionException, TimeoutException {
492        ForkJoinWorkerThread w = getWorker();
493        if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
494            awaitDone(w, unit.toNanos(timeout));
495        return reportTimedFutureResult();
496    }
497
498    /**
499     * Possibly executes other tasks until this task is ready, then
500     * returns the result of the computation.  This method may be more
501     * efficient than <tt>join</tt>, but is only applicable when there
502     * are no potemtial dependencies between continuation of the
503     * current task and that of any other task that might be executed
504     * while helping. (This usually holds for pure divide-and-conquer
505     * tasks).
506     * @return the computed result
507     */
508    public final V helpJoin() {
509        ForkJoinWorkerThread w = (ForkJoinWorkerThread)(Thread.currentThread());
510        if (status < 0 || !w.unpushTask(this) || !tryExec())
511            reportException(w.helpJoinTask(this));
512        return getRawResult();
513    }
514
549      /**
550 <     * Performs this task, awaits its completion if necessary, and
551 <     * return its result.
552 <     * @throws Throwable (a RuntimeException, Error, or unchecked
553 <     * exception) if the underlying computation did so.
550 >     * Commences performing this task, awaits its completion if
551 >     * necessary, and return its result, or throws an (unchecked)
552 >     * exception if the underlying computation did so.
553 >     *
554       * @return the computed result
555       */
556      public final V invoke() {
# Line 527 | Line 561 | public abstract class ForkJoinTask<V> im
561      }
562  
563      /**
564 <     * Joins this task, without returning its result or throwing an
565 <     * exception. This method may be useful when processing
566 <     * collections of tasks when some have been cancelled or otherwise
567 <     * known to have aborted.
564 >     * Forks the given tasks, returning when {@code isDone} holds for
565 >     * each task or an (unchecked) exception is encountered, in which
566 >     * case the exception is rethrown.  If either task encounters an
567 >     * exception, the other one may be, but is not guaranteed to be,
568 >     * cancelled.  If both tasks throw an exception, then this method
569 >     * throws one of them.  The individual status of each task may be
570 >     * checked using {@link #getException()} and related methods.
571 >     *
572 >     * <p>This method may be invoked only from within {@code
573 >     * ForkJoinTask} computations (as may be determined using method
574 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
575 >     * result in exceptions or errors, possibly including {@code
576 >     * ClassCastException}.
577 >     *
578 >     * @param t1 the first task
579 >     * @param t2 the second task
580 >     * @throws NullPointerException if any task is null
581       */
582 <    public final void quietlyJoin() {
583 <        if (status >= 0) {
584 <            ForkJoinWorkerThread w = getWorker();
585 <            if (w == null || !w.unpushTask(this) || !tryQuietlyInvoke())
539 <                awaitDone(w, true);
540 <        }
582 >    public static void invokeAll(ForkJoinTask<?> t1, ForkJoinTask<?> t2) {
583 >        t2.fork();
584 >        t1.invoke();
585 >        t2.join();
586      }
587  
588      /**
589 <     * Possibly executes other tasks until this task is ready.
589 >     * Forks the given tasks, returning when {@code isDone} holds for
590 >     * each task or an (unchecked) exception is encountered, in which
591 >     * case the exception is rethrown. If any task encounters an
592 >     * exception, others may be, but are not guaranteed to be,
593 >     * cancelled.  If more than one task encounters an exception, then
594 >     * this method throws any one of these exceptions.  The individual
595 >     * status of each task may be checked using {@link #getException()}
596 >     * and related methods.
597 >     *
598 >     * <p>This method may be invoked only from within {@code
599 >     * ForkJoinTask} computations (as may be determined using method
600 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
601 >     * result in exceptions or errors, possibly including {@code
602 >     * ClassCastException}.
603 >     *
604 >     * @param tasks the tasks
605 >     * @throws NullPointerException if any task is null
606       */
607 <    public final void quietlyHelpJoin() {
608 <        if (status >= 0) {
609 <            ForkJoinWorkerThread w =
610 <                (ForkJoinWorkerThread)(Thread.currentThread());
611 <            if (!w.unpushTask(this) || !tryQuietlyInvoke())
612 <                w.helpJoinTask(this);
607 >    public static void invokeAll(ForkJoinTask<?>... tasks) {
608 >        Throwable ex = null;
609 >        int last = tasks.length - 1;
610 >        for (int i = last; i >= 0; --i) {
611 >            ForkJoinTask<?> t = tasks[i];
612 >            if (t == null) {
613 >                if (ex == null)
614 >                    ex = new NullPointerException();
615 >            }
616 >            else if (i != 0)
617 >                t.fork();
618 >            else {
619 >                t.quietlyInvoke();
620 >                if (ex == null)
621 >                    ex = t.getException();
622 >            }
623 >        }
624 >        for (int i = 1; i <= last; ++i) {
625 >            ForkJoinTask<?> t = tasks[i];
626 >            if (t != null) {
627 >                if (ex != null)
628 >                    t.cancel(false);
629 >                else {
630 >                    t.quietlyJoin();
631 >                    if (ex == null)
632 >                        ex = t.getException();
633 >                }
634 >            }
635          }
636 +        if (ex != null)
637 +            rethrowException(ex);
638      }
639  
640      /**
641 <     * Performs this task and awaits its completion if necessary,
642 <     * without returning its result or throwing an exception. This
643 <     * method may be useful when processing collections of tasks when
644 <     * some have been cancelled or otherwise known to have aborted.
641 >     * Forks all tasks in the specified collection, returning when
642 >     * {@code isDone} holds for each task or an (unchecked) exception
643 >     * is encountered.  If any task encounters an exception, others
644 >     * may be, but are not guaranteed to be, cancelled.  If more than
645 >     * one task encounters an exception, then this method throws any
646 >     * one of these exceptions.  The individual status of each task
647 >     * may be checked using {@link #getException()} and related
648 >     * methods.  The behavior of this operation is undefined if the
649 >     * specified collection is modified while the operation is in
650 >     * progress.
651 >     *
652 >     * <p>This method may be invoked only from within {@code
653 >     * ForkJoinTask} computations (as may be determined using method
654 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
655 >     * result in exceptions or errors, possibly including {@code
656 >     * ClassCastException}.
657 >     *
658 >     * @param tasks the collection of tasks
659 >     * @return the tasks argument, to simplify usage
660 >     * @throws NullPointerException if tasks or any element are null
661       */
662 <    public final void quietlyInvoke() {
663 <        if (status >= 0 && !tryQuietlyInvoke())
664 <            quietlyJoin();
662 >    public static <T extends ForkJoinTask<?>> Collection<T> invokeAll(Collection<T> tasks) {
663 >        if (!(tasks instanceof RandomAccess) || !(tasks instanceof List<?>)) {
664 >            invokeAll(tasks.toArray(new ForkJoinTask<?>[tasks.size()]));
665 >            return tasks;
666 >        }
667 >        @SuppressWarnings("unchecked")
668 >        List<? extends ForkJoinTask<?>> ts =
669 >            (List<? extends ForkJoinTask<?>>) tasks;
670 >        Throwable ex = null;
671 >        int last = ts.size() - 1;
672 >        for (int i = last; i >= 0; --i) {
673 >            ForkJoinTask<?> t = ts.get(i);
674 >            if (t == null) {
675 >                if (ex == null)
676 >                    ex = new NullPointerException();
677 >            }
678 >            else if (i != 0)
679 >                t.fork();
680 >            else {
681 >                t.quietlyInvoke();
682 >                if (ex == null)
683 >                    ex = t.getException();
684 >            }
685 >        }
686 >        for (int i = 1; i <= last; ++i) {
687 >            ForkJoinTask<?> t = ts.get(i);
688 >            if (t != null) {
689 >                if (ex != null)
690 >                    t.cancel(false);
691 >                else {
692 >                    t.quietlyJoin();
693 >                    if (ex == null)
694 >                        ex = t.getException();
695 >                }
696 >            }
697 >        }
698 >        if (ex != null)
699 >            rethrowException(ex);
700 >        return tasks;
701      }
702  
703      /**
704 <     * Returns true if the computation performed by this task has
705 <     * completed (or has been cancelled).
706 <     * @return true if this computation has completed
704 >     * Attempts to cancel execution of this task. This attempt will
705 >     * fail if the task has already completed, has already been
706 >     * cancelled, or could not be cancelled for some other reason. If
707 >     * successful, and this task has not started when cancel is
708 >     * called, execution of this task is suppressed, {@link
709 >     * #isCancelled} will report true, and {@link #join} will result
710 >     * in a {@code CancellationException} being thrown.
711 >     *
712 >     * <p>This method may be overridden in subclasses, but if so, must
713 >     * still ensure that these minimal properties hold. In particular,
714 >     * the {@code cancel} method itself must not throw exceptions.
715 >     *
716 >     * <p>This method is designed to be invoked by <em>other</em>
717 >     * tasks. To terminate the current task, you can just return or
718 >     * throw an unchecked exception from its computation method, or
719 >     * invoke {@link #completeExceptionally}.
720 >     *
721 >     * @param mayInterruptIfRunning this value is ignored in the
722 >     * default implementation because tasks are not
723 >     * cancelled via interruption
724 >     *
725 >     * @return {@code true} if this task is now cancelled
726       */
727 +    public boolean cancel(boolean mayInterruptIfRunning) {
728 +        setCompletion(CANCELLED);
729 +        return (status & COMPLETION_MASK) == CANCELLED;
730 +    }
731 +
732      public final boolean isDone() {
733          return status < 0;
734      }
735  
575    /**
576     * Returns true if this task was cancelled.
577     * @return true if this task was cancelled
578     */
736      public final boolean isCancelled() {
737          return (status & COMPLETION_MASK) == CANCELLED;
738      }
739  
740      /**
741 <     * Returns true if this task threw an exception or was cancelled
742 <     * @return true if this task threw an exception or was cancelled
741 >     * Returns {@code true} if this task threw an exception or was cancelled.
742 >     *
743 >     * @return {@code true} if this task threw an exception or was cancelled
744       */
745 <    public final boolean completedAbnormally() {
745 >    public final boolean isCompletedAbnormally() {
746          return (status & COMPLETION_MASK) < NORMAL;
747      }
748  
749      /**
750 <     * Returns the exception thrown by the base computation, or a
751 <     * CancellationException if cancelled, or null if none or if the
752 <     * method has not yet completed.
753 <     * @return the exception, or null if none
750 >     * Returns {@code true} if this task completed without throwing an
751 >     * exception and was not cancelled.
752 >     *
753 >     * @return {@code true} if this task completed without throwing an
754 >     * exception and was not cancelled
755       */
756 <    public final Throwable getException() {
757 <        int s = status & COMPLETION_MASK;
599 <        if (s >= NORMAL)
600 <            return null;
601 <        if (s == CANCELLED)
602 <            return new CancellationException();
603 <        return exceptionMap.get(this);
756 >    public final boolean isCompletedNormally() {
757 >        return (status & COMPLETION_MASK) == NORMAL;
758      }
759  
760      /**
761 <     * Asserts that the results of this task's computation will not be
762 <     * used. If a cancellation occurs before this task is processed,
763 <     * then its <tt>compute</tt> method will not be executed,
610 <     * <tt>isCancelled</tt> will report true, and <tt>join</tt> will
611 <     * result in a CancellationException being thrown. Otherwise, when
612 <     * cancellation races with completion, there are no guarantees
613 <     * about whether <tt>isCancelled</tt> will report true, whether
614 <     * <tt>join</tt> will return normally or via an exception, or
615 <     * whether these behaviors will remain consistent upon repeated
616 <     * invocation.
617 <     *
618 <     * <p>This method may be overridden in subclasses, but if so, must
619 <     * still ensure that these minimal properties hold. In particular,
620 <     * the cancel method itself must not throw exceptions.
621 <     *
622 <     * <p> This method is designed to be invoked by <em>other</em>
623 <     * tasks. To terminate the current task, you can just return or
624 <     * throw an unchecked exception from its computation method, or
625 <     * invoke <tt>completeExceptionally(someException)</tt>.
626 <     *
627 <     * @param mayInterruptIfRunning this value is ignored in the
628 <     * default implementation because tasks are not in general
629 <     * cancelled via interruption.
761 >     * Returns the exception thrown by the base computation, or a
762 >     * {@code CancellationException} if cancelled, or {@code null} if
763 >     * none or if the method has not yet completed.
764       *
765 <     * @return true if this task is now cancelled
765 >     * @return the exception, or {@code null} if none
766       */
767 <    public boolean cancel(boolean mayInterruptIfRunning) {
768 <        setCompletion(CANCELLED);
769 <        return (status & COMPLETION_MASK) == CANCELLED;
767 >    public final Throwable getException() {
768 >        int s = status & COMPLETION_MASK;
769 >        return ((s >= NORMAL)    ? null :
770 >                (s == CANCELLED) ? new CancellationException() :
771 >                exceptionMap.get(this));
772      }
773  
774      /**
775       * Completes this task abnormally, and if not already aborted or
776       * cancelled, causes it to throw the given exception upon
777 <     * <tt>join</tt> and related operations. This method may be used
777 >     * {@code join} and related operations. This method may be used
778       * to induce exceptions in asynchronous tasks, or to force
779 <     * completion of tasks that would not otherwise complete.  This
780 <     * method is overridable, but overridden versions must invoke
781 <     * <tt>super</tt> implementation to maintain guarantees.
779 >     * completion of tasks that would not otherwise complete.  Its use
780 >     * in other situations is discouraged.  This method is
781 >     * overridable, but overridden versions must invoke {@code super}
782 >     * implementation to maintain guarantees.
783 >     *
784       * @param ex the exception to throw. If this exception is
785       * not a RuntimeException or Error, the actual exception thrown
786       * will be a RuntimeException with cause ex.
787       */
788      public void completeExceptionally(Throwable ex) {
789          setDoneExceptionally((ex instanceof RuntimeException) ||
790 <                             (ex instanceof Error)? ex :
790 >                             (ex instanceof Error) ? ex :
791                               new RuntimeException(ex));
792      }
793  
794      /**
795       * Completes this task, and if not already aborted or cancelled,
796 <     * returning a <tt>null</tt> result upon <tt>join</tt> and related
796 >     * returning a {@code null} result upon {@code join} and related
797       * operations. This method may be used to provide results for
798       * asynchronous tasks, or to provide alternative handling for
799 <     * tasks that would not otherwise complete normally.
799 >     * tasks that would not otherwise complete normally. Its use in
800 >     * other situations is discouraged. This method is
801 >     * overridable, but overridden versions must invoke {@code super}
802 >     * implementation to maintain guarantees.
803       *
804 <     * @param value the result value for this task.
804 >     * @param value the result value for this task
805       */
806      public void complete(V value) {
807          try {
808              setRawResult(value);
809 <        } catch(Throwable rex) {
809 >        } catch (Throwable rex) {
810              setDoneExceptionally(rex);
811              return;
812          }
813          setNormalCompletion();
814      }
815  
816 +    public final V get() throws InterruptedException, ExecutionException {
817 +        ForkJoinWorkerThread w = getWorker();
818 +        if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
819 +            awaitDone(w, true);
820 +        return reportFutureResult();
821 +    }
822 +
823 +    public final V get(long timeout, TimeUnit unit)
824 +        throws InterruptedException, ExecutionException, TimeoutException {
825 +        long nanos = unit.toNanos(timeout);
826 +        ForkJoinWorkerThread w = getWorker();
827 +        if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
828 +            awaitDone(w, nanos);
829 +        return reportTimedFutureResult();
830 +    }
831 +
832 +    /**
833 +     * Possibly executes other tasks until this task {@link #isDone is
834 +     * done}, then returns the result of the computation.  This method
835 +     * may be more efficient than {@code join}, but is only applicable
836 +     * when there are no potential dependencies between continuation
837 +     * of the current task and that of any other task that might be
838 +     * executed while helping. (This usually holds for pure
839 +     * divide-and-conquer tasks).
840 +     *
841 +     * <p>This method may be invoked only from within {@code
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 {@code
845 +     * ClassCastException}.
846 +     *
847 +     * @return the computed result
848 +     */
849 +    public final V helpJoin() {
850 +        ForkJoinWorkerThread w = (ForkJoinWorkerThread) Thread.currentThread();
851 +        if (status < 0 || !w.unpushTask(this) || !tryExec())
852 +            reportException(busyJoin(w));
853 +        return getRawResult();
854 +    }
855 +
856 +    /**
857 +     * Possibly executes other tasks until this task {@link #isDone is
858 +     * done}.  This method may be useful when processing collections
859 +     * of tasks when some have been cancelled or otherwise known to
860 +     * have aborted.
861 +     *
862 +     * <p>This method may be invoked only from within {@code
863 +     * ForkJoinTask} computations (as may be determined using method
864 +     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
865 +     * result in exceptions or errors, possibly including {@code
866 +     * ClassCastException}.
867 +     */
868 +    public final void quietlyHelpJoin() {
869 +        if (status >= 0) {
870 +            ForkJoinWorkerThread w =
871 +                (ForkJoinWorkerThread) Thread.currentThread();
872 +            if (!w.unpushTask(this) || !tryQuietlyInvoke())
873 +                busyJoin(w);
874 +        }
875 +    }
876 +
877 +    /**
878 +     * Joins this task, without returning its result or throwing an
879 +     * exception. This method may be useful when processing
880 +     * collections of tasks when some have been cancelled or otherwise
881 +     * known to have aborted.
882 +     */
883 +    public final void quietlyJoin() {
884 +        if (status >= 0) {
885 +            ForkJoinWorkerThread w = getWorker();
886 +            if (w == null || !w.unpushTask(this) || !tryQuietlyInvoke())
887 +                awaitDone(w, true);
888 +        }
889 +    }
890 +
891 +    /**
892 +     * Commences performing this task and awaits its completion if
893 +     * necessary, without returning its result or throwing an
894 +     * exception. This method may be useful when processing
895 +     * collections of tasks when some have been cancelled or otherwise
896 +     * known to have aborted.
897 +     */
898 +    public final void quietlyInvoke() {
899 +        if (status >= 0 && !tryQuietlyInvoke())
900 +            quietlyJoin();
901 +    }
902 +
903 +    /**
904 +     * Possibly executes tasks until the pool hosting the current task
905 +     * {@link ForkJoinPool#isQuiescent is quiescent}. This method may
906 +     * be of use in designs in which many tasks are forked, but none
907 +     * are explicitly joined, instead executing them until all are
908 +     * processed.
909 +     *
910 +     * <p>This method may be invoked only from within {@code
911 +     * ForkJoinTask} computations (as may be determined using method
912 +     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
913 +     * result in exceptions or errors, possibly including {@code
914 +     * ClassCastException}.
915 +     */
916 +    public static void helpQuiesce() {
917 +        ((ForkJoinWorkerThread) Thread.currentThread())
918 +            .helpQuiescePool();
919 +    }
920 +
921      /**
922       * Resets the internal bookkeeping state of this task, allowing a
923 <     * subsequent <tt>fork</tt>. This method allows repeated reuse of
923 >     * subsequent {@code fork}. This method allows repeated reuse of
924       * this task, but only if reuse occurs when this task has either
925       * never been forked, or has been forked, then completed and all
926       * outstanding joins of this task have also completed. Effects
927 <     * under any other usage conditions are not guaranteed, and are
928 <     * almost surely wrong. This method may be useful when executing
927 >     * under any other usage conditions are not guaranteed.
928 >     * This method may be useful when executing
929       * pre-constructed trees of subtasks in loops.
930       */
931      public void reinitialize() {
# Line 689 | Line 935 | public abstract class ForkJoinTask<V> im
935      }
936  
937      /**
938 <     * Tries to unschedule this task for execution. This method will
939 <     * typically succeed if this task is the next task that would be
940 <     * executed by the current thread, and will typically fail (return
941 <     * false) otherwise. This method may be useful when arranging
942 <     * faster local processing of tasks that could have been, but were
697 <     * not, stolen.
698 <     * @return true if unforked
938 >     * Returns the pool hosting the current task execution, or null
939 >     * if this task is executing outside of any ForkJoinPool.
940 >     *
941 >     * @see #inForkJoinPool
942 >     * @return the pool, or {@code null} if none
943       */
944 <    public boolean tryUnfork() {
945 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).unpushTask(this);
944 >    public static ForkJoinPool getPool() {
945 >        Thread t = Thread.currentThread();
946 >        return (t instanceof ForkJoinWorkerThread) ?
947 >            ((ForkJoinWorkerThread) t).pool : null;
948      }
949  
950      /**
951 <     * Forks both tasks, returning when <tt>isDone</tt> holds for both
952 <     * of them or an exception is encountered. This method may be
953 <     * invoked only from within other ForkJoinTask
954 <     * computations. Attempts to invoke in other contexts result in
955 <     * exceptions or errors including ClassCastException.
710 <     * @param t1 one task
711 <     * @param t2 the other task
712 <     * @throws NullPointerException if t1 or t2 are null
713 <     * @throws RuntimeException or Error if either task did so.
951 >     * Returns {@code true} if the current thread is executing as a
952 >     * ForkJoinPool computation.
953 >     *
954 >     * @return {@code true} if the current thread is executing as a
955 >     * ForkJoinPool computation, or false otherwise
956       */
957 <    public static void invokeAll(ForkJoinTask<?>t1, ForkJoinTask<?> t2) {
958 <        t2.fork();
717 <        t1.invoke();
718 <        t2.join();
957 >    public static boolean inForkJoinPool() {
958 >        return Thread.currentThread() instanceof ForkJoinWorkerThread;
959      }
960  
961      /**
962 <     * Forks the given tasks, returning when <tt>isDone</tt> holds for
963 <     * all of them. If any task encounters an exception, others may be
964 <     * cancelled.  This method may be invoked only from within other
965 <     * ForkJoinTask computations. Attempts to invoke in other contexts
966 <     * result in exceptions or errors including ClassCastException.
967 <     * @param tasks the array of tasks
968 <     * @throws NullPointerException if tasks or any element are null.
969 <     * @throws RuntimeException or Error if any task did so.
970 <     */
971 <    public static void invokeAll(ForkJoinTask<?>... tasks) {
972 <        Throwable ex = null;
973 <        int last = tasks.length - 1;
974 <        for (int i = last; i >= 0; --i) {
975 <            ForkJoinTask<?> t = tasks[i];
736 <            if (t == null) {
737 <                if (ex == null)
738 <                    ex = new NullPointerException();
739 <            }
740 <            else if (i != 0)
741 <                t.fork();
742 <            else {
743 <                t.quietlyInvoke();
744 <                if (ex == null)
745 <                    ex = t.getException();
746 <            }
747 <        }
748 <        for (int i = 1; i <= last; ++i) {
749 <            ForkJoinTask<?> t = tasks[i];
750 <            if (t != null) {
751 <                if (ex != null)
752 <                    t.cancel(false);
753 <                else {
754 <                    t.quietlyJoin();
755 <                    if (ex == null)
756 <                        ex = t.getException();
757 <                }
758 <            }
759 <        }
760 <        if (ex != null)
761 <            rethrowException(ex);
762 <    }
763 <
764 <    /**
765 <     * Forks all tasks in the collection, returning when
766 <     * <tt>isDone</tt> holds for all of them. If any task encounters
767 <     * an exception, others may be cancelled.  This method may be
768 <     * invoked only from within other ForkJoinTask
769 <     * computations. Attempts to invoke in other contexts result in
770 <     * exceptions or errors including ClassCastException.
771 <     * @param tasks the collection of tasks
772 <     * @throws NullPointerException if tasks or any element are null.
773 <     * @throws RuntimeException or Error if any task did so.
962 >     * Tries to unschedule this task for execution. This method will
963 >     * typically succeed if this task is the most recently forked task
964 >     * by the current thread, and has not commenced executing in
965 >     * another thread.  This method may be useful when arranging
966 >     * alternative local processing of tasks that could have been, but
967 >     * were not, stolen.
968 >     *
969 >     * <p>This method may be invoked only from within {@code
970 >     * ForkJoinTask} computations (as may be determined using method
971 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
972 >     * result in exceptions or errors, possibly including {@code
973 >     * ClassCastException}.
974 >     *
975 >     * @return {@code true} if unforked
976       */
977 <    public static void invokeAll(Collection<? extends ForkJoinTask<?>> tasks) {
978 <        if (!(tasks instanceof List)) {
979 <            invokeAll(tasks.toArray(new ForkJoinTask[tasks.size()]));
778 <            return;
779 <        }
780 <        List<? extends ForkJoinTask<?>> ts =
781 <            (List<? extends ForkJoinTask<?>>)tasks;
782 <        Throwable ex = null;
783 <        int last = ts.size() - 1;
784 <        for (int i = last; i >= 0; --i) {
785 <            ForkJoinTask<?> t = ts.get(i);
786 <            if (t == null) {
787 <                if (ex == null)
788 <                    ex = new NullPointerException();
789 <            }
790 <            else if (i != 0)
791 <                t.fork();
792 <            else {
793 <                t.quietlyInvoke();
794 <                if (ex == null)
795 <                    ex = t.getException();
796 <            }
797 <        }
798 <        for (int i = 1; i <= last; ++i) {
799 <            ForkJoinTask<?> t = ts.get(i);
800 <            if (t != null) {
801 <                if (ex != null)
802 <                    t.cancel(false);
803 <                else {
804 <                    t.quietlyJoin();
805 <                    if (ex == null)
806 <                        ex = t.getException();
807 <                }
808 <            }
809 <        }
810 <        if (ex != null)
811 <            rethrowException(ex);
977 >    public boolean tryUnfork() {
978 >        return ((ForkJoinWorkerThread) Thread.currentThread())
979 >            .unpushTask(this);
980      }
981  
982      /**
983 <     * Possibly executes tasks until the pool hosting the current task
984 <     * {@link ForkJoinPool#isQuiescent}. This method may be of use in
985 <     * designs in which many tasks are forked, but none are explicitly
986 <     * joined, instead executing them until all are processed.
983 >     * Returns an estimate of the number of tasks that have been
984 >     * forked by the current worker thread but not yet executed. This
985 >     * value may be useful for heuristic decisions about whether to
986 >     * fork other tasks.
987 >     *
988 >     * <p>This method may be invoked only from within {@code
989 >     * ForkJoinTask} computations (as may be determined using method
990 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
991 >     * result in exceptions or errors, possibly including {@code
992 >     * ClassCastException}.
993 >     *
994 >     * @return the number of tasks
995       */
996 <    public static void helpQuiesce() {
997 <        ((ForkJoinWorkerThread)(Thread.currentThread())).
998 <            helpQuiescePool();
996 >    public static int getQueuedTaskCount() {
997 >        return ((ForkJoinWorkerThread) Thread.currentThread())
998 >            .getQueueSize();
999      }
1000  
1001      /**
1002 <     * Returns a estimate of how many more locally queued tasks are
1002 >     * Returns an estimate of how many more locally queued tasks are
1003       * held by the current worker thread than there are other worker
1004 <     * threads that might want to steal them.  This value may be
1005 <     * useful for heuristic decisions about whether to fork other
1006 <     * tasks. In many usages of ForkJoinTasks, at steady state, each
1007 <     * worker should aim to maintain a small constant surplus (for
1008 <     * example, 3) of tasks, and to process computations locally if
1009 <     * this threshold is exceeded.
1004 >     * threads that might steal them.  This value may be useful for
1005 >     * heuristic decisions about whether to fork other tasks. In many
1006 >     * usages of ForkJoinTasks, at steady state, each worker should
1007 >     * aim to maintain a small constant surplus (for example, 3) of
1008 >     * tasks, and to process computations locally if this threshold is
1009 >     * exceeded.
1010 >     *
1011 >     * <p>This method may be invoked only from within {@code
1012 >     * ForkJoinTask} computations (as may be determined using method
1013 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1014 >     * result in exceptions or errors, possibly including {@code
1015 >     * ClassCastException}.
1016 >     *
1017       * @return the surplus number of tasks, which may be negative
1018       */
1019 <    public static int surplus() {
1020 <        return ((ForkJoinWorkerThread)(Thread.currentThread()))
1019 >    public static int getSurplusQueuedTaskCount() {
1020 >        return ((ForkJoinWorkerThread) Thread.currentThread())
1021              .getEstimatedSurplusTaskCount();
1022      }
1023  
1024 <    // Extension kit
1024 >    // Extension methods
1025  
1026      /**
1027 <     * Returns the result that would be returned by <tt>join</tt>, or
1028 <     * null if this task is not known to have been completed.  This
1029 <     * method is designed to aid debugging, as well as to support
1030 <     * extensions. Its use in any other context is discouraged.
1027 >     * Returns the result that would be returned by {@link #join}, even
1028 >     * if this task completed abnormally, or {@code null} if this task
1029 >     * is not known to have been completed.  This method is designed
1030 >     * to aid debugging, as well as to support extensions. Its use in
1031 >     * any other context is discouraged.
1032       *
1033 <     * @return the result, or null if not completed.
1033 >     * @return the result, or {@code null} if not completed
1034       */
1035      public abstract V getRawResult();
1036  
# Line 865 | Line 1049 | public abstract class ForkJoinTask<V> im
1049       * called otherwise. The return value controls whether this task
1050       * is considered to be done normally. It may return false in
1051       * asynchronous actions that require explicit invocations of
1052 <     * <tt>complete</tt> to become joinable. It may throw exceptions
1053 <     * to indicate abnormal exit.
1054 <     * @return true if completed normally
1055 <     * @throws Error or RuntimeException if encountered during computation
1052 >     * {@link #complete} to become joinable. It may also throw an
1053 >     * (unchecked) exception to indicate abnormal exit.
1054 >     *
1055 >     * @return {@code true} if completed normally
1056       */
1057      protected abstract boolean exec();
1058  
1059 +    /**
1060 +     * Returns, but does not unschedule or execute, a task queued by
1061 +     * the current thread but not yet executed, if one is immediately
1062 +     * available. There is no guarantee that this task will actually
1063 +     * be polled or executed next. Conversely, this method may return
1064 +     * null even if a task exists but cannot be accessed without
1065 +     * contention with other threads.  This method is designed
1066 +     * primarily to support extensions, and is unlikely to be useful
1067 +     * otherwise.
1068 +     *
1069 +     * <p>This method may be invoked only from within {@code
1070 +     * ForkJoinTask} computations (as may be determined using method
1071 +     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1072 +     * result in exceptions or errors, possibly including {@code
1073 +     * ClassCastException}.
1074 +     *
1075 +     * @return the next task, or {@code null} if none are available
1076 +     */
1077 +    protected static ForkJoinTask<?> peekNextLocalTask() {
1078 +        return ((ForkJoinWorkerThread) Thread.currentThread())
1079 +            .peekTask();
1080 +    }
1081 +
1082 +    /**
1083 +     * Unschedules and returns, without executing, the next task
1084 +     * queued by the current thread but not yet executed.  This method
1085 +     * is designed primarily to support extensions, and is unlikely to
1086 +     * be useful otherwise.
1087 +     *
1088 +     * <p>This method may be invoked only from within {@code
1089 +     * ForkJoinTask} computations (as may be determined using method
1090 +     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1091 +     * result in exceptions or errors, possibly including {@code
1092 +     * ClassCastException}.
1093 +     *
1094 +     * @return the next task, or {@code null} if none are available
1095 +     */
1096 +    protected static ForkJoinTask<?> pollNextLocalTask() {
1097 +        return ((ForkJoinWorkerThread) Thread.currentThread())
1098 +            .pollLocalTask();
1099 +    }
1100 +
1101 +    /**
1102 +     * Unschedules and returns, without executing, the next task
1103 +     * queued by the current thread but not yet executed, if one is
1104 +     * available, or if not available, a task that was forked by some
1105 +     * other thread, if available. Availability may be transient, so a
1106 +     * {@code null} result does not necessarily imply quiescence
1107 +     * of the pool this task is operating in.  This method is designed
1108 +     * primarily to support extensions, and is unlikely to be useful
1109 +     * otherwise.
1110 +     *
1111 +     * <p>This method may be invoked only from within {@code
1112 +     * ForkJoinTask} computations (as may be determined using method
1113 +     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1114 +     * result in exceptions or errors, possibly including {@code
1115 +     * ClassCastException}.
1116 +     *
1117 +     * @return a task, or {@code null} if none are available
1118 +     */
1119 +    protected static ForkJoinTask<?> pollTask() {
1120 +        return ((ForkJoinWorkerThread) Thread.currentThread())
1121 +            .pollTask();
1122 +    }
1123 +
1124 +    /**
1125 +     * Adaptor for Runnables. This implements RunnableFuture
1126 +     * to be compliant with AbstractExecutorService constraints
1127 +     * when used in ForkJoinPool.
1128 +     */
1129 +    static final class AdaptedRunnable<T> extends ForkJoinTask<T>
1130 +        implements RunnableFuture<T> {
1131 +        final Runnable runnable;
1132 +        final T resultOnCompletion;
1133 +        T result;
1134 +        AdaptedRunnable(Runnable runnable, T result) {
1135 +            if (runnable == null) throw new NullPointerException();
1136 +            this.runnable = runnable;
1137 +            this.resultOnCompletion = result;
1138 +        }
1139 +        public T getRawResult() { return result; }
1140 +        public void setRawResult(T v) { result = v; }
1141 +        public boolean exec() {
1142 +            runnable.run();
1143 +            result = resultOnCompletion;
1144 +            return true;
1145 +        }
1146 +        public void run() { invoke(); }
1147 +        private static final long serialVersionUID = 5232453952276885070L;
1148 +    }
1149 +
1150 +    /**
1151 +     * Adaptor for Callables
1152 +     */
1153 +    static final class AdaptedCallable<T> extends ForkJoinTask<T>
1154 +        implements RunnableFuture<T> {
1155 +        final Callable<? extends T> callable;
1156 +        T result;
1157 +        AdaptedCallable(Callable<? extends T> callable) {
1158 +            if (callable == null) throw new NullPointerException();
1159 +            this.callable = callable;
1160 +        }
1161 +        public T getRawResult() { return result; }
1162 +        public void setRawResult(T v) { result = v; }
1163 +        public boolean exec() {
1164 +            try {
1165 +                result = callable.call();
1166 +                return true;
1167 +            } catch (Error err) {
1168 +                throw err;
1169 +            } catch (RuntimeException rex) {
1170 +                throw rex;
1171 +            } catch (Exception ex) {
1172 +                throw new RuntimeException(ex);
1173 +            }
1174 +        }
1175 +        public void run() { invoke(); }
1176 +        private static final long serialVersionUID = 2838392045355241008L;
1177 +    }
1178 +
1179 +    /**
1180 +     * Returns a new {@code ForkJoinTask} that performs the {@code run}
1181 +     * method of the given {@code Runnable} as its action, and returns
1182 +     * a null result upon {@link #join}.
1183 +     *
1184 +     * @param runnable the runnable action
1185 +     * @return the task
1186 +     */
1187 +    public static ForkJoinTask<?> adapt(Runnable runnable) {
1188 +        return new AdaptedRunnable<Void>(runnable, null);
1189 +    }
1190 +
1191 +    /**
1192 +     * Returns a new {@code ForkJoinTask} that performs the {@code run}
1193 +     * method of the given {@code Runnable} as its action, and returns
1194 +     * the given result upon {@link #join}.
1195 +     *
1196 +     * @param runnable the runnable action
1197 +     * @param result the result upon completion
1198 +     * @return the task
1199 +     */
1200 +    public static <T> ForkJoinTask<T> adapt(Runnable runnable, T result) {
1201 +        return new AdaptedRunnable<T>(runnable, result);
1202 +    }
1203 +
1204 +    /**
1205 +     * Returns a new {@code ForkJoinTask} that performs the {@code call}
1206 +     * method of the given {@code Callable} as its action, and returns
1207 +     * its result upon {@link #join}, translating any checked exceptions
1208 +     * encountered into {@code RuntimeException}.
1209 +     *
1210 +     * @param callable the callable action
1211 +     * @return the task
1212 +     */
1213 +    public static <T> ForkJoinTask<T> adapt(Callable<? extends T> callable) {
1214 +        return new AdaptedCallable<T>(callable);
1215 +    }
1216 +
1217      // Serialization support
1218  
1219      private static final long serialVersionUID = -7721805057305804111L;
# Line 880 | Line 1222 | public abstract class ForkJoinTask<V> im
1222       * Save the state to a stream.
1223       *
1224       * @serialData the current run status and the exception thrown
1225 <     * during execution, or null if none.
1225 >     * during execution, or {@code null} if none
1226       * @param s the stream
1227       */
1228      private void writeObject(java.io.ObjectOutputStream s)
# Line 891 | Line 1233 | public abstract class ForkJoinTask<V> im
1233  
1234      /**
1235       * Reconstitute the instance from a stream.
1236 +     *
1237       * @param s the stream
1238       */
1239      private void readObject(java.io.ObjectInputStream s)
1240          throws java.io.IOException, ClassNotFoundException {
1241          s.defaultReadObject();
1242 <        //        status &= ~INTERNAL_SIGNAL_MASK; //  todo: define policy
1242 >        status &= ~INTERNAL_SIGNAL_MASK; // clear internal signal counts
1243 >        status |= EXTERNAL_SIGNAL; // conservatively set external signal
1244          Object ex = s.readObject();
1245          if (ex != null)
1246 <            setDoneExceptionally((Throwable)ex);
1246 >            setDoneExceptionally((Throwable) ex);
1247      }
1248  
1249 <    // Temporary Unsafe mechanics for preliminary release
1249 >    // Unsafe mechanics
1250  
1251 <    static final Unsafe _unsafe;
1252 <    static final long statusOffset;
1251 >    private static final sun.misc.Unsafe UNSAFE = getUnsafe();
1252 >    private static final long statusOffset =
1253 >        objectFieldOffset("status", ForkJoinTask.class);
1254  
1255 <    static {
1255 >    private static long objectFieldOffset(String field, Class<?> klazz) {
1256          try {
1257 <            if (ForkJoinTask.class.getClassLoader() != null) {
1258 <                Field f = Unsafe.class.getDeclaredField("theUnsafe");
1259 <                f.setAccessible(true);
1260 <                _unsafe = (Unsafe)f.get(null);
1261 <            }
1262 <            else
1263 <                _unsafe = Unsafe.getUnsafe();
919 <            statusOffset = _unsafe.objectFieldOffset
920 <                (ForkJoinTask.class.getDeclaredField("status"));
921 <        } catch (Exception ex) { throw new Error(ex); }
1257 >            return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field));
1258 >        } catch (NoSuchFieldException e) {
1259 >            // Convert Exception to corresponding Error
1260 >            NoSuchFieldError error = new NoSuchFieldError(field);
1261 >            error.initCause(e);
1262 >            throw error;
1263 >        }
1264      }
1265  
1266 +    /**
1267 +     * Returns a sun.misc.Unsafe.  Suitable for use in a 3rd party package.
1268 +     * Replace with a simple call to Unsafe.getUnsafe when integrating
1269 +     * into a jdk.
1270 +     *
1271 +     * @return a sun.misc.Unsafe
1272 +     */
1273 +    private static sun.misc.Unsafe getUnsafe() {
1274 +        try {
1275 +            return sun.misc.Unsafe.getUnsafe();
1276 +        } catch (SecurityException se) {
1277 +            try {
1278 +                return java.security.AccessController.doPrivileged
1279 +                    (new java.security
1280 +                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
1281 +                        public sun.misc.Unsafe run() throws Exception {
1282 +                            java.lang.reflect.Field f = sun.misc
1283 +                                .Unsafe.class.getDeclaredField("theUnsafe");
1284 +                            f.setAccessible(true);
1285 +                            return (sun.misc.Unsafe) f.get(null);
1286 +                        }});
1287 +            } catch (java.security.PrivilegedActionException e) {
1288 +                throw new RuntimeException("Could not initialize intrinsics",
1289 +                                           e.getCause());
1290 +            }
1291 +        }
1292 +    }
1293   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines