--- jsr166/src/jsr166y/ForkJoinTask.java 2009/08/04 13:16:54 1.36
+++ jsr166/src/jsr166y/ForkJoinTask.java 2009/08/05 23:37:32 1.41
@@ -89,7 +89,7 @@ import java.util.WeakHashMap;
* (in which case {@link #getException} returns a {@link
* java.util.concurrent.CancellationException}); and {@link
* #isCompletedAbnormally} is true if a task was either cancelled or
- * encountered an exception.
+ * encountered an exception.
*
*
The ForkJoinTask class is not usually directly subclassed.
* Instead, you subclass one of the abstract classes that support a
@@ -125,11 +125,11 @@ import java.util.WeakHashMap;
* improve throughput. If too small, then memory and internal task
* maintenance overhead may overwhelm processing.
*
- *
This class provides {@code adapt} methods for {@link
- * java.lang.Runnable} and {@link java.util.concurrent.Callable}, that
- * may be of use when mixing execution of ForkJoinTasks with other
- * kinds of tasks. When all tasks are of this form, consider using a
- * pool in {@link ForkJoinPool#setAsyncMode async mode}.
+ *
This class provides {@code adapt} methods for {@link Runnable}
+ * and {@link Callable}, that may be of use when mixing execution of
+ * {@code ForkJoinTasks} with other kinds of tasks. When all tasks
+ * are of this form, consider using a pool in
+ * {@linkplain ForkJoinPool#setAsyncMode async mode}.
*
*
ForkJoinTasks are {@code Serializable}, which enables them to be
* used in extensions such as remote execution frameworks. It is
@@ -392,10 +392,11 @@ public abstract class ForkJoinTask im
/**
* Returns result or throws exception using j.u.c.Future conventions.
- * Only call when {@code isDone} known to be true.
+ * Only call when {@code isDone} known to be true or thread known
+ * to be interrupted.
*/
private V reportFutureResult()
- throws ExecutionException, InterruptedException {
+ throws InterruptedException, ExecutionException {
if (Thread.interrupted())
throw new InterruptedException();
int s = status & COMPLETION_MASK;
@@ -421,11 +422,12 @@ public abstract class ForkJoinTask im
int s = status & COMPLETION_MASK;
if (s == NORMAL)
return getRawResult();
- if (s == CANCELLED)
+ else if (s == CANCELLED)
throw new CancellationException();
- if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
+ else if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
throw new ExecutionException(ex);
- throw new TimeoutException();
+ else
+ throw new TimeoutException();
}
// internal execution methods
@@ -527,7 +529,7 @@ public abstract class ForkJoinTask im
}
/**
- * Returns the result of the computation when it is ready.
+ * 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}.
@@ -558,9 +560,10 @@ 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 more than one task
- * encounters an exception, then this method throws any one of
- * these exceptions. The individual status of each task may be
+ * 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.
*
* This method may be invoked only from within {@code
@@ -723,21 +726,10 @@ public abstract class ForkJoinTask im
return (status & COMPLETION_MASK) == CANCELLED;
}
- /**
- * Returns {@code true} if the computation performed by this task
- * has completed (or has been cancelled).
- *
- * @return {@code true} if this computation has completed
- */
public final boolean isDone() {
return status < 0;
}
- /**
- * Returns {@code true} if this task was cancelled.
- *
- * @return {@code true} if this task was cancelled
- */
public final boolean isCancelled() {
return (status & COMPLETION_MASK) == CANCELLED;
}
@@ -780,11 +772,9 @@ public abstract class ForkJoinTask im
*/
public final Throwable getException() {
int s = status & COMPLETION_MASK;
- if (s >= NORMAL)
- return null;
- if (s == CANCELLED)
- return new CancellationException();
- return exceptionMap.get(this);
+ return ((s >= NORMAL) ? null :
+ (s == CANCELLED) ? new CancellationException() :
+ exceptionMap.get(this));
}
/**
@@ -846,13 +836,13 @@ public abstract class ForkJoinTask im
}
/**
- * Possibly executes other tasks until this task is ready, then
- * returns the result of the computation. This method may be more
- * efficient than {@code join}, but is only applicable when
- * there are no potential dependencies between continuation of the
- * current task and that of any other task that might be executed
- * while helping. (This usually holds for pure divide-and-conquer
- * tasks).
+ * Possibly executes other tasks until this task {@link #isDone is
+ * done}, then returns the result of the computation. This method
+ * may be more efficient than {@code join}, but is only applicable
+ * when there are no potential dependencies between continuation
+ * of the current task and that of any other task that might be
+ * executed while helping. (This usually holds for pure
+ * divide-and-conquer tasks).
*
* This method may be invoked only from within {@code
* ForkJoinTask} computations (as may be determined using method
@@ -870,9 +860,10 @@ public abstract class ForkJoinTask im
}
/**
- * Possibly executes other tasks until this task is ready. This
- * method may be useful when processing collections of tasks when
- * some have been cancelled or otherwise known to have aborted.
+ * Possibly executes other tasks until this task {@link #isDone is
+ * done}. This method may be useful when processing collections
+ * of tasks when some have been cancelled or otherwise known to
+ * have aborted.
*
* This method may be invoked only from within {@code
* ForkJoinTask} computations (as may be determined using method