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.88 by dl, Sun Mar 4 19:47:08 2012 UTC vs.
Revision 1.89 by dl, Mon Apr 9 13:11:44 2012 UTC

# Line 5 | Line 5
5   */
6  
7   package jsr166y;
8 +
9   import java.io.Serializable;
10   import java.util.Collection;
11   import java.util.List;
# Line 115 | Line 116 | import java.lang.reflect.Constructor;
116   * <p>The ForkJoinTask class is not usually directly subclassed.
117   * Instead, you subclass one of the abstract classes that support a
118   * particular style of fork/join processing, typically {@link
119 < * RecursiveAction} for computations that do not return results, or
120 < * {@link RecursiveTask} for those that do.  Normally, a concrete
121 < * ForkJoinTask subclass declares fields comprising its parameters,
122 < * established in a constructor, and then defines a {@code compute}
123 < * method that somehow uses the control methods supplied by this base
124 < * class. While these methods have {@code public} access (to allow
125 < * instances of different task subclasses to call each other's
126 < * methods), some of them may only be called from within other
127 < * ForkJoinTasks (as may be determined using method {@link
128 < * #inForkJoinPool}).  Attempts to invoke them in other contexts
129 < * result in exceptions or errors, possibly including
130 < * {@code ClassCastException}.
119 > * RecursiveAction} for most computations that do not return results,
120 > * {@link RecursiveTask} for those that do, and {@link
121 > * CountedCompleter} for those in which completed actions trigger
122 > * other actions.  Normally, a concrete ForkJoinTask subclass declares
123 > * fields comprising its parameters, established in a constructor, and
124 > * then defines a {@code compute} method that somehow uses the control
125 > * 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}.
132   *
133   * <p>Method {@link #join} and its variants are appropriate for use
134   * only when completion dependencies are acyclic; that is, the
# Line 269 | Line 271 | public abstract class ForkJoinTask<V> im
271      }
272  
273      /**
274 <     * Tries to set SIGNAL status. Used by ForkJoinPool. Other
275 <     * variants are directly incorporated into externalAwaitDone etc.
274 >     * Tries to set SIGNAL status unless already completed. Used by
275 >     * ForkJoinPool. Other variants are directly incorporated into
276 >     * externalAwaitDone etc.
277       *
278       * @return true if successful
279       */
280      final boolean trySetSignal() {
281 <        int s;
282 <        return U.compareAndSwapInt(this, STATUS, s = status, s | SIGNAL);
281 >        int s = status;
282 >        return s >= 0 && U.compareAndSwapInt(this, STATUS, s, s | SIGNAL);
283      }
284  
285      /**
# Line 414 | Line 417 | public abstract class ForkJoinTask<V> im
417       * @return status on exit
418       */
419      private int setExceptionalCompletion(Throwable ex) {
420 <        int h = System.identityHashCode(this);
421 <        final ReentrantLock lock = exceptionTableLock;
422 <        lock.lock();
423 <        try {
424 <            expungeStaleExceptions();
425 <            ExceptionNode[] t = exceptionTable;
426 <            int i = h & (t.length - 1);
427 <            for (ExceptionNode e = t[i]; ; e = e.next) {
428 <                if (e == null) {
429 <                    t[i] = new ExceptionNode(this, ex, t[i]);
430 <                    break;
420 >        int s;
421 >        if ((s = status) >= 0) {
422 >            int h = System.identityHashCode(this);
423 >            final ReentrantLock lock = exceptionTableLock;
424 >            lock.lock();
425 >            try {
426 >                expungeStaleExceptions();
427 >                ExceptionNode[] t = exceptionTable;
428 >                int i = h & (t.length - 1);
429 >                for (ExceptionNode e = t[i]; ; e = e.next) {
430 >                    if (e == null) {
431 >                        t[i] = new ExceptionNode(this, ex, t[i]);
432 >                        break;
433 >                    }
434 >                    if (e.get() == this) // already present
435 >                        break;
436                  }
437 <                if (e.get() == this) // already present
438 <                    break;
437 >            } finally {
438 >                lock.unlock();
439              }
440 <        } finally {
433 <            lock.unlock();
440 >            s = setCompletion(EXCEPTIONAL);
441          }
442 <        return setCompletion(EXCEPTIONAL);
442 >        ForkJoinTask<?> p = internalGetCompleter(); // propagate
443 >        if (p != null && p.status >= 0)
444 >            p.setExceptionalCompletion(ex);
445 >        return s;
446 >    }
447 >
448 >    /**
449 >     * Exception propagation support for tasks with completers.
450 >     */
451 >    ForkJoinTask<?> internalGetCompleter() {
452 >        return null;
453      }
454  
455      /**
# Line 514 | Line 531 | public abstract class ForkJoinTask<V> im
531          Throwable ex;
532          if (e == null || (ex = e.ex) == null)
533              return null;
534 <        if (e.thrower != Thread.currentThread().getId()) {
534 >        if (false && e.thrower != Thread.currentThread().getId()) {
535              Class<? extends Throwable> ec = ex.getClass();
536              try {
537                  Constructor<?> noArgCtor = null;
# Line 904 | Line 921 | public abstract class ForkJoinTask<V> im
921      }
922  
923      /**
924 <     * Completes this task. The most recent value established by
925 <     * {@link #setRawResult} (or {@code null}) will be returned as the
926 <     * result of subsequent invocations of {@code join} and related
927 <     * operations. This method may be useful when processing sets of
928 <     * tasks when some do not otherwise complete normally. Its use in
929 <     * other situations is discouraged.
924 >     * Completes this task normally without setting a value. The most
925 >     * recent value established by {@link #setRawResult} (or {@code
926 >     * null} by default) will be returned as the result of subsequent
927 >     * invocations of {@code join} and related operations.
928 >     *
929 >     * @since 1.8
930       */
931      public final void quietlyComplete() {
932          setCompletion(NORMAL);
# Line 1234 | Line 1251 | public abstract class ForkJoinTask<V> im
1251      protected abstract void setRawResult(V value);
1252  
1253      /**
1254 <     * Immediately performs the base action of this task.  This method
1255 <     * is designed to support extensions, and should not in general be
1256 <     * called otherwise. The return value controls whether this task
1257 <     * is considered to be done normally. It may return false in
1254 >     * Immediately performs the base action of this task and returns
1255 >     * true if, upon return from this method, this task is guaranteed
1256 >     * to have completed normally. This method may return false
1257 >     * otherwise, to indicate that this task is not necessarily
1258 >     * complete (or is not known to be complete), for example in
1259       * asynchronous actions that require explicit invocations of
1260 <     * {@link #complete} to become joinable. It may also throw an
1261 <     * (unchecked) exception to indicate abnormal exit.
1260 >     * completion methods. This method may also throw an (unchecked)
1261 >     * exception to indicate abnormal exit. This method is designed to
1262 >     * support extensions, and should not in general be called
1263 >     * otherwise.
1264       *
1265 <     * @return {@code true} if completed normally
1265 >     * @return {@code true} if this task is known to have completed normally
1266       */
1267      protected abstract boolean exec();
1268  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines