--- jsr166/src/jsr166y/ForkJoinTask.java 2010/07/07 19:52:31 1.49
+++ jsr166/src/jsr166y/ForkJoinTask.java 2010/11/23 10:51:18 1.71
@@ -6,8 +6,6 @@
package jsr166y;
-import java.util.concurrent.*;
-
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
@@ -15,6 +13,16 @@ import java.util.List;
import java.util.RandomAccess;
import java.util.Map;
import java.util.WeakHashMap;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
/**
* Abstract base class for tasks that run within a {@link ForkJoinPool}.
@@ -28,10 +36,10 @@ import java.util.WeakHashMap;
* start other subtasks. As indicated by the name of this class,
* many programs using {@code ForkJoinTask} employ only methods
* {@link #fork} and {@link #join}, or derivatives such as {@link
- * #invokeAll}. However, this class also provides a number of other
- * methods that can come into play in advanced usages, as well as
- * extension mechanics that allow support of new forms of fork/join
- * processing.
+ * #invokeAll(ForkJoinTask...) invokeAll}. However, this class also
+ * provides a number of other methods that can come into play in
+ * advanced usages, as well as extension mechanics that allow
+ * support of new forms of fork/join processing.
*
* A {@code ForkJoinTask} is a lightweight form of {@link Future}.
* The efficiency of {@code ForkJoinTask}s stems from a set of
@@ -100,7 +108,17 @@ import java.util.WeakHashMap;
* ForkJoinTasks (as may be determined using method {@link
* #inForkJoinPool}). Attempts to invoke them in other contexts
* result in exceptions or errors, possibly including
- * ClassCastException.
+ * {@code ClassCastException}.
+ *
+ *
Method {@link #join} and its variants are appropriate for use
+ * only when completion dependencies are acyclic; that is, the
+ * parallel computation can be described as a directed acyclic graph
+ * (DAG). Otherwise, executions may encounter a form of deadlock as
+ * tasks cyclically wait for each other. However, this framework
+ * supports other methods and techniques (for example the use of
+ * {@link Phaser}, {@link #helpQuiesce}, and {@link #complete}) that
+ * may be of use in constructing custom subclasses for problems that
+ * are not statically structured as DAGs.
*
*
Most base support methods are {@code final}, to prevent
* overriding of implementations that are intrinsically tied to the
@@ -116,9 +134,10 @@ import java.util.WeakHashMap;
* computation. Large tasks should be split into smaller subtasks,
* usually via recursive decomposition. As a very rough rule of thumb,
* a task should perform more than 100 and less than 10000 basic
- * computational steps. If tasks are too big, then parallelism cannot
- * improve throughput. If too small, then memory and internal task
- * maintenance overhead may overwhelm processing.
+ * computational steps, and should avoid indefinite looping. If tasks
+ * are too big, then parallelism cannot improve throughput. If too
+ * small, then memory and internal task maintenance overhead may
+ * overwhelm processing.
*
*
This class provides {@code adapt} methods for {@link Runnable}
* and {@link Callable}, that may be of use when mixing execution of
@@ -144,24 +163,28 @@ public abstract class ForkJoinTask im
* status maintenance (2) execution and awaiting completion (3)
* user-level methods that additionally report results. This is
* sometimes hard to see because this file orders exported methods
- * in a way that flows well in javadocs.
+ * in a way that flows well in javadocs. In particular, most
+ * join mechanics are in method quietlyJoin, below.
*/
- /**
- * Run control status bits packed into a single int to minimize
- * footprint and to ensure atomicity (via CAS). Status is
- * initially zero, and takes on nonnegative values until
- * completed, upon which status holds value COMPLETED. CANCELLED,
- * or EXCEPTIONAL. Tasks undergoing blocking waits by other
- * threads have the SIGNAL bit set. Completion of a stolen task
- * with SIGNAL set awakens any waiters via notifyAll. Even though
- * suboptimal for some purposes, we use basic builtin wait/notify
- * to take advantage of "monitor inflation" in JVMs that we would
- * otherwise need to emulate to avoid adding further per-task
- * bookkeeping overhead. We want these monitors to be "fat",
- * i.e., not use biasing or thin-lock techniques, so use some odd
- * coding idioms that tend to avoid them.
+ /*
+ * The status field holds run control status bits packed into a
+ * single int to minimize footprint and to ensure atomicity (via
+ * CAS). Status is initially zero, and takes on nonnegative
+ * values until completed, upon which status holds value
+ * NORMAL, CANCELLED, or EXCEPTIONAL. Tasks undergoing blocking
+ * waits by other threads have the SIGNAL bit set. Completion of
+ * a stolen task with SIGNAL set awakens any waiters via
+ * notifyAll. Even though suboptimal for some purposes, we use
+ * basic builtin wait/notify to take advantage of "monitor
+ * inflation" in JVMs that we would otherwise need to emulate to
+ * avoid adding further per-task bookkeeping overhead. We want
+ * these monitors to be "fat", i.e., not use biasing or thin-lock
+ * techniques, so use some odd coding idioms that tend to avoid
+ * them.
*/
+
+ /** The run status of this task */
volatile int status; // accessed directly by pool and workers
private static final int NORMAL = -1;
@@ -188,75 +211,98 @@ public abstract class ForkJoinTask im
* also clearing signal request bits.
*
* @param completion one of NORMAL, CANCELLED, EXCEPTIONAL
- * @return status on exit
*/
- private int setCompletion(int completion) {
+ private void setCompletion(int completion) {
int s;
while ((s = status) >= 0) {
if (UNSAFE.compareAndSwapInt(this, statusOffset, s, completion)) {
- if (s == SIGNAL)
+ if (s != 0)
synchronized (this) { notifyAll(); }
- return completion;
+ break;
}
}
- return s;
}
/**
- * Record exception and set exceptional completion
+ * Records exception and sets exceptional completion.
+ *
* @return status on exit
*/
- private int setExceptionalCompletion(Throwable rex) {
+ private void setExceptionalCompletion(Throwable rex) {
exceptionMap.put(this, rex);
- return setCompletion(EXCEPTIONAL);
+ setCompletion(EXCEPTIONAL);
}
/**
- * Blocks a worker thread until completion. Called only by pool.
+ * Blocks a worker thread until completed or timed out. Called
+ * only by pool.
*/
- final int internalAwaitDone() {
- int s;
- while ((s = status) >= 0) {
- synchronized(this) {
- if (UNSAFE.compareAndSwapInt(this, statusOffset, s, SIGNAL)) {
- do {
- try {
- wait();
- } catch (InterruptedException ie) {
- cancelIfTerminating();
- }
- } while ((s = status) >= 0);
- break;
+ final void internalAwaitDone(long millis, int nanos) {
+ if (status >= 0) {
+ try { // the odd construction reduces lock bias effects
+ synchronized (this) {
+ if (status > 0 ||
+ UNSAFE.compareAndSwapInt(this, statusOffset,
+ 0, SIGNAL))
+ wait(millis, nanos);
}
+ } catch (InterruptedException ie) {
+ cancelIfTerminating();
}
}
- return s;
}
/**
* Blocks a non-worker-thread until completion.
- * @return status on exit
*/
- private int externalAwaitDone() {
- int s;
- while ((s = status) >= 0) {
+ private void externalAwaitDone() {
+ if (status >= 0) {
+ boolean interrupted = false;
+ synchronized(this) {
+ int s;
+ while ((s = status) >= 0) {
+ if (s == 0 &&
+ !UNSAFE.compareAndSwapInt(this, statusOffset,
+ 0, SIGNAL))
+ continue;
+ try {
+ wait();
+ } catch (InterruptedException ie) {
+ interrupted = true;
+ }
+ }
+ }
+ if (interrupted)
+ Thread.currentThread().interrupt();
+ }
+ }
+
+ /**
+ * Blocks a non-worker-thread until completion or interruption or timeout.
+ */
+ private void externalInterruptibleAwaitDone(boolean timed, long nanos)
+ throws InterruptedException {
+ if (Thread.interrupted())
+ throw new InterruptedException();
+ if (status >= 0) {
+ long startTime = timed ? System.nanoTime() : 0L;
synchronized(this) {
- if (UNSAFE.compareAndSwapInt(this, statusOffset, s, SIGNAL)){
- boolean interrupted = false;
- do {
- try {
- wait();
- } catch (InterruptedException ie) {
- interrupted = true;
- }
- } while ((s = status) >= 0);
- if (interrupted)
- Thread.currentThread().interrupt();
- break;
+ int s;
+ while ((s = status) >= 0) {
+ long nt;
+ if (s == 0 &&
+ !UNSAFE.compareAndSwapInt(this, statusOffset,
+ 0, SIGNAL))
+ continue;
+ else if (!timed)
+ wait();
+ else if ((nt = nanos - (System.nanoTime()-startTime)) > 0L)
+ wait(nt / 1000000, (int)(nt % 1000000));
+ else
+ break;
}
}
}
- return s;
}
/**
@@ -264,7 +310,7 @@ public abstract class ForkJoinTask im
* doesn't wait for completion otherwise. Primary execution method
* for ForkJoinWorkerThread.
*/
- final void tryExec() {
+ final void quietlyExec() {
try {
if (status < 0 || !exec())
return;
@@ -275,67 +321,6 @@ public abstract class ForkJoinTask im
setCompletion(NORMAL); // must be outside try block
}
- /**
- * If not done and this task is next in worker queue, runs it,
- * else waits for it.
- * @return status on exit
- */
- private int doJoin() {
- int stat;
- if ((stat = status) < 0)
- return stat;
- Thread t = Thread.currentThread();
- ForkJoinWorkerThread w;
- if (t instanceof ForkJoinWorkerThread) {
- if ((w = (ForkJoinWorkerThread) t).unpushTask(this)) {
- boolean completed;
- try {
- completed = exec();
- } catch (Throwable rex) {
- return setExceptionalCompletion(rex);
- }
- if (completed)
- return setCompletion(NORMAL);
- }
- w.joinTask(this);
- return status;
- }
- return externalAwaitDone();
- }
-
- /**
- * Unless done, calls exec and records status if completed, or
- * waits for completion otherwise.
- * @return status on exit
- */
- private int doInvoke() {
- int stat;
- if ((stat = status) >= 0) {
- boolean completed;
- try {
- completed = exec();
- } catch (Throwable rex) {
- return setExceptionalCompletion(rex);
- }
- if (completed)
- stat = setCompletion(NORMAL);
- else
- stat = doJoin();
- }
- return stat;
- }
-
- /**
- * Returns result or throws exception associated with given status.
- * @param s the status
- */
- private V reportResult(int s) {
- Throwable ex;
- if (s < NORMAL && (ex = getException()) != null)
- UNSAFE.throwException(ex);
- return getRawResult();
- }
-
// public methods
/**
@@ -349,7 +334,7 @@ public abstract class ForkJoinTask im
* #isDone} returning {@code true}.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -363,39 +348,55 @@ public abstract class ForkJoinTask im
}
/**
- * Returns the result of the computation when it {@link #isDone is done}.
- * This method differs from {@link #get()} in that
+ * Returns the result of the computation when it {@link #isDone is
+ * done}. This method differs from {@link #get()} in that
* abnormal completion results in {@code RuntimeException} or
- * {@code Error}, not {@code ExecutionException}.
+ * {@code Error}, not {@code ExecutionException}, and that
+ * interrupts of the calling thread do not cause the
+ * method to abruptly return by throwing {@code
+ * InterruptedException}.
*
* @return the computed result
*/
public final V join() {
- return reportResult(doJoin());
+ quietlyJoin();
+ Throwable ex;
+ if (status < NORMAL && (ex = getException()) != null)
+ UNSAFE.throwException(ex);
+ return getRawResult();
}
/**
* Commences performing this task, awaits its completion if
- * necessary, and return its result, or throws an (unchecked)
- * exception if the underlying computation did so.
+ * necessary, and returns its result, or throws an (unchecked)
+ * {@code RuntimeException} or {@code Error} if the underlying
+ * computation did so.
*
* @return the computed result
*/
public final V invoke() {
- return reportResult(doInvoke());
+ quietlyInvoke();
+ Throwable ex;
+ if (status < NORMAL && (ex = getException()) != null)
+ UNSAFE.throwException(ex);
+ return getRawResult();
}
/**
* Forks the given tasks, returning when {@code isDone} holds for
* each task or an (unchecked) exception is encountered, in which
- * case the exception is rethrown. If either task encounters an
- * exception, the other one may be, but is not guaranteed to be,
- * cancelled. If both tasks throw an exception, then this method
- * throws one of them. The individual status of each task may be
- * checked using {@link #getException()} and related methods.
+ * case the exception is rethrown. If more than one task
+ * encounters an exception, then this method throws any one of
+ * these exceptions. If any task encounters an exception, the
+ * other may be cancelled. However, the execution status of
+ * individual tasks is not guaranteed upon exceptional return. The
+ * status of each task may be obtained using {@link
+ * #getException()} and related methods to check if they have been
+ * cancelled, completed normally or exceptionally, or left
+ * unprocessed.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -413,15 +414,17 @@ public abstract class ForkJoinTask im
/**
* Forks the given tasks, returning when {@code isDone} holds for
* each task or an (unchecked) exception is encountered, in which
- * case the exception is rethrown. If any task encounters an
- * exception, others may be, but are not guaranteed to be,
- * cancelled. If more than one task encounters an exception, then
- * this method throws any one of these exceptions. The individual
- * status of each task may be checked using {@link #getException()}
- * and related methods.
+ * case the exception is rethrown. If more than one task
+ * encounters an exception, then this method throws any one of
+ * these exceptions. If any task encounters an exception, others
+ * may be cancelled. However, the execution status of individual
+ * tasks is not guaranteed upon exceptional return. The status of
+ * each task may be obtained using {@link #getException()} and
+ * related methods to check if they have been cancelled, completed
+ * normally or exceptionally, or left unprocessed.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -440,16 +443,22 @@ public abstract class ForkJoinTask im
}
else if (i != 0)
t.fork();
- else if (t.doInvoke() < NORMAL && ex == null)
- ex = t.getException();
+ else {
+ t.quietlyInvoke();
+ if (ex == null && t.status < NORMAL)
+ ex = t.getException();
+ }
}
for (int i = 1; i <= last; ++i) {
ForkJoinTask t = tasks[i];
if (t != null) {
if (ex != null)
t.cancel(false);
- else if (t.doJoin() < NORMAL && ex == null)
- ex = t.getException();
+ else {
+ t.quietlyJoin();
+ if (ex == null && t.status < NORMAL)
+ ex = t.getException();
+ }
}
}
if (ex != null)
@@ -459,17 +468,18 @@ public abstract class ForkJoinTask im
/**
* Forks all tasks in the specified collection, returning when
* {@code isDone} holds for each task or an (unchecked) exception
- * is encountered. If any task encounters an exception, others
- * may be, but are not guaranteed to be, cancelled. If more than
- * one task encounters an exception, then this method throws any
- * one of these exceptions. The individual status of each task
- * may be checked using {@link #getException()} and related
- * methods. The behavior of this operation is undefined if the
- * specified collection is modified while the operation is in
- * progress.
+ * is encountered, in which case the exception is rethrown. If
+ * more than one task encounters an exception, then this method
+ * throws any one of these exceptions. If any task encounters an
+ * exception, others may be cancelled. However, the execution
+ * status of individual tasks is not guaranteed upon exceptional
+ * return. The status of each task may be obtained using {@link
+ * #getException()} and related methods to check if they have been
+ * cancelled, completed normally or exceptionally, or left
+ * unprocessed.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -496,16 +506,22 @@ public abstract class ForkJoinTask im
}
else if (i != 0)
t.fork();
- else if (t.doInvoke() < NORMAL && ex == null)
- ex = t.getException();
+ else {
+ t.quietlyInvoke();
+ if (ex == null && t.status < NORMAL)
+ ex = t.getException();
+ }
}
for (int i = 1; i <= last; ++i) {
ForkJoinTask t = ts.get(i);
if (t != null) {
if (ex != null)
t.cancel(false);
- else if (t.doJoin() < NORMAL && ex == null)
- ex = t.getException();
+ else {
+ t.quietlyJoin();
+ if (ex == null && t.status < NORMAL)
+ ex = t.getException();
+ }
}
}
if (ex != null)
@@ -515,25 +531,28 @@ public abstract class ForkJoinTask im
/**
* Attempts to cancel execution of this task. This attempt will
- * fail if the task has already completed, has already been
- * cancelled, or could not be cancelled for some other reason. If
- * successful, and this task has not started when cancel is
- * called, execution of this task is suppressed, {@link
- * #isCancelled} will report true, and {@link #join} will result
- * in a {@code CancellationException} being thrown.
+ * fail if the task has already completed or could not be
+ * cancelled for some other reason. If successful, and this task
+ * has not started when {@code cancel} is called, execution of
+ * this task is suppressed. After this method returns
+ * successfully, unless there is an intervening call to {@link
+ * #reinitialize}, subsequent calls to {@link #isCancelled},
+ * {@link #isDone}, and {@code cancel} will return {@code true}
+ * and calls to {@link #join} and related methods will result in
+ * {@code CancellationException}.
*
* This method may be overridden in subclasses, but if so, must
- * still ensure that these minimal properties hold. In particular,
- * the {@code cancel} method itself must not throw exceptions.
+ * still ensure that these properties hold. In particular, the
+ * {@code cancel} method itself must not throw exceptions.
*
*
This method is designed to be invoked by other
* tasks. To terminate the current task, you can just return or
* throw an unchecked exception from its computation method, or
* invoke {@link #completeExceptionally}.
*
- * @param mayInterruptIfRunning this value is ignored in the
- * default implementation because tasks are not
- * cancelled via interruption
+ * @param mayInterruptIfRunning this value has no effect in the
+ * default implementation because interrupts are not used to
+ * control cancellation.
*
* @return {@code true} if this task is now cancelled
*/
@@ -543,8 +562,10 @@ public abstract class ForkJoinTask im
}
/**
- * Cancels, ignoring any exceptions it throws. Used during worker
- * and pool shutdown.
+ * Cancels, ignoring any exceptions thrown by cancel. Used during
+ * worker and pool shutdown. Cancel is spec'ed not to throw any
+ * exceptions, but if it does anyway, we have no recourse during
+ * shutdown, so guard against this case.
*/
final void cancelIgnoringExceptions() {
try {
@@ -554,9 +575,10 @@ public abstract class ForkJoinTask im
}
/**
- * Cancels ignoring exceptions if worker is terminating
+ * Cancels if current thread is a terminating worker thread,
+ * ignoring any exceptions thrown by cancel.
*/
- private void cancelIfTerminating() {
+ final void cancelIfTerminating() {
Thread t = Thread.currentThread();
if ((t instanceof ForkJoinWorkerThread) &&
((ForkJoinWorkerThread) t).isTerminating()) {
@@ -631,13 +653,14 @@ public abstract class ForkJoinTask im
/**
* Completes this task, and if not already aborted or cancelled,
- * returning a {@code null} result upon {@code join} and related
- * operations. This method may be used to provide results for
- * asynchronous tasks, or to provide alternative handling for
- * tasks that would not otherwise complete normally. Its use in
- * other situations is discouraged. This method is
- * overridable, but overridden versions must invoke {@code super}
- * implementation to maintain guarantees.
+ * returning the given value as the result of subsequent
+ * invocations of {@code join} and related operations. This method
+ * may be used to provide results for asynchronous tasks, or to
+ * provide alternative handling for tasks that would not otherwise
+ * complete normally. Its use in other situations is
+ * discouraged. This method is overridable, but overridden
+ * versions must invoke {@code super} implementation to maintain
+ * guarantees.
*
* @param value the result value for this task
*/
@@ -651,11 +674,25 @@ public abstract class ForkJoinTask im
setCompletion(NORMAL);
}
+ /**
+ * Waits if necessary for the computation to complete, and then
+ * retrieves its result.
+ *
+ * @return the computed result
+ * @throws CancellationException if the computation was cancelled
+ * @throws ExecutionException if the computation threw an
+ * exception
+ * @throws InterruptedException if the current thread is not a
+ * member of a ForkJoinPool and was interrupted while waiting
+ */
public final V get() throws InterruptedException, ExecutionException {
- int s = doJoin();
- if (Thread.interrupted())
- throw new InterruptedException();
- if (s < NORMAL) {
+ Thread t = Thread.currentThread();
+ if (t instanceof ForkJoinWorkerThread)
+ quietlyJoin();
+ else
+ externalInterruptibleAwaitDone(false, 0L);
+ int s = status;
+ if (s != NORMAL) {
Throwable ex;
if (s == CANCELLED)
throw new CancellationException();
@@ -665,75 +702,34 @@ public abstract class ForkJoinTask im
return getRawResult();
}
+ /**
+ * Waits if necessary for at most the given time for the computation
+ * to complete, and then retrieves its result, if available.
+ *
+ * @param timeout the maximum time to wait
+ * @param unit the time unit of the timeout argument
+ * @return the computed result
+ * @throws CancellationException if the computation was cancelled
+ * @throws ExecutionException if the computation threw an
+ * exception
+ * @throws InterruptedException if the current thread is not a
+ * member of a ForkJoinPool and was interrupted while waiting
+ * @throws TimeoutException if the wait timed out
+ */
public final V get(long timeout, TimeUnit unit)
throws InterruptedException, ExecutionException, TimeoutException {
+ long nanos = unit.toNanos(timeout);
Thread t = Thread.currentThread();
- ForkJoinPool pool;
- if (t instanceof ForkJoinWorkerThread) {
- ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
- if (status >= 0 && w.unpushTask(this))
- tryExec();
- pool = w.pool;
- }
+ if (t instanceof ForkJoinWorkerThread)
+ ((ForkJoinWorkerThread)t).joinTask(this, true, nanos);
else
- pool = null;
- /*
- * Timed wait loop intermixes cases for fj (pool != null) and
- * non FJ threads. For FJ, decrement pool count but don't try
- * for replacement; increment count on completion. For non-FJ,
- * deal with interrupts. This is messy, but a little less so
- * than is splitting the FJ and nonFJ cases.
- */
- boolean interrupted = false;
- boolean dec = false; // true if pool count decremented
- for (;;) {
- if (Thread.interrupted() && pool == null) {
- interrupted = true;
- break;
- }
- int s = status;
- if (s < 0)
- break;
- if (UNSAFE.compareAndSwapInt(this, statusOffset,
- s, s | SIGNAL)) {
- long startTime = System.nanoTime();
- long nanos = unit.toNanos(timeout);
- long nt; // wait time
- while (status >= 0 &&
- (nt = nanos - (System.nanoTime() - startTime)) > 0) {
- if (pool != null && !dec)
- dec = pool.tryDecrementRunningCount();
- else {
- long ms = nt / 1000000;
- int ns = (int) (nt % 1000000);
- try {
- synchronized(this) {
- if (status >= 0)
- wait(ms, ns);
- }
- } catch (InterruptedException ie) {
- if (pool != null)
- cancelIfTerminating();
- else {
- interrupted = true;
- break;
- }
- }
- }
- }
- break;
- }
- }
- if (pool != null && dec)
- pool.incrementRunningCount();
- if (interrupted)
- throw new InterruptedException();
- int es = status;
- if (es != NORMAL) {
+ externalInterruptibleAwaitDone(true, nanos);
+ int s = status;
+ if (s != NORMAL) {
Throwable ex;
- if (es == CANCELLED)
+ if (s == CANCELLED)
throw new CancellationException();
- if (es == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
+ if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
throw new ExecutionException(ex);
throw new TimeoutException();
}
@@ -741,24 +737,55 @@ public abstract class ForkJoinTask im
}
/**
- * Joins this task, without returning its result or throwing an
+ * Joins this task, without returning its result or throwing its
* exception. This method may be useful when processing
* collections of tasks when some have been cancelled or otherwise
* known to have aborted.
*/
public final void quietlyJoin() {
- doJoin();
+ Thread t;
+ if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
+ ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
+ if (status >= 0) {
+ if (w.unpushTask(this)) {
+ boolean completed;
+ try {
+ completed = exec();
+ } catch (Throwable rex) {
+ setExceptionalCompletion(rex);
+ return;
+ }
+ if (completed) {
+ setCompletion(NORMAL);
+ return;
+ }
+ }
+ w.joinTask(this, false, 0L);
+ }
+ }
+ else
+ externalAwaitDone();
}
/**
* Commences performing this task and awaits its completion if
- * necessary, without returning its result or throwing an
- * exception. This method may be useful when processing
- * collections of tasks when some have been cancelled or otherwise
- * known to have aborted.
+ * necessary, without returning its result or throwing its
+ * exception.
*/
public final void quietlyInvoke() {
- doInvoke();
+ if (status >= 0) {
+ boolean completed;
+ try {
+ completed = exec();
+ } catch (Throwable rex) {
+ setExceptionalCompletion(rex);
+ return;
+ }
+ if (completed)
+ setCompletion(NORMAL);
+ else
+ quietlyJoin();
+ }
}
/**
@@ -769,7 +796,7 @@ public abstract class ForkJoinTask im
* processed.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -788,6 +815,12 @@ public abstract class ForkJoinTask im
* under any other usage conditions are not guaranteed.
* This method may be useful when executing
* pre-constructed trees of subtasks in loops.
+ *
+ * Upon completion of this method, {@code isDone()} reports
+ * {@code false}, and {@code getException()} reports {@code
+ * null}. However, the value returned by {@code getRawResult} is
+ * unaffected. To clear this value, you can invoke {@code
+ * setRawResult(null)}.
*/
public void reinitialize() {
if (status == EXCEPTIONAL)
@@ -809,11 +842,12 @@ public abstract class ForkJoinTask im
}
/**
- * Returns {@code true} if the current thread is executing as a
- * ForkJoinPool computation.
+ * Returns {@code true} if the current thread is a {@link
+ * ForkJoinWorkerThread} executing as a ForkJoinPool computation.
*
- * @return {@code true} if the current thread is executing as a
- * ForkJoinPool computation, or false otherwise
+ * @return {@code true} if the current thread is a {@link
+ * ForkJoinWorkerThread} executing as a ForkJoinPool computation,
+ * or {@code false} otherwise
*/
public static boolean inForkJoinPool() {
return Thread.currentThread() instanceof ForkJoinWorkerThread;
@@ -828,7 +862,7 @@ public abstract class ForkJoinTask im
* were not, stolen.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -847,7 +881,7 @@ public abstract class ForkJoinTask im
* fork other tasks.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -870,7 +904,7 @@ public abstract class ForkJoinTask im
* exceeded.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -928,7 +962,7 @@ public abstract class ForkJoinTask im
* otherwise.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -947,7 +981,7 @@ public abstract class ForkJoinTask im
* be useful otherwise.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -970,7 +1004,7 @@ public abstract class ForkJoinTask im
* otherwise.
*
* This method may be invoked only from within {@code
- * ForkJoinTask} computations (as may be determined using method
+ * ForkJoinPool} computations (as may be determined using method
* {@link #inForkJoinPool}). Attempts to invoke in other contexts
* result in exceptions or errors, possibly including {@code
* ClassCastException}.
@@ -1080,7 +1114,7 @@ public abstract class ForkJoinTask im
private static final long serialVersionUID = -7721805057305804111L;
/**
- * Saves the state to a stream.
+ * Saves the state to a stream (that is, serializes it).
*
* @serialData the current run status and the exception thrown
* during execution, or {@code null} if none
@@ -1093,7 +1127,7 @@ public abstract class ForkJoinTask im
}
/**
- * Reconstitutes the instance from a stream.
+ * Reconstitutes the instance from a stream (that is, deserializes it).
*
* @param s the stream
*/
@@ -1103,8 +1137,6 @@ public abstract class ForkJoinTask im
Object ex = s.readObject();
if (ex != null)
setExceptionalCompletion((Throwable) ex);
- if (status < 0)
- synchronized (this) { notifyAll(); }
}
// Unsafe mechanics