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.89 by dl, Mon Apr 9 13:11:44 2012 UTC vs.
Revision 1.95 by jsr166, Mon Nov 26 14:11:54 2012 UTC

# Line 30 | Line 30 | import java.lang.reflect.Constructor;
30   * subtasks may be hosted by a small number of actual threads in a
31   * ForkJoinPool, at the price of some usage limitations.
32   *
33 < * <p>A "main" {@code ForkJoinTask} begins execution when submitted
34 < * to a {@link ForkJoinPool}.  Once started, it will usually in turn
35 < * start other subtasks.  As indicated by the name of this class,
36 < * many programs using {@code ForkJoinTask} employ only methods
37 < * {@link #fork} and {@link #join}, or derivatives such as {@link
33 > * <p>A "main" {@code ForkJoinTask} begins execution when it is
34 > * explicitly submitted to a {@link ForkJoinPool}, or, if not already
35 > * engaged in a ForkJoin computation, commenced in the {@link
36 > * ForkJoinPool#commonPool()} via {@link #fork}, {@link #invoke}, or
37 > * related methods.  Once started, it will usually in turn start other
38 > * subtasks.  As indicated by the name of this class, many programs
39 > * using {@code ForkJoinTask} employ only methods {@link #fork} and
40 > * {@link #join}, or derivatives such as {@link
41   * #invokeAll(ForkJoinTask...) invokeAll}.  However, this class also
42   * provides a number of other methods that can come into play in
43 < * advanced usages, as well as extension mechanics that allow
44 < * support of new forms of fork/join processing.
43 > * advanced usages, as well as extension mechanics that allow support
44 > * of new forms of fork/join processing.
45   *
46   * <p>A {@code ForkJoinTask} is a lightweight form of {@link Future}.
47   * The efficiency of {@code ForkJoinTask}s stems from a set of
# Line 52 | Line 55 | import java.lang.reflect.Constructor;
55   * minimize other blocking synchronization apart from joining other
56   * tasks or using synchronizers such as Phasers that are advertised to
57   * cooperate with fork/join scheduling. Subdividable tasks should also
58 < * not perform blocking IO, and should ideally access variables that
58 > * not perform blocking I/O, and should ideally access variables that
59   * are completely independent of those accessed by other running
60   * tasks. These guidelines are loosely enforced by not permitting
61   * checked exceptions such as {@code IOExceptions} to be
# Line 70 | Line 73 | import java.lang.reflect.Constructor;
73   * <p>It is possible to define and use ForkJoinTasks that may block,
74   * but doing do requires three further considerations: (1) Completion
75   * of few if any <em>other</em> tasks should be dependent on a task
76 < * that blocks on external synchronization or IO. Event-style async
77 < * tasks that are never joined often fall into this category.  (2) To
78 < * minimize resource impact, tasks should be small; ideally performing
79 < * only the (possibly) blocking action. (3) Unless the {@link
76 > * that blocks on external synchronization or I/O. Event-style async
77 > * tasks that are never joined (for example, those subclassing {@link
78 > * CountedCompleter}) often fall into this category.  (2) To minimize
79 > * resource impact, tasks should be small; ideally performing only the
80 > * (possibly) blocking action. (3) Unless the {@link
81   * ForkJoinPool.ManagedBlocker} API is used, or the number of possibly
82   * blocked tasks is known to be less than the pool's {@link
83   * ForkJoinPool#getParallelism} level, the pool cannot guarantee that
# Line 122 | Line 126 | import java.lang.reflect.Constructor;
126   * other actions.  Normally, a concrete ForkJoinTask subclass declares
127   * fields comprising its parameters, established in a constructor, and
128   * then defines a {@code compute} method that somehow uses the control
129 < * methods supplied by this base class. While these methods have
126 < * {@code public} access (to allow instances of different task
127 < * subclasses to call each other's methods), some of them may only be
128 < * called from within other ForkJoinTasks (as may be determined using
129 < * method {@link #inForkJoinPool}).  Attempts to invoke them in other
130 < * contexts result in exceptions or errors, possibly including {@code
131 < * ClassCastException}.
129 > * methods supplied by this base class.
130   *
131   * <p>Method {@link #join} and its variants are appropriate for use
132   * only when completion dependencies are acyclic; that is, the
# Line 139 | Line 137 | import java.lang.reflect.Constructor;
137   * {@link Phaser}, {@link #helpQuiesce}, and {@link #complete}) that
138   * may be of use in constructing custom subclasses for problems that
139   * are not statically structured as DAGs. To support such usages a
140 < * ForkJoinTask may be atomically <em>tagged</em> with a {@code
141 < * short} value using {@link #setForkJoinTaskTag} or {@link
140 > * ForkJoinTask may be atomically <em>tagged</em> with a {@code short}
141 > * value using {@link #setForkJoinTaskTag} or {@link
142   * #compareAndSetForkJoinTaskTag} and checked using {@link
143 < * #getForkJoinTaskTag}. The ForkJoinTask implementation does not
144 < * use these {@code protected} methods or tags for any purpose, but
145 < * they may be of use in the construction of specialized subclasses.
146 < * For example, parallel graph traversals can use the supplied methods
147 < * to avoid revisiting nodes/tasks that have already been processed.
148 < * Also, completion based designs can use them to record that subtasks
149 < * have completed. (Method names for tagging are bulky in part to
152 < * encourage definition of methods that reflect their usage patterns.)
143 > * #getForkJoinTaskTag}. The ForkJoinTask implementation does not use
144 > * these {@code protected} methods or tags for any purpose, but they
145 > * may be of use in the construction of specialized subclasses.  For
146 > * example, parallel graph traversals can use the supplied methods to
147 > * avoid revisiting nodes/tasks that have already been processed.
148 > * (Method names for tagging are bulky in part to encourage definition
149 > * of methods that reflect their usage patterns.)
150   *
151   * <p>Most base support methods are {@code final}, to prevent
152   * overriding of implementations that are intrinsically tied to the
# Line 287 | Line 284 | public abstract class ForkJoinTask<V> im
284       * @return status upon completion
285       */
286      private int externalAwaitDone() {
290        boolean interrupted = false;
287          int s;
288 +        ForkJoinPool.externalHelpJoin(this);
289 +        boolean interrupted = false;
290          while ((s = status) >= 0) {
291              if (U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
292                  synchronized (this) {
# Line 316 | Line 314 | public abstract class ForkJoinTask<V> im
314          int s;
315          if (Thread.interrupted())
316              throw new InterruptedException();
317 +        ForkJoinPool.externalHelpJoin(this);
318          while ((s = status) >= 0) {
319              if (U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
320                  synchronized (this) {
# Line 329 | Line 328 | public abstract class ForkJoinTask<V> im
328          return s;
329      }
330  
331 +
332      /**
333       * Implementation for join, get, quietlyJoin. Directly handles
334       * only cases of already-completed, external wait, and
# Line 338 | Line 338 | public abstract class ForkJoinTask<V> im
338       */
339      private int doJoin() {
340          int s; Thread t; ForkJoinWorkerThread wt; ForkJoinPool.WorkQueue w;
341 <        if ((s = status) >= 0) {
342 <            if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)) {
343 <                if (!(w = (wt = (ForkJoinWorkerThread)t).workQueue).
344 <                    tryUnpush(this) || (s = doExec()) >= 0)
345 <                    s = wt.pool.awaitJoin(w, this);
346 <            }
347 <            else
348 <                s = externalAwaitDone();
349 <        }
350 <        return s;
341 >        return (s = status) < 0 ? s :
342 >            ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
343 >            (w = (wt = (ForkJoinWorkerThread)t).workQueue).
344 >            tryUnpush(this) && (s = doExec()) < 0 ? s :
345 >            wt.pool.awaitJoin(w, this) :
346 >            externalAwaitDone();
347      }
348  
349      /**
# Line 357 | Line 353 | public abstract class ForkJoinTask<V> im
353       */
354      private int doInvoke() {
355          int s; Thread t; ForkJoinWorkerThread wt;
356 <        if ((s = doExec()) >= 0) {
357 <            if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
358 <                s = (wt = (ForkJoinWorkerThread)t).pool.awaitJoin(wt.workQueue,
359 <                                                                  this);
364 <            else
365 <                s = externalAwaitDone();
366 <        }
367 <        return s;
356 >        return (s = doExec()) < 0 ? s :
357 >            ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
358 >            (wt = (ForkJoinWorkerThread)t).pool.awaitJoin(wt.workQueue, this) :
359 >            externalAwaitDone();
360      }
361  
362      // Exception table support
# Line 412 | Line 404 | public abstract class ForkJoinTask<V> im
404      }
405  
406      /**
407 <     * Records exception and sets exceptional completion.
407 >     * Records exception and sets status.
408       *
409       * @return status on exit
410       */
411 <    private int setExceptionalCompletion(Throwable ex) {
411 >    final int recordExceptionalCompletion(Throwable ex) {
412          int s;
413          if ((s = status) >= 0) {
414              int h = System.identityHashCode(this);
# Line 439 | Line 431 | public abstract class ForkJoinTask<V> im
431              }
432              s = setCompletion(EXCEPTIONAL);
433          }
442        ForkJoinTask<?> p = internalGetCompleter(); // propagate
443        if (p != null && p.status >= 0)
444            p.setExceptionalCompletion(ex);
434          return s;
435      }
436  
437      /**
438 <     * Exception propagation support for tasks with completers.
438 >     * Records exception and possibly propagates
439 >     *
440 >     * @return status on exit
441 >     */
442 >    private int setExceptionalCompletion(Throwable ex) {
443 >        int s = recordExceptionalCompletion(ex);
444 >        if ((s & DONE_MASK) == EXCEPTIONAL)
445 >            internalPropagateException(ex);
446 >        return s;
447 >    }
448 >
449 >    /**
450 >     * Hook for exception propagation support for tasks with completers.
451       */
452 <    ForkJoinTask<?> internalGetCompleter() {
452 <        return null;
452 >    void internalPropagateException(Throwable ex) {
453      }
454  
455      /**
# Line 598 | Line 598 | public abstract class ForkJoinTask<V> im
598      }
599  
600      /**
601 +     * A version of "sneaky throw" to relay exceptions
602 +     */
603 +    static void rethrow(final Throwable ex) {
604 +        if (ex != null) {
605 +            if (ex instanceof Error)
606 +                throw (Error)ex;
607 +            if (ex instanceof RuntimeException)
608 +                throw (RuntimeException)ex;
609 +            throw uncheckedThrowable(ex, RuntimeException.class);
610 +        }
611 +    }
612 +
613 +    /**
614 +     * The sneaky part of sneaky throw, relying on generics
615 +     * limitations to evade compiler complaints about rethrowing
616 +     * unchecked exceptions
617 +     */
618 +    @SuppressWarnings("unchecked") static <T extends Throwable>
619 +        T uncheckedThrowable(final Throwable t, final Class<T> c) {
620 +        return (T)t; // rely on vacuous cast
621 +    }
622 +
623 +    /**
624       * Throws exception, if any, associated with the given status.
625       */
626      private void reportException(int s) {
627 <        Throwable ex = ((s == CANCELLED) ?  new CancellationException() :
628 <                        (s == EXCEPTIONAL) ? getThrowableException() :
629 <                        null);
630 <        if (ex != null)
608 <            U.throwException(ex);
627 >        if (s == CANCELLED)
628 >            throw new CancellationException();
629 >        if (s == EXCEPTIONAL)
630 >            rethrow(getThrowableException());
631      }
632  
633      // public methods
634  
635      /**
636 <     * Arranges to asynchronously execute this task.  While it is not
637 <     * necessarily enforced, it is a usage error to fork a task more
638 <     * than once unless it has completed and been reinitialized.
639 <     * Subsequent modifications to the state of this task or any data
640 <     * it operates on are not necessarily consistently observable by
641 <     * any thread other than the one executing it unless preceded by a
642 <     * call to {@link #join} or related methods, or a call to {@link
643 <     * #isDone} returning {@code true}.
644 <     *
645 <     * <p>This method may be invoked only from within {@code
646 <     * ForkJoinPool} computations (as may be determined using method
625 <     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
626 <     * result in exceptions or errors, possibly including {@code
627 <     * ClassCastException}.
636 >     * Arranges to asynchronously execute this task in the pool the
637 >     * current task is running in, if applicable, or using the {@link
638 >     * ForkJoinPool#commonPool()} if not {@link #inForkJoinPool}.  While
639 >     * it is not necessarily enforced, it is a usage error to fork a
640 >     * task more than once unless it has completed and been
641 >     * reinitialized.  Subsequent modifications to the state of this
642 >     * task or any data it operates on are not necessarily
643 >     * consistently observable by any thread other than the one
644 >     * executing it unless preceded by a call to {@link #join} or
645 >     * related methods, or a call to {@link #isDone} returning {@code
646 >     * true}.
647       *
648       * @return {@code this}, to simplify usage
649       */
650      public final ForkJoinTask<V> fork() {
651 <        ((ForkJoinWorkerThread)Thread.currentThread()).workQueue.push(this);
651 >        Thread t;
652 >        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
653 >            ((ForkJoinWorkerThread)t).workQueue.push(this);
654 >        else
655 >            ForkJoinPool.commonPool.externalPush(this);
656          return this;
657      }
658  
# Line 679 | Line 702 | public abstract class ForkJoinTask<V> im
702       * cancelled, completed normally or exceptionally, or left
703       * unprocessed.
704       *
682     * <p>This method may be invoked only from within {@code
683     * ForkJoinPool} computations (as may be determined using method
684     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
685     * result in exceptions or errors, possibly including {@code
686     * ClassCastException}.
687     *
705       * @param t1 the first task
706       * @param t2 the second task
707       * @throws NullPointerException if any task is null
# Line 710 | Line 727 | public abstract class ForkJoinTask<V> im
727       * related methods to check if they have been cancelled, completed
728       * normally or exceptionally, or left unprocessed.
729       *
713     * <p>This method may be invoked only from within {@code
714     * ForkJoinPool} computations (as may be determined using method
715     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
716     * result in exceptions or errors, possibly including {@code
717     * ClassCastException}.
718     *
730       * @param tasks the tasks
731       * @throws NullPointerException if any task is null
732       */
# Line 743 | Line 754 | public abstract class ForkJoinTask<V> im
754              }
755          }
756          if (ex != null)
757 <            U.throwException(ex);
757 >            rethrow(ex);
758      }
759  
760      /**
# Line 759 | Line 770 | public abstract class ForkJoinTask<V> im
770       * cancelled, completed normally or exceptionally, or left
771       * unprocessed.
772       *
762     * <p>This method may be invoked only from within {@code
763     * ForkJoinPool} computations (as may be determined using method
764     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
765     * result in exceptions or errors, possibly including {@code
766     * ClassCastException}.
767     *
773       * @param tasks the collection of tasks
774       * @return the tasks argument, to simplify usage
775       * @throws NullPointerException if tasks or any element are null
# Line 800 | Line 805 | public abstract class ForkJoinTask<V> im
805              }
806          }
807          if (ex != null)
808 <            U.throwException(ex);
808 >            rethrow(ex);
809          return tasks;
810      }
811  
# Line 983 | Line 988 | public abstract class ForkJoinTask<V> im
988                  ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;
989                  p = wt.pool;
990                  w = wt.workQueue;
991 <                s = p.helpJoinOnce(w, this); // no retries on failure
991 >                p.helpJoinOnce(w, this); // no retries on failure
992              }
993 +            else
994 +                ForkJoinPool.externalHelpJoin(this);
995              boolean canBlock = false;
996              boolean interrupted = false;
997              try {
998                  while ((s = status) >= 0) {
999 <                    if (w != null && w.runState < 0)
999 >                    if (w != null && w.qlock < 0)
1000                          cancelIgnoringExceptions(this);
1001                      else if (!canBlock) {
1002 <                        if (p == null || p.tryCompensate(this, null))
1002 >                        if (p == null || p.tryCompensate())
1003                              canBlock = true;
1004                      }
1005                      else {
# Line 1060 | Line 1067 | public abstract class ForkJoinTask<V> im
1067       * be of use in designs in which many tasks are forked, but none
1068       * are explicitly joined, instead executing them until all are
1069       * processed.
1063     *
1064     * <p>This method may be invoked only from within {@code
1065     * ForkJoinPool} computations (as may be determined using method
1066     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1067     * result in exceptions or errors, possibly including {@code
1068     * ClassCastException}.
1070       */
1071      public static void helpQuiesce() {
1072 <        ForkJoinWorkerThread wt =
1073 <            (ForkJoinWorkerThread)Thread.currentThread();
1074 <        wt.pool.helpQuiescePool(wt.workQueue);
1072 >        Thread t;
1073 >        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
1074 >            ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;
1075 >            wt.pool.helpQuiescePool(wt.workQueue);
1076 >        }
1077 >        else
1078 >            ForkJoinPool.externalHelpQuiescePool();
1079      }
1080  
1081      /**
# Line 1123 | Line 1128 | public abstract class ForkJoinTask<V> im
1128  
1129      /**
1130       * Tries to unschedule this task for execution. This method will
1131 <     * typically succeed if this task is the most recently forked task
1132 <     * by the current thread, and has not commenced executing in
1133 <     * another thread.  This method may be useful when arranging
1134 <     * alternative local processing of tasks that could have been, but
1135 <     * were not, stolen.
1131 <     *
1132 <     * <p>This method may be invoked only from within {@code
1133 <     * ForkJoinPool} computations (as may be determined using method
1134 <     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1135 <     * result in exceptions or errors, possibly including {@code
1136 <     * ClassCastException}.
1131 >     * typically (but is not guaranteed to) succeed if this task is
1132 >     * the most recently forked task by the current thread, and has
1133 >     * not commenced executing in another thread.  This method may be
1134 >     * useful when arranging alternative local processing of tasks
1135 >     * that could have been, but were not, stolen.
1136       *
1137       * @return {@code true} if unforked
1138       */
1139      public boolean tryUnfork() {
1140 <        return ((ForkJoinWorkerThread)Thread.currentThread())
1141 <            .workQueue.tryUnpush(this);
1140 >        Thread t;
1141 >        return (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1142 >                ((ForkJoinWorkerThread)t).workQueue.tryUnpush(this) :
1143 >                ForkJoinPool.tryExternalUnpush(this));
1144      }
1145  
1146      /**
# Line 1148 | Line 1149 | public abstract class ForkJoinTask<V> im
1149       * value may be useful for heuristic decisions about whether to
1150       * fork other tasks.
1151       *
1151     * <p>This method may be invoked only from within {@code
1152     * ForkJoinPool} computations (as may be determined using method
1153     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1154     * result in exceptions or errors, possibly including {@code
1155     * ClassCastException}.
1156     *
1152       * @return the number of tasks
1153       */
1154      public static int getQueuedTaskCount() {
1155 <        return ((ForkJoinWorkerThread) Thread.currentThread())
1156 <            .workQueue.queueSize();
1155 >        Thread t; ForkJoinPool.WorkQueue q;
1156 >        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
1157 >            q = ((ForkJoinWorkerThread)t).workQueue;
1158 >        else
1159 >            q = ForkJoinPool.commonSubmitterQueue();
1160 >        return (q == null) ? 0 : q.queueSize();
1161      }
1162  
1163      /**
1164       * Returns an estimate of how many more locally queued tasks are
1165       * held by the current worker thread than there are other worker
1166 <     * threads that might steal them.  This value may be useful for
1166 >     * threads that might steal them, or zero if this thread is not
1167 >     * operating in a ForkJoinPool. This value may be useful for
1168       * heuristic decisions about whether to fork other tasks. In many
1169       * usages of ForkJoinTasks, at steady state, each worker should
1170       * aim to maintain a small constant surplus (for example, 3) of
1171       * tasks, and to process computations locally if this threshold is
1172       * exceeded.
1173       *
1174     * <p>This method may be invoked only from within {@code
1175     * ForkJoinPool} computations (as may be determined using method
1176     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1177     * result in exceptions or errors, possibly including {@code
1178     * ClassCastException}.
1179     *
1174       * @return the surplus number of tasks, which may be negative
1175       */
1176      public static int getSurplusQueuedTaskCount() {
1177 <        /*
1184 <         * The aim of this method is to return a cheap heuristic guide
1185 <         * for task partitioning when programmers, frameworks, tools,
1186 <         * or languages have little or no idea about task granularity.
1187 <         * In essence by offering this method, we ask users only about
1188 <         * tradeoffs in overhead vs expected throughput and its
1189 <         * variance, rather than how finely to partition tasks.
1190 <         *
1191 <         * In a steady state strict (tree-structured) computation,
1192 <         * each thread makes available for stealing enough tasks for
1193 <         * other threads to remain active. Inductively, if all threads
1194 <         * play by the same rules, each thread should make available
1195 <         * only a constant number of tasks.
1196 <         *
1197 <         * The minimum useful constant is just 1. But using a value of
1198 <         * 1 would require immediate replenishment upon each steal to
1199 <         * maintain enough tasks, which is infeasible.  Further,
1200 <         * partitionings/granularities of offered tasks should
1201 <         * minimize steal rates, which in general means that threads
1202 <         * nearer the top of computation tree should generate more
1203 <         * than those nearer the bottom. In perfect steady state, each
1204 <         * thread is at approximately the same level of computation
1205 <         * tree. However, producing extra tasks amortizes the
1206 <         * uncertainty of progress and diffusion assumptions.
1207 <         *
1208 <         * So, users will want to use values larger, but not much
1209 <         * larger than 1 to both smooth over transient shortages and
1210 <         * hedge against uneven progress; as traded off against the
1211 <         * cost of extra task overhead. We leave the user to pick a
1212 <         * threshold value to compare with the results of this call to
1213 <         * guide decisions, but recommend values such as 3.
1214 <         *
1215 <         * When all threads are active, it is on average OK to
1216 <         * estimate surplus strictly locally. In steady-state, if one
1217 <         * thread is maintaining say 2 surplus tasks, then so are
1218 <         * others. So we can just use estimated queue length.
1219 <         * However, this strategy alone leads to serious mis-estimates
1220 <         * in some non-steady-state conditions (ramp-up, ramp-down,
1221 <         * other stalls). We can detect many of these by further
1222 <         * considering the number of "idle" threads, that are known to
1223 <         * have zero queued tasks, so compensate by a factor of
1224 <         * (#idle/#active) threads.
1225 <         */
1226 <        ForkJoinWorkerThread wt =
1227 <            (ForkJoinWorkerThread)Thread.currentThread();
1228 <        return wt.workQueue.queueSize() - wt.pool.idlePerActive();
1177 >        return ForkJoinPool.getSurplusQueuedTaskCount();
1178      }
1179  
1180      // Extension methods
# Line 1276 | Line 1225 | public abstract class ForkJoinTask<V> im
1225       * primarily to support extensions, and is unlikely to be useful
1226       * otherwise.
1227       *
1279     * <p>This method may be invoked only from within {@code
1280     * ForkJoinPool} computations (as may be determined using method
1281     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1282     * result in exceptions or errors, possibly including {@code
1283     * ClassCastException}.
1284     *
1228       * @return the next task, or {@code null} if none are available
1229       */
1230      protected static ForkJoinTask<?> peekNextLocalTask() {
1231 <        return ((ForkJoinWorkerThread) Thread.currentThread()).workQueue.peek();
1231 >        Thread t; ForkJoinPool.WorkQueue q;
1232 >        if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
1233 >            q = ((ForkJoinWorkerThread)t).workQueue;
1234 >        else
1235 >            q = ForkJoinPool.commonSubmitterQueue();
1236 >        return (q == null) ? null : q.peek();
1237      }
1238  
1239      /**
1240       * Unschedules and returns, without executing, the next task
1241 <     * queued by the current thread but not yet executed.  This method
1242 <     * is designed primarily to support extensions, and is unlikely to
1243 <     * be useful otherwise.
1244 <     *
1297 <     * <p>This method may be invoked only from within {@code
1298 <     * ForkJoinPool} computations (as may be determined using method
1299 <     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1300 <     * result in exceptions or errors, possibly including {@code
1301 <     * ClassCastException}.
1241 >     * queued by the current thread but not yet executed, if the
1242 >     * current thread is operating in a ForkJoinPool.  This method is
1243 >     * designed primarily to support extensions, and is unlikely to be
1244 >     * useful otherwise.
1245       *
1246       * @return the next task, or {@code null} if none are available
1247       */
1248      protected static ForkJoinTask<?> pollNextLocalTask() {
1249 <        return ((ForkJoinWorkerThread) Thread.currentThread())
1250 <            .workQueue.nextLocalTask();
1249 >        Thread t;
1250 >        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1251 >            ((ForkJoinWorkerThread)t).workQueue.nextLocalTask() :
1252 >            null;
1253      }
1254  
1255      /**
1256 <     * Unschedules and returns, without executing, the next task
1256 >     * If the current thread is operating in a ForkJoinPool,
1257 >     * unschedules and returns, without executing, the next task
1258       * queued by the current thread but not yet executed, if one is
1259       * available, or if not available, a task that was forked by some
1260       * other thread, if available. Availability may be transient, so a
1261 <     * {@code null} result does not necessarily imply quiescence
1262 <     * of the pool this task is operating in.  This method is designed
1261 >     * {@code null} result does not necessarily imply quiescence of
1262 >     * the pool this task is operating in.  This method is designed
1263       * primarily to support extensions, and is unlikely to be useful
1264       * otherwise.
1265       *
1320     * <p>This method may be invoked only from within {@code
1321     * ForkJoinPool} computations (as may be determined using method
1322     * {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1323     * result in exceptions or errors, possibly including {@code
1324     * ClassCastException}.
1325     *
1266       * @return a task, or {@code null} if none are available
1267       */
1268      protected static ForkJoinTask<?> pollTask() {
1269 <        ForkJoinWorkerThread wt =
1270 <            (ForkJoinWorkerThread)Thread.currentThread();
1271 <        return wt.pool.nextTaskFor(wt.workQueue);
1269 >        Thread t; ForkJoinWorkerThread wt;
1270 >        return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1271 >            (wt = (ForkJoinWorkerThread)t).pool.nextTaskFor(wt.workQueue) :
1272 >            null;
1273      }
1274  
1275      // tag operations
# Line 1517 | Line 1458 | public abstract class ForkJoinTask<V> im
1458      // Unsafe mechanics
1459      private static final sun.misc.Unsafe U;
1460      private static final long STATUS;
1461 +
1462      static {
1463          exceptionTableLock = new ReentrantLock();
1464          exceptionTableRefQueue = new ReferenceQueue<Object>();
1465          exceptionTable = new ExceptionNode[EXCEPTION_MAP_CAPACITY];
1466          try {
1467              U = getUnsafe();
1468 +            Class<?> k = ForkJoinTask.class;
1469              STATUS = U.objectFieldOffset
1470 <                (ForkJoinTask.class.getDeclaredField("status"));
1470 >                (k.getDeclaredField("status"));
1471          } catch (Exception e) {
1472              throw new Error(e);
1473          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines