ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/ForkJoinTask.java

Comparing jsr166/src/jsr166y/ForkJoinTask.java (file contents):
Revision 1.46 by dl, Mon Apr 5 15:52:26 2010 UTC vs.
Revision 1.51 by dl, Fri Jul 23 16:49:11 2010 UTC

#	Line 64 | Line 64 | import java.util.WeakHashMap;
64		* results of a task is {@link #join}, but there are several variants:
65		* The {@link Future#get} methods support interruptible and/or timed
66		* waits for completion and report results using {@code Future}
67	<	* conventions. Method {@link #helpJoin} enables callers to actively
68	<	* execute other tasks while awaiting joins, which is sometimes more
69	<	* efficient but only applies when all subtasks are known to be
70	<	* strictly tree-structured. Method {@link #invoke} is semantically
67	>	* conventions. Method {@link #invoke} is semantically
68		* equivalent to {@code fork(); join()} but always attempts to begin
69		* execution in the current thread. The "<em>quiet</em>" forms of
70		* these methods do not extract results or report exceptions. These
#	Line 125 | Line 122 | import java.util.WeakHashMap;
122		*
123		* <p>This class provides {@code adapt} methods for {@link Runnable}
124		* and {@link Callable}, that may be of use when mixing execution of
125	<	* {@code ForkJoinTasks} with other kinds of tasks. When all tasks
126	<	* are of this form, consider using a pool in
130	<	* {@linkplain ForkJoinPool#setAsyncMode async mode}.
125	>	* {@code ForkJoinTasks} with other kinds of tasks. When all tasks are
126	>	* of this form, consider using a pool constructed in <em>asyncMode</em>.
127		*
128		* <p>ForkJoinTasks are {@code Serializable}, which enables them to be
129		* used in extensions such as remote execution frameworks. It is
#	Line 151 | Line 147 | public abstract class ForkJoinTask<V> im
147		* in a way that flows well in javadocs.
148		*/
149
150	<	/**
151	<	* Run control status bits packed into a single int to minimize
152	<	* footprint and to ensure atomicity (via CAS).  Status is
153	<	* initially zero, and takes on nonnegative values until
154	<	* completed, upon which status holds COMPLETED. CANCELLED, or
155	<	* EXCEPTIONAL, which use the top 3 bits.  Tasks undergoing
156	<	* blocking waits by other threads have SIGNAL_MASK bits set --
157	<	* bit 15 for external (nonFJ) waits, and the rest a count of
158	<	* waiting FJ threads.  (This representation relies on
159	<	* ForkJoinPool max thread limits). Signal counts are not directly
160	<	* incremented by ForkJoinTask methods, but instead via a call to
161	<	* requestSignal within ForkJoinPool.preJoin, once their need is
162	<	* established.
163	<	*
164	<	* Completion of a stolen task with SIGNAL_MASK bits set awakens
169	<	* any waiters via notifyAll. Even though suboptimal for some
170	<	* purposes, we use basic builtin wait/notify to take advantage of
171	<	* "monitor inflation" in JVMs that we would otherwise need to
172	<	* emulate to avoid adding further per-task bookkeeping overhead.
173	<	* We want these monitors to be "fat", i.e., not use biasing or
174	<	* thin-lock techniques, so use some odd coding idioms that tend
175	<	* to avoid them.
176	<	*
177	<	* Note that bits 16-28 are currently unused. Also value
178	<	* 0x80000000 is available as spare completion value.
150	>	/*
151	>	* The status field holds run control status bits packed into a
152	>	* single int to minimize footprint and to ensure atomicity (via
153	>	* CAS).  Status is initially zero, and takes on nonnegative
154	>	* values until completed, upon which status holds value
155	>	* COMPLETED. CANCELLED, or EXCEPTIONAL. Tasks undergoing blocking
156	>	* waits by other threads have the SIGNAL bit set.  Completion of
157	>	* a stolen task with SIGNAL set awakens any waiters via
158	>	* notifyAll. Even though suboptimal for some purposes, we use
159	>	* basic builtin wait/notify to take advantage of "monitor
160	>	* inflation" in JVMs that we would otherwise need to emulate to
161	>	* avoid adding further per-task bookkeeping overhead.  We want
162	>	* these monitors to be "fat", i.e., not use biasing or thin-lock
163	>	* techniques, so use some odd coding idioms that tend to avoid
164	>	* them.
165		*/
166	+
167	+	/** Run status of this task */
168		volatile int status; // accessed directly by pool and workers
169
170	<	private static final int COMPLETION_MASK      = 0xe0000000;
171	<	private static final int NORMAL               = 0xe0000000; // == mask
172	<	private static final int CANCELLED            = 0xc0000000;
173	<	private static final int EXCEPTIONAL          = 0xa0000000;
186	<	private static final int SIGNAL_MASK          = 0x0000ffff;
187	<	private static final int INTERNAL_SIGNAL_MASK = 0x00007fff;
188	<	private static final int EXTERNAL_SIGNAL      = 0x00008000;
170	>	private static final int NORMAL      = -1;
171	>	private static final int CANCELLED   = -2;
172	>	private static final int EXCEPTIONAL = -3;
173	>	private static final int SIGNAL      =  1;
174
175		/**
176		* Table of exceptions thrown by tasks, to enable reporting by
#	Line 206 | Line 191 | public abstract class ForkJoinTask<V> im
191		* also clearing signal request bits.
192		*
193		* @param completion one of NORMAL, CANCELLED, EXCEPTIONAL
194	+	* @return status on exit
195		*/
196	<	private void setCompletion(int completion) {
196	>	private int setCompletion(int completion) {
197		int s;
198		while ((s = status) >= 0) {
199		if (UNSAFE.compareAndSwapInt(this, statusOffset, s, completion)) {
200	<	if ((s & SIGNAL_MASK) != 0) {
215	<	Thread t = Thread.currentThread();
216	<	if (t instanceof ForkJoinWorkerThread)
217	<	((ForkJoinWorkerThread) t).pool.updateRunningCount
218	<	(s & INTERNAL_SIGNAL_MASK);
200	>	if (s != 0)
201		synchronized (this) { notifyAll(); }
202	<	}
221	<	return;
202	>	return completion;
203		}
204		}
205	+	return s;
206		}
207
208		/**
209		* Record exception and set exceptional completion
210	+	* @return status on exit
211		*/
212	<	private void setDoneExceptionally(Throwable rex) {
212	>	private int setExceptionalCompletion(Throwable rex) {
213		exceptionMap.put(this, rex);
214	<	setCompletion(EXCEPTIONAL);
232	<	}
233	<
234	<	/**
235	<	* Main internal execution method: Unless done, calls exec and
236	<	* records completion.
237	<	*
238	<	* @return true if ran and completed normally
239	<	*/
240	<	final boolean tryExec() {
241	<	try {
242	<	if (status < 0 || !exec())
243	<	return false;
244	<	} catch (Throwable rex) {
245	<	setDoneExceptionally(rex);
246	<	return false;
247	<	}
248	<	setCompletion(NORMAL); // must be outside try block
249	<	return true;
214	>	return setCompletion(EXCEPTIONAL);
215		}
216
217		/**
218	<	* Increments internal signal count (thus requesting signal upon
254	<	* completion) unless already done.  Call only once per join.
255	<	* Used by ForkJoinPool.preJoin.
256	<	*
257	<	* @return status
258	<	*/
259	<	final int requestSignal() {
260	<	int s;
261	<	do {} while ((s = status) >= 0 &&
262	<	!UNSAFE.compareAndSwapInt(this, statusOffset, s, s + 1));
263	<	return s;
264	<	}
265	<
266	<	/**
267	<	* Sets external signal request unless already done.
268	<	*
269	<	* @return status
270	<	*/
271	<	private int requestExternalSignal() {
272	<	int s;
273	<	do {} while ((s = status) >= 0 &&
274	<	!UNSAFE.compareAndSwapInt(this, statusOffset,
275	<	s, s | EXTERNAL_SIGNAL));
276	<	return s;
277	<	}
278	<
279	<	/*
280	<	* Awaiting completion. The four versions, internal vs external X
281	<	* untimed vs timed, have the same overall structure but differ
282	<	* from each other enough to defy simple integration.
218	>	* Blocks a worker thread until completion. Called only by pool.
219		*/
220	<
221	<	/**
222	<	* Blocks a worker until this task is done, also maintaining pool
223	<	* and signal counts
224	<	*/
225	<	private void awaitDone(ForkJoinWorkerThread w) {
226	<	if (status >= 0) {
291	<	w.pool.preJoin(this);
292	<	while (status >= 0) {
293	<	try { // minimize lock scope
294	<	synchronized(this) {
295	<	if (status >= 0)
296	<	wait();
297	<	else { // help release; also helps avoid lock-biasing
298	<	notifyAll();
299	<	break;
300	<	}
301	<	}
302	<	} catch (InterruptedException ie) {
303	<	cancelIfTerminating();
220	>	final void internalAwaitDone() {
221	>	int s;         // the odd construction reduces lock bias effects
222	>	while ((s = status) >= 0) {
223	>	try {
224	>	synchronized(this) {
225	>	if (UNSAFE.compareAndSwapInt(this, statusOffset, s,SIGNAL))
226	>	wait();
227		}
228	+	} catch (InterruptedException ie) {
229	+	cancelIfTerminating();
230		}
231		}
232		}
233
234		/**
235	<	* Blocks a non-ForkJoin thread until this task is done.
235	>	* Blocks a non-worker-thread until completion.
236	>	* @return status on exit
237		*/
238	<	private void externalAwaitDone() {
239	<	if (requestExternalSignal() >= 0) {
240	<	boolean interrupted = false;
241	<	while (status >= 0) {
242	<	try {
243	<	synchronized(this) {
244	<	if (status >= 0)
245	<	wait();
246	<	else {
247	<	notifyAll();
248	<	break;
238	>	private int externalAwaitDone() {
239	>	int s;
240	>	while ((s = status) >= 0) {
241	>	synchronized(this) {
242	>	if (UNSAFE.compareAndSwapInt(this, statusOffset, s, SIGNAL)){
243	>	boolean interrupted = false;
244	>	while ((s = status) >= 0) {
245	>	try {
246	>	wait();
247	>	} catch (InterruptedException ie) {
248	>	interrupted = true;
249		}
250		}
251	<	} catch (InterruptedException ie) {
252	<	interrupted = true;
251	>	if (interrupted)
252	>	Thread.currentThread().interrupt();
253	>	break;
254		}
255		}
329	–	if (interrupted)
330	–	Thread.currentThread().interrupt();
256		}
257	+	return s;
258		}
259
260		/**
261	<	* Blocks a worker until this task is done or timeout elapses
261	>	* Unless done, calls exec and records status if completed, but
262	>	* doesn't wait for completion otherwise. Primary execution method
263	>	* for ForkJoinWorkerThread.
264		*/
265	<	private void timedAwaitDone(ForkJoinWorkerThread w, long nanos) {
266	<	if (status >= 0) {
267	<	long startTime = System.nanoTime();
268	<	ForkJoinPool pool = w.pool;
269	<	pool.preJoin(this);
270	<	while (status >= 0) {
271	<	long nt = nanos - (System.nanoTime() - startTime);
344	<	if (nt > 0) {
345	<	long ms = nt / 1000000;
346	<	int ns = (int) (nt % 1000000);
347	<	try {
348	<	synchronized(this) { if (status >= 0) wait(ms, ns); }
349	<	} catch (InterruptedException ie) {
350	<	cancelIfTerminating();
351	<	}
352	<	}
353	<	else {
354	<	int s; // adjust running count on timeout
355	<	while ((s = status) >= 0 &&
356	<	(s & INTERNAL_SIGNAL_MASK) != 0) {
357	<	if (UNSAFE.compareAndSwapInt(this, statusOffset,
358	<	s, s - 1)) {
359	<	pool.updateRunningCount(1);
360	<	break;
361	<	}
362	<	}
363	<	break;
364	<	}
365	<	}
265	>	final void tryExec() {
266	>	try {
267	>	if (status < 0 || !exec())
268	>	return;
269	>	} catch (Throwable rex) {
270	>	setExceptionalCompletion(rex);
271	>	return;
272		}
273	+	setCompletion(NORMAL); // must be outside try block
274		}
275
276		/**
277	<	* Blocks a non-ForkJoin thread until this task is done or timeout elapses
278	<	*/
279	<	private void externalTimedAwaitDone(long nanos) {
280	<	if (requestExternalSignal() >= 0) {
281	<	long startTime = System.nanoTime();
282	<	boolean interrupted = false;
283	<	while (status >= 0) {
284	<	long nt = nanos - (System.nanoTime() - startTime);
285	<	if (nt <= 0)
286	<	break;
287	<	long ms = nt / 1000000;
288	<	int ns = (int) (nt % 1000000);
277	>	* If not done and this task is next in worker queue, runs it,
278	>	* else waits for it.
279	>	* @return status on exit
280	>	*/
281	>	private int doJoin() {
282	>	int stat;
283	>	if ((stat = status) < 0)
284	>	return stat;
285	>	Thread t = Thread.currentThread();
286	>	ForkJoinWorkerThread w;
287	>	if (t instanceof ForkJoinWorkerThread) {
288	>	if ((w = (ForkJoinWorkerThread) t).unpushTask(this)) {
289	>	boolean completed;
290		try {
291	<	synchronized(this) { if (status >= 0) wait(ms, ns); }
292	<	} catch (InterruptedException ie) {
293	<	interrupted = true;
291	>	completed = exec();
292	>	} catch (Throwable rex) {
293	>	return setExceptionalCompletion(rex);
294		}
295	+	if (completed)
296	+	return setCompletion(NORMAL);
297		}
298	<	if (interrupted)
389	<	Thread.currentThread().interrupt();
298	>	return w.joinTask(this);
299		}
300	+	return externalAwaitDone();
301		}
302
393	–	// reporting results
394	–
303		/**
304	<	* Returns result or throws the exception associated with status.
305	<	* Uses Unsafe as a workaround for javac not allowing rethrow of
306	<	* unchecked exceptions.
304	>	* Unless done, calls exec and records status if completed, or
305	>	* waits for completion otherwise.
306	>	* @return status on exit
307		*/
308	<	private V reportResult() {
309	<	if ((status & COMPLETION_MASK) < NORMAL) {
310	<	Throwable ex = getException();
311	<	if (ex != null)
312	<	UNSAFE.throwException(ex);
313	<	}
314	<	return getRawResult();
315	<	}
316	<
317	<	/**
410	<	* Returns result or throws exception using j.u.c.Future conventions.
411	<	* Only call when {@code isDone} known to be true or thread known
412	<	* to be interrupted.
413	<	*/
414	<	private V reportFutureResult()
415	<	throws InterruptedException, ExecutionException {
416	<	if (Thread.interrupted())
417	<	throw new InterruptedException();
418	<	int s = status & COMPLETION_MASK;
419	<	if (s < NORMAL) {
420	<	Throwable ex;
421	<	if (s == CANCELLED)
422	<	throw new CancellationException();
423	<	if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
424	<	throw new ExecutionException(ex);
308	>	private int doInvoke() {
309	>	int stat;
310	>	if ((stat = status) >= 0) {
311	>	boolean completed;
312	>	try {
313	>	completed = exec();
314	>	} catch (Throwable rex) {
315	>	return setExceptionalCompletion(rex);
316	>	}
317	>	stat = completed ? setCompletion(NORMAL) : doJoin();
318		}
319	<	return getRawResult();
319	>	return stat;
320		}
321
322		/**
323	<	* Returns result or throws exception using j.u.c.Future conventions
324	<	* with timeouts.
323	>	* Returns result or throws exception associated with given status.
324	>	* @param s the status
325		*/
326	<	private V reportTimedFutureResult()
434	<	throws InterruptedException, ExecutionException, TimeoutException {
435	<	if (Thread.interrupted())
436	<	throw new InterruptedException();
326	>	private V reportResult(int s) {
327		Throwable ex;
328	<	int s = status & COMPLETION_MASK;
329	<	if (s == NORMAL)
330	<	return getRawResult();
441	<	else if (s == CANCELLED)
442	<	throw new CancellationException();
443	<	else if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
444	<	throw new ExecutionException(ex);
445	<	else
446	<	throw new TimeoutException();
328	>	if (s < NORMAL && (ex = getException()) != null)
329	>	UNSAFE.throwException(ex);
330	>	return getRawResult();
331		}
332
333		// public methods
#	Line 481 | Line 365 | public abstract class ForkJoinTask<V> im
365		* @return the computed result
366		*/
367		public final V join() {
368	<	quietlyJoin();
485	<	return reportResult();
368	>	return reportResult(doJoin());
369		}
370
371		/**
#	Line 493 | Line 376 | public abstract class ForkJoinTask<V> im
376		* @return the computed result
377		*/
378		public final V invoke() {
379	<	if (!tryExec())
497	<	quietlyJoin();
498	<	return reportResult();
379	>	return reportResult(doInvoke());
380		}
381
382		/**
#	Line 553 | Line 434 | public abstract class ForkJoinTask<V> im
434		}
435		else if (i != 0)
436		t.fork();
437	<	else {
438	<	t.quietlyInvoke();
558	<	if (ex == null)
559	<	ex = t.getException();
560	<	}
437	>	else if (t.doInvoke() < NORMAL && ex == null)
438	>	ex = t.getException();
439		}
440		for (int i = 1; i <= last; ++i) {
441		ForkJoinTask<?> t = tasks[i];
442		if (t != null) {
443		if (ex != null)
444		t.cancel(false);
445	<	else {
446	<	t.quietlyJoin();
569	<	if (ex == null)
570	<	ex = t.getException();
571	<	}
445	>	else if (t.doJoin() < NORMAL && ex == null)
446	>	ex = t.getException();
447		}
448		}
449		if (ex != null)
#	Line 615 | Line 490 | public abstract class ForkJoinTask<V> im
490		}
491		else if (i != 0)
492		t.fork();
493	<	else {
494	<	t.quietlyInvoke();
620	<	if (ex == null)
621	<	ex = t.getException();
622	<	}
493	>	else if (t.doInvoke() < NORMAL && ex == null)
494	>	ex = t.getException();
495		}
496		for (int i = 1; i <= last; ++i) {
497		ForkJoinTask<?> t = ts.get(i);
498		if (t != null) {
499		if (ex != null)
500		t.cancel(false);
501	<	else {
502	<	t.quietlyJoin();
631	<	if (ex == null)
632	<	ex = t.getException();
633	<	}
501	>	else if (t.doJoin() < NORMAL && ex == null)
502	>	ex = t.getException();
503		}
504		}
505		if (ex != null)
#	Line 663 | Line 532 | public abstract class ForkJoinTask<V> im
532		* @return {@code true} if this task is now cancelled
533		*/
534		public boolean cancel(boolean mayInterruptIfRunning) {
535	<	setCompletion(CANCELLED);
667	<	return (status & COMPLETION_MASK) == CANCELLED;
535	>	return setCompletion(CANCELLED) == CANCELLED;
536		}
537
538		/**
#	Line 681 | Line 549 | public abstract class ForkJoinTask<V> im
549		/**
550		* Cancels ignoring exceptions if worker is terminating
551		*/
552	<	private void cancelIfTerminating() {
552	>	final void cancelIfTerminating() {
553		Thread t = Thread.currentThread();
554		if ((t instanceof ForkJoinWorkerThread) &&
555	<	((ForkJoinWorkerThread) t).isTerminating()) {
555	>	((ForkJoinWorkerThread) t).isTerminating()) {
556		try {
557		cancel(false);
558		} catch (Throwable ignore) {
#	Line 697 | Line 565 | public abstract class ForkJoinTask<V> im
565		}
566
567		public final boolean isCancelled() {
568	<	return (status & COMPLETION_MASK) == CANCELLED;
568	>	return status == CANCELLED;
569		}
570
571		/**
#	Line 706 | Line 574 | public abstract class ForkJoinTask<V> im
574		* @return {@code true} if this task threw an exception or was cancelled
575		*/
576		public final boolean isCompletedAbnormally() {
577	<	return (status & COMPLETION_MASK) < NORMAL;
577	>	return status < NORMAL;
578		}
579
580		/**
#	Line 717 | Line 585 | public abstract class ForkJoinTask<V> im
585		* exception and was not cancelled
586		*/
587		public final boolean isCompletedNormally() {
588	<	return (status & COMPLETION_MASK) == NORMAL;
588	>	return status == NORMAL;
589		}
590
591		/**
#	Line 728 | Line 596 | public abstract class ForkJoinTask<V> im
596		* @return the exception, or {@code null} if none
597		*/
598		public final Throwable getException() {
599	<	int s = status & COMPLETION_MASK;
599	>	int s = status;
600		return ((s >= NORMAL)    ? null :
601		(s == CANCELLED) ? new CancellationException() :
602		exceptionMap.get(this));
#	Line 749 | Line 617 | public abstract class ForkJoinTask<V> im
617		* thrown will be a {@code RuntimeException} with cause {@code ex}.
618		*/
619		public void completeExceptionally(Throwable ex) {
620	<	setDoneExceptionally((ex instanceof RuntimeException) ||
621	<	(ex instanceof Error) ? ex :
622	<	new RuntimeException(ex));
620	>	setExceptionalCompletion((ex instanceof RuntimeException) ||
621	>	(ex instanceof Error) ? ex :
622	>	new RuntimeException(ex));
623		}
624
625		/**
#	Line 770 | Line 638 | public abstract class ForkJoinTask<V> im
638		try {
639		setRawResult(value);
640		} catch (Throwable rex) {
641	<	setDoneExceptionally(rex);
641	>	setExceptionalCompletion(rex);
642		return;
643		}
644		setCompletion(NORMAL);
645		}
646
647		public final V get() throws InterruptedException, ExecutionException {
648	<	quietlyJoin();
649	<	return reportFutureResult();
648	>	int s = doJoin();
649	>	if (Thread.interrupted())
650	>	throw new InterruptedException();
651	>	if (s < NORMAL) {
652	>	Throwable ex;
653	>	if (s == CANCELLED)
654	>	throw new CancellationException();
655	>	if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
656	>	throw new ExecutionException(ex);
657	>	}
658	>	return getRawResult();
659		}
660	<
660	>
661		public final V get(long timeout, TimeUnit unit)
662		throws InterruptedException, ExecutionException, TimeoutException {
786	–	long nanos = unit.toNanos(timeout);
663		Thread t = Thread.currentThread();
664	+	ForkJoinPool pool;
665		if (t instanceof ForkJoinWorkerThread) {
666		ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
667	<	if (!w.unpushTask(this) || !tryExec())
668	<	timedAwaitDone(w, nanos);
667	>	if (status >= 0 && w.unpushTask(this))
668	>	tryExec();
669	>	pool = w.pool;
670		}
671		else
672	<	externalTimedAwaitDone(nanos);
673	<	return reportTimedFutureResult();
674	<	}
675	<
676	<	/**
677	<	* Possibly executes other tasks until this task {@link #isDone is
678	<	* done}, then returns the result of the computation.  This method
679	<	* may be more efficient than {@code join}, but is only applicable
680	<	* when there are no potential dependencies between continuation
681	<	* of the current task and that of any other task that might be
682	<	* executed while helping. (This usually holds for pure
683	<	* divide-and-conquer tasks).
684	<	*
685	<	* <p>This method may be invoked only from within {@code
686	<	* ForkJoinTask} computations (as may be determined using method
687	<	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
688	<	* result in exceptions or errors, possibly including {@code
689	<	* ClassCastException}.
690	<	*
691	<	* @return the computed result
692	<	*/
693	<	public final V helpJoin() {
694	<	quietlyHelpJoin();
695	<	return reportResult();
696	<	}
697	<
698	<	/**
699	<	* Possibly executes other tasks until this task {@link #isDone is
700	<	* done}.  This method may be useful when processing collections
701	<	* of tasks when some have been cancelled or otherwise known to
702	<	* have aborted.
703	<	*
704	<	* <p>This method may be invoked only from within {@code
705	<	* ForkJoinTask} computations (as may be determined using method
706	<	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
707	<	* result in exceptions or errors, possibly including {@code
708	<	* ClassCastException}.
709	<	*/
710	<	public final void quietlyHelpJoin() {
711	<	ForkJoinWorkerThread w = (ForkJoinWorkerThread) Thread.currentThread();
712	<	if (!w.unpushTask(this) || !tryExec()) {
713	<	while (status >= 0) {
714	<	ForkJoinTask<?> t = w.scanWhileJoining(this);
715	<	if (t == null) {
838	<	if (status >= 0)
839	<	awaitDone(w);
840	<	break;
672	>	pool = null;
673	>	/*
674	>	* Timed wait loop intermixes cases for fj (pool != null) and
675	>	* non FJ threads. For FJ, decrement pool count but don't try
676	>	* for replacement; increment count on completion. For non-FJ,
677	>	* deal with interrupts. This is messy, but a little less so
678	>	* than is splitting the FJ and nonFJ cases.
679	>	*/
680	>	boolean interrupted = false;
681	>	boolean dec = false; // true if pool count decremented
682	>	for (;;) {
683	>	if (Thread.interrupted() && pool == null) {
684	>	interrupted = true;
685	>	break;
686	>	}
687	>	int s = status;
688	>	if (s < 0)
689	>	break;
690	>	if (UNSAFE.compareAndSwapInt(this, statusOffset,
691	>	s, s | SIGNAL)) {
692	>	long startTime = System.nanoTime();
693	>	long nanos = unit.toNanos(timeout);
694	>	long nt; // wait time
695	>	while (status >= 0 &&
696	>	(nt = nanos - (System.nanoTime() - startTime)) > 0) {
697	>	if (pool != null && !dec)
698	>	dec = pool.tryDecrementRunningCount();
699	>	else {
700	>	long ms = nt / 1000000;
701	>	int ns = (int) (nt % 1000000);
702	>	try {
703	>	synchronized(this) {
704	>	if (status >= 0)
705	>	wait(ms, ns);
706	>	}
707	>	} catch (InterruptedException ie) {
708	>	if (pool != null)
709	>	cancelIfTerminating();
710	>	else {
711	>	interrupted = true;
712	>	break;
713	>	}
714	>	}
715	>	}
716		}
717	<	t.tryExec();
717	>	break;
718		}
719		}
720	+	if (pool != null && dec)
721	+	pool.incrementRunningCount();
722	+	if (interrupted)
723	+	throw new InterruptedException();
724	+	int es = status;
725	+	if (es != NORMAL) {
726	+	Throwable ex;
727	+	if (es == CANCELLED)
728	+	throw new CancellationException();
729	+	if (es == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
730	+	throw new ExecutionException(ex);
731	+	throw new TimeoutException();
732	+	}
733	+	return getRawResult();
734		}
735
736		/**
#	Line 851 | Line 740 | public abstract class ForkJoinTask<V> im
740		* known to have aborted.
741		*/
742		public final void quietlyJoin() {
743	<	Thread t = Thread.currentThread();
855	<	if (t instanceof ForkJoinWorkerThread) {
856	<	ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
857	<	if (!w.unpushTask(this) || !tryExec())
858	<	awaitDone(w);
859	<	}
860	<	else
861	<	externalAwaitDone();
743	>	doJoin();
744		}
745
746		/**
#	Line 869 | Line 751 | public abstract class ForkJoinTask<V> im
751		* known to have aborted.
752		*/
753		public final void quietlyInvoke() {
754	<	if (!tryExec())
873	<	quietlyJoin();
754	>	doInvoke();
755		}
756
757		/**
#	Line 902 | Line 783 | public abstract class ForkJoinTask<V> im
783		* pre-constructed trees of subtasks in loops.
784		*/
785		public void reinitialize() {
786	<	if ((status & COMPLETION_MASK) == EXCEPTIONAL)
786	>	if (status == EXCEPTIONAL)
787		exceptionMap.remove(this);
788		status = 0;
789		}
#	Line 1212 | Line 1093 | public abstract class ForkJoinTask<V> im
1093		private void readObject(java.io.ObjectInputStream s)
1094		throws java.io.IOException, ClassNotFoundException {
1095		s.defaultReadObject();
1215	–	status &= ~INTERNAL_SIGNAL_MASK; // clear internal signal counts
1216	–	status |= EXTERNAL_SIGNAL; // conservatively set external signal
1096		Object ex = s.readObject();
1097		if (ex != null)
1098	<	setDoneExceptionally((Throwable) ex);
1098	>	setExceptionalCompletion((Throwable) ex);
1099		}
1100
1101		// Unsafe mechanics

Diff Legend

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