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.90 by dl, Sat Apr 21 11:45:20 2012 UTC vs.
Revision 1.104 by jsr166, Thu Jun 30 14:17:04 2016 UTC

#	Line 30 | Line 30 | import java.lang.reflect.Constructor;
30		* subtasks may be hosted by a small number of actual threads in a
31		* ForkJoinPool, at the price of some usage limitations.
32		*
33	<	* <p>A "main" {@code ForkJoinTask} begins execution when submitted
34	<	* to a {@link ForkJoinPool}.  Once started, it will usually in turn
35	<	* start other subtasks.  As indicated by the name of this class,
36	<	* many programs using {@code ForkJoinTask} employ only methods
37	<	* {@link #fork} and {@link #join}, or derivatives such as {@link
33	>	* <p>A "main" {@code ForkJoinTask} begins execution when it is
34	>	* explicitly submitted to a {@link ForkJoinPool}, or, if not already
35	>	* engaged in a ForkJoin computation, commenced in the {@link
36	>	* ForkJoinPool#commonPool()} via {@link #fork}, {@link #invoke}, or
37	>	* related methods.  Once started, it will usually in turn start other
38	>	* subtasks.  As indicated by the name of this class, many programs
39	>	* using {@code ForkJoinTask} employ only methods {@link #fork} and
40	>	* {@link #join}, or derivatives such as {@link
41		* #invokeAll(ForkJoinTask...) invokeAll}.  However, this class also
42		* provides a number of other methods that can come into play in
43	<	* advanced usages, as well as extension mechanics that allow
44	<	* support of new forms of fork/join processing.
43	>	* advanced usages, as well as extension mechanics that allow support
44	>	* of new forms of fork/join processing.
45		*
46		* <p>A {@code ForkJoinTask} is a lightweight form of {@link Future}.
47		* The efficiency of {@code ForkJoinTask}s stems from a set of
#	Line 52 | Line 55 | import java.lang.reflect.Constructor;
55		* minimize other blocking synchronization apart from joining other
56		* tasks or using synchronizers such as Phasers that are advertised to
57		* cooperate with fork/join scheduling. Subdividable tasks should also
58	<	* not perform blocking IO, and should ideally access variables that
58	>	* not perform blocking I/O, and should ideally access variables that
59		* are completely independent of those accessed by other running
60		* tasks. These guidelines are loosely enforced by not permitting
61		* checked exceptions such as {@code IOExceptions} to be
#	Line 68 | Line 71 | import java.lang.reflect.Constructor;
71		* encountering the exception; minimally only the latter.
72		*
73		* <p>It is possible to define and use ForkJoinTasks that may block,
74	<	* but doing do requires three further considerations: (1) Completion
74	>	* but doing so requires three further considerations: (1) Completion
75		* of few if any <em>other</em> tasks should be dependent on a task
76	<	* that blocks on external synchronization or IO. Event-style async
76	>	* that blocks on external synchronization or I/O. Event-style async
77		* tasks that are never joined (for example, those subclassing {@link
78		* CountedCompleter}) often fall into this category.  (2) To minimize
79		* resource impact, tasks should be small; ideally performing only the
#	Line 123 | Line 126 | import java.lang.reflect.Constructor;
126		* other actions.  Normally, a concrete ForkJoinTask subclass declares
127		* fields comprising its parameters, established in a constructor, and
128		* then defines a {@code compute} method that somehow uses the control
129	<	* methods supplied by this base class. While these methods have
127	<	* {@code public} access (to allow instances of different task
128	<	* subclasses to call each other's methods), some of them may only be
129	<	* called from within other ForkJoinTasks (as may be determined using
130	<	* method {@link #inForkJoinPool}).  Attempts to invoke them in other
131	<	* contexts result in exceptions or errors, possibly including {@code
132	<	* ClassCastException}.
129	>	* methods supplied by this base class.
130		*
131		* <p>Method {@link #join} and its variants are appropriate for use
132		* only when completion dependencies are acyclic; that is, the
#	Line 287 | Line 284 | public abstract class ForkJoinTask<V> im
284		* @return status upon completion
285		*/
286		private int externalAwaitDone() {
290	–	boolean interrupted = false;
287		int s;
288	+	ForkJoinPool.externalHelpJoin(this);
289	+	boolean interrupted = false;
290		while ((s = status) >= 0) {
291		if (U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
292		synchronized (this) {
#	Line 316 | Line 314 | public abstract class ForkJoinTask<V> im
314		int s;
315		if (Thread.interrupted())
316		throw new InterruptedException();
317	+	ForkJoinPool.externalHelpJoin(this);
318		while ((s = status) >= 0) {
319		if (U.compareAndSwapInt(this, STATUS, s, s | SIGNAL)) {
320		synchronized (this) {
#	Line 329 | Line 328 | public abstract class ForkJoinTask<V> im
328		return s;
329		}
330
331	+
332		/**
333		* Implementation for join, get, quietlyJoin. Directly handles
334		* only cases of already-completed, external wait, and
#	Line 338 | Line 338 | public abstract class ForkJoinTask<V> im
338		*/
339		private int doJoin() {
340		int s; Thread t; ForkJoinWorkerThread wt; ForkJoinPool.WorkQueue w;
341	<	if ((s = status) >= 0) {
342	<	if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)) {
343	<	if (!(w = (wt = (ForkJoinWorkerThread)t).workQueue).
344	<	tryUnpush(this) || (s = doExec()) >= 0)
345	<	s = wt.pool.awaitJoin(w, this);
346	<	}
347	<	else
348	<	s = externalAwaitDone();
349	<	}
350	<	return s;
341	>	return (s = status) < 0 ? s :
342	>	((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
343	>	(w = (wt = (ForkJoinWorkerThread)t).workQueue).
344	>	tryUnpush(this) && (s = doExec()) < 0 ? s :
345	>	wt.pool.awaitJoin(w, this) :
346	>	externalAwaitDone();
347		}
348
349		/**
#	Line 357 | Line 353 | public abstract class ForkJoinTask<V> im
353		*/
354		private int doInvoke() {
355		int s; Thread t; ForkJoinWorkerThread wt;
356	<	if ((s = doExec()) >= 0) {
357	<	if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
358	<	s = (wt = (ForkJoinWorkerThread)t).pool.awaitJoin(wt.workQueue,
359	<	this);
364	<	else
365	<	s = externalAwaitDone();
366	<	}
367	<	return s;
356	>	return (s = doExec()) < 0 ? s :
357	>	((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
358	>	(wt = (ForkJoinWorkerThread)t).pool.awaitJoin(wt.workQueue, this) :
359	>	externalAwaitDone();
360		}
361
362		// Exception table support
#	Line 403 | Line 395 | public abstract class ForkJoinTask<V> im
395		final Throwable ex;
396		ExceptionNode next;
397		final long thrower;  // use id not ref to avoid weak cycles
398	+	final int hashCode;  // store task hashCode before weak ref disappears
399		ExceptionNode(ForkJoinTask<?> task, Throwable ex, ExceptionNode next) {
400		super(task, exceptionTableRefQueue);
401		this.ex = ex;
402		this.next = next;
403		this.thrower = Thread.currentThread().getId();
404	+	this.hashCode = System.identityHashCode(task);
405		}
406		}
407
#	Line 443 | Line 437 | public abstract class ForkJoinTask<V> im
437		}
438
439		/**
440	<	* Records exception and possibly propagates
440	>	* Records exception and possibly propagates.
441		*
442		* @return status on exit
443		*/
#	Line 476 | Line 470 | public abstract class ForkJoinTask<V> im
470		}
471
472		/**
473	<	* Removes exception node and clears status
473	>	* Removes exception node and clears status.
474		*/
475		private void clearExceptionalCompletion() {
476		int h = System.identityHashCode(this);
#	Line 569 | Line 563 | public abstract class ForkJoinTask<V> im
563		private static void expungeStaleExceptions() {
564		for (Object x; (x = exceptionTableRefQueue.poll()) != null;) {
565		if (x instanceof ExceptionNode) {
566	<	ForkJoinTask<?> key = ((ExceptionNode)x).get();
566	>	int hashCode = ((ExceptionNode)x).hashCode;
567		ExceptionNode[] t = exceptionTable;
568	<	int i = System.identityHashCode(key) & (t.length - 1);
568	>	int i = hashCode & (t.length - 1);
569		ExceptionNode e = t[i];
570		ExceptionNode pred = null;
571		while (e != null) {
#	Line 606 | Line 600 | public abstract class ForkJoinTask<V> im
600		}
601
602		/**
603	+	* A version of "sneaky throw" to relay exceptions
604	+	*/
605	+	static void rethrow(final Throwable ex) {
606	+	if (ex != null) {
607	+	if (ex instanceof Error)
608	+	throw (Error)ex;
609	+	if (ex instanceof RuntimeException)
610	+	throw (RuntimeException)ex;
611	+	ForkJoinTask.<RuntimeException>uncheckedThrow(ex);
612	+	}
613	+	}
614	+
615	+	/**
616	+	* The sneaky part of sneaky throw, relying on generics
617	+	* limitations to evade compiler complaints about rethrowing
618	+	* unchecked exceptions
619	+	*/
620	+	@SuppressWarnings("unchecked") static <T extends Throwable>
621	+	void uncheckedThrow(Throwable t) throws T {
622	+	if (t != null)
623	+	throw (T)t; // rely on vacuous cast
624	+	}
625	+
626	+	/**
627		* Throws exception, if any, associated with the given status.
628		*/
629		private void reportException(int s) {
630	<	Throwable ex = ((s == CANCELLED) ?  new CancellationException() :
631	<	(s == EXCEPTIONAL) ? getThrowableException() :
632	<	null);
633	<	if (ex != null)
616	<	U.throwException(ex);
630	>	if (s == CANCELLED)
631	>	throw new CancellationException();
632	>	if (s == EXCEPTIONAL)
633	>	rethrow(getThrowableException());
634		}
635
636		// public methods
637
638		/**
639	<	* Arranges to asynchronously execute this task.  While it is not
640	<	* necessarily enforced, it is a usage error to fork a task more
641	<	* than once unless it has completed and been reinitialized.
642	<	* Subsequent modifications to the state of this task or any data
643	<	* it operates on are not necessarily consistently observable by
644	<	* any thread other than the one executing it unless preceded by a
645	<	* call to {@link #join} or related methods, or a call to {@link
646	<	* #isDone} returning {@code true}.
647	<	*
648	<	* <p>This method may be invoked only from within {@code
649	<	* ForkJoinPool} computations (as may be determined using method
633	<	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
634	<	* result in exceptions or errors, possibly including {@code
635	<	* ClassCastException}.
639	>	* Arranges to asynchronously execute this task in the pool the
640	>	* current task is running in, if applicable, or using the {@link
641	>	* ForkJoinPool#commonPool()} if not {@link #inForkJoinPool}.  While
642	>	* it is not necessarily enforced, it is a usage error to fork a
643	>	* task more than once unless it has completed and been
644	>	* reinitialized.  Subsequent modifications to the state of this
645	>	* task or any data it operates on are not necessarily
646	>	* consistently observable by any thread other than the one
647	>	* executing it unless preceded by a call to {@link #join} or
648	>	* related methods, or a call to {@link #isDone} returning {@code
649	>	* true}.
650		*
651		* @return {@code this}, to simplify usage
652		*/
653		public final ForkJoinTask<V> fork() {
654	<	((ForkJoinWorkerThread)Thread.currentThread()).workQueue.push(this);
654	>	Thread t;
655	>	if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
656	>	((ForkJoinWorkerThread)t).workQueue.push(this);
657	>	else
658	>	ForkJoinPool.common.externalPush(this);
659		return this;
660		}
661
#	Line 687 | Line 705 | public abstract class ForkJoinTask<V> im
705		* cancelled, completed normally or exceptionally, or left
706		* unprocessed.
707		*
690	–	* <p>This method may be invoked only from within {@code
691	–	* ForkJoinPool} computations (as may be determined using method
692	–	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
693	–	* result in exceptions or errors, possibly including {@code
694	–	* ClassCastException}.
695	–	*
708		* @param t1 the first task
709		* @param t2 the second task
710		* @throws NullPointerException if any task is null
#	Line 718 | Line 730 | public abstract class ForkJoinTask<V> im
730		* related methods to check if they have been cancelled, completed
731		* normally or exceptionally, or left unprocessed.
732		*
721	–	* <p>This method may be invoked only from within {@code
722	–	* ForkJoinPool} computations (as may be determined using method
723	–	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
724	–	* result in exceptions or errors, possibly including {@code
725	–	* ClassCastException}.
726	–	*
733		* @param tasks the tasks
734		* @throws NullPointerException if any task is null
735		*/
#	Line 751 | Line 757 | public abstract class ForkJoinTask<V> im
757		}
758		}
759		if (ex != null)
760	<	U.throwException(ex);
760	>	rethrow(ex);
761		}
762
763		/**
#	Line 767 | Line 773 | public abstract class ForkJoinTask<V> im
773		* cancelled, completed normally or exceptionally, or left
774		* unprocessed.
775		*
770	–	* <p>This method may be invoked only from within {@code
771	–	* ForkJoinPool} computations (as may be determined using method
772	–	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
773	–	* result in exceptions or errors, possibly including {@code
774	–	* ClassCastException}.
775	–	*
776		* @param tasks the collection of tasks
777		* @return the tasks argument, to simplify usage
778		* @throws NullPointerException if tasks or any element are null
#	Line 808 | Line 808 | public abstract class ForkJoinTask<V> im
808		}
809		}
810		if (ex != null)
811	<	U.throwException(ex);
811	>	rethrow(ex);
812		return tasks;
813		}
814
#	Line 981 | Line 981 | public abstract class ForkJoinTask<V> im
981		if (Thread.interrupted())
982		throw new InterruptedException();
983		// Messy in part because we measure in nanosecs, but wait in millisecs
984	<	int s; long ns, ms;
985	<	if ((s = status) >= 0 && (ns = unit.toNanos(timeout)) > 0L) {
984	>	int s; long ms;
985	>	long ns = unit.toNanos(timeout);
986	>	if ((s = status) >= 0 && ns > 0L) {
987		long deadline = System.nanoTime() + ns;
988		ForkJoinPool p = null;
989		ForkJoinPool.WorkQueue w = null;
#	Line 991 | Line 992 | public abstract class ForkJoinTask<V> im
992		ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;
993		p = wt.pool;
994		w = wt.workQueue;
995	<	s = p.helpJoinOnce(w, this); // no retries on failure
995	>	p.helpJoinOnce(w, this); // no retries on failure
996		}
997	+	else
998	+	ForkJoinPool.externalHelpJoin(this);
999		boolean canBlock = false;
1000		boolean interrupted = false;
1001		try {
1002		while ((s = status) >= 0) {
1003	<	if (w != null && w.runState < 0)
1003	>	if (w != null && w.qlock < 0)
1004		cancelIgnoringExceptions(this);
1005		else if (!canBlock) {
1006	<	if (p == null || p.tryCompensate(this, null))
1006	>	if (p == null || p.tryCompensate())
1007		canBlock = true;
1008		}
1009		else {
#	Line 1064 | Line 1067 | public abstract class ForkJoinTask<V> im
1067
1068		/**
1069		* Possibly executes tasks until the pool hosting the current task
1070	<	* {@link ForkJoinPool#isQuiescent is quiescent}. This method may
1071	<	* be of use in designs in which many tasks are forked, but none
1072	<	* are explicitly joined, instead executing them until all are
1073	<	* processed.
1071	<	*
1072	<	* <p>This method may be invoked only from within {@code
1073	<	* ForkJoinPool} computations (as may be determined using method
1074	<	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1075	<	* result in exceptions or errors, possibly including {@code
1076	<	* ClassCastException}.
1070	>	* {@linkplain ForkJoinPool#isQuiescent is quiescent}.  This
1071	>	* method may be of use in designs in which many tasks are forked,
1072	>	* but none are explicitly joined, instead executing them until
1073	>	* all are processed.
1074		*/
1075		public static void helpQuiesce() {
1076	<	ForkJoinWorkerThread wt =
1077	<	(ForkJoinWorkerThread)Thread.currentThread();
1078	<	wt.pool.helpQuiescePool(wt.workQueue);
1076	>	Thread t;
1077	>	if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
1078	>	ForkJoinWorkerThread wt = (ForkJoinWorkerThread)t;
1079	>	wt.pool.helpQuiescePool(wt.workQueue);
1080	>	}
1081	>	else
1082	>	ForkJoinPool.quiesceCommonPool();
1083		}
1084
1085		/**
#	Line 1131 | Line 1132 | public abstract class ForkJoinTask<V> im
1132
1133		/**
1134		* Tries to unschedule this task for execution. This method will
1135	<	* typically succeed if this task is the most recently forked task
1136	<	* by the current thread, and has not commenced executing in
1137	<	* another thread.  This method may be useful when arranging
1138	<	* alternative local processing of tasks that could have been, but
1139	<	* were not, stolen.
1139	<	*
1140	<	* <p>This method may be invoked only from within {@code
1141	<	* ForkJoinPool} computations (as may be determined using method
1142	<	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1143	<	* result in exceptions or errors, possibly including {@code
1144	<	* ClassCastException}.
1135	>	* typically (but is not guaranteed to) succeed if this task is
1136	>	* the most recently forked task by the current thread, and has
1137	>	* not commenced executing in another thread.  This method may be
1138	>	* useful when arranging alternative local processing of tasks
1139	>	* that could have been, but were not, stolen.
1140		*
1141		* @return {@code true} if unforked
1142		*/
1143		public boolean tryUnfork() {
1144	<	return ((ForkJoinWorkerThread)Thread.currentThread())
1145	<	.workQueue.tryUnpush(this);
1144	>	Thread t;
1145	>	return (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1146	>	((ForkJoinWorkerThread)t).workQueue.tryUnpush(this) :
1147	>	ForkJoinPool.tryExternalUnpush(this));
1148		}
1149
1150		/**
#	Line 1156 | Line 1153 | public abstract class ForkJoinTask<V> im
1153		* value may be useful for heuristic decisions about whether to
1154		* fork other tasks.
1155		*
1159	–	* <p>This method may be invoked only from within {@code
1160	–	* ForkJoinPool} computations (as may be determined using method
1161	–	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1162	–	* result in exceptions or errors, possibly including {@code
1163	–	* ClassCastException}.
1164	–	*
1156		* @return the number of tasks
1157		*/
1158		public static int getQueuedTaskCount() {
1159	<	return ((ForkJoinWorkerThread) Thread.currentThread())
1160	<	.workQueue.queueSize();
1159	>	Thread t; ForkJoinPool.WorkQueue q;
1160	>	if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
1161	>	q = ((ForkJoinWorkerThread)t).workQueue;
1162	>	else
1163	>	q = ForkJoinPool.commonSubmitterQueue();
1164	>	return (q == null) ? 0 : q.queueSize();
1165		}
1166
1167		/**
1168		* Returns an estimate of how many more locally queued tasks are
1169		* held by the current worker thread than there are other worker
1170	<	* threads that might steal them.  This value may be useful for
1170	>	* threads that might steal them, or zero if this thread is not
1171	>	* operating in a ForkJoinPool. This value may be useful for
1172		* heuristic decisions about whether to fork other tasks. In many
1173		* usages of ForkJoinTasks, at steady state, each worker should
1174		* aim to maintain a small constant surplus (for example, 3) of
1175		* tasks, and to process computations locally if this threshold is
1176		* exceeded.
1177		*
1182	–	* <p>This method may be invoked only from within {@code
1183	–	* ForkJoinPool} computations (as may be determined using method
1184	–	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1185	–	* result in exceptions or errors, possibly including {@code
1186	–	* ClassCastException}.
1187	–	*
1178		* @return the surplus number of tasks, which may be negative
1179		*/
1180		public static int getSurplusQueuedTaskCount() {
1181	<	/*
1192	<	* The aim of this method is to return a cheap heuristic guide
1193	<	* for task partitioning when programmers, frameworks, tools,
1194	<	* or languages have little or no idea about task granularity.
1195	<	* In essence by offering this method, we ask users only about
1196	<	* tradeoffs in overhead vs expected throughput and its
1197	<	* variance, rather than how finely to partition tasks.
1198	<	*
1199	<	* In a steady state strict (tree-structured) computation,
1200	<	* each thread makes available for stealing enough tasks for
1201	<	* other threads to remain active. Inductively, if all threads
1202	<	* play by the same rules, each thread should make available
1203	<	* only a constant number of tasks.
1204	<	*
1205	<	* The minimum useful constant is just 1. But using a value of
1206	<	* 1 would require immediate replenishment upon each steal to
1207	<	* maintain enough tasks, which is infeasible.  Further,
1208	<	* partitionings/granularities of offered tasks should
1209	<	* minimize steal rates, which in general means that threads
1210	<	* nearer the top of computation tree should generate more
1211	<	* than those nearer the bottom. In perfect steady state, each
1212	<	* thread is at approximately the same level of computation
1213	<	* tree. However, producing extra tasks amortizes the
1214	<	* uncertainty of progress and diffusion assumptions.
1215	<	*
1216	<	* So, users will want to use values larger, but not much
1217	<	* larger than 1 to both smooth over transient shortages and
1218	<	* hedge against uneven progress; as traded off against the
1219	<	* cost of extra task overhead. We leave the user to pick a
1220	<	* threshold value to compare with the results of this call to
1221	<	* guide decisions, but recommend values such as 3.
1222	<	*
1223	<	* When all threads are active, it is on average OK to
1224	<	* estimate surplus strictly locally. In steady-state, if one
1225	<	* thread is maintaining say 2 surplus tasks, then so are
1226	<	* others. So we can just use estimated queue length.
1227	<	* However, this strategy alone leads to serious mis-estimates
1228	<	* in some non-steady-state conditions (ramp-up, ramp-down,
1229	<	* other stalls). We can detect many of these by further
1230	<	* considering the number of "idle" threads, that are known to
1231	<	* have zero queued tasks, so compensate by a factor of
1232	<	* (#idle/#active) threads.
1233	<	*/
1234	<	ForkJoinWorkerThread wt =
1235	<	(ForkJoinWorkerThread)Thread.currentThread();
1236	<	return wt.workQueue.queueSize() - wt.pool.idlePerActive();
1181	>	return ForkJoinPool.getSurplusQueuedTaskCount();
1182		}
1183
1184		// Extension methods
#	Line 1284 | Line 1229 | public abstract class ForkJoinTask<V> im
1229		* primarily to support extensions, and is unlikely to be useful
1230		* otherwise.
1231		*
1287	–	* <p>This method may be invoked only from within {@code
1288	–	* ForkJoinPool} computations (as may be determined using method
1289	–	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1290	–	* result in exceptions or errors, possibly including {@code
1291	–	* ClassCastException}.
1292	–	*
1232		* @return the next task, or {@code null} if none are available
1233		*/
1234		protected static ForkJoinTask<?> peekNextLocalTask() {
1235	<	return ((ForkJoinWorkerThread) Thread.currentThread()).workQueue.peek();
1235	>	Thread t; ForkJoinPool.WorkQueue q;
1236	>	if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
1237	>	q = ((ForkJoinWorkerThread)t).workQueue;
1238	>	else
1239	>	q = ForkJoinPool.commonSubmitterQueue();
1240	>	return (q == null) ? null : q.peek();
1241		}
1242
1243		/**
1244		* Unschedules and returns, without executing, the next task
1245	<	* queued by the current thread but not yet executed.  This method
1246	<	* is designed primarily to support extensions, and is unlikely to
1247	<	* be useful otherwise.
1248	<	*
1305	<	* <p>This method may be invoked only from within {@code
1306	<	* ForkJoinPool} computations (as may be determined using method
1307	<	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1308	<	* result in exceptions or errors, possibly including {@code
1309	<	* ClassCastException}.
1245	>	* queued by the current thread but not yet executed, if the
1246	>	* current thread is operating in a ForkJoinPool.  This method is
1247	>	* designed primarily to support extensions, and is unlikely to be
1248	>	* useful otherwise.
1249		*
1250		* @return the next task, or {@code null} if none are available
1251		*/
1252		protected static ForkJoinTask<?> pollNextLocalTask() {
1253	<	return ((ForkJoinWorkerThread) Thread.currentThread())
1254	<	.workQueue.nextLocalTask();
1253	>	Thread t;
1254	>	return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1255	>	((ForkJoinWorkerThread)t).workQueue.nextLocalTask() :
1256	>	null;
1257		}
1258
1259		/**
1260	<	* Unschedules and returns, without executing, the next task
1260	>	* If the current thread is operating in a ForkJoinPool,
1261	>	* unschedules and returns, without executing, the next task
1262		* queued by the current thread but not yet executed, if one is
1263		* available, or if not available, a task that was forked by some
1264		* other thread, if available. Availability may be transient, so a
1265	<	* {@code null} result does not necessarily imply quiescence
1266	<	* of the pool this task is operating in.  This method is designed
1265	>	* {@code null} result does not necessarily imply quiescence of
1266	>	* the pool this task is operating in.  This method is designed
1267		* primarily to support extensions, and is unlikely to be useful
1268		* otherwise.
1269		*
1328	–	* <p>This method may be invoked only from within {@code
1329	–	* ForkJoinPool} computations (as may be determined using method
1330	–	* {@link #inForkJoinPool}).  Attempts to invoke in other contexts
1331	–	* result in exceptions or errors, possibly including {@code
1332	–	* ClassCastException}.
1333	–	*
1270		* @return a task, or {@code null} if none are available
1271		*/
1272		protected static ForkJoinTask<?> pollTask() {
1273	<	ForkJoinWorkerThread wt =
1274	<	(ForkJoinWorkerThread)Thread.currentThread();
1275	<	return wt.pool.nextTaskFor(wt.workQueue);
1273	>	Thread t; ForkJoinWorkerThread wt;
1274	>	return ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread) ?
1275	>	(wt = (ForkJoinWorkerThread)t).pool.nextTaskFor(wt.workQueue) :
1276	>	null;
1277		}
1278
1279		// tag operations
#	Line 1391 | Line 1328 | public abstract class ForkJoinTask<V> im
1328		}
1329
1330		/**
1331	<	* Adaptor for Runnables. This implements RunnableFuture
1331	>	* Adapter for Runnables. This implements RunnableFuture
1332		* to be compliant with AbstractExecutorService constraints
1333		* when used in ForkJoinPool.
1334		*/
#	Line 1412 | Line 1349 | public abstract class ForkJoinTask<V> im
1349		}
1350
1351		/**
1352	<	* Adaptor for Runnables without results
1352	>	* Adapter for Runnables without results
1353		*/
1354		static final class AdaptedRunnableAction extends ForkJoinTask<Void>
1355		implements RunnableFuture<Void> {
#	Line 1429 | Line 1366 | public abstract class ForkJoinTask<V> im
1366		}
1367
1368		/**
1369	<	* Adaptor for Callables
1369	>	* Adapter for Callables
1370		*/
1371		static final class AdaptedCallable<T> extends ForkJoinTask<T>
1372		implements RunnableFuture<T> {
#	Line 1525 | Line 1462 | public abstract class ForkJoinTask<V> im
1462		// Unsafe mechanics
1463		private static final sun.misc.Unsafe U;
1464		private static final long STATUS;
1465	+
1466		static {
1467		exceptionTableLock = new ReentrantLock();
1468		exceptionTableRefQueue = new ReferenceQueue<Object>();
1469		exceptionTable = new ExceptionNode[EXCEPTION_MAP_CAPACITY];
1470		try {
1471		U = getUnsafe();
1472	+	Class<?> k = ForkJoinTask.class;
1473		STATUS = U.objectFieldOffset
1474	<	(ForkJoinTask.class.getDeclaredField("status"));
1474	>	(k.getDeclaredField("status"));
1475		} catch (Exception e) {
1476		throw new Error(e);
1477		}
#	Line 1548 | Line 1487 | public abstract class ForkJoinTask<V> im
1487		private static sun.misc.Unsafe getUnsafe() {
1488		try {
1489		return sun.misc.Unsafe.getUnsafe();
1490	<	} catch (SecurityException se) {
1491	<	try {
1492	<	return java.security.AccessController.doPrivileged
1493	<	(new java.security
1494	<	.PrivilegedExceptionAction<sun.misc.Unsafe>() {
1495	<	public sun.misc.Unsafe run() throws Exception {
1496	<	java.lang.reflect.Field f = sun.misc
1497	<	.Unsafe.class.getDeclaredField("theUnsafe");
1498	<	f.setAccessible(true);
1499	<	return (sun.misc.Unsafe) f.get(null);
1500	<	}});
1501	<	} catch (java.security.PrivilegedActionException e) {
1502	<	throw new RuntimeException("Could not initialize intrinsics",
1503	<	e.getCause());
1504	<	}
1490	>	} catch (SecurityException tryReflectionInstead) {}
1491	>	try {
1492	>	return java.security.AccessController.doPrivileged
1493	>	(new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
1494	>	public sun.misc.Unsafe run() throws Exception {
1495	>	Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class;
1496	>	for (java.lang.reflect.Field f : k.getDeclaredFields()) {
1497	>	f.setAccessible(true);
1498	>	Object x = f.get(null);
1499	>	if (k.isInstance(x))
1500	>	return k.cast(x);
1501	>	}
1502	>	throw new NoSuchFieldError("the Unsafe");
1503	>	}});
1504	>	} catch (java.security.PrivilegedActionException e) {
1505	>	throw new RuntimeException("Could not initialize intrinsics",
1506	>	e.getCause());
1507		}
1508		}
1509		}

Diff Legend

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