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.12 by jsr166, Wed Jul 22 01:36:51 2009 UTC vs.
Revision 1.38 by dl, Tue Aug 4 22:47:08 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 {@link
21 < * ForkJoinPool}.  A ForkJoinTask is a thread-like entity that is much
20 > * Abstract base class for tasks that run within a {@link ForkJoinPool}.
21 > * A {@code ForkJoinTask} is a thread-like entity that is much
22   * lighter weight than a normal thread.  Huge numbers of tasks and
23   * subtasks may be hosted by a small number of actual threads in a
24   * ForkJoinPool, at the price of some usage limitations.
25   *
26 < * <p> A "main" ForkJoinTask begins execution when submitted to a
27 < * {@link ForkJoinPool}. Once started, it will usually in turn start
28 < * other subtasks.  As indicated by the name of this class, many
29 < * programs using ForkJoinTasks employ only methods {@code fork}
30 < * and {@code join}, or derivatives such as
31 < * {@code invokeAll}.  However, this class also provides a number
32 < * of other methods that can come into play in advanced usages, as
33 < * well as extension mechanics that allow support of new forms of
34 < * fork/join processing.
26 > * <p>A "main" {@code ForkJoinTask} begins execution when submitted
27 > * to a {@link ForkJoinPool}.  Once started, it will usually in turn
28 > * start other subtasks.  As indicated by the name of this class,
29 > * many programs using {@code ForkJoinTask} employ only methods
30 > * {@link #fork} and {@link #join}, or derivatives such as {@link
31 > * #invokeAll}.  However, this class also provides a number of other
32 > * methods that can come into play in advanced usages, as well as
33 > * extension mechanics that allow support of new forms of fork/join
34 > * processing.
35   *
36 < * <p>A ForkJoinTask is a lightweight form of {@link Future}.  The
37 < * efficiency of ForkJoinTasks stems from a set of restrictions (that
38 < * are only partially statically enforceable) reflecting their
39 < * intended use as computational tasks calculating pure functions or
40 < * operating on purely isolated objects.  The primary coordination
41 < * mechanisms are {@link #fork}, that arranges asynchronous execution,
42 < * and {@link #join}, that doesn't proceed until the task's result has
43 < * been computed.  Computations should avoid {@code synchronized}
44 < * methods or blocks, and should minimize other blocking
45 < * synchronization apart from joining other tasks or using
46 < * synchronizers such as Phasers that are advertised to cooperate with
47 < * fork/join scheduling. Tasks should also not perform blocking IO,
48 < * and should ideally access variables that are completely independent
49 < * of those accessed by other running tasks. Minor breaches of these
50 < * restrictions, for example using shared output streams, may be
51 < * tolerable in practice, but frequent use may result in poor
52 < * performance, and the potential to indefinitely stall if the number
53 < * of threads not waiting for IO or other external synchronization
54 < * becomes exhausted. This usage restriction is in part enforced by
55 < * not permitting checked exceptions such as {@code IOExceptions}
56 < * to be thrown. However, computations may still encounter unchecked
57 < * exceptions, that are rethrown to callers attempting join
58 < * them. These exceptions may additionally include
59 < * RejectedExecutionExceptions stemming from internal resource
60 < * exhaustion such as failure to allocate internal task queues.
36 > * <p>A {@code ForkJoinTask} is a lightweight form of {@link Future}.
37 > * The efficiency of {@code ForkJoinTask}s stems from a set of
38 > * restrictions (that are only partially statically enforceable)
39 > * reflecting their intended use as computational tasks calculating
40 > * pure functions or operating on purely isolated objects.  The
41 > * primary coordination mechanisms are {@link #fork}, that arranges
42 > * asynchronous execution, and {@link #join}, that doesn't proceed
43 > * until the task's result has been computed.  Computations should
44 > * avoid {@code synchronized} methods or blocks, and should minimize
45 > * other blocking synchronization apart from joining other tasks or
46 > * using synchronizers such as Phasers that are advertised to
47 > * cooperate with fork/join scheduling. Tasks should also not perform
48 > * blocking IO, and should ideally access variables that are
49 > * completely independent of those accessed by other running
50 > * tasks. Minor breaches of these restrictions, for example using
51 > * shared output streams, may be tolerable in practice, but frequent
52 > * use may result in poor performance, and the potential to
53 > * indefinitely stall if the number of threads not waiting for IO or
54 > * other external synchronization becomes exhausted. This usage
55 > * restriction is in part enforced by not permitting checked
56 > * exceptions such as {@code IOExceptions} to be thrown. However,
57 > * computations may still encounter unchecked exceptions, that are
58 > * rethrown to callers attempting to join them. These exceptions may
59 > * additionally include 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:
# Line 63 | Line 68 | import java.lang.reflect.*;
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
72 < * begin execution in the current thread. The "<em>quiet</em>" forms
73 < * of these methods do not extract results or report exceptions. These
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> The ForkJoinTask class is not usually directly subclassed.
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 #isCancelled} is true if completion was due to cancellation;
84 > * {@link #isCompletedNormally} is true if a task completed without
85 > * cancellation or encountering an exception; {@link
86 > * #isCompletedExceptionally} is true if if the task encountered an
87 > * exception (in which case {@link #getException} returns the
88 > * exception); {@link #isCancelled} is true if the task was cancelled
89 > * (in which case {@link #getException} returns a {@link
90 > * java.util.concurrent.CancellationException}); and {@link
91 > * #isCompletedAbnormally} is true if a task was either cancelled or
92 > * encountered an exception.
93 > *
94 > * <p>The ForkJoinTask class is not usually directly subclassed.
95   * Instead, you subclass one of the abstract classes that support a
96 < * particular style of fork/join processing.  Normally, a concrete
96 > * particular style of fork/join processing, typically {@link
97 > * RecursiveAction} for computations that do not return results, or
98 > * {@link RecursiveTask} for those that do.  Normally, a concrete
99   * ForkJoinTask subclass declares fields comprising its parameters,
100   * established in a constructor, and then defines a {@code compute}
101   * method that somehow uses the control methods supplied by this base
102   * class. While these methods have {@code public} access (to allow
103 < * instances of different task subclasses to call each others
103 > * instances of different task subclasses to call each other's
104   * methods), some of them may only be called from within other
105 < * ForkJoinTasks. Attempts to invoke them in other contexts result in
106 < * exceptions or errors possibly including ClassCastException.
105 > * ForkJoinTasks (as may be determined using method {@link
106 > * #inForkJoinPool}).  Attempts to invoke them in other contexts
107 > * result in exceptions or errors, possibly including
108 > * ClassCastException.
109   *
110 < * <p>Most base support methods are {@code final} because their
111 < * implementations are intrinsically tied to the underlying
112 < * lightweight task scheduling framework, and so cannot be overridden.
113 < * Developers creating new basic styles of fork/join processing should
114 < * minimally implement {@code protected} methods
115 < * {@code exec}, {@code setRawResult}, and
116 < * {@code getRawResult}, while also introducing an abstract
117 < * computational method that can be implemented in its subclasses,
118 < * possibly relying on other {@code protected} methods provided
96 < * by this class.
110 > * <p>Most base support methods are {@code final}, to prevent
111 > * overriding of implementations that are intrinsically tied to the
112 > * underlying lightweight task scheduling framework.  Developers
113 > * creating new basic styles of fork/join processing should minimally
114 > * implement {@code protected} methods {@link #exec}, {@link
115 > * #setRawResult}, and {@link #getRawResult}, while also introducing
116 > * an abstract computational method that can be implemented in its
117 > * subclasses, possibly relying on other {@code protected} methods
118 > * provided by this class.
119   *
120   * <p>ForkJoinTasks should perform relatively small amounts of
121 < * computations, otherwise splitting into smaller tasks. As a very
122 < * rough rule of thumb, a task should perform more than 100 and less
123 < * than 10000 basic computational steps. If tasks are too big, then
124 < * parallelism cannot improve throughput. If too small, then memory
125 < * and internal task maintenance overhead may overwhelm processing.
121 > * computation. Large tasks should be split into smaller subtasks,
122 > * usually via recursive decomposition. As a very rough rule of thumb,
123 > * a task should perform more than 100 and less than 10000 basic
124 > * computational steps. If tasks are too big, then parallelism cannot
125 > * improve throughput. If too small, then memory and internal task
126 > * maintenance overhead may overwhelm processing.
127 > *
128 > * <p>This class provides {@code adapt} methods for {@link Runnable}
129 > * and {@link Callable}, that may be of use when mixing execution of
130 > * {@code ForkJoinTasks} with other kinds of tasks. When all tasks
131 > * are of this form, consider using a pool in
132 > * {@linkplain ForkJoinPool#setAsyncMode async mode}.
133   *
134 < * <p>ForkJoinTasks are {@code Serializable}, which enables them
135 < * to be used in extensions such as remote execution frameworks. It is
136 < * in general sensible to serialize tasks only before or after, but
137 < * not during execution. Serialization is not relied on during
109 < * execution itself.
134 > * <p>ForkJoinTasks are {@code Serializable}, which enables them to be
135 > * used in extensions such as remote execution frameworks. It is
136 > * sensible to serialize tasks only before or after, but not during,
137 > * execution. Serialization is not relied on during execution itself.
138   *
139   * @since 1.7
140   * @author Doug Lea
# Line 160 | Line 188 | public abstract class ForkJoinTask<V> im
188       */
189      static ForkJoinWorkerThread getWorker() {
190          Thread t = Thread.currentThread();
191 <        return ((t instanceof ForkJoinWorkerThread)?
192 <                (ForkJoinWorkerThread)t : null);
191 >        return ((t instanceof ForkJoinWorkerThread) ?
192 >                (ForkJoinWorkerThread) t : null);
193      }
194  
195      final boolean casStatus(int cmp, int val) {
# Line 187 | Line 215 | public abstract class ForkJoinTask<V> im
215          ForkJoinPool pool = getPool();
216          if (pool != null) {
217              int s; // Clear signal bits while setting completion status
218 <            do;while ((s = status) >= 0 && !casStatus(s, completion));
218 >            do {} while ((s = status) >= 0 && !casStatus(s, completion));
219  
220              if ((s & SIGNAL_MASK) != 0) {
221                  if ((s &= INTERNAL_SIGNAL_MASK) != 0)
222                      pool.updateRunningCount(s);
223 <                synchronized(this) { notifyAll(); }
223 >                synchronized (this) { notifyAll(); }
224              }
225          }
226          else
# Line 205 | Line 233 | public abstract class ForkJoinTask<V> im
233       */
234      private void externallySetCompletion(int completion) {
235          int s;
236 <        do;while ((s = status) >= 0 &&
237 <                  !casStatus(s, (s & SIGNAL_MASK) | completion));
238 <        synchronized(this) { notifyAll(); }
236 >        do {} while ((s = status) >= 0 &&
237 >                     !casStatus(s, (s & SIGNAL_MASK) | completion));
238 >        synchronized (this) { notifyAll(); }
239      }
240  
241      /**
242 <     * Sets status to indicate normal completion
242 >     * Sets status to indicate normal completion.
243       */
244      final void setNormalCompletion() {
245          // Try typical fast case -- single CAS, no signal, not already done.
# Line 223 | Line 251 | public abstract class ForkJoinTask<V> im
251      // internal waiting and notification
252  
253      /**
254 <     * Performs the actual monitor wait for awaitDone
254 >     * Performs the actual monitor wait for awaitDone.
255       */
256      private void doAwaitDone() {
257          // Minimize lock bias and in/de-flation effects by maximizing
258          // chances of waiting inside sync
259          try {
260              while (status >= 0)
261 <                synchronized(this) { if (status >= 0) wait(); }
261 >                synchronized (this) { if (status >= 0) wait(); }
262          } catch (InterruptedException ie) {
263              onInterruptedWait();
264          }
265      }
266  
267      /**
268 <     * Performs the actual monitor wait for awaitDone
268 >     * Performs the actual timed monitor wait for awaitDone.
269       */
270      private void doAwaitDone(long startTime, long nanos) {
271 <        synchronized(this) {
271 >        synchronized (this) {
272              try {
273                  while (status >= 0) {
274 <                    long nt = nanos - System.nanoTime() - startTime;
274 >                    long nt = nanos - (System.nanoTime() - startTime);
275                      if (nt <= 0)
276                          break;
277 <                    wait(nt / 1000000, (int)(nt % 1000000));
277 >                    wait(nt / 1000000, (int) (nt % 1000000));
278                  }
279              } catch (InterruptedException ie) {
280                  onInterruptedWait();
# Line 262 | Line 290 | public abstract class ForkJoinTask<V> im
290       *
291       * @return status upon exit
292       */
293 <    private int awaitDone(ForkJoinWorkerThread w, boolean maintainParallelism) {
294 <        ForkJoinPool pool = w == null? null : w.pool;
293 >    private int awaitDone(ForkJoinWorkerThread w,
294 >                          boolean maintainParallelism) {
295 >        ForkJoinPool pool = (w == null) ? null : w.pool;
296          int s;
297          while ((s = status) >= 0) {
298 <            if (casStatus(s, pool == null? s|EXTERNAL_SIGNAL : s+1)) {
298 >            if (casStatus(s, (pool == null) ? s|EXTERNAL_SIGNAL : s+1)) {
299                  if (pool == null || !pool.preJoin(this, maintainParallelism))
300                      doAwaitDone();
301                  if (((s = status) & INTERNAL_SIGNAL_MASK) != 0)
# Line 279 | Line 308 | public abstract class ForkJoinTask<V> im
308  
309      /**
310       * Timed version of awaitDone
311 +     *
312       * @return status upon exit
313       */
314      private int awaitDone(ForkJoinWorkerThread w, long nanos) {
315 <        ForkJoinPool pool = w == null? null : w.pool;
315 >        ForkJoinPool pool = (w == null) ? null : w.pool;
316          int s;
317          while ((s = status) >= 0) {
318 <            if (casStatus(s, pool == null? s|EXTERNAL_SIGNAL : s+1)) {
318 >            if (casStatus(s, (pool == null) ? s|EXTERNAL_SIGNAL : s+1)) {
319                  long startTime = System.nanoTime();
320                  if (pool == null || !pool.preJoin(this, false))
321                      doAwaitDone(startTime, nanos);
# Line 307 | Line 337 | public abstract class ForkJoinTask<V> im
337       */
338      private void adjustPoolCountsOnUnblock(ForkJoinPool pool) {
339          int s;
340 <        do;while ((s = status) < 0 && !casStatus(s, s & COMPLETION_MASK));
340 >        do {} while ((s = status) < 0 && !casStatus(s, s & COMPLETION_MASK));
341          if (pool != null && (s &= INTERNAL_SIGNAL_MASK) != 0)
342              pool.updateRunningCount(s);
343      }
# Line 362 | Line 392 | public abstract class ForkJoinTask<V> im
392  
393      /**
394       * Returns result or throws exception using j.u.c.Future conventions.
395 <     * Only call when isDone known to be true.
395 >     * Only call when {@code isDone} known to be true or thread known
396 >     * to be interrupted.
397       */
398      private V reportFutureResult()
399 <        throws ExecutionException, InterruptedException {
399 >        throws InterruptedException, ExecutionException {
400 >        if (Thread.interrupted())
401 >            throw new InterruptedException();
402          int s = status & COMPLETION_MASK;
403          if (s < NORMAL) {
404              Throwable ex;
# Line 373 | Line 406 | public abstract class ForkJoinTask<V> im
406                  throw new CancellationException();
407              if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
408                  throw new ExecutionException(ex);
376            if (Thread.interrupted())
377                throw new InterruptedException();
409          }
410          return getRawResult();
411      }
# Line 385 | Line 416 | public abstract class ForkJoinTask<V> im
416       */
417      private V reportTimedFutureResult()
418          throws InterruptedException, ExecutionException, TimeoutException {
419 +        if (Thread.interrupted())
420 +            throw new InterruptedException();
421          Throwable ex;
422          int s = status & COMPLETION_MASK;
423          if (s == NORMAL)
424              return getRawResult();
425 <        if (s == CANCELLED)
425 >        else if (s == CANCELLED)
426              throw new CancellationException();
427 <        if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
427 >        else if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
428              throw new ExecutionException(ex);
429 <        if (Thread.interrupted())
430 <            throw new InterruptedException();
398 <        throw new TimeoutException();
429 >        else
430 >            throw new TimeoutException();
431      }
432  
433      // internal execution methods
# Line 428 | Line 460 | public abstract class ForkJoinTask<V> im
460              try {
461                  if (!exec())
462                      return;
463 <            } catch(Throwable rex) {
463 >            } catch (Throwable rex) {
464                  setDoneExceptionally(rex);
465                  return;
466              }
# Line 460 | Line 492 | public abstract class ForkJoinTask<V> im
492      final void cancelIgnoringExceptions() {
493          try {
494              cancel(false);
495 <        } catch(Throwable ignore) {
495 >        } catch (Throwable ignore) {
496          }
497      }
498  
# Line 472 | Line 504 | public abstract class ForkJoinTask<V> im
504          ForkJoinTask<?> t;
505          while ((s = status) >= 0 && (t = w.scanWhileJoining(this)) != null)
506              t.quietlyExec();
507 <        return (s >= 0)? awaitDone(w, false) : s; // block if no work
507 >        return (s >= 0) ? awaitDone(w, false) : s; // block if no work
508      }
509  
510      // public methods
# Line 480 | Line 512 | public abstract class ForkJoinTask<V> im
512      /**
513       * Arranges to asynchronously execute this task.  While it is not
514       * necessarily enforced, it is a usage error to fork a task more
515 <     * than once unless it has completed and been reinitialized.  This
516 <     * method may be invoked only from within ForkJoinTask
517 <     * computations. Attempts to invoke in other contexts result in
518 <     * exceptions or errors possibly including ClassCastException.
519 <     */
520 <    public final void fork() {
521 <        ((ForkJoinWorkerThread)(Thread.currentThread())).pushTask(this);
515 >     * than once unless it has completed and been reinitialized.
516 >     *
517 >     * <p>This method may be invoked only from within {@code
518 >     * ForkJoinTask} computations (as may be determined using method
519 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
520 >     * result in exceptions or errors, possibly including {@code
521 >     * ClassCastException}.
522 >     *
523 >     * @return {@code this}, to simplify usage
524 >     */
525 >    public final ForkJoinTask<V> fork() {
526 >        ((ForkJoinWorkerThread) Thread.currentThread())
527 >            .pushTask(this);
528 >        return this;
529      }
530  
531      /**
532       * Returns the result of the computation when it is ready.
533 <     * This method differs from {@code get} in that abnormal
534 <     * completion results in RuntimeExceptions or Errors, not
535 <     * ExecutionExceptions.
533 >     * This method differs from {@link #get()} in that
534 >     * abnormal completion results in {@code RuntimeException} or
535 >     * {@code Error}, not {@code ExecutionException}.
536       *
537       * @return the computed result
538       */
# Line 506 | Line 545 | public abstract class ForkJoinTask<V> im
545  
546      /**
547       * Commences performing this task, awaits its completion if
548 <     * necessary, and return its result.
548 >     * necessary, and return its result, or throws an (unchecked)
549 >     * exception if the underlying computation did so.
550       *
511     * @throws Throwable (a RuntimeException, Error, or unchecked
512     * exception) if the underlying computation did so
551       * @return the computed result
552       */
553      public final V invoke() {
# Line 520 | Line 558 | public abstract class ForkJoinTask<V> im
558      }
559  
560      /**
561 <     * Forks both tasks, returning when {@code isDone} holds for
562 <     * both of them or an exception is encountered. This method may be
563 <     * invoked only from within ForkJoinTask computations. Attempts to
564 <     * invoke in other contexts result in exceptions or errors
565 <     * possibly including ClassCastException.
566 <     *
567 <     * @param t1 one task
568 <     * @param t2 the other task
569 <     * @throws NullPointerException if t1 or t2 are null
570 <     * @throws RuntimeException or Error if either task did so
561 >     * Forks the given tasks, returning when {@code isDone} holds for
562 >     * each task or an (unchecked) exception is encountered, in which
563 >     * case the exception is rethrown.  If more than one task
564 >     * encounters an exception, then this method throws any one of
565 >     * these exceptions.  The individual status of each task may be
566 >     * checked using {@link #getException()} and related methods.
567 >     *
568 >     * <p>This method may be invoked only from within {@code
569 >     * ForkJoinTask} computations (as may be determined using method
570 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
571 >     * result in exceptions or errors, possibly including {@code
572 >     * ClassCastException}.
573 >     *
574 >     * @param t1 the first task
575 >     * @param t2 the second task
576 >     * @throws NullPointerException if any task is null
577       */
578 <    public static void invokeAll(ForkJoinTask<?>t1, ForkJoinTask<?> t2) {
578 >    public static void invokeAll(ForkJoinTask<?> t1, ForkJoinTask<?> t2) {
579          t2.fork();
580          t1.invoke();
581          t2.join();
582      }
583  
584      /**
585 <     * Forks the given tasks, returning when {@code isDone} holds
586 <     * for all of them. If any task encounters an exception, others
587 <     * may be cancelled.  This method may be invoked only from within
588 <     * ForkJoinTask computations. Attempts to invoke in other contexts
589 <     * result in exceptions or errors possibly including ClassCastException.
585 >     * Forks the given tasks, returning when {@code isDone} holds for
586 >     * each task or an (unchecked) exception is encountered, in which
587 >     * case the exception is rethrown. If any task encounters an
588 >     * exception, others may be, but are not guaranteed to be,
589 >     * cancelled.  If more than one task encounters an exception, then
590 >     * this method throws any one of these exceptions.  The individual
591 >     * status of each task may be checked using {@link #getException()}
592 >     * and related methods.
593 >     *
594 >     * <p>This method may be invoked only from within {@code
595 >     * ForkJoinTask} computations (as may be determined using method
596 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
597 >     * result in exceptions or errors, possibly including {@code
598 >     * ClassCastException}.
599       *
600 <     * @param tasks the array of tasks
601 <     * @throws NullPointerException if tasks or any element are null
549 <     * @throws RuntimeException or Error if any task did so
600 >     * @param tasks the tasks
601 >     * @throws NullPointerException if any task is null
602       */
603      public static void invokeAll(ForkJoinTask<?>... tasks) {
604          Throwable ex = null;
# Line 582 | Line 634 | public abstract class ForkJoinTask<V> im
634      }
635  
636      /**
637 <     * Forks all tasks in the collection, returning when
638 <     * {@code isDone} holds for all of them. If any task
639 <     * encounters an exception, others may be cancelled.  This method
640 <     * may be invoked only from within ForkJoinTask
641 <     * computations. Attempts to invoke in other contexts result in
642 <     * exceptions or errors possibly including ClassCastException.
637 >     * Forks all tasks in the specified collection, returning when
638 >     * {@code isDone} holds for each task or an (unchecked) exception
639 >     * is encountered.  If any task encounters an exception, others
640 >     * may be, but are not guaranteed to be, cancelled.  If more than
641 >     * one task encounters an exception, then this method throws any
642 >     * one of these exceptions.  The individual status of each task
643 >     * may be checked using {@link #getException()} and related
644 >     * methods.  The behavior of this operation is undefined if the
645 >     * specified collection is modified while the operation is in
646 >     * progress.
647 >     *
648 >     * <p>This method may be invoked only from within {@code
649 >     * ForkJoinTask} computations (as may be determined using method
650 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
651 >     * result in exceptions or errors, possibly including {@code
652 >     * ClassCastException}.
653       *
654       * @param tasks the collection of tasks
655 +     * @return the tasks argument, to simplify usage
656       * @throws NullPointerException if tasks or any element are null
594     * @throws RuntimeException or Error if any task did so
657       */
658 <    public static void invokeAll(Collection<? extends ForkJoinTask<?>> tasks) {
659 <        if (!(tasks instanceof List)) {
660 <            invokeAll(tasks.toArray(new ForkJoinTask[tasks.size()]));
661 <            return;
658 >    public static <T extends ForkJoinTask<?>> Collection<T> invokeAll(Collection<T> tasks) {
659 >        if (!(tasks instanceof RandomAccess) || !(tasks instanceof List<?>)) {
660 >            invokeAll(tasks.toArray(new ForkJoinTask<?>[tasks.size()]));
661 >            return tasks;
662          }
663 +        @SuppressWarnings("unchecked")
664          List<? extends ForkJoinTask<?>> ts =
665 <            (List<? extends ForkJoinTask<?>>)tasks;
665 >            (List<? extends ForkJoinTask<?>>) tasks;
666          Throwable ex = null;
667          int last = ts.size() - 1;
668          for (int i = last; i >= 0; --i) {
# Line 630 | Line 693 | public abstract class ForkJoinTask<V> im
693          }
694          if (ex != null)
695              rethrowException(ex);
696 +        return tasks;
697 +    }
698 +
699 +    /**
700 +     * Attempts to cancel execution of this task. This attempt will
701 +     * fail if the task has already completed, has already been
702 +     * cancelled, or could not be cancelled for some other reason. If
703 +     * successful, and this task has not started when cancel is
704 +     * called, execution of this task is suppressed, {@link
705 +     * #isCancelled} will report true, and {@link #join} will result
706 +     * in a {@code CancellationException} being thrown.
707 +     *
708 +     * <p>This method may be overridden in subclasses, but if so, must
709 +     * still ensure that these minimal properties hold. In particular,
710 +     * the {@code cancel} method itself must not throw exceptions.
711 +     *
712 +     * <p>This method is designed to be invoked by <em>other</em>
713 +     * tasks. To terminate the current task, you can just return or
714 +     * throw an unchecked exception from its computation method, or
715 +     * invoke {@link #completeExceptionally}.
716 +     *
717 +     * @param mayInterruptIfRunning this value is ignored in the
718 +     * default implementation because tasks are not
719 +     * cancelled via interruption
720 +     *
721 +     * @return {@code true} if this task is now cancelled
722 +     */
723 +    public boolean cancel(boolean mayInterruptIfRunning) {
724 +        setCompletion(CANCELLED);
725 +        return (status & COMPLETION_MASK) == CANCELLED;
726      }
727  
728      /**
729 <     * Returns true if the computation performed by this task has
730 <     * completed (or has been cancelled).
729 >     * Returns {@code true} if the computation performed by this task
730 >     * has completed (or has been cancelled).
731       *
732 <     * @return true if this computation has completed
732 >     * @return {@code true} if this computation has completed
733       */
734      public final boolean isDone() {
735          return status < 0;
736      }
737  
738      /**
739 <     * Returns true if this task was cancelled.
739 >     * Returns {@code true} if this task was cancelled.
740       *
741 <     * @return true if this task was cancelled
741 >     * @return {@code true} if this task was cancelled
742       */
743      public final boolean isCancelled() {
744          return (status & COMPLETION_MASK) == CANCELLED;
745      }
746  
747      /**
748 <     * Asserts that the results of this task's computation will not be
656 <     * used. If a cancellation occurs before attempting to execute this
657 <     * task, then execution will be suppressed, {@code isCancelled}
658 <     * will report true, and {@code join} will result in a
659 <     * {@code CancellationException} being thrown. Otherwise, when
660 <     * cancellation races with completion, there are no guarantees
661 <     * about whether {@code isCancelled} will report true, whether
662 <     * {@code join} will return normally or via an exception, or
663 <     * whether these behaviors will remain consistent upon repeated
664 <     * invocation.
665 <     *
666 <     * <p>This method may be overridden in subclasses, but if so, must
667 <     * still ensure that these minimal properties hold. In particular,
668 <     * the cancel method itself must not throw exceptions.
748 >     * Returns {@code true} if this task threw an exception or was cancelled.
749       *
750 <     * <p> This method is designed to be invoked by <em>other</em>
751 <     * tasks. To terminate the current task, you can just return or
752 <     * throw an unchecked exception from its computation method, or
753 <     * invoke {@code completeExceptionally}.
754 <     *
755 <     * @param mayInterruptIfRunning this value is ignored in the
756 <     * default implementation because tasks are not in general
757 <     * cancelled via interruption.
750 >     * @return {@code true} if this task threw an exception or was cancelled
751 >     */
752 >    public final boolean isCompletedAbnormally() {
753 >        return (status & COMPLETION_MASK) < NORMAL;
754 >    }
755 >
756 >    /**
757 >     * Returns {@code true} if this task completed without throwing an
758 >     * exception and was not cancelled.
759       *
760 <     * @return true if this task is now cancelled
760 >     * @return {@code true} if this task completed without throwing an
761 >     * exception and was not cancelled
762       */
763 <    public boolean cancel(boolean mayInterruptIfRunning) {
764 <        setCompletion(CANCELLED);
683 <        return (status & COMPLETION_MASK) == CANCELLED;
763 >    public final boolean isCompletedNormally() {
764 >        return (status & COMPLETION_MASK) == NORMAL;
765      }
766  
767      /**
768 <     * Returns true if this task threw an exception or was cancelled.
768 >     * Returns {@code true} if this task threw an exception.
769       *
770 <     * @return true if this task threw an exception or was cancelled
770 >     * @return {@code true} if this task threw an exception
771       */
772 <    public final boolean isCompletedAbnormally() {
773 <        return (status & COMPLETION_MASK) < NORMAL;
772 >    public final boolean isCompletedExceptionally() {
773 >        return (status & COMPLETION_MASK) == EXCEPTIONAL;
774      }
775  
776      /**
777       * Returns the exception thrown by the base computation, or a
778 <     * CancellationException if cancelled, or null if none or if the
779 <     * method has not yet completed.
778 >     * {@code CancellationException} if cancelled, or {@code null} if
779 >     * none or if the method has not yet completed.
780       *
781 <     * @return the exception, or null if none
781 >     * @return the exception, or {@code null} if none
782       */
783      public final Throwable getException() {
784          int s = status & COMPLETION_MASK;
785 <        if (s >= NORMAL)
786 <            return null;
787 <        if (s == CANCELLED)
707 <            return new CancellationException();
708 <        return exceptionMap.get(this);
785 >        return ((s >= NORMAL)    ? null :
786 >                (s == CANCELLED) ? new CancellationException() :
787 >                exceptionMap.get(this));
788      }
789  
790      /**
# Line 714 | Line 793 | public abstract class ForkJoinTask<V> im
793       * {@code join} and related operations. This method may be used
794       * to induce exceptions in asynchronous tasks, or to force
795       * completion of tasks that would not otherwise complete.  Its use
796 <     * in other situations is likely to be wrong.  This method is
796 >     * in other situations is discouraged.  This method is
797       * overridable, but overridden versions must invoke {@code super}
798       * implementation to maintain guarantees.
799       *
# Line 724 | Line 803 | public abstract class ForkJoinTask<V> im
803       */
804      public void completeExceptionally(Throwable ex) {
805          setDoneExceptionally((ex instanceof RuntimeException) ||
806 <                             (ex instanceof Error)? ex :
806 >                             (ex instanceof Error) ? ex :
807                               new RuntimeException(ex));
808      }
809  
# Line 734 | Line 813 | public abstract class ForkJoinTask<V> im
813       * operations. This method may be used to provide results for
814       * asynchronous tasks, or to provide alternative handling for
815       * tasks that would not otherwise complete normally. Its use in
816 <     * other situations is likely to be wrong. This method is
816 >     * other situations is discouraged. This method is
817       * overridable, but overridden versions must invoke {@code super}
818       * implementation to maintain guarantees.
819       *
# Line 743 | Line 822 | public abstract class ForkJoinTask<V> im
822      public void complete(V value) {
823          try {
824              setRawResult(value);
825 <        } catch(Throwable rex) {
825 >        } catch (Throwable rex) {
826              setDoneExceptionally(rex);
827              return;
828          }
# Line 759 | Line 838 | public abstract class ForkJoinTask<V> im
838  
839      public final V get(long timeout, TimeUnit unit)
840          throws InterruptedException, ExecutionException, TimeoutException {
841 +        long nanos = unit.toNanos(timeout);
842          ForkJoinWorkerThread w = getWorker();
843          if (w == null || status < 0 || !w.unpushTask(this) || !tryQuietlyInvoke())
844 <            awaitDone(w, unit.toNanos(timeout));
844 >            awaitDone(w, nanos);
845          return reportTimedFutureResult();
846      }
847  
# Line 772 | Line 852 | public abstract class ForkJoinTask<V> im
852       * there are no potential dependencies between continuation of the
853       * current task and that of any other task that might be executed
854       * while helping. (This usually holds for pure divide-and-conquer
855 <     * tasks). This method may be invoked only from within
856 <     * ForkJoinTask computations. Attempts to invoke in other contexts
857 <     * result in exceptions or errors possibly including ClassCastException.
855 >     * tasks).
856 >     *
857 >     * <p>This method may be invoked only from within {@code
858 >     * ForkJoinTask} computations (as may be determined using method
859 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
860 >     * result in exceptions or errors, possibly including {@code
861 >     * ClassCastException}.
862       *
863       * @return the computed result
864       */
865      public final V helpJoin() {
866 <        ForkJoinWorkerThread w = (ForkJoinWorkerThread)(Thread.currentThread());
866 >        ForkJoinWorkerThread w = (ForkJoinWorkerThread) Thread.currentThread();
867          if (status < 0 || !w.unpushTask(this) || !tryExec())
868              reportException(busyJoin(w));
869          return getRawResult();
# Line 787 | Line 871 | public abstract class ForkJoinTask<V> im
871  
872      /**
873       * Possibly executes other tasks until this task is ready.  This
874 <     * method may be invoked only from within ForkJoinTask
875 <     * computations. Attempts to invoke in other contexts result in
876 <     * exceptions or errors possibly including ClassCastException.
874 >     * method may be useful when processing collections of tasks when
875 >     * some have been cancelled or otherwise known to have aborted.
876 >     *
877 >     * <p>This method may be invoked only from within {@code
878 >     * ForkJoinTask} computations (as may be determined using method
879 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
880 >     * result in exceptions or errors, possibly including {@code
881 >     * ClassCastException}.
882       */
883      public final void quietlyHelpJoin() {
884          if (status >= 0) {
885              ForkJoinWorkerThread w =
886 <                (ForkJoinWorkerThread)(Thread.currentThread());
886 >                (ForkJoinWorkerThread) Thread.currentThread();
887              if (!w.unpushTask(this) || !tryQuietlyInvoke())
888                  busyJoin(w);
889          }
# Line 828 | Line 917 | public abstract class ForkJoinTask<V> im
917  
918      /**
919       * Possibly executes tasks until the pool hosting the current task
920 <     * {@link ForkJoinPool#isQuiescent}. This method may be of use in
921 <     * designs in which many tasks are forked, but none are explicitly
922 <     * joined, instead executing them until all are processed.
920 >     * {@link ForkJoinPool#isQuiescent is quiescent}. This method may
921 >     * be of use in designs in which many tasks are forked, but none
922 >     * are explicitly joined, instead executing them until all are
923 >     * processed.
924 >     *
925 >     * <p>This method may be invoked only from within {@code
926 >     * ForkJoinTask} computations (as may be determined using method
927 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
928 >     * result in exceptions or errors, possibly including {@code
929 >     * ClassCastException}.
930       */
931      public static void helpQuiesce() {
932 <        ((ForkJoinWorkerThread)(Thread.currentThread())).
933 <            helpQuiescePool();
932 >        ((ForkJoinWorkerThread) Thread.currentThread())
933 >            .helpQuiescePool();
934      }
935  
936      /**
# Line 843 | Line 939 | public abstract class ForkJoinTask<V> im
939       * this task, but only if reuse occurs when this task has either
940       * never been forked, or has been forked, then completed and all
941       * outstanding joins of this task have also completed. Effects
942 <     * under any other usage conditions are not guaranteed, and are
943 <     * almost surely wrong. This method may be useful when executing
942 >     * under any other usage conditions are not guaranteed.
943 >     * This method may be useful when executing
944       * pre-constructed trees of subtasks in loops.
945       */
946      public void reinitialize() {
# Line 855 | Line 951 | public abstract class ForkJoinTask<V> im
951  
952      /**
953       * Returns the pool hosting the current task execution, or null
954 <     * if this task is executing outside of any pool.
954 >     * if this task is executing outside of any ForkJoinPool.
955       *
956 <     * @return the pool, or null if none
956 >     * @see #inForkJoinPool
957 >     * @return the pool, or {@code null} if none
958       */
959      public static ForkJoinPool getPool() {
960          Thread t = Thread.currentThread();
961 <        return ((t instanceof ForkJoinWorkerThread)?
962 <                ((ForkJoinWorkerThread)t).pool : null);
961 >        return (t instanceof ForkJoinWorkerThread) ?
962 >            ((ForkJoinWorkerThread) t).pool : null;
963 >    }
964 >
965 >    /**
966 >     * Returns {@code true} if the current thread is executing as a
967 >     * ForkJoinPool computation.
968 >     *
969 >     * @return {@code true} if the current thread is executing as a
970 >     * ForkJoinPool computation, or false otherwise
971 >     */
972 >    public static boolean inForkJoinPool() {
973 >        return Thread.currentThread() instanceof ForkJoinWorkerThread;
974      }
975  
976      /**
# Line 871 | Line 979 | public abstract class ForkJoinTask<V> im
979       * by the current thread, and has not commenced executing in
980       * another thread.  This method may be useful when arranging
981       * alternative local processing of tasks that could have been, but
982 <     * were not, stolen. This method may be invoked only from within
875 <     * ForkJoinTask computations. Attempts to invoke in other contexts
876 <     * result in exceptions or errors possibly including ClassCastException.
982 >     * were not, stolen.
983       *
984 <     * @return true if unforked
984 >     * <p>This method may be invoked only from within {@code
985 >     * ForkJoinTask} computations (as may be determined using method
986 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
987 >     * result in exceptions or errors, possibly including {@code
988 >     * ClassCastException}.
989 >     *
990 >     * @return {@code true} if unforked
991       */
992      public boolean tryUnfork() {
993 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).unpushTask(this);
993 >        return ((ForkJoinWorkerThread) Thread.currentThread())
994 >            .unpushTask(this);
995      }
996  
997      /**
# Line 887 | Line 1000 | public abstract class ForkJoinTask<V> im
1000       * value may be useful for heuristic decisions about whether to
1001       * fork other tasks.
1002       *
1003 +     * <p>This method may be invoked only from within {@code
1004 +     * ForkJoinTask} computations (as may be determined using method
1005 +     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1006 +     * result in exceptions or errors, possibly including {@code
1007 +     * ClassCastException}.
1008 +     *
1009       * @return the number of tasks
1010       */
1011      public static int getQueuedTaskCount() {
1012 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).
1013 <            getQueueSize();
1012 >        return ((ForkJoinWorkerThread) Thread.currentThread())
1013 >            .getQueueSize();
1014      }
1015  
1016      /**
# Line 904 | Line 1023 | public abstract class ForkJoinTask<V> im
1023       * tasks, and to process computations locally if this threshold is
1024       * exceeded.
1025       *
1026 +     * <p>This method may be invoked only from within {@code
1027 +     * ForkJoinTask} computations (as may be determined using method
1028 +     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1029 +     * result in exceptions or errors, possibly including {@code
1030 +     * ClassCastException}.
1031 +     *
1032       * @return the surplus number of tasks, which may be negative
1033       */
1034      public static int getSurplusQueuedTaskCount() {
1035 <        return ((ForkJoinWorkerThread)(Thread.currentThread()))
1035 >        return ((ForkJoinWorkerThread) Thread.currentThread())
1036              .getEstimatedSurplusTaskCount();
1037      }
1038  
1039      // Extension methods
1040  
1041      /**
1042 <     * Returns the result that would be returned by {@code join},
1043 <     * even if this task completed abnormally, or null if this task is
1044 <     * not known to have been completed.  This method is designed to
1045 <     * aid debugging, as well as to support extensions. Its use in any
1046 <     * other context is discouraged.
1042 >     * Returns the result that would be returned by {@link #join}, even
1043 >     * if this task completed abnormally, or {@code null} if this task
1044 >     * is not known to have been completed.  This method is designed
1045 >     * to aid debugging, as well as to support extensions. Its use in
1046 >     * any other context is discouraged.
1047       *
1048 <     * @return the result, or null if not completed
1048 >     * @return the result, or {@code null} if not completed
1049       */
1050      public abstract V getRawResult();
1051  
# Line 939 | Line 1064 | public abstract class ForkJoinTask<V> im
1064       * called otherwise. The return value controls whether this task
1065       * is considered to be done normally. It may return false in
1066       * asynchronous actions that require explicit invocations of
1067 <     * {@code complete} to become joinable. It may throw exceptions
1068 <     * to indicate abnormal exit.
1067 >     * {@link #complete} to become joinable. It may also throw an
1068 >     * (unchecked) exception to indicate abnormal exit.
1069       *
1070 <     * @return true if completed normally
946 <     * @throws Error or RuntimeException if encountered during computation
1070 >     * @return {@code true} if completed normally
1071       */
1072      protected abstract boolean exec();
1073  
1074      /**
1075 <     * Returns, but does not unschedule or execute, the task queued by
1076 <     * the current thread but not yet executed, if one is
1075 >     * Returns, but does not unschedule or execute, a task queued by
1076 >     * the current thread but not yet executed, if one is immediately
1077       * available. There is no guarantee that this task will actually
1078 <     * be polled or executed next.  This method is designed primarily
1079 <     * to support extensions, and is unlikely to be useful otherwise.
1080 <     * This method may be invoked only from within ForkJoinTask
1081 <     * computations. Attempts to invoke in other contexts result in
1082 <     * exceptions or errors possibly including ClassCastException.
1078 >     * be polled or executed next. Conversely, this method may return
1079 >     * null even if a task exists but cannot be accessed without
1080 >     * contention with other threads.  This method is designed
1081 >     * primarily to support extensions, and is unlikely to be useful
1082 >     * otherwise.
1083       *
1084 <     * @return the next task, or null if none are available
1084 >     * <p>This method may be invoked only from within {@code
1085 >     * ForkJoinTask} computations (as may be determined using method
1086 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1087 >     * result in exceptions or errors, possibly including {@code
1088 >     * ClassCastException}.
1089 >     *
1090 >     * @return the next task, or {@code null} if none are available
1091       */
1092      protected static ForkJoinTask<?> peekNextLocalTask() {
1093 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).peekTask();
1093 >        return ((ForkJoinWorkerThread) Thread.currentThread())
1094 >            .peekTask();
1095      }
1096  
1097      /**
1098       * Unschedules and returns, without executing, the next task
1099       * queued by the current thread but not yet executed.  This method
1100       * is designed primarily to support extensions, and is unlikely to
1101 <     * be useful otherwise.  This method may be invoked only from
1102 <     * within ForkJoinTask computations. Attempts to invoke in other
1103 <     * contexts result in exceptions or errors possibly including
1104 <     * ClassCastException.
1101 >     * be useful otherwise.
1102 >     *
1103 >     * <p>This method may be invoked only from within {@code
1104 >     * ForkJoinTask} computations (as may be determined using method
1105 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1106 >     * result in exceptions or errors, possibly including {@code
1107 >     * ClassCastException}.
1108       *
1109 <     * @return the next task, or null if none are available
1109 >     * @return the next task, or {@code null} if none are available
1110       */
1111      protected static ForkJoinTask<?> pollNextLocalTask() {
1112 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).pollLocalTask();
1112 >        return ((ForkJoinWorkerThread) Thread.currentThread())
1113 >            .pollLocalTask();
1114      }
1115  
1116      /**
# Line 986 | Line 1121 | public abstract class ForkJoinTask<V> im
1121       * {@code null} result does not necessarily imply quiescence
1122       * of the pool this task is operating in.  This method is designed
1123       * primarily to support extensions, and is unlikely to be useful
1124 <     * otherwise.  This method may be invoked only from within
990 <     * ForkJoinTask computations. Attempts to invoke in other contexts
991 <     * result in exceptions or errors possibly including
992 <     * ClassCastException.
1124 >     * otherwise.
1125       *
1126 <     * @return a task, or null if none are available
1126 >     * <p>This method may be invoked only from within {@code
1127 >     * ForkJoinTask} computations (as may be determined using method
1128 >     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1129 >     * result in exceptions or errors, possibly including {@code
1130 >     * ClassCastException}.
1131 >     *
1132 >     * @return a task, or {@code null} if none are available
1133       */
1134      protected static ForkJoinTask<?> pollTask() {
1135 <        return ((ForkJoinWorkerThread)(Thread.currentThread())).
1136 <            pollTask();
1135 >        return ((ForkJoinWorkerThread) Thread.currentThread())
1136 >            .pollTask();
1137 >    }
1138 >
1139 >    /**
1140 >     * Adaptor for Runnables. This implements RunnableFuture
1141 >     * to be compliant with AbstractExecutorService constraints
1142 >     * when used in ForkJoinPool.
1143 >     */
1144 >    static final class AdaptedRunnable<T> extends ForkJoinTask<T>
1145 >        implements RunnableFuture<T> {
1146 >        final Runnable runnable;
1147 >        final T resultOnCompletion;
1148 >        T result;
1149 >        AdaptedRunnable(Runnable runnable, T result) {
1150 >            if (runnable == null) throw new NullPointerException();
1151 >            this.runnable = runnable;
1152 >            this.resultOnCompletion = result;
1153 >        }
1154 >        public T getRawResult() { return result; }
1155 >        public void setRawResult(T v) { result = v; }
1156 >        public boolean exec() {
1157 >            runnable.run();
1158 >            result = resultOnCompletion;
1159 >            return true;
1160 >        }
1161 >        public void run() { invoke(); }
1162 >        private static final long serialVersionUID = 5232453952276885070L;
1163 >    }
1164 >
1165 >    /**
1166 >     * Adaptor for Callables
1167 >     */
1168 >    static final class AdaptedCallable<T> extends ForkJoinTask<T>
1169 >        implements RunnableFuture<T> {
1170 >        final Callable<? extends T> callable;
1171 >        T result;
1172 >        AdaptedCallable(Callable<? extends T> callable) {
1173 >            if (callable == null) throw new NullPointerException();
1174 >            this.callable = callable;
1175 >        }
1176 >        public T getRawResult() { return result; }
1177 >        public void setRawResult(T v) { result = v; }
1178 >        public boolean exec() {
1179 >            try {
1180 >                result = callable.call();
1181 >                return true;
1182 >            } catch (Error err) {
1183 >                throw err;
1184 >            } catch (RuntimeException rex) {
1185 >                throw rex;
1186 >            } catch (Exception ex) {
1187 >                throw new RuntimeException(ex);
1188 >            }
1189 >        }
1190 >        public void run() { invoke(); }
1191 >        private static final long serialVersionUID = 2838392045355241008L;
1192 >    }
1193 >
1194 >    /**
1195 >     * Returns a new {@code ForkJoinTask} that performs the {@code run}
1196 >     * method of the given {@code Runnable} as its action, and returns
1197 >     * a null result upon {@link #join}.
1198 >     *
1199 >     * @param runnable the runnable action
1200 >     * @return the task
1201 >     */
1202 >    public static ForkJoinTask<?> adapt(Runnable runnable) {
1203 >        return new AdaptedRunnable<Void>(runnable, null);
1204 >    }
1205 >
1206 >    /**
1207 >     * Returns a new {@code ForkJoinTask} that performs the {@code run}
1208 >     * method of the given {@code Runnable} as its action, and returns
1209 >     * the given result upon {@link #join}.
1210 >     *
1211 >     * @param runnable the runnable action
1212 >     * @param result the result upon completion
1213 >     * @return the task
1214 >     */
1215 >    public static <T> ForkJoinTask<T> adapt(Runnable runnable, T result) {
1216 >        return new AdaptedRunnable<T>(runnable, result);
1217 >    }
1218 >
1219 >    /**
1220 >     * Returns a new {@code ForkJoinTask} that performs the {@code call}
1221 >     * method of the given {@code Callable} as its action, and returns
1222 >     * its result upon {@link #join}, translating any checked exceptions
1223 >     * encountered into {@code RuntimeException}.
1224 >     *
1225 >     * @param callable the callable action
1226 >     * @return the task
1227 >     */
1228 >    public static <T> ForkJoinTask<T> adapt(Callable<? extends T> callable) {
1229 >        return new AdaptedCallable<T>(callable);
1230      }
1231  
1232      // Serialization support
# Line 1006 | Line 1237 | public abstract class ForkJoinTask<V> im
1237       * Save the state to a stream.
1238       *
1239       * @serialData the current run status and the exception thrown
1240 <     * during execution, or null if none
1240 >     * during execution, or {@code null} if none
1241       * @param s the stream
1242       */
1243      private void writeObject(java.io.ObjectOutputStream s)
# Line 1027 | Line 1258 | public abstract class ForkJoinTask<V> im
1258          status |= EXTERNAL_SIGNAL; // conservatively set external signal
1259          Object ex = s.readObject();
1260          if (ex != null)
1261 <            setDoneExceptionally((Throwable)ex);
1261 >            setDoneExceptionally((Throwable) ex);
1262      }
1263  
1264 <    // Temporary Unsafe mechanics for preliminary release
1265 <    private static Unsafe getUnsafe() throws Throwable {
1264 >    // Unsafe mechanics
1265 >
1266 >    private static final sun.misc.Unsafe UNSAFE = getUnsafe();
1267 >    private static final long statusOffset =
1268 >        objectFieldOffset("status", ForkJoinTask.class);
1269 >
1270 >    private static long objectFieldOffset(String field, Class<?> klazz) {
1271          try {
1272 <            return Unsafe.getUnsafe();
1272 >            return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field));
1273 >        } catch (NoSuchFieldException e) {
1274 >            // Convert Exception to corresponding Error
1275 >            NoSuchFieldError error = new NoSuchFieldError(field);
1276 >            error.initCause(e);
1277 >            throw error;
1278 >        }
1279 >    }
1280 >
1281 >    /**
1282 >     * Returns a sun.misc.Unsafe.  Suitable for use in a 3rd party package.
1283 >     * Replace with a simple call to Unsafe.getUnsafe when integrating
1284 >     * into a jdk.
1285 >     *
1286 >     * @return a sun.misc.Unsafe
1287 >     */
1288 >    private static sun.misc.Unsafe getUnsafe() {
1289 >        try {
1290 >            return sun.misc.Unsafe.getUnsafe();
1291          } catch (SecurityException se) {
1292              try {
1293                  return java.security.AccessController.doPrivileged
1294 <                    (new java.security.PrivilegedExceptionAction<Unsafe>() {
1295 <                        public Unsafe run() throws Exception {
1296 <                            return getUnsafePrivileged();
1294 >                    (new java.security
1295 >                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
1296 >                        public sun.misc.Unsafe run() throws Exception {
1297 >                            java.lang.reflect.Field f = sun.misc
1298 >                                .Unsafe.class.getDeclaredField("theUnsafe");
1299 >                            f.setAccessible(true);
1300 >                            return (sun.misc.Unsafe) f.get(null);
1301                          }});
1302              } catch (java.security.PrivilegedActionException e) {
1303 <                throw e.getCause();
1303 >                throw new RuntimeException("Could not initialize intrinsics",
1304 >                                           e.getCause());
1305              }
1306          }
1307      }
1049
1050    private static Unsafe getUnsafePrivileged()
1051            throws NoSuchFieldException, IllegalAccessException {
1052        Field f = Unsafe.class.getDeclaredField("theUnsafe");
1053        f.setAccessible(true);
1054        return (Unsafe) f.get(null);
1055    }
1056
1057    private static long fieldOffset(String fieldName)
1058            throws NoSuchFieldException {
1059        return UNSAFE.objectFieldOffset
1060            (ForkJoinTask.class.getDeclaredField(fieldName));
1061    }
1062
1063    static final Unsafe UNSAFE;
1064    static final long statusOffset;
1065
1066    static {
1067        try {
1068            UNSAFE = getUnsafe();
1069            statusOffset = fieldOffset("status");
1070        } catch (Throwable e) {
1071            throw new RuntimeException("Could not initialize intrinsics", e);
1072        }
1073    }
1074
1308   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines