ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/ForkJoinPool.java

Comparing jsr166/src/jsr166y/ForkJoinPool.java (file contents):
Revision 1.150 by jsr166, Wed Nov 21 22:15:41 2012 UTC vs.
Revision 1.189 by jsr166, Sat Sep 12 19:16:45 2015 UTC

#	Line 51 | Line 51 | import java.util.concurrent.TimeUnit;
51		* dynamically adding, suspending, or resuming internal worker
52		* threads, even if some tasks are stalled waiting to join
53		* others. However, no such adjustments are guaranteed in the face of
54	<	* blocked IO or other unmanaged synchronization. The nested {@link
54	>	* blocked I/O or other unmanaged synchronization. The nested {@link
55		* ManagedBlocker} interface enables extension of the kinds of
56		* synchronization accommodated.
57		*
#	Line 99 | Line 99 | import java.util.concurrent.TimeUnit;
99		*
100		* <p>The common pool is by default constructed with default
101		* parameters, but these may be controlled by setting three {@link
102	<	* System#getProperty properties} with prefix {@code
102	>	* System#getProperty system properties} with prefix {@code
103		* java.util.concurrent.ForkJoinPool.common}: {@code parallelism} --
104		* an integer greater than zero, {@code threadFactory} -- the class
105		* name of a {@link ForkJoinWorkerThreadFactory}, and {@code
#	Line 440 | Line 440 | public class ForkJoinPool extends Abstra
440		* Common Pool
441		* ===========
442		*
443	<	* The static commonPool always exists after static
443	>	* The static common Pool always exists after static
444		* initialization.  Since it (or any other created pool) need
445		* never be used, we minimize initial construction overhead and
446		* footprint to the setup of about a dozen fields, with no nested
#	Line 687 | Line 687 | public class ForkJoinPool extends Abstra
687		return (n >= 0) ? 0 : -n; // ignore transient negative
688		}
689
690	<	/**
690	>	/**
691		* Provides a more accurate estimate of whether this queue has
692		* any tasks than does queueSize, by checking whether a
693		* near-empty queue has at least one unclaimed task.
#	Line 708 | Line 708 | public class ForkJoinPool extends Abstra
708		* shared-queue version is embedded in method externalPush.)
709		*
710		* @param task the task. Caller must ensure non-null.
711	<	* @throw RejectedExecutionException if array cannot be resized
711	>	* @throws RejectedExecutionException if array cannot be resized
712		*/
713		final void push(ForkJoinTask<?> task) {
714		ForkJoinTask<?>[] a; ForkJoinPool p;
#	Line 725 | Line 725 | public class ForkJoinPool extends Abstra
725		}
726		}
727
728	<	/**
728	>	/**
729		* Initializes or doubles the capacity of array. Call either
730		* by owner or with lock held -- it is OK for base, but not
731		* top, to move while resizings are in progress.
#	Line 907 | Line 907 | public class ForkJoinPool extends Abstra
907		* or any other cancelled task. Returns (true) on any CAS
908		* or consistency check failure so caller can retry.
909		*
910	<	* @return false if no progress can be made, else true;
910	>	* @return false if no progress can be made, else true
911		*/
912		final boolean tryRemoveAndExec(ForkJoinTask<?> task) {
913		boolean stat = true, removed = false, empty = true;
#	Line 952 | Line 952 | public class ForkJoinPool extends Abstra
952
953		/**
954		* Polls for and executes the given task or any other task in
955	<	* its CountedCompleter computation
955	>	* its CountedCompleter computation.
956		*/
957		final boolean pollAndExecCC(ForkJoinTask<?> root) {
958		ForkJoinTask<?>[] a; int b; Object o;
#	Line 987 | Line 987 | public class ForkJoinPool extends Abstra
987		if (t != null) {
988		(currentSteal = t).doExec();
989		currentSteal = null;
990	+	++nsteals;
991		if (base - top < 0) {       // process remaining local tasks
992		if (mode == 0)
993		popAndExecAll();
994		else
995		pollAndExecAll();
996		}
996	–	++nsteals;
997	–	hint = -1;
997		}
998		}
999
#	Line 1021 | Line 1020 | public class ForkJoinPool extends Abstra
1020		s != Thread.State.TIMED_WAITING);
1021		}
1022
1024	–	/**
1025	–	* If this owned and is not already interrupted, try to
1026	–	* interrupt and/or unpark, ignoring exceptions.
1027	–	*/
1028	–	final void interruptOwner() {
1029	–	Thread wt, p;
1030	–	if ((wt = owner) != null && !wt.isInterrupted()) {
1031	–	try {
1032	–	wt.interrupt();
1033	–	} catch (SecurityException ignore) {
1034	–	}
1035	–	}
1036	–	if ((p = parker) != null)
1037	–	U.unpark(p);
1038	–	}
1039	–
1023		// Unsafe mechanics
1024		private static final sun.misc.Unsafe U;
1025		private static final long QLOCK;
1026		private static final int ABASE;
1027		private static final int ASHIFT;
1028		static {
1046	–	int s;
1029		try {
1030		U = getUnsafe();
1031		Class<?> k = WorkQueue.class;
#	Line 1051 | Line 1033 | public class ForkJoinPool extends Abstra
1033		QLOCK = U.objectFieldOffset
1034		(k.getDeclaredField("qlock"));
1035		ABASE = U.arrayBaseOffset(ak);
1036	<	s = U.arrayIndexScale(ak);
1036	>	int scale = U.arrayIndexScale(ak);
1037	>	if ((scale & (scale - 1)) != 0)
1038	>	throw new Error("data type scale not a power of two");
1039	>	ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
1040		} catch (Exception e) {
1041		throw new Error(e);
1042		}
1058	–	if ((s & (s-1)) != 0)
1059	–	throw new Error("data type scale not a power of two");
1060	–	ASHIFT = 31 - Integer.numberOfLeadingZeros(s);
1043		}
1044		}
1045
#	Line 1091 | Line 1073 | public class ForkJoinPool extends Abstra
1073		* to paranoically avoid potential initialization circularities
1074		* as well as to simplify generated code.
1075		*/
1076	<	static final ForkJoinPool commonPool;
1076	>	static final ForkJoinPool common;
1077
1078		/**
1079	<	* Common pool parallelism. Must equal commonPool.parallelism.
1079	>	* Common pool parallelism. Must equal common.parallelism.
1080		*/
1081	<	static final int commonPoolParallelism;
1081	>	static final int commonParallelism;
1082
1083		/**
1084		* Sequence number for creating workerNamePrefix.
#	Line 1104 | Line 1086 | public class ForkJoinPool extends Abstra
1086		private static int poolNumberSequence;
1087
1088		/**
1089	<	* Return the next sequence number. We don't expect this to
1090	<	* ever contend so use simple builtin sync.
1089	>	* Returns the next sequence number. We don't expect this to
1090	>	* ever contend, so use simple builtin sync.
1091		*/
1092		private static final synchronized int nextPoolId() {
1093		return ++poolNumberSequence;
#	Line 1129 | Line 1111 | public class ForkJoinPool extends Abstra
1111		private static final long FAST_IDLE_TIMEOUT =  200L * 1000L * 1000L;
1112
1113		/**
1114	+	* Tolerance for idle timeouts, to cope with timer undershoots
1115	+	*/
1116	+	private static final long TIMEOUT_SLOP = 2000000L;
1117	+
1118	+	/**
1119		* The maximum stolen->joining link depth allowed in method
1120		* tryHelpStealer.  Must be a power of two.  Depths for legitimate
1121		* chains are unbounded, but we use a fixed constant to avoid
#	Line 1144 | Line 1131 | public class ForkJoinPool extends Abstra
1131		*/
1132		private static final int SEED_INCREMENT = 0x61c88647;
1133
1134	<	/**
1134	>	/*
1135		* Bits and masks for control variables
1136		*
1137		* Field ctl is a long packed with:
#	Line 1257 | Line 1244 | public class ForkJoinPool extends Abstra
1244		volatile Object pad10, pad11, pad12, pad13, pad14, pad15, pad16, pad17;
1245		volatile Object pad18, pad19, pad1a, pad1b;
1246
1247	<	/*
1247	>	/**
1248		* Acquires the plock lock to protect worker array and related
1249		* updates. This method is called only if an initial CAS on plock
1250	<	* fails. This acts as a spinLock for normal cases, but falls back
1250	>	* fails. This acts as a spinlock for normal cases, but falls back
1251		* to builtin monitor to block when (rarely) needed. This would be
1252		* a terrible idea for a highly contended lock, but works fine as
1253	<	* a more conservative alternative to a pure spinlock.  See
1267	<	* internal ConcurrentHashMap documentation for further
1268	<	* explanation of nearly the same construction.
1253	>	* a more conservative alternative to a pure spinlock.
1254		*/
1255		private int acquirePlock() {
1256		int spins = PL_SPINS, r = 0, ps, nps;
#	Line 1317 | Line 1302 | public class ForkJoinPool extends Abstra
1302		}
1303
1304		/**
1305	<	* Performs secondary initialization, called when plock is zero.
1306	<	* Creates workQueue array and sets plock to a valid value.  The
1322	<	* lock body must be exception-free (so no try/finally) so we
1323	<	* optimistically allocate new array outside the lock and throw
1324	<	* away if (very rarely) not needed. (A similar tactic is used in
1325	<	* fullExternalPush.)  Because the plock seq value can eventually
1326	<	* wrap around zero, this method harmlessly fails to reinitialize
1327	<	* if workQueues exists, while still advancing plock.
1328	<	*
1329	<	* Additonally tries to create the first worker.
1330	<	*/
1331	<	private void initWorkers() {
1332	<	WorkQueue[] ws, nws; int ps;
1333	<	int p = config & SMASK;        // find power of two table size
1334	<	int n = (p > 1) ? p - 1 : 1;   // ensure at least 2 slots
1335	<	n |= n >>> 1; n |= n >>> 2; n |= n >>> 4; n |= n >>> 8; n |= n >>> 16;
1336	<	n = (n + 1) << 1;
1337	<	if ((ws = workQueues) == null || ws.length == 0)
1338	<	nws = new WorkQueue[n];
1339	<	else
1340	<	nws = null;
1341	<	if (((ps = plock) & PL_LOCK) != 0 ||
1342	<	!U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1343	<	ps = acquirePlock();
1344	<	if (((ws = workQueues) == null || ws.length == 0) && nws != null)
1345	<	workQueues = nws;
1346	<	int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
1347	<	if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
1348	<	releasePlock(nps);
1349	<	tryAddWorker();
1350	<	}
1351	<
1352	<	/**
1353	<	* Tries to create and start one worker. Adjusts counts etc on
1354	<	* failure.
1305	>	* Tries to create and start one worker if fewer than target
1306	>	* parallelism level exist. Adjusts counts etc on failure.
1307		*/
1308		private void tryAddWorker() {
1309		long c; int u;
#	Line 1461 | Line 1413 | public class ForkJoinPool extends Abstra
1413		}
1414		}
1415
1416	<	long c;                             // adjust ctl counts
1416	>	long c;                          // adjust ctl counts
1417		do {} while (!U.compareAndSwapLong
1418		(this, CTL, c = ctl, (((c - AC_UNIT) & AC_MASK) |
1419		((c - TC_UNIT) & TC_MASK) |
1420		(c & ~(AC_MASK|TC_MASK)))));
1421
1422	<	if (!tryTerminate(false, false) && w != null) {
1423	<	w.cancelAll();                  // cancel remaining tasks
1424	<	if (w.array != null)            // suppress signal if never ran
1425	<	tryAddWorker();             // create replacement
1426	<	if (ex == null)                 // help clean refs on way out
1427	<	ForkJoinTask.helpExpungeStaleExceptions();
1422	>	if (!tryTerminate(false, false) && w != null && w.array != null) {
1423	>	w.cancelAll();               // cancel remaining tasks
1424	>	WorkQueue[] ws; WorkQueue v; Thread p; int u, i, e;
1425	>	while ((u = (int)((c = ctl) >>> 32)) < 0 && (e = (int)c) >= 0) {
1426	>	if (e > 0) {             // activate or create replacement
1427	>	if ((ws = workQueues) == null ||
1428	>	(i = e & SMASK) >= ws.length ||
1429	>	(v = ws[i]) == null)
1430	>	break;
1431	>	long nc = (((long)(v.nextWait & E_MASK)) |
1432	>	((long)(u + UAC_UNIT) << 32));
1433	>	if (v.eventCount != (e | INT_SIGN))
1434	>	break;
1435	>	if (U.compareAndSwapLong(this, CTL, c, nc)) {
1436	>	v.eventCount = (e + E_SEQ) & E_MASK;
1437	>	if ((p = v.parker) != null)
1438	>	U.unpark(p);
1439	>	break;
1440	>	}
1441	>	}
1442	>	else {
1443	>	if ((short)u < 0)
1444	>	tryAddWorker();
1445	>	break;
1446	>	}
1447	>	}
1448		}
1449	<
1450	<	if (ex != null)                     // rethrow
1449	>	if (ex == null)                     // help clean refs on way out
1450	>	ForkJoinTask.helpExpungeStaleExceptions();
1451	>	else                                // rethrow
1452		ForkJoinTask.rethrow(ex);
1453		}
1454
#	Line 1513 | Line 1486 | public class ForkJoinPool extends Abstra
1486		/**
1487		* Full version of externalPush. This method is called, among
1488		* other times, upon the first submission of the first task to the
1489	<	* pool, so must perform secondary initialization (via
1490	<	* initWorkers). It also detects first submission by an external
1491	<	* thread by looking up its ThreadLocal, and creates a new shared
1492	<	* queue if the one at index if empty or contended. The plock lock
1493	<	* body must be exception-free (so no try/finally) so we
1494	<	* optimistically allocate new queues outside the lock and throw
1495	<	* them away if (very rarely) not needed.
1489	>	* pool, so must perform secondary initialization.  It also
1490	>	* detects first submission by an external thread by looking up
1491	>	* its ThreadLocal, and creates a new shared queue if the one at
1492	>	* index if empty or contended. The plock lock body must be
1493	>	* exception-free (so no try/finally) so we optimistically
1494	>	* allocate new queues outside the lock and throw them away if
1495	>	* (very rarely) not needed.
1496	>	*
1497	>	* Secondary initialization occurs when plock is zero, to create
1498	>	* workQueue array and set plock to a valid value.  This lock body
1499	>	* must also be exception-free. Because the plock seq value can
1500	>	* eventually wrap around zero, this method harmlessly fails to
1501	>	* reinitialize if workQueues exists, while still advancing plock.
1502		*/
1503		private void fullExternalPush(ForkJoinTask<?> task) {
1504		int r = 0; // random index seed
#	Line 1530 | Line 1509 | public class ForkJoinPool extends Abstra
1509		r += SEED_INCREMENT) && r != 0)
1510		submitters.set(z = new Submitter(r));
1511		}
1512	<	else if (r == 0) {               // move to a different index
1512	>	else if (r == 0) {                  // move to a different index
1513		r = z.seed;
1514	<	r ^= r << 13;                // same xorshift as WorkQueues
1514	>	r ^= r << 13;                   // same xorshift as WorkQueues
1515		r ^= r >>> 17;
1516		z.seed = r ^ (r << 5);
1517		}
1518		else if ((ps = plock) < 0)
1519		throw new RejectedExecutionException();
1520		else if (ps == 0 || (ws = workQueues) == null ||
1521	<	(m = ws.length - 1) < 0)
1522	<	initWorkers();
1521	>	(m = ws.length - 1) < 0) { // initialize workQueues
1522	>	int p = config & SMASK;         // find power of two table size
1523	>	int n = (p > 1) ? p - 1 : 1;    // ensure at least 2 slots
1524	>	n |= n >>> 1;
1525	>	n |= n >>> 2;
1526	>	n |= n >>> 4;
1527	>	n |= n >>> 8;
1528	>	n |= n >>> 16;
1529	>	n = (n + 1) << 1;
1530	>	WorkQueue[] nws = ((ws = workQueues) == null || ws.length == 0 ?
1531	>	new WorkQueue[n] : null);
1532	>	if (((ps = plock) & PL_LOCK) != 0 ||
1533	>	!U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1534	>	ps = acquirePlock();
1535	>	if (((ws = workQueues) == null || ws.length == 0) && nws != null)
1536	>	workQueues = nws;
1537	>	int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
1538	>	if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
1539	>	releasePlock(nps);
1540	>	}
1541		else if ((q = ws[k = r & m & SQMASK]) != null) {
1542		if (q.qlock == 0 && U.compareAndSwapInt(q, QLOCK, 0, 1)) {
1543		ForkJoinTask<?>[] a = q.array;
#	Line 1660 | Line 1657 | public class ForkJoinPool extends Abstra
1657		*
1658		* * If not already enqueued, try to inactivate and enqueue the
1659		* worker on wait queue. Or, if inactivating has caused the pool
1660	<	* to be quiescent, relay to idleAwaitWork to check for
1661	<	* termination and possibly shrink pool.
1660	>	* to be quiescent, relay to idleAwaitWork to possibly shrink
1661	>	* pool.
1662		*
1663		* * If already enqueued and none of the above apply, possibly
1664	<	* (with 1/2 probability) park awaiting signal, else lingering to
1665	<	* help scan and signal.
1664	>	* park awaiting signal, else lingering to help scan and signal.
1665	>	*
1666	>	* * If a non-empty queue discovered or left as a hint,
1667	>	* help wake up other workers before return.
1668		*
1669		* @param w the worker (via its WorkQueue)
1670		* @return a task or null if none found
#	Line 1676 | Line 1675 | public class ForkJoinPool extends Abstra
1675		if (w != null && (ws = workQueues) != null && (m = ws.length - 1) >= 0) {
1676		int ec = w.eventCount;               // ec is negative if inactive
1677		int r = w.seed; r ^= r << 13; r ^= r >>> 17; w.seed = r ^= r << 5;
1678	+	w.hint = -1;                         // update seed and clear hint
1679		int j = ((m + m + 1) | MIN_SCAN) & MAX_SCAN;
1680		do {
1681		WorkQueue q; ForkJoinTask<?>[] a; int b;
#	Line 1697 | Line 1697 | public class ForkJoinPool extends Abstra
1697		}
1698		} while (--j >= 0);
1699
1700	<	long c, sc; int e, ns, h;
1701	<	if ((h = w.hint) < 0) {
1702	<	if ((ns = w.nsteals) != 0) {
1703	<	if (U.compareAndSwapLong(this, STEALCOUNT,
1704	<	sc = stealCount, sc + ns))
1705	<	w.nsteals = 0;           // collect steals
1706	<	}
1707	<	else if (plock != ps)            // consistency check
1708	<	;                            // skip
1709	<	else if ((e = (int)(c = ctl)) < 0)
1710	<	w.qlock = -1;                // pool is terminating
1711	<	else if (ec >= 0) {              // try to enqueue/inactivate
1712	<	long nc = ((long)ec | ((c - AC_UNIT) & (AC_MASK|TC_MASK)));
1713	<	w.nextWait = e;              // link and mark inactive
1714	<	w.eventCount = ec | INT_SIGN;
1715	<	if (ctl != c || !U.compareAndSwapLong(this, CTL, c, nc))
1716	<	w.eventCount = ec;       // unmark on CAS failure
1717	<	else if ((int)(c >> AC_SHIFT) == 1 - (config & SMASK))
1718	<	idleAwaitWork(w, nc, c);
1719	<	}
1720	<	else if (w.eventCount < 0) {     // block
1721	<	Thread wt = Thread.currentThread();
1722	<	Thread.interrupted();        // clear status
1723	<	U.putObject(wt, PARKBLOCKER, this);
1724	<	w.parker = wt;               // emulate LockSupport.park
1725	<	if (w.eventCount < 0)        // recheck
1726	<	U.park(false, 0L);
1727	<	w.parker = null;
1728	<	U.putObject(wt, PARKBLOCKER, null);
1729	<	}
1730	<	}
1731	<	if (h >= 0 || (h = w.hint) >= 0) {   // signal others before retry
1732	<	w.hint = -1;                     // reset
1733	<	helpSignal(null, h, true);
1700	>	int h, e, ns; long c, sc; WorkQueue q;
1701	>	if ((ns = w.nsteals) != 0) {
1702	>	if (U.compareAndSwapLong(this, STEALCOUNT,
1703	>	sc = stealCount, sc + ns))
1704	>	w.nsteals = 0;               // collect steals and rescan
1705	>	}
1706	>	else if (plock != ps)                // consistency check
1707	>	;                                // skip
1708	>	else if ((e = (int)(c = ctl)) < 0)
1709	>	w.qlock = -1;                    // pool is terminating
1710	>	else {
1711	>	if ((h = w.hint) < 0) {
1712	>	if (ec >= 0) {               // try to enqueue/inactivate
1713	>	long nc = (((long)ec |
1714	>	((c - AC_UNIT) & (AC_MASK|TC_MASK))));
1715	>	w.nextWait = e;          // link and mark inactive
1716	>	w.eventCount = ec | INT_SIGN;
1717	>	if (ctl != c || !U.compareAndSwapLong(this, CTL, c, nc))
1718	>	w.eventCount = ec;   // unmark on CAS failure
1719	>	else if ((int)(c >> AC_SHIFT) == 1 - (config & SMASK))
1720	>	idleAwaitWork(w, nc, c);
1721	>	}
1722	>	else if (w.eventCount < 0 && ctl == c) {
1723	>	Thread wt = Thread.currentThread();
1724	>	Thread.interrupted();    // clear status
1725	>	U.putObject(wt, PARKBLOCKER, this);
1726	>	w.parker = wt;           // emulate LockSupport.park
1727	>	if (w.eventCount < 0)    // recheck
1728	>	U.park(false, 0L);   // block
1729	>	w.parker = null;
1730	>	U.putObject(wt, PARKBLOCKER, null);
1731	>	}
1732	>	}
1733	>	if ((h >= 0 || (h = w.hint) >= 0) &&
1734	>	(ws = workQueues) != null && h < ws.length &&
1735	>	(q = ws[h]) != null) {      // signal others before retry
1736	>	WorkQueue v; Thread p; int u, i, s;
1737	>	for (int n = (config & SMASK) - 1;;) {
1738	>	int idleCount = (w.eventCount < 0) ? 0 : -1;
1739	>	if (((s = idleCount - q.base + q.top) <= n &&
1740	>	(n = s) <= 0) ||
1741	>	(u = (int)((c = ctl) >>> 32)) >= 0 ||
1742	>	(e = (int)c) <= 0 || m < (i = e & SMASK) ||
1743	>	(v = ws[i]) == null)
1744	>	break;
1745	>	long nc = (((long)(v.nextWait & E_MASK)) |
1746	>	((long)(u + UAC_UNIT) << 32));
1747	>	if (v.eventCount != (e | INT_SIGN) ||
1748	>	!U.compareAndSwapLong(this, CTL, c, nc))
1749	>	break;
1750	>	v.hint = h;
1751	>	v.eventCount = (e + E_SEQ) & E_MASK;
1752	>	if ((p = v.parker) != null)
1753	>	U.unpark(p);
1754	>	if (--n <= 0)
1755	>	break;
1756	>	}
1757	>	}
1758		}
1759		}
1760		return null;
#	Line 1750 | Line 1774 | public class ForkJoinPool extends Abstra
1774		*/
1775		private void idleAwaitWork(WorkQueue w, long currentCtl, long prevCtl) {
1776		if (w != null && w.eventCount < 0 &&
1777	<	!tryTerminate(false, false) && (int)prevCtl != 0) {
1777	>	!tryTerminate(false, false) && (int)prevCtl != 0 &&
1778	>	ctl == currentCtl) {
1779		int dc = -(short)(currentCtl >>> TC_SHIFT);
1780		long parkTime = dc < 0 ? FAST_IDLE_TIMEOUT: (dc + 1) * IDLE_TIMEOUT;
1781	<	long deadline = System.nanoTime() + parkTime - 100000L; // 1ms slop
1781	>	long deadline = System.nanoTime() + parkTime - TIMEOUT_SLOP;
1782		Thread wt = Thread.currentThread();
1783		while (ctl == currentCtl) {
1784		Thread.interrupted();  // timed variant of version in scan()
#	Line 1768 | Line 1793 | public class ForkJoinPool extends Abstra
1793		if (deadline - System.nanoTime() <= 0L &&
1794		U.compareAndSwapLong(this, CTL, currentCtl, prevCtl)) {
1795		w.eventCount = (w.eventCount + E_SEQ) | E_MASK;
1796	+	w.hint = -1;
1797		w.qlock = -1;   // shrink
1798		break;
1799		}
#	Line 1776 | Line 1802 | public class ForkJoinPool extends Abstra
1802		}
1803
1804		/**
1805	<	* Scans through queues looking for work (optionally, while
1806	<	* joining a task); if any present, signals. May return early if
1807	<	* more signalling is detectably unneeded.
1805	>	* Scans through queues looking for work while joining a task; if
1806	>	* any present, signals. May return early if more signalling is
1807	>	* detectably unneeded.
1808		*
1809	<	* @param task if non-null, return early if done
1809	>	* @param task return early if done
1810		* @param origin an index to start scan
1785	–	* @param once if only the origin should be checked
1811		*/
1812	<	private void helpSignal(ForkJoinTask<?> task, int origin, boolean once) {
1812	>	private void helpSignal(ForkJoinTask<?> task, int origin) {
1813		WorkQueue[] ws; WorkQueue w; Thread p; long c; int m, u, e, i, s;
1814	<	if ((u = (int)(ctl >>> 32)) < 0 && (u >> UAC_SHIFT) < 0 &&
1814	>	if (task != null && task.status >= 0 &&
1815	>	(u = (int)(ctl >>> 32)) < 0 && (u >> UAC_SHIFT) < 0 &&
1816		(ws = workQueues) != null && (m = ws.length - 1) >= 0) {
1817	<	outer: for (int k = origin, j = once ? 0 : m; j >= 0; --j) {
1817	>	outer: for (int k = origin, j = m; j >= 0; --j) {
1818		WorkQueue q = ws[k++ & m];
1819		for (int n = m;;) { // limit to at most m signals
1820	<	if (task != null && task.status < 0)
1820	>	if (task.status < 0)
1821		break outer;
1822		if (q == null ||
1823	<	((s = (task == null ? -1 : 0) - q.base + q.top) <= n &&
1798	<	(n = s) <= 0))
1823	>	((s = -q.base + q.top) <= n && (n = s) <= 0))
1824		break;
1825		if ((u = (int)((c = ctl) >>> 32)) >= 0 ||
1826		(e = (int)c) <= 0 || m < (i = e & SMASK) ||
#	Line 1803 | Line 1828 | public class ForkJoinPool extends Abstra
1828		break outer;
1829		long nc = (((long)(w.nextWait & E_MASK)) |
1830		((long)(u + UAC_UNIT) << 32));
1831	<	if (w.eventCount == (e | INT_SIGN) &&
1832	<	U.compareAndSwapLong(this, CTL, c, nc)) {
1831	>	if (w.eventCount != (e | INT_SIGN))
1832	>	break outer;
1833	>	if (U.compareAndSwapLong(this, CTL, c, nc)) {
1834		w.eventCount = (e + E_SEQ) & E_MASK;
1835		if ((p = w.parker) != null)
1836		U.unpark(p);
#	Line 1909 | Line 1935 | public class ForkJoinPool extends Abstra
1935		* @param task the task to join
1936		* @param mode if shared, exit upon completing any task
1937		* if all workers are active
1912	–	*
1938		*/
1939		private int helpComplete(ForkJoinTask<?> task, int mode) {
1940		WorkQueue[] ws; WorkQueue q; int m, n, s, u;
#	Line 1996 | Line 2021 | public class ForkJoinPool extends Abstra
2021		do {} while ((s = task.status) >= 0 && !joiner.isEmpty() &&
2022		joiner.tryRemoveAndExec(task)); // process local tasks
2023		if (s >= 0 && (s = task.status) >= 0) {
2024	<	helpSignal(task, joiner.poolIndex, false);
2024	>	helpSignal(task, joiner.poolIndex);
2025		if ((s = task.status) >= 0 &&
2026		(task instanceof CountedCompleter))
2027		s = helpComplete(task, LIFO_QUEUE);
#	Line 2005 | Line 2030 | public class ForkJoinPool extends Abstra
2030		if ((!joiner.isEmpty() ||           // try helping
2031		(s = tryHelpStealer(joiner, task)) == 0) &&
2032		(s = task.status) >= 0) {
2033	<	helpSignal(task, joiner.poolIndex, false);
2033	>	helpSignal(task, joiner.poolIndex);
2034		if ((s = task.status) >= 0 && tryCompensate()) {
2035		if (task.trySetSignal() && (s = task.status) >= 0) {
2036		synchronized (task) {
#	Line 2046 | Line 2071 | public class ForkJoinPool extends Abstra
2071		do {} while ((s = task.status) >= 0 && !joiner.isEmpty() &&
2072		joiner.tryRemoveAndExec(task));
2073		if (s >= 0 && (s = task.status) >= 0) {
2074	<	helpSignal(task, joiner.poolIndex, false);
2074	>	helpSignal(task, joiner.poolIndex);
2075		if ((s = task.status) >= 0 &&
2076		(task instanceof CountedCompleter))
2077		s = helpComplete(task, LIFO_QUEUE);
#	Line 2061 | Line 2086 | public class ForkJoinPool extends Abstra
2086
2087		/**
2088		* Returns a (probably) non-empty steal queue, if one is found
2089	<	* during a random, then cyclic scan, else null.  This method must
2090	<	* be retried by caller if, by the time it tries to use the queue,
2066	<	* it is empty.
2089	>	* during a scan, else null.  This method must be retried by
2090	>	* caller if, by the time it tries to use the queue, it is empty.
2091		* @param r a (random) seed for scanning
2092		*/
2093		private WorkQueue findNonEmptyStealQueue(int r) {
2094	<	for (WorkQueue[] ws;;) {
2095	<	int ps = plock, m, n;
2096	<	if ((ws = workQueues) == null || (m = ws.length - 1) < 1)
2097	<	return null;
2098	<	for (int j = (m + 1) << 2; ;) {
2099	<	WorkQueue q = ws[(((r + j) << 1) | 1) & m];
2100	<	if (q != null && (n = q.base - q.top) < 0) {
2077	<	if (n < -1)
2078	<	signalWork(q);
2079	<	return q;
2080	<	}
2081	<	else if (--j < 0) {
2082	<	if (plock == ps)
2083	<	return null;
2084	<	break;
2094	>	for (;;) {
2095	>	int ps = plock, m; WorkQueue[] ws; WorkQueue q;
2096	>	if ((ws = workQueues) != null && (m = ws.length - 1) >= 0) {
2097	>	for (int j = (m + 1) << 2; j >= 0; --j) {
2098	>	if ((q = ws[(((r + j) << 1) | 1) & m]) != null &&
2099	>	q.base - q.top < 0)
2100	>	return q;
2101		}
2102		}
2103	+	if (plock == ps)
2104	+	return null;
2105		}
2106		}
2107
#	Line 2095 | Line 2113 | public class ForkJoinPool extends Abstra
2113		*/
2114		final void helpQuiescePool(WorkQueue w) {
2115		for (boolean active = true;;) {
2116	<	ForkJoinTask<?> localTask; // exhaust local queue
2117	<	while ((localTask = w.nextLocalTask()) != null)
2118	<	localTask.doExec();
2119	<	// Similar to loop in scan(), but ignoring submissions
2120	<	WorkQueue q = findNonEmptyStealQueue(w.nextSeed());
2121	<	if (q != null) {
2122	<	ForkJoinTask<?> t; int b;
2116	>	long c; WorkQueue q; ForkJoinTask<?> t; int b;
2117	>	while ((t = w.nextLocalTask()) != null) {
2118	>	if (w.base - w.top < 0)
2119	>	signalWork(w);
2120	>	t.doExec();
2121	>	}
2122	>	if ((q = findNonEmptyStealQueue(w.nextSeed())) != null) {
2123		if (!active) {      // re-establish active count
2106	–	long c;
2124		active = true;
2125		do {} while (!U.compareAndSwapLong
2126		(this, CTL, c = ctl, c + AC_UNIT));
2127		}
2128	<	if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
2128	>	if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
2129	>	if (q.base - q.top < 0)
2130	>	signalWork(q);
2131		w.runSubtask(t);
2132	+	}
2133		}
2134	<	else {
2135	<	long c;
2136	<	if (active) {       // decrement active count without queuing
2134	>	else if (active) {      // decrement active count without queuing
2135	>	long nc = (c = ctl) - AC_UNIT;
2136	>	if ((int)(nc >> AC_SHIFT) + (config & SMASK) == 0)
2137	>	return;         // bypass decrement-then-increment
2138	>	if (U.compareAndSwapLong(this, CTL, c, nc))
2139		active = false;
2118	–	do {} while (!U.compareAndSwapLong
2119	–	(this, CTL, c = ctl, c -= AC_UNIT));
2120	–	}
2121	–	else
2122	–	c = ctl;        // re-increment on exit
2123	–	if ((int)(c >> AC_SHIFT) + (config & SMASK) == 0) {
2124	–	do {} while (!U.compareAndSwapLong
2125	–	(this, CTL, c = ctl, c + AC_UNIT));
2126	–	break;
2127	–	}
2140		}
2141	+	else if ((int)((c = ctl) >> AC_SHIFT) + (config & SMASK) == 0 &&
2142	+	U.compareAndSwapLong(this, CTL, c, c + AC_UNIT))
2143	+	return;
2144		}
2145		}
2146
#	Line 2141 | Line 2156 | public class ForkJoinPool extends Abstra
2156		return t;
2157		if ((q = findNonEmptyStealQueue(w.nextSeed())) == null)
2158		return null;
2159	<	if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
2159	>	if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
2160	>	if (q.base - q.top < 0)
2161	>	signalWork(q);
2162		return t;
2163	+	}
2164		}
2165		}
2166
#	Line 2171 | Line 2189 | public class ForkJoinPool extends Abstra
2189		* producing extra tasks amortizes the uncertainty of progress and
2190		* diffusion assumptions.
2191		*
2192	<	* So, users will want to use values larger, but not much larger
2192	>	* So, users will want to use values larger (but not much larger)
2193		* than 1 to both smooth over transient shortages and hedge
2194		* against uneven progress; as traded off against the cost of
2195		* extra task overhead. We leave the user to pick a threshold
#	Line 2224 | Line 2242 | public class ForkJoinPool extends Abstra
2242		* @return true if now terminating or terminated
2243		*/
2244		private boolean tryTerminate(boolean now, boolean enable) {
2245	<	if (this == commonPool)                     // cannot shut down
2245	>	int ps;
2246	>	if (this == common)                    // cannot shut down
2247		return false;
2248	+	if ((ps = plock) >= 0) {                   // enable by setting plock
2249	+	if (!enable)
2250	+	return false;
2251	+	if ((ps & PL_LOCK) != 0 ||
2252	+	!U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
2253	+	ps = acquirePlock();
2254	+	int nps = ((ps + PL_LOCK) & ~SHUTDOWN) | SHUTDOWN;
2255	+	if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
2256	+	releasePlock(nps);
2257	+	}
2258		for (long c;;) {
2259	<	if (((c = ctl) & STOP_BIT) != 0) {      // already terminating
2259	>	if (((c = ctl) & STOP_BIT) != 0) {     // already terminating
2260		if ((short)(c >>> TC_SHIFT) == -(config & SMASK)) {
2261		synchronized (this) {
2262	<	notifyAll();                // signal when 0 workers
2262	>	notifyAll();               // signal when 0 workers
2263		}
2264		}
2265		return true;
2266		}
2267	<	if (plock >= 0) {                       // not yet enabled
2268	<	int ps;
2269	<	if (!enable)
2241	<	return false;
2242	<	if (((ps = plock) & PL_LOCK) != 0 ||
2243	<	!U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
2244	<	ps = acquirePlock();
2245	<	int nps = SHUTDOWN;
2246	<	if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
2247	<	releasePlock(nps);
2248	<	}
2249	<	if (!now) {                             // check if idle & no tasks
2250	<	if ((int)(c >> AC_SHIFT) != -(config & SMASK) ||
2251	<	hasQueuedSubmissions())
2267	>	if (!now) {                            // check if idle & no tasks
2268	>	WorkQueue[] ws; WorkQueue w;
2269	>	if ((int)(c >> AC_SHIFT) != -(config & SMASK))
2270		return false;
2271	<	// Check for unqueued inactive workers. One pass suffices.
2272	<	WorkQueue[] ws = workQueues; WorkQueue w;
2273	<	if (ws != null) {
2274	<	for (int i = 1; i < ws.length; i += 2) {
2275	<	if ((w = ws[i]) != null && w.eventCount >= 0)
2276	<	return false;
2271	>	if ((ws = workQueues) != null) {
2272	>	for (int i = 0; i < ws.length; ++i) {
2273	>	if ((w = ws[i]) != null) {
2274	>	if (!w.isEmpty()) {    // signal unprocessed tasks
2275	>	signalWork(w);
2276	>	return false;
2277	>	}
2278	>	if ((i & 1) != 0 && w.eventCount >= 0)
2279	>	return false;      // unqueued inactive worker
2280	>	}
2281		}
2282		}
2283		}
2284		if (U.compareAndSwapLong(this, CTL, c, c | STOP_BIT)) {
2285		for (int pass = 0; pass < 3; ++pass) {
2286	<	WorkQueue[] ws = workQueues;
2287	<	if (ws != null) {
2266	<	WorkQueue w;
2286	>	WorkQueue[] ws; WorkQueue w; Thread wt;
2287	>	if ((ws = workQueues) != null) {
2288		int n = ws.length;
2289		for (int i = 0; i < n; ++i) {
2290		if ((w = ws[i]) != null) {
2291		w.qlock = -1;
2292		if (pass > 0) {
2293		w.cancelAll();
2294	<	if (pass > 1)
2295	<	w.interruptOwner();
2294	>	if (pass > 1 && (wt = w.owner) != null) {
2295	>	if (!wt.isInterrupted()) {
2296	>	try {
2297	>	wt.interrupt();
2298	>	} catch (Throwable ignore) {
2299	>	}
2300	>	}
2301	>	U.unpark(wt);
2302	>	}
2303		}
2304		}
2305		}
2306		// Wake up workers parked on event queue
2307		int i, e; long cc; Thread p;
2308		while ((e = (int)(cc = ctl) & E_MASK) != 0 &&
2309	<	(i = e & SMASK) < n &&
2309	>	(i = e & SMASK) < n && i >= 0 &&
2310		(w = ws[i]) != null) {
2311		long nc = ((long)(w.nextWait & E_MASK) |
2312		((cc + AC_UNIT) & AC_MASK) |
#	Line 2306 | Line 2334 | public class ForkJoinPool extends Abstra
2334		static WorkQueue commonSubmitterQueue() {
2335		ForkJoinPool p; WorkQueue[] ws; int m; Submitter z;
2336		return ((z = submitters.get()) != null &&
2337	<	(p = commonPool) != null &&
2337	>	(p = common) != null &&
2338		(ws = p.workQueues) != null &&
2339		(m = ws.length - 1) >= 0) ?
2340		ws[m & z.seed & SQMASK] : null;
#	Line 2320 | Line 2348 | public class ForkJoinPool extends Abstra
2348		ForkJoinTask<?>[] a;  int m, s;
2349		if (t != null &&
2350		(z = submitters.get()) != null &&
2351	<	(p = commonPool) != null &&
2351	>	(p = common) != null &&
2352		(ws = p.workQueues) != null &&
2353		(m = ws.length - 1) >= 0 &&
2354		(q = ws[m & z.seed & SQMASK]) != null &&
#	Line 2378 | Line 2406 | public class ForkJoinPool extends Abstra
2406		(u = (int)(ctl >>> 32)) >= 0 || (u >> UAC_SHIFT) >= 0)
2407		break;
2408		if (task == null) {
2409	<	helpSignal(root, q.poolIndex, false);
2409	>	helpSignal(root, q.poolIndex);
2410		if (root.status >= 0)
2411		helpComplete(root, SHARED_QUEUE);
2412		break;
#	Line 2397 | Line 2425 | public class ForkJoinPool extends Abstra
2425		ForkJoinTask<?>[] a;  int m, s, n;
2426		if (t != null &&
2427		(z = submitters.get()) != null &&
2428	<	(p = commonPool) != null &&
2428	>	(p = common) != null &&
2429		(ws = p.workQueues) != null &&
2430		(m = ws.length - 1) >= 0 &&
2431		(q = ws[m & z.seed & SQMASK]) != null &&
#	Line 2421 | Line 2449 | public class ForkJoinPool extends Abstra
2449		if (t instanceof CountedCompleter)
2450		p.externalHelpComplete(q, t);
2451		else
2452	<	p.helpSignal(t, q.poolIndex, false);
2452	>	p.helpSignal(t, q.poolIndex);
2453		}
2454		}
2455		}
2456
2429	–	/**
2430	–	* Restricted version of helpQuiescePool for external callers
2431	–	*/
2432	–	static void externalHelpQuiescePool() {
2433	–	ForkJoinPool p; ForkJoinTask<?> t; WorkQueue q; int b;
2434	–	if ((p = commonPool) != null &&
2435	–	(q = p.findNonEmptyStealQueue(1)) != null &&
2436	–	(b = q.base) - q.top < 0 &&
2437	–	(t = q.pollAt(b)) != null)
2438	–	t.doExec();
2439	–	}
2440	–
2457		// Exported methods
2458
2459		// Constructors
#	Line 2454 | Line 2470 | public class ForkJoinPool extends Abstra
2470		*         java.lang.RuntimePermission}{@code ("modifyThread")}
2471		*/
2472		public ForkJoinPool() {
2473	<	this(Runtime.getRuntime().availableProcessors(),
2473	>	this(Math.min(MAX_CAP, Runtime.getRuntime().availableProcessors()),
2474		defaultForkJoinWorkerThreadFactory, null, false);
2475		}
2476
#	Line 2536 | Line 2552 | public class ForkJoinPool extends Abstra
2552		}
2553
2554		/**
2555	<	* Returns the common pool instance.
2555	>	* Returns the common pool instance. This pool is statically
2556	>	* constructed; its run state is unaffected by attempts to {@link
2557	>	* #shutdown} or {@link #shutdownNow}. However this pool and any
2558	>	* ongoing processing are automatically terminated upon program
2559	>	* {@link System#exit}.  Any program that relies on asynchronous
2560	>	* task processing to complete before program termination should
2561	>	* invoke {@code commonPool().}{@link #awaitQuiescence}, before
2562	>	* exit.
2563		*
2564		* @return the common pool instance
2565	+	* @since 1.8
2566		*/
2567		public static ForkJoinPool commonPool() {
2568	<	// assert commonPool != null : "static init error";
2569	<	return commonPool;
2568	>	// assert common != null : "static init error";
2569	>	return common;
2570		}
2571
2572		// Execution methods
#	Line 2665 | Line 2689 | public class ForkJoinPool extends Abstra
2689		// In previous versions of this class, this method constructed
2690		// a task to run ForkJoinTask.invokeAll, but now external
2691		// invocation of multiple tasks is at least as efficient.
2692	<	List<ForkJoinTask<T>> fs = new ArrayList<ForkJoinTask<T>>(tasks.size());
2669	<	// Workaround needed because method wasn't declared with
2670	<	// wildcards in return type but should have been.
2671	<	@SuppressWarnings({"unchecked", "rawtypes"})
2672	<	List<Future<T>> futures = (List<Future<T>>) (List) fs;
2692	>	ArrayList<Future<T>> futures = new ArrayList<Future<T>>(tasks.size());
2693
2694		boolean done = false;
2695		try {
2696		for (Callable<T> t : tasks) {
2697		ForkJoinTask<T> f = new ForkJoinTask.AdaptedCallable<T>(t);
2698	+	futures.add(f);
2699		externalPush(f);
2679	–	fs.add(f);
2700		}
2701	<	for (ForkJoinTask<T> f : fs)
2702	<	f.quietlyJoin();
2701	>	for (int i = 0, size = futures.size(); i < size; i++)
2702	>	((ForkJoinTask<?>)futures.get(i)).quietlyJoin();
2703		done = true;
2704		return futures;
2705		} finally {
2706		if (!done)
2707	<	for (ForkJoinTask<T> f : fs)
2708	<	f.cancel(false);
2707	>	for (int i = 0, size = futures.size(); i < size; i++)
2708	>	futures.get(i).cancel(false);
2709		}
2710		}
2711
#	Line 2721 | Line 2741 | public class ForkJoinPool extends Abstra
2741		* Returns the targeted parallelism level of the common pool.
2742		*
2743		* @return the targeted parallelism level of the common pool
2744	+	* @since 1.8
2745		*/
2746		public static int getCommonPoolParallelism() {
2747	<	return commonPoolParallelism;
2747	>	return commonParallelism;
2748		}
2749
2750		/**
#	Line 2981 | Line 3002 | public class ForkJoinPool extends Abstra
3002		* Possibly initiates an orderly shutdown in which previously
3003		* submitted tasks are executed, but no new tasks will be
3004		* accepted. Invocation has no effect on execution state if this
3005	<	* is the {@link #commonPool}, and no additional effect if
3005	>	* is the {@link #commonPool()}, and no additional effect if
3006		* already shut down.  Tasks that are in the process of being
3007		* submitted concurrently during the course of this method may or
3008		* may not be rejected.
#	Line 2999 | Line 3020 | public class ForkJoinPool extends Abstra
3020		/**
3021		* Possibly attempts to cancel and/or stop all tasks, and reject
3022		* all subsequently submitted tasks.  Invocation has no effect on
3023	<	* execution state if this is the {@link #commonPool}, and no
3023	>	* execution state if this is the {@link #commonPool()}, and no
3024		* additional effect if already shut down. Otherwise, tasks that
3025		* are in the process of being submitted or executed concurrently
3026		* during the course of this method may or may not be
#	Line 3036 | Line 3057 | public class ForkJoinPool extends Abstra
3057		* commenced but not yet completed.  This method may be useful for
3058		* debugging. A return of {@code true} reported a sufficient
3059		* period after shutdown may indicate that submitted tasks have
3060	<	* ignored or suppressed interruption, or are waiting for IO,
3060	>	* ignored or suppressed interruption, or are waiting for I/O,
3061		* causing this executor not to properly terminate. (See the
3062		* advisory notes for class {@link ForkJoinTask} stating that
3063		* tasks should not normally entail blocking operations.  But if
#	Line 3062 | Line 3083 | public class ForkJoinPool extends Abstra
3083		/**
3084		* Blocks until all tasks have completed execution after a
3085		* shutdown request, or the timeout occurs, or the current thread
3086	<	* is interrupted, whichever happens first. Note that the {@link
3087	<	* #commonPool()} never terminates until program shutdown so
3088	<	* this method will always time out.
3086	>	* is interrupted, whichever happens first. Because the {@link
3087	>	* #commonPool()} never terminates until program shutdown, when
3088	>	* applied to the common pool, this method is equivalent to {@link
3089	>	* #awaitQuiescence} but always returns {@code false}.
3090		*
3091		* @param timeout the maximum time to wait
3092		* @param unit the time unit of the timeout argument
#	Line 3074 | Line 3096 | public class ForkJoinPool extends Abstra
3096		*/
3097		public boolean awaitTermination(long timeout, TimeUnit unit)
3098		throws InterruptedException {
3099	+	if (Thread.interrupted())
3100	+	throw new InterruptedException();
3101	+	if (this == common) {
3102	+	awaitQuiescence(timeout, unit);
3103	+	return false;
3104	+	}
3105		long nanos = unit.toNanos(timeout);
3106		if (isTerminated())
3107		return true;
#	Line 3093 | Line 3121 | public class ForkJoinPool extends Abstra
3121		}
3122
3123		/**
3124	+	* If called by a ForkJoinTask operating in this pool, equivalent
3125	+	* in effect to {@link ForkJoinTask#helpQuiesce}. Otherwise,
3126	+	* waits and/or attempts to assist performing tasks until this
3127	+	* pool {@link #isQuiescent} or the indicated timeout elapses.
3128	+	*
3129	+	* @param timeout the maximum time to wait
3130	+	* @param unit the time unit of the timeout argument
3131	+	* @return {@code true} if quiescent; {@code false} if the
3132	+	* timeout elapsed.
3133	+	*/
3134	+	public boolean awaitQuiescence(long timeout, TimeUnit unit) {
3135	+	long nanos = unit.toNanos(timeout);
3136	+	ForkJoinWorkerThread wt;
3137	+	Thread thread = Thread.currentThread();
3138	+	if ((thread instanceof ForkJoinWorkerThread) &&
3139	+	(wt = (ForkJoinWorkerThread)thread).pool == this) {
3140	+	helpQuiescePool(wt.workQueue);
3141	+	return true;
3142	+	}
3143	+	long startTime = System.nanoTime();
3144	+	WorkQueue[] ws;
3145	+	int r = 0, m;
3146	+	boolean found = true;
3147	+	while (!isQuiescent() && (ws = workQueues) != null &&
3148	+	(m = ws.length - 1) >= 0) {
3149	+	if (!found) {
3150	+	if ((System.nanoTime() - startTime) > nanos)
3151	+	return false;
3152	+	Thread.yield(); // cannot block
3153	+	}
3154	+	found = false;
3155	+	for (int j = (m + 1) << 2; j >= 0; --j) {
3156	+	ForkJoinTask<?> t; WorkQueue q; int b;
3157	+	if ((q = ws[r++ & m]) != null && (b = q.base) - q.top < 0) {
3158	+	found = true;
3159	+	if ((t = q.pollAt(b)) != null) {
3160	+	if (q.base - q.top < 0)
3161	+	signalWork(q);
3162	+	t.doExec();
3163	+	}
3164	+	break;
3165	+	}
3166	+	}
3167	+	}
3168	+	return true;
3169	+	}
3170	+
3171	+	/**
3172	+	* Waits and/or attempts to assist performing tasks indefinitely
3173	+	* until the {@link #commonPool()} {@link #isQuiescent}.
3174	+	*/
3175	+	static void quiesceCommonPool() {
3176	+	common.awaitQuiescence(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
3177	+	}
3178	+
3179	+	/**
3180		* Interface for extending managed parallelism for tasks running
3181		* in {@link ForkJoinPool}s.
3182		*
#	Line 3245 | Line 3329 | public class ForkJoinPool extends Abstra
3329		private static final long QLOCK;
3330
3331		static {
3332	<	int s; // initialize field offsets for CAS etc
3332	>	// initialize field offsets for CAS etc
3333		try {
3334		U = getUnsafe();
3335		Class<?> k = ForkJoinPool.class;
#	Line 3265 | Line 3349 | public class ForkJoinPool extends Abstra
3349		(wk.getDeclaredField("qlock"));
3350		Class<?> ak = ForkJoinTask[].class;
3351		ABASE = U.arrayBaseOffset(ak);
3352	<	s = U.arrayIndexScale(ak);
3353	<	ASHIFT = 31 - Integer.numberOfLeadingZeros(s);
3352	>	int scale = U.arrayIndexScale(ak);
3353	>	if ((scale & (scale - 1)) != 0)
3354	>	throw new Error("data type scale not a power of two");
3355	>	ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
3356		} catch (Exception e) {
3357		throw new Error(e);
3358		}
3273	–	if ((s & (s-1)) != 0)
3274	–	throw new Error("data type scale not a power of two");
3359
3360		submitters = new ThreadLocal<Submitter>();
3361		ForkJoinWorkerThreadFactory fac = defaultForkJoinWorkerThreadFactory =
#	Line 3308 | Line 3392 | public class ForkJoinPool extends Abstra
3392		par = Runtime.getRuntime().availableProcessors();
3393		if (par > MAX_CAP)
3394		par = MAX_CAP;
3395	<	commonPoolParallelism = par;
3395	>	commonParallelism = par;
3396		long np = (long)(-par); // precompute initial ctl value
3397		long ct = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
3398
3399	<	commonPool = new ForkJoinPool(par, ct, fac, handler);
3399	>	common = new ForkJoinPool(par, ct, fac, handler);
3400		}
3401
3402		/**
#	Line 3325 | Line 3409 | public class ForkJoinPool extends Abstra
3409		private static sun.misc.Unsafe getUnsafe() {
3410		try {
3411		return sun.misc.Unsafe.getUnsafe();
3412	<	} catch (SecurityException se) {
3413	<	try {
3414	<	return java.security.AccessController.doPrivileged
3415	<	(new java.security
3416	<	.PrivilegedExceptionAction<sun.misc.Unsafe>() {
3417	<	public sun.misc.Unsafe run() throws Exception {
3418	<	java.lang.reflect.Field f = sun.misc
3419	<	.Unsafe.class.getDeclaredField("theUnsafe");
3420	<	f.setAccessible(true);
3421	<	return (sun.misc.Unsafe) f.get(null);
3422	<	}});
3423	<	} catch (java.security.PrivilegedActionException e) {
3424	<	throw new RuntimeException("Could not initialize intrinsics",
3425	<	e.getCause());
3426	<	}
3412	>	} catch (SecurityException tryReflectionInstead) {}
3413	>	try {
3414	>	return java.security.AccessController.doPrivileged
3415	>	(new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
3416	>	public sun.misc.Unsafe run() throws Exception {
3417	>	Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class;
3418	>	for (java.lang.reflect.Field f : k.getDeclaredFields()) {
3419	>	f.setAccessible(true);
3420	>	Object x = f.get(null);
3421	>	if (k.isInstance(x))
3422	>	return k.cast(x);
3423	>	}
3424	>	throw new NoSuchFieldError("the Unsafe");
3425	>	}});
3426	>	} catch (java.security.PrivilegedActionException e) {
3427	>	throw new RuntimeException("Could not initialize intrinsics",
3428	>	e.getCause());
3429		}
3430		}
3345	–
3431		}

Diff Legend

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