ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/jsr166y/CountedCompleter.java

Comparing jsr166/src/jsr166y/CountedCompleter.java (file contents):
Revision 1.20 by jsr166, Sun Nov 25 18:45:48 2012 UTC vs.
Revision 1.23 by jsr166, Sun Nov 25 21:04:43 2012 UTC

#	Line 126 | Line 126 | package jsr166y;
126		*       op.apply(array[lo]);
127		*     tryComplete();
128		*   }
129	<	* } }</pre>
129	>	* }}</pre>
130		*
131		* This design can be improved by noticing that in the recursive case,
132		* the task has nothing to do after forking its right task, so can
#	Line 277 | Line 277 | package jsr166y;
277		*   }
278		*   public void onCompletion(CountedCompleter<?> caller) {
279		*     if (caller != this) {
280	<	*      MapReducer<E> child = (MapReducer<E>)caller;
281	<	*      MapReducer<E> sib = child.sibling;
282	<	*      if (sib == null || sib.result == null)
283	<	*        result = child.result;
284	<	*      else
285	<	*        result = reducer.apply(child.result, sib.result);
280	>	*       MapReducer<E> child = (MapReducer<E>)caller;
281	>	*       MapReducer<E> sib = child.sibling;
282	>	*       if (sib == null || sib.result == null)
283	>	*         result = child.result;
284	>	*       else
285	>	*         result = reducer.apply(child.result, sib.result);
286		*     }
287		*   }
288		*   public E getRawResult() { return result; }
#	Line 291 | Line 291 | package jsr166y;
291		*     return new MapReducer<E>(null, array, mapper, reducer,
292		*                              0, array.length).invoke();
293		*   }
294	<	* } }</pre>
294	>	* }}</pre>
295		*
296		* Here, method {@code onCompletion} takes a form common to many
297		* completion designs that combine results. This callback-style method
#	Line 661 | Line 661 | public abstract class CountedCompleter<T
661		}
662
663		/**
664	<	* Support for FJT exception propagation
664	>	* Supports ForkJoinTask exception propagation.
665		*/
666		void internalPropagateException(Throwable ex) {
667		CountedCompleter<?> a = this, s = a;
#	Line 671 | Line 671 | public abstract class CountedCompleter<T
671		}
672
673		/**
674	<	* Implements execution conventions for CountedCompleters
674	>	* Implements execution conventions for CountedCompleters.
675		*/
676		protected final boolean exec() {
677		compute();

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines