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.56 by jsr166, Sat Sep 4 00:21:31 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 148 | Line 144 | public abstract class ForkJoinTask<V> im
144		* status maintenance (2) execution and awaiting completion (3)
145		* user-level methods that additionally report results. This is
146		* sometimes hard to see because this file orders exported methods
147	<	* in a way that flows well in javadocs.
147	>	* in a way that flows well in javadocs. In particular, most
148	>	* join mechanics are in method quietlyJoin, below.
149		*/
150
151	<	/**
152	<	* Run control status bits packed into a single int to minimize
153	<	* footprint and to ensure atomicity (via CAS).  Status is
154	<	* initially zero, and takes on nonnegative values until
155	<	* completed, upon which status holds COMPLETED. CANCELLED, or
156	<	* EXCEPTIONAL, which use the top 3 bits.  Tasks undergoing
157	<	* blocking waits by other threads have SIGNAL_MASK bits set --
158	<	* bit 15 for external (nonFJ) waits, and the rest a count of
159	<	* waiting FJ threads.  (This representation relies on
160	<	* ForkJoinPool max thread limits). Signal counts are not directly
161	<	* incremented by ForkJoinTask methods, but instead via a call to
162	<	* requestSignal within ForkJoinPool.preJoin, once their need is
163	<	* established.
164	<	*
165	<	* 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.
151	>	/*
152	>	* The status field holds run control status bits packed into a
153	>	* single int to minimize footprint and to ensure atomicity (via
154	>	* CAS).  Status is initially zero, and takes on nonnegative
155	>	* values until completed, upon which status holds value
156	>	* COMPLETED. CANCELLED, or EXCEPTIONAL. Tasks undergoing blocking
157	>	* waits by other threads have the SIGNAL bit set.  Completion of
158	>	* a stolen task with SIGNAL set awakens any waiters via
159	>	* notifyAll. Even though suboptimal for some purposes, we use
160	>	* basic builtin wait/notify to take advantage of "monitor
161	>	* inflation" in JVMs that we would otherwise need to emulate to
162	>	* avoid adding further per-task bookkeeping overhead.  We want
163	>	* these monitors to be "fat", i.e., not use biasing or thin-lock
164	>	* techniques, so use some odd coding idioms that tend to avoid
165	>	* them.
166		*/
167	+
168	+	/** The run status of this task */
169		volatile int status; // accessed directly by pool and workers
170
171	<	private static final int COMPLETION_MASK      = 0xe0000000;
172	<	private static final int NORMAL               = 0xe0000000; // == mask
173	<	private static final int CANCELLED            = 0xc0000000;
174	<	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;
171	>	private static final int NORMAL      = -1;
172	>	private static final int CANCELLED   = -2;
173	>	private static final int EXCEPTIONAL = -3;
174	>	private static final int SIGNAL      =  1;
175
176		/**
177		* Table of exceptions thrown by tasks, to enable reporting by
#	Line 211 | Line 197 | public abstract class ForkJoinTask<V> im
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	>	break;
203		}
204		}
205		}
206
207		/**
208	<	* Record exception and set exceptional completion
208	>	* Records exception and sets exceptional completion.
209	>	*
210	>	* @return status on exit
211		*/
212	<	private void setDoneExceptionally(Throwable rex) {
212	>	private void setExceptionalCompletion(Throwable rex) {
213		exceptionMap.put(this, rex);
214		setCompletion(EXCEPTIONAL);
215		}
216
217		/**
218	<	* Main internal execution method: Unless done, calls exec and
219	<	* records completion.
220	<	*
238	<	* @return true if ran and completed normally
218	>	* Blocks a worker thread until completion. Called only by
219	>	* pool. Currently unused -- pool-based waits use timeout
220	>	* version below.
221		*/
222	<	final boolean tryExec() {
223	<	try {
224	<	if (status < 0 || !exec())
225	<	return false;
226	<	} catch (Throwable rex) {
227	<	setDoneExceptionally(rex);
228	<	return false;
222	>	final void internalAwaitDone() {
223	>	int s;         // the odd construction reduces lock bias effects
224	>	while ((s = status) >= 0) {
225	>	try {
226	>	synchronized(this) {
227	>	if (UNSAFE.compareAndSwapInt(this, statusOffset, s,SIGNAL))
228	>	wait();
229	>	}
230	>	} catch (InterruptedException ie) {
231	>	cancelIfTerminating();
232	>	}
233		}
248	–	setCompletion(NORMAL); // must be outside try block
249	–	return true;
234		}
235
236		/**
237	<	* Increments internal signal count (thus requesting signal upon
238	<	* completion) unless already done.  Call only once per join.
255	<	* Used by ForkJoinPool.preJoin.
237	>	* Blocks a worker thread until completed or timed out.  Called
238	>	* only by pool.
239		*
240	<	* @return status
240	>	* @return status on exit
241		*/
242	<	final int requestSignal() {
242	>	final int internalAwaitDone(long millis) {
243		int s;
244	<	do {} while ((s = status) >= 0 &&
245	<	!UNSAFE.compareAndSwapInt(this, statusOffset, s, s + 1));
246	<	return s;
247	<	}
248	<
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.
283	<	*/
284	<
285	<	/**
286	<	* Blocks a worker until this task is done, also maintaining pool
287	<	* and signal counts
288	<	*/
289	<	private void awaitDone(ForkJoinWorkerThread w) {
290	<	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();
244	>	if ((s = status) >= 0) {
245	>	try {
246	>	synchronized(this) {
247	>	if (UNSAFE.compareAndSwapInt(this, statusOffset, s,SIGNAL))
248	>	wait(millis, 0);
249		}
250	+	} catch (InterruptedException ie) {
251	+	cancelIfTerminating();
252		}
253	+	s = status;
254		}
255	+	return s;
256		}
257
258		/**
259	<	* Blocks a non-ForkJoin thread until this task is done.
259	>	* Blocks a non-worker-thread until completion.
260		*/
261		private void externalAwaitDone() {
262	<	if (requestExternalSignal() >= 0) {
263	<	boolean interrupted = false;
264	<	while (status >= 0) {
265	<	try {
266	<	synchronized(this) {
267	<	if (status >= 0)
268	<	wait();
269	<	else {
270	<	notifyAll();
271	<	break;
323	<	}
324	<	}
325	<	} catch (InterruptedException ie) {
326	<	interrupted = true;
327	<	}
328	<	}
329	<	if (interrupted)
330	<	Thread.currentThread().interrupt();
331	<	}
332	<	}
333	<
334	<	/**
335	<	* Blocks a worker until this task is done or timeout elapses
336	<	*/
337	<	private void timedAwaitDone(ForkJoinWorkerThread w, long nanos) {
338	<	if (status >= 0) {
339	<	long startTime = System.nanoTime();
340	<	ForkJoinPool pool = w.pool;
341	<	pool.preJoin(this);
342	<	while (status >= 0) {
343	<	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;
262	>	int s;
263	>	while ((s = status) >= 0) {
264	>	synchronized(this) {
265	>	if (UNSAFE.compareAndSwapInt(this, statusOffset, s, SIGNAL)){
266	>	boolean interrupted = false;
267	>	while (status >= 0) {
268	>	try {
269	>	wait();
270	>	} catch (InterruptedException ie) {
271	>	interrupted = true;
272		}
273		}
274	+	if (interrupted)
275	+	Thread.currentThread().interrupt();
276		break;
277		}
278		}
#	Line 367 | Line 280 | public abstract class ForkJoinTask<V> im
280		}
281
282		/**
283	<	* Blocks a non-ForkJoin thread until this task is done or timeout elapses
284	<	*/
285	<	private void externalTimedAwaitDone(long nanos) {
373	<	if (requestExternalSignal() >= 0) {
374	<	long startTime = System.nanoTime();
375	<	boolean interrupted = false;
376	<	while (status >= 0) {
377	<	long nt = nanos - (System.nanoTime() - startTime);
378	<	if (nt <= 0)
379	<	break;
380	<	long ms = nt / 1000000;
381	<	int ns = (int) (nt % 1000000);
382	<	try {
383	<	synchronized(this) { if (status >= 0) wait(ms, ns); }
384	<	} catch (InterruptedException ie) {
385	<	interrupted = true;
386	<	}
387	<	}
388	<	if (interrupted)
389	<	Thread.currentThread().interrupt();
390	<	}
391	<	}
392	<
393	<	// reporting results
394	<
395	<	/**
396	<	* Returns result or throws the exception associated with status.
397	<	* Uses Unsafe as a workaround for javac not allowing rethrow of
398	<	* unchecked exceptions.
283	>	* Unless done, calls exec and records status if completed, but
284	>	* doesn't wait for completion otherwise. Primary execution method
285	>	* for ForkJoinWorkerThread.
286		*/
287	<	private V reportResult() {
288	<	if ((status & COMPLETION_MASK) < NORMAL) {
289	<	Throwable ex = getException();
290	<	if (ex != null)
291	<	UNSAFE.throwException(ex);
292	<	}
293	<	return getRawResult();
407	<	}
408	<
409	<	/**
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);
287	>	final void quietlyExec() {
288	>	try {
289	>	if (status < 0 || !exec())
290	>	return;
291	>	} catch (Throwable rex) {
292	>	setExceptionalCompletion(rex);
293	>	return;
294		}
295	<	return getRawResult();
427	<	}
428	<
429	<	/**
430	<	* Returns result or throws exception using j.u.c.Future conventions
431	<	* with timeouts.
432	<	*/
433	<	private V reportTimedFutureResult()
434	<	throws InterruptedException, ExecutionException, TimeoutException {
435	<	if (Thread.interrupted())
436	<	throw new InterruptedException();
437	<	Throwable ex;
438	<	int s = status & COMPLETION_MASK;
439	<	if (s == NORMAL)
440	<	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();
295	>	setCompletion(NORMAL); // must be outside try block
296		}
297
298		// public methods
#	Line 482 | Line 331 | public abstract class ForkJoinTask<V> im
331		*/
332		public final V join() {
333		quietlyJoin();
334	<	return reportResult();
334	>	Throwable ex;
335	>	if (status < NORMAL && (ex = getException()) != null)
336	>	UNSAFE.throwException(ex);
337	>	return getRawResult();
338		}
339
340		/**
341		* Commences performing this task, awaits its completion if
342	<	* necessary, and return its result, or throws an (unchecked)
342	>	* necessary, and returns its result, or throws an (unchecked)
343		* exception if the underlying computation did so.
344		*
345		* @return the computed result
346		*/
347		public final V invoke() {
348	<	if (!tryExec())
349	<	quietlyJoin();
350	<	return reportResult();
348	>	quietlyInvoke();
349	>	Throwable ex;
350	>	if (status < NORMAL && (ex = getException()) != null)
351	>	UNSAFE.throwException(ex);
352	>	return getRawResult();
353		}
354
355		/**
#	Line 555 | Line 409 | public abstract class ForkJoinTask<V> im
409		t.fork();
410		else {
411		t.quietlyInvoke();
412	<	if (ex == null)
412	>	if (ex == null && t.status < NORMAL)
413		ex = t.getException();
414		}
415		}
#	Line 566 | Line 420 | public abstract class ForkJoinTask<V> im
420		t.cancel(false);
421		else {
422		t.quietlyJoin();
423	<	if (ex == null)
423	>	if (ex == null && t.status < NORMAL)
424		ex = t.getException();
425		}
426		}
#	Line 617 | Line 471 | public abstract class ForkJoinTask<V> im
471		t.fork();
472		else {
473		t.quietlyInvoke();
474	<	if (ex == null)
474	>	if (ex == null && t.status < NORMAL)
475		ex = t.getException();
476		}
477		}
#	Line 628 | Line 482 | public abstract class ForkJoinTask<V> im
482		t.cancel(false);
483		else {
484		t.quietlyJoin();
485	<	if (ex == null)
485	>	if (ex == null && t.status < NORMAL)
486		ex = t.getException();
487		}
488		}
#	Line 664 | Line 518 | public abstract class ForkJoinTask<V> im
518		*/
519		public boolean cancel(boolean mayInterruptIfRunning) {
520		setCompletion(CANCELLED);
521	<	return (status & COMPLETION_MASK) == CANCELLED;
521	>	return status == CANCELLED;
522		}
523
524		/**
525	<	* Cancels, ignoring any exceptions it throws. Used during worker
526	<	* and pool shutdown.
525	>	* Cancels, ignoring any exceptions thrown by cancel. Used during
526	>	* worker and pool shutdown. Cancel is spec'ed not to throw any
527	>	* exceptions, but if it does anyway, we have no recourse during
528	>	* shutdown, so guard against this case.
529		*/
530		final void cancelIgnoringExceptions() {
531		try {
#	Line 679 | Line 535 | public abstract class ForkJoinTask<V> im
535		}
536
537		/**
538	<	* Cancels ignoring exceptions if worker is terminating
538	>	* Cancels if current thread is a terminating worker thread,
539	>	* ignoring any exceptions thrown by cancel.
540		*/
541	<	private void cancelIfTerminating() {
541	>	final void cancelIfTerminating() {
542		Thread t = Thread.currentThread();
543		if ((t instanceof ForkJoinWorkerThread) &&
544	<	((ForkJoinWorkerThread) t).isTerminating()) {
544	>	((ForkJoinWorkerThread) t).isTerminating()) {
545		try {
546		cancel(false);
547		} catch (Throwable ignore) {
#	Line 697 | Line 554 | public abstract class ForkJoinTask<V> im
554		}
555
556		public final boolean isCancelled() {
557	<	return (status & COMPLETION_MASK) == CANCELLED;
557	>	return status == CANCELLED;
558		}
559
560		/**
#	Line 706 | Line 563 | public abstract class ForkJoinTask<V> im
563		* @return {@code true} if this task threw an exception or was cancelled
564		*/
565		public final boolean isCompletedAbnormally() {
566	<	return (status & COMPLETION_MASK) < NORMAL;
566	>	return status < NORMAL;
567		}
568
569		/**
#	Line 717 | Line 574 | public abstract class ForkJoinTask<V> im
574		* exception and was not cancelled
575		*/
576		public final boolean isCompletedNormally() {
577	<	return (status & COMPLETION_MASK) == NORMAL;
577	>	return status == NORMAL;
578		}
579
580		/**
#	Line 728 | Line 585 | public abstract class ForkJoinTask<V> im
585		* @return the exception, or {@code null} if none
586		*/
587		public final Throwable getException() {
588	<	int s = status & COMPLETION_MASK;
588	>	int s = status;
589		return ((s >= NORMAL)    ? null :
590		(s == CANCELLED) ? new CancellationException() :
591		exceptionMap.get(this));
#	Line 749 | Line 606 | public abstract class ForkJoinTask<V> im
606		* thrown will be a {@code RuntimeException} with cause {@code ex}.
607		*/
608		public void completeExceptionally(Throwable ex) {
609	<	setDoneExceptionally((ex instanceof RuntimeException) ||
610	<	(ex instanceof Error) ? ex :
611	<	new RuntimeException(ex));
609	>	setExceptionalCompletion((ex instanceof RuntimeException) ||
610	>	(ex instanceof Error) ? ex :
611	>	new RuntimeException(ex));
612		}
613
614		/**
#	Line 770 | Line 627 | public abstract class ForkJoinTask<V> im
627		try {
628		setRawResult(value);
629		} catch (Throwable rex) {
630	<	setDoneExceptionally(rex);
630	>	setExceptionalCompletion(rex);
631		return;
632		}
633		setCompletion(NORMAL);
#	Line 778 | Line 635 | public abstract class ForkJoinTask<V> im
635
636		public final V get() throws InterruptedException, ExecutionException {
637		quietlyJoin();
638	<	return reportFutureResult();
638	>	if (Thread.interrupted())
639	>	throw new InterruptedException();
640	>	int s = status;
641	>	if (s < NORMAL) {
642	>	Throwable ex;
643	>	if (s == CANCELLED)
644	>	throw new CancellationException();
645	>	if (s == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
646	>	throw new ExecutionException(ex);
647	>	}
648	>	return getRawResult();
649		}
650	<
650	>
651		public final V get(long timeout, TimeUnit unit)
652		throws InterruptedException, ExecutionException, TimeoutException {
786	–	long nanos = unit.toNanos(timeout);
653		Thread t = Thread.currentThread();
654	+	ForkJoinPool pool;
655		if (t instanceof ForkJoinWorkerThread) {
656		ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
657	<	if (!w.unpushTask(this) || !tryExec())
658	<	timedAwaitDone(w, nanos);
657	>	if (status >= 0 && w.unpushTask(this))
658	>	quietlyExec();
659	>	pool = w.pool;
660		}
661		else
662	<	externalTimedAwaitDone(nanos);
663	<	return reportTimedFutureResult();
664	<	}
665	<
666	<	/**
667	<	* Possibly executes other tasks until this task {@link #isDone is
668	<	* done}, then returns the result of the computation.  This method
669	<	* may be more efficient than {@code join}, but is only applicable
670	<	* when there are no potential dependencies between continuation
671	<	* of the current task and that of any other task that might be
672	<	* executed while helping. (This usually holds for pure
673	<	* divide-and-conquer tasks).
674	<	*
675	<	* <p>This method may be invoked only from within {@code
676	<	* ForkJoinTask} computations (as may be determined using method
677	<	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
678	<	* result in exceptions or errors, possibly including {@code
679	<	* ClassCastException}.
680	<	*
681	<	* @return the computed result
682	<	*/
683	<	public final V helpJoin() {
684	<	quietlyHelpJoin();
685	<	return reportResult();
686	<	}
687	<
688	<	/**
689	<	* Possibly executes other tasks until this task {@link #isDone is
690	<	* done}.  This method may be useful when processing collections
691	<	* of tasks when some have been cancelled or otherwise known to
692	<	* have aborted.
693	<	*
694	<	* <p>This method may be invoked only from within {@code
695	<	* ForkJoinTask} computations (as may be determined using method
696	<	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
697	<	* result in exceptions or errors, possibly including {@code
698	<	* ClassCastException}.
699	<	*/
700	<	public final void quietlyHelpJoin() {
701	<	ForkJoinWorkerThread w = (ForkJoinWorkerThread) Thread.currentThread();
702	<	if (!w.unpushTask(this) || !tryExec()) {
703	<	while (status >= 0) {
704	<	ForkJoinTask<?> t = w.scanWhileJoining(this);
837	<	if (t == null) {
838	<	if (status >= 0)
839	<	awaitDone(w);
840	<	break;
662	>	pool = null;
663	>	/*
664	>	* Timed wait loop intermixes cases for FJ (pool != null) and
665	>	* non FJ threads. For FJ, decrement pool count but don't try
666	>	* for replacement; increment count on completion. For non-FJ,
667	>	* deal with interrupts. This is messy, but a little less so
668	>	* than is splitting the FJ and nonFJ cases.
669	>	*/
670	>	boolean interrupted = false;
671	>	boolean dec = false; // true if pool count decremented
672	>	long nanos = unit.toNanos(timeout);
673	>	for (;;) {
674	>	if (Thread.interrupted() && pool == null) {
675	>	interrupted = true;
676	>	break;
677	>	}
678	>	int s = status;
679	>	if (s < 0)
680	>	break;
681	>	if (UNSAFE.compareAndSwapInt(this, statusOffset, s, SIGNAL)) {
682	>	long startTime = System.nanoTime();
683	>	long nt; // wait time
684	>	while (status >= 0 &&
685	>	(nt = nanos - (System.nanoTime() - startTime)) > 0) {
686	>	if (pool != null && !dec)
687	>	dec = pool.tryDecrementRunningCount();
688	>	else {
689	>	long ms = nt / 1000000;
690	>	int ns = (int) (nt % 1000000);
691	>	try {
692	>	synchronized(this) {
693	>	if (status >= 0)
694	>	wait(ms, ns);
695	>	}
696	>	} catch (InterruptedException ie) {
697	>	if (pool != null)
698	>	cancelIfTerminating();
699	>	else {
700	>	interrupted = true;
701	>	break;
702	>	}
703	>	}
704	>	}
705		}
706	<	t.tryExec();
706	>	break;
707		}
708		}
709	+	if (pool != null && dec)
710	+	pool.incrementRunningCount();
711	+	if (interrupted)
712	+	throw new InterruptedException();
713	+	int es = status;
714	+	if (es != NORMAL) {
715	+	Throwable ex;
716	+	if (es == CANCELLED)
717	+	throw new CancellationException();
718	+	if (es == EXCEPTIONAL && (ex = exceptionMap.get(this)) != null)
719	+	throw new ExecutionException(ex);
720	+	throw new TimeoutException();
721	+	}
722	+	return getRawResult();
723		}
724
725		/**
726	<	* Joins this task, without returning its result or throwing an
726	>	* Joins this task, without returning its result or throwing its
727		* exception. This method may be useful when processing
728		* collections of tasks when some have been cancelled or otherwise
729		* known to have aborted.
730		*/
731		public final void quietlyJoin() {
732	<	Thread t = Thread.currentThread();
733	<	if (t instanceof ForkJoinWorkerThread) {
732	>	Thread t;
733	>	if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
734		ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
735	<	if (!w.unpushTask(this) || !tryExec())
736	<	awaitDone(w);
735	>	if (status >= 0) {
736	>	if (w.unpushTask(this)) {
737	>	boolean completed;
738	>	try {
739	>	completed = exec();
740	>	} catch (Throwable rex) {
741	>	setExceptionalCompletion(rex);
742	>	return;
743	>	}
744	>	if (completed) {
745	>	setCompletion(NORMAL);
746	>	return;
747	>	}
748	>	}
749	>	w.joinTask(this);
750	>	}
751		}
752		else
753		externalAwaitDone();
#	Line 863 | Line 755 | public abstract class ForkJoinTask<V> im
755
756		/**
757		* Commences performing this task and awaits its completion if
758	<	* necessary, without returning its result or throwing an
758	>	* necessary, without returning its result or throwing its
759		* exception. This method may be useful when processing
760		* collections of tasks when some have been cancelled or otherwise
761		* known to have aborted.
762		*/
763		public final void quietlyInvoke() {
764	<	if (!tryExec())
765	<	quietlyJoin();
764	>	if (status >= 0) {
765	>	boolean completed;
766	>	try {
767	>	completed = exec();
768	>	} catch (Throwable rex) {
769	>	setExceptionalCompletion(rex);
770	>	return;
771	>	}
772	>	if (completed)
773	>	setCompletion(NORMAL);
774	>	else
775	>	quietlyJoin();
776	>	}
777		}
778
779		/**
#	Line 902 | Line 805 | public abstract class ForkJoinTask<V> im
805		* pre-constructed trees of subtasks in loops.
806		*/
807		public void reinitialize() {
808	<	if ((status & COMPLETION_MASK) == EXCEPTIONAL)
808	>	if (status == EXCEPTIONAL)
809		exceptionMap.remove(this);
810		status = 0;
811		}
#	Line 1192 | Line 1095 | public abstract class ForkJoinTask<V> im
1095		private static final long serialVersionUID = -7721805057305804111L;
1096
1097		/**
1098	<	* Saves the state to a stream.
1098	>	* Saves the state to a stream (that is, serializes it).
1099		*
1100		* @serialData the current run status and the exception thrown
1101		* during execution, or {@code null} if none
#	Line 1205 | Line 1108 | public abstract class ForkJoinTask<V> im
1108		}
1109
1110		/**
1111	<	* Reconstitutes the instance from a stream.
1111	>	* Reconstitutes the instance from a stream (that is, deserializes it).
1112		*
1113		* @param s the stream
1114		*/
1115		private void readObject(java.io.ObjectInputStream s)
1116		throws java.io.IOException, ClassNotFoundException {
1117		s.defaultReadObject();
1215	–	status &= ~INTERNAL_SIGNAL_MASK; // clear internal signal counts
1216	–	status |= EXTERNAL_SIGNAL; // conservatively set external signal
1118		Object ex = s.readObject();
1119		if (ex != null)
1120	<	setDoneExceptionally((Throwable) ex);
1120	>	setExceptionalCompletion((Throwable) ex);
1121		}
1122
1123		// Unsafe mechanics

Diff Legend

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