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.60 by dl, Sat Jul 24 20:28:18 2010 UTC vs.
Revision 1.61 by dl, Wed Aug 11 18:45:12 2010 UTC

#	Line 156 | Line 156 | public class ForkJoinPool extends Abstra
156		*      ForkJoinWorkerThread.helpJoinTask tracks joining->stealing
157		*      links to try to find such a task.
158		*
159	<	*   Compensating: Unless there are already enough live threads,
160	<	*      creating or or re-activating a spare thread to compensate
161	<	*      for the (blocked) joiner until it unblocks.  Spares then
162	<	*      suspend at their next opportunity or eventually die if
163	<	*      unused for too long.  See below and the internal
164	<	*      documentation for tryAwaitJoin for more details about
165	<	*      compensation rules.
159	>	*   Compensating: Unless there are already enough live threads,
160	>	*      method helpMaintainParallelism() may create or or
161	>	*      re-activate a spare thread to compensate for blocked
162	>	*      joiners until they unblock.
163		*
164		* Because the determining existence of conservatively safe
165		* helping targets, the availability of already-created spares,
166		* and the apparent need to create new spares are all racy and
167	<	* require heuristic guidance, joins (in
168	<	* ForkJoinWorkerThread.joinTask) interleave these options until
169	<	* successful.  Creating a new spare always succeeds, but also
170	<	* increases application footprint, so we try to avoid it, within
171	<	* reason.
167	>	* require heuristic guidance, we rely on multiple retries of
168	>	* each. Further, because it is impossible to keep exactly the
169	>	* target (parallelism) number of threads running at any given
170	>	* time, we allow compensation during joins to fail, and enlist
171	>	* all other threads to help out whenever they are not otherwise
172	>	* occupied (i.e., mainly in method preStep).
173		*
174	<	* The ManagedBlocker extension API can't use helping so uses a
175	<	* special version of compensation in method awaitBlocker.
174	>	* The ManagedBlocker extension API can't use helping so relies
175	>	* only on compensation in method awaitBlocker.
176		*
177		* The main throughput advantages of work-stealing stem from
178		* decentralized control -- workers mostly steal tasks from each
#	Line 207 | Line 205 | public class ForkJoinPool extends Abstra
205		* blocked workers. However, all other support code is set up to
206		* work with other policies.
207		*
208	+	* To ensure that we do not hold on to worker references that
209	+	* would prevent GC, ALL accesses to workers are via indices into
210	+	* the workers array (which is one source of some of the unusual
211	+	* code constructions here). In essence, the workers array serves
212	+	* as a WeakReference mechanism. Thus for example the event queue
213	+	* stores worker indices, not worker references. Access to the
214	+	* workers in associated methods (for example releaseEventWaiters)
215	+	* must both index-check and null-check the IDs. All such accesses
216	+	* ignore bad IDs by returning out early from what they are doing,
217	+	* since this can only be associated with shutdown, in which case
218	+	* it is OK to give up. On termination, we just clobber these
219	+	* data structures without trying to use them.
220	+	*
221		* 2. Bookkeeping for dynamically adding and removing workers. We
222		* aim to approximately maintain the given level of parallelism.
223		* When some workers are known to be blocked (on joins or via
#	Line 248 | Line 259 | public class ForkJoinPool extends Abstra
259		* workers that previously could not find a task to now find one:
260		* Submission of a new task to the pool, or another worker pushing
261		* a task onto a previously empty queue.  (We also use this
262	<	* mechanism for termination and reconfiguration actions that
263	<	* require wakeups of idle workers).  Each worker maintains its
264	<	* last known event count, and blocks when a scan for work did not
265	<	* find a task AND its lastEventCount matches the current
266	<	* eventCount. Waiting idle workers are recorded in a variant of
267	<	* Treiber stack headed by field eventWaiters which, when nonzero,
268	<	* encodes the thread index and count awaited for by the worker
269	<	* thread most recently calling eventSync. This thread in turn has
270	<	* a record (field nextEventWaiter) for the next waiting worker.
271	<	* In addition to allowing simpler decisions about need for
272	<	* wakeup, the event count bits in eventWaiters serve the role of
273	<	* tags to avoid ABA errors in Treiber stacks.  To reduce delays
274	<	* in task diffusion, workers not otherwise occupied may invoke
275	<	* method releaseWaiters, that removes and signals (unparks)
276	<	* workers not waiting on current count. To minimize task
277	<	* production stalls associate with signalling, any worker pushing
278	<	* a task on an empty queue invokes the weaker method signalWork,
279	<	* that only releases idle workers until it detects interference
280	<	* by other threads trying to release, and lets them take
281	<	* over. The net effect is a tree-like diffusion of signals, where
282	<	* released threads (and possibly others) help with unparks.  To
283	<	* further reduce contention effects a bit, failed CASes to
262	>	* mechanism for termination actions that require wakeups of idle
263	>	* workers).  Each worker maintains its last known event count,
264	>	* and blocks when a scan for work did not find a task AND its
265	>	* lastEventCount matches the current eventCount. Waiting idle
266	>	* workers are recorded in a variant of Treiber stack headed by
267	>	* field eventWaiters which, when nonzero, encodes the thread
268	>	* index and count awaited for by the worker thread most recently
269	>	* calling eventSync. This thread in turn has a record (field
270	>	* nextEventWaiter) for the next waiting worker.  In addition to
271	>	* allowing simpler decisions about need for wakeup, the event
272	>	* count bits in eventWaiters serve the role of tags to avoid ABA
273	>	* errors in Treiber stacks.  To reduce delays in task diffusion,
274	>	* workers not otherwise occupied may invoke method
275	>	* releaseEventWaiters, that removes and signals (unparks) workers
276	>	* not waiting on current count. To reduce stalls, To minimize
277	>	* task production stalls associate with signalling, any worker
278	>	* pushing a task on an empty queue invokes the weaker method
279	>	* signalWork, that only releases idle workers until it detects
280	>	* interference by other threads trying to release, and lets them
281	>	* take over.  The net effect is a tree-like diffusion of signals,
282	>	* where released threads (and possibly others) help with unparks.
283	>	* To further reduce contention effects a bit, failed CASes to
284		* increment field eventCount are tolerated without retries.
285		* Conceptually they are merged into the same event, which is OK
286		* when their only purpose is to enable workers to scan for work.
#	Line 285 | Line 296 | public class ForkJoinPool extends Abstra
296		* spare threads from normal "core" threads: On each call to
297		* preStep (the only point at which we can do this) a worker
298		* checks to see if there are now too many running workers, and if
299	<	* so, suspends itself.  Methods tryAwaitJoin and awaitBlocker
300	<	* look for suspended threads to resume before considering
301	<	* creating a new replacement. We don't need a special data
302	<	* structure to maintain spares; simply scanning the workers array
303	<	* looking for worker.isSuspended() is fine because the calling
304	<	* thread is otherwise not doing anything useful anyway; we are at
305	<	* least as happy if after locating a spare, the caller doesn't
306	<	* actually block because the join is ready before we try to
307	<	* adjust and compensate.  Note that this is intrinsically racy.
308	<	* One thread may become a spare at about the same time as another
309	<	* is needlessly being created. We counteract this and related
310	<	* slop in part by requiring resumed spares to immediately recheck
311	<	* (in preStep) to see whether they they should re-suspend. The
312	<	* only effective difference between "extra" and "core" threads is
313	<	* that we allow the "extra" ones to time out and die if they are
303	<	* not resumed within a keep-alive interval of a few seconds. This
304	<	* is implemented mainly within ForkJoinWorkerThread, but requires
305	<	* some coordination (isTrimmed() -- meaning killed while
306	<	* suspended) to correctly maintain pool counts.
299	>	* so, suspends itself.  Method helpMaintainParallelism looks for
300	>	* suspended threads to resume before considering creating a new
301	>	* replacement. The spares themselves are encoded on another
302	>	* variant of a Treiber Stack, headed at field "spareWaiters".
303	>	* Note that the use of spares is intrinsically racy.  One thread
304	>	* may become a spare at about the same time as another is
305	>	* needlessly being created. We counteract this and related slop
306	>	* in part by requiring resumed spares to immediately recheck (in
307	>	* preStep) to see whether they they should re-suspend.  To avoid
308	>	* long-term build-up of spares, the oldest spare (see
309	>	* ForkJoinWorkerThread.suspendAsSpare) occasionally wakes up if
310	>	* not signalled and calls tryTrimSpare, which uses two different
311	>	* thresholds: Always killing if the number of spares is greater
312	>	* that 25% of total, and killing others only at a slower rate
313	>	* (UNUSED_SPARE_TRIM_RATE_NANOS).
314		*
315		* 6. Deciding when to create new workers. The main dynamic
316	<	* control in this class is deciding when to create extra threads,
317	<	* in methods awaitJoin and awaitBlocker. We always need to create
318	<	* one when the number of running threads would become zero and
319	<	* all workers are busy. However, this is not easy to detect
320	<	* reliably in the presence of transients so we use retries and
321	<	* allow slack (in tryAwaitJoin) to reduce false alarms.  These
322	<	* effectively reduce churn at the price of systematically
323	<	* undershooting target parallelism when many threads are blocked.
324	<	* However, biasing toward undeshooting partially compensates for
325	<	* the above mechanics to suspend extra threads, that normally
326	<	* lead to overshoot because we can only suspend workers
327	<	* in-between top-level actions. It also better copes with the
328	<	* fact that some of the methods in this class tend to never
329	<	* become compiled (but are interpreted), so some components of
330	<	* the entire set of controls might execute many times faster than
331	<	* others. And similarly for cases where the apparent lack of work
332	<	* is just due to GC stalls and other transient system activity.
316	>	* control in this class is deciding when to create extra threads
317	>	* in method helpMaintainParallelism. We would like to keep
318	>	* exactly #parallelism threads running, which is an impossble
319	>	* task. We always need to create one when the number of running
320	>	* threads would become zero and all workers are busy. Beyond
321	>	* this, we must rely on heuristics that work well in the the
322	>	* presence of transients phenomena such as GC stalls, dynamic
323	>	* compilation, and wake-up lags. These transients are extremely
324	>	* common -- we are normally trying to fully saturate the CPUs on
325	>	* a machine, so almost any activity other than running tasks
326	>	* impedes accuracy. Our main defense is to allow some slack in
327	>	* creation thresholds, using rules that reflect the fact that the
328	>	* more threads we have running, the more likely that we are
329	>	* underestimating the number running threads. The rules also
330	>	* better cope with the fact that some of the methods in this
331	>	* class tend to never become compiled (but are interpreted), so
332	>	* some components of the entire set of controls might execute 100
333	>	* times faster than others. And similarly for cases where the
334	>	* apparent lack of work is just due to GC stalls and other
335	>	* transient system activity.
336		*
337		* Beware that there is a lot of representation-level coupling
338		* among classes ForkJoinPool, ForkJoinWorkerThread, and
#	Line 335 | Line 345 | public class ForkJoinPool extends Abstra
345		*
346		* Style notes: There are lots of inline assignments (of form
347		* "while ((local = field) != 0)") which are usually the simplest
348	<	* way to ensure read orderings. Also several occurrences of the
349	<	* unusual "do {} while(!cas...)" which is the simplest way to
350	<	* force an update of a CAS'ed variable. There are also other
351	<	* coding oddities that help some methods perform reasonably even
352	<	* when interpreted (not compiled), at the expense of messiness.
348	>	* way to ensure the required read orderings (which are sometimes
349	>	* critical). Also several occurrences of the unusual "do {}
350	>	* while(!cas...)" which is the simplest way to force an update of
351	>	* a CAS'ed variable. There are also other coding oddities that
352	>	* help some methods perform reasonably even when interpreted (not
353	>	* compiled), at the expense of some messy constructions that
354	>	* reduce byte code counts.
355		*
356		* The order of declarations in this file is: (1) statics (2)
357		* fields (along with constants used when unpacking some of them)
#	Line 407 | Line 419 | public class ForkJoinPool extends Abstra
419		new AtomicInteger();
420
421		/**
422	<	* Absolute bound for parallelism level. Twice this number must
423	<	* fit into a 16bit field to enable word-packing for some counts.
422	>	* Absolute bound for parallelism level. Twice this number plus
423	>	* one (i.e., 0xfff) must fit into a 16bit field to enable
424	>	* word-packing for some counts and indices.
425		*/
426	<	private static final int MAX_THREADS = 0x7fff;
426	>	private static final int MAX_WORKERS   = 0x7fff;
427
428		/**
429		* Array holding all worker threads in the pool.  Array size must
#	Line 450 | Line 463 | public class ForkJoinPool extends Abstra
463		private volatile long stealCount;
464
465		/**
466	+	* The last nanoTime that a spare thread was trimmed
467	+	*/
468	+	private volatile long trimTime;
469	+
470	+	/**
471	+	* The rate at which to trim unused spares
472	+	*/
473	+	static final long UNUSED_SPARE_TRIM_RATE_NANOS =
474	+	1000L * 1000L * 1000L; // 1 sec
475	+
476	+	/**
477		* Encoded record of top of treiber stack of threads waiting for
478		* events. The top 32 bits contain the count being waited for. The
479	<	* bottom word contains one plus the pool index of waiting worker
480	<	* thread.
479	>	* bottom 16 bits contains one plus the pool index of waiting
480	>	* worker thread. (Bits 16-31 are unused.)
481		*/
482		private volatile long eventWaiters;
483
484		private static final int  EVENT_COUNT_SHIFT = 32;
485	<	private static final long WAITER_ID_MASK = (1L << EVENT_COUNT_SHIFT)-1L;
485	>	private static final long WAITER_ID_MASK    = (1L << 16) - 1L;
486
487		/**
488		* A counter for events that may wake up worker threads:
489		*   - Submission of a new task to the pool
490		*   - A worker pushing a task on an empty queue
491	<	*   - termination and reconfiguration
491	>	*   - termination
492		*/
493		private volatile int eventCount;
494
495		/**
496	+	* Encoded record of top of treiber stack of spare threads waiting
497	+	* for resumption. The top 16 bits contain an arbitrary count to
498	+	* avoid ABA effects. The bottom 16bits contains one plus the pool
499	+	* index of waiting worker thread.
500	+	*/
501	+	private volatile int spareWaiters;
502	+
503	+	private static final int SPARE_COUNT_SHIFT = 16;
504	+	private static final int SPARE_ID_MASK     = (1 << 16) - 1;
505	+
506	+	/**
507		* Lifecycle control. The low word contains the number of workers
508		* that are (probably) executing tasks. This value is atomically
509		* incremented before a worker gets a task to run, and decremented
#	Line 529 | Line 564 | public class ForkJoinPool extends Abstra
564		*/
565		private final int poolNumber;
566
567	+
568		// Utilities for CASing fields. Note that several of these
569		// are manually inlined by callers
570
571		/**
572	<	* Increments running count.  Also used by ForkJoinTask.
572	>	* Increments running count part of workerCounts
573		*/
574		final void incrementRunningCount() {
575		int c;
#	Line 554 | Line 590 | public class ForkJoinPool extends Abstra
590		}
591
592		/**
593	<	* Tries to increment running count
593	>	* Forces decrement of encoded workerCounts, awaiting nonzero if
594	>	* (rarely) necessary when other count updates lag.
595	>	*
596	>	* @param dr -- either zero or ONE_RUNNING
597	>	* @param dt == either zero or ONE_TOTAL
598		*/
599	<	final boolean tryIncrementRunningCount() {
600	<	int wc;
601	<	return UNSAFE.compareAndSwapInt(this, workerCountsOffset,
602	<	wc = workerCounts, wc + ONE_RUNNING);
599	>	private void decrementWorkerCounts(int dr, int dt) {
600	>	for (;;) {
601	>	int wc = workerCounts;
602	>	if (wc == 0 && (runState & TERMINATED) != 0)
603	>	return; // lagging termination on a backout
604	>	if ((wc & RUNNING_COUNT_MASK)  - dr < 0 ||
605	>	(wc >>> TOTAL_COUNT_SHIFT) - dt < 0)
606	>	Thread.yield();
607	>	if (UNSAFE.compareAndSwapInt(this, workerCountsOffset,
608	>	wc, wc - (dr + dt)))
609	>	return;
610	>	}
611	>	}
612	>
613	>	/**
614	>	* Increments event count
615	>	*/
616	>	private void advanceEventCount() {
617	>	int c;
618	>	do {} while(!UNSAFE.compareAndSwapInt(this, eventCountOffset,
619	>	c = eventCount, c+1));
620		}
621
622		/**
#	Line 610 | Line 667 | public class ForkJoinPool extends Abstra
667		lock.lock();
668		try {
669		ForkJoinWorkerThread[] ws = workers;
670	<	int nws = ws.length;
671	<	if (k < 0 || k >= nws || ws[k] != null) {
672	<	for (k = 0; k < nws && ws[k] != null; ++k)
670	>	int n = ws.length;
671	>	if (k < 0 || k >= n || ws[k] != null) {
672	>	for (k = 0; k < n && ws[k] != null; ++k)
673		;
674	<	if (k == nws)
675	<	ws = Arrays.copyOf(ws, nws << 1);
674	>	if (k == n)
675	>	ws = Arrays.copyOf(ws, n << 1);
676		}
677		ws[k] = w;
678		workers = ws; // volatile array write ensures slot visibility
#	Line 648 | Line 705 | public class ForkJoinPool extends Abstra
705		* Tries to create and add new worker. Assumes that worker counts
706		* are already updated to accommodate the worker, so adjusts on
707		* failure.
651	–	*
652	–	* @return new worker or null if creation failed
708		*/
709	<	private ForkJoinWorkerThread addWorker() {
709	>	private void addWorker() {
710		ForkJoinWorkerThread w = null;
711		try {
712		w = factory.newThread(this);
713		} finally { // Adjust on either null or exceptional factory return
714	<	if (w == null)
715	<	onWorkerCreationFailure();
714	>	if (w == null) {
715	>	decrementWorkerCounts(ONE_RUNNING, ONE_TOTAL);
716	>	tryTerminate(false); // in case of failure during shutdown
717	>	}
718		}
719		if (w != null)
720		w.start(recordWorker(w), ueh);
664	–	return w;
665	–	}
666	–
667	–	/**
668	–	* Adjusts counts upon failure to create worker
669	–	*/
670	–	private void onWorkerCreationFailure() {
671	–	for (;;) {
672	–	int wc = workerCounts;
673	–	int rc = wc & RUNNING_COUNT_MASK;
674	–	int tc = wc >>> TOTAL_COUNT_SHIFT;
675	–	if (rc == 0 || wc == 0)
676	–	Thread.yield(); // must wait for other counts to settle
677	–	else if (UNSAFE.compareAndSwapInt(this, workerCountsOffset, wc,
678	–	wc - (ONE_RUNNING|ONE_TOTAL)))
679	–	break;
680	–	}
681	–	tryTerminate(false); // in case of failure during shutdown
682	–	}
683	–
684	–	/**
685	–	* Creates enough total workers to establish target parallelism,
686	–	* giving up if terminating or addWorker fails
687	–	*/
688	–	private void ensureEnoughTotalWorkers() {
689	–	int wc;
690	–	while (((wc = workerCounts) >>> TOTAL_COUNT_SHIFT) < parallelism &&
691	–	runState < TERMINATING) {
692	–	if ((UNSAFE.compareAndSwapInt(this, workerCountsOffset,
693	–	wc, wc + (ONE_RUNNING|ONE_TOTAL)) &&
694	–	addWorker() == null))
695	–	break;
696	–	}
721		}
722
723		/**
724		* Final callback from terminating worker.  Removes record of
725		* worker from array, and adjusts counts. If pool is shutting
726	<	* down, tries to complete terminatation, else possibly replaces
703	<	* the worker.
726	>	* down, tries to complete terminatation.
727		*
728		* @param w the worker
729		*/
730		final void workerTerminated(ForkJoinWorkerThread w) {
708	–	if (w.active) { // force inactive
709	–	w.active = false;
710	–	do {} while (!tryDecrementActiveCount());
711	–	}
731		forgetWorker(w);
732	<
733	<	// Decrement total count, and if was running, running count
734	<	// Spin (waiting for other updates) if either would be negative
735	<	int nr = w.isTrimmed() ? 0 : ONE_RUNNING;
717	<	int unit = ONE_TOTAL + nr;
718	<	for (;;) {
719	<	int wc = workerCounts;
720	<	int rc = wc & RUNNING_COUNT_MASK;
721	<	int tc = wc >>> TOTAL_COUNT_SHIFT;
722	<	if (rc - nr < 0 || tc == 0)
723	<	Thread.yield(); // back off if waiting for other updates
724	<	else if (UNSAFE.compareAndSwapInt(this, workerCountsOffset,
725	<	wc, wc - unit))
726	<	break;
727	<	}
728	<
729	<	accumulateStealCount(w); // collect final count
730	<	if (!tryTerminate(false))
731	<	ensureEnoughTotalWorkers();
732	>	decrementWorkerCounts(w.isTrimmed()? 0 : ONE_RUNNING, ONE_TOTAL);
733	>	while (w.stealCount != 0) // collect final count
734	>	tryAccumulateStealCount(w);
735	>	tryTerminate(false);
736		}
737
738		// Waiting for and signalling events
739
740		/**
741		* Releases workers blocked on a count not equal to current count.
742	<	* @return true if any released
742	>	* Normally called after precheck that eventWaiters isn't zero to
743	>	* avoid wasted array checks.
744	>	*
745	>	* @param signalling true if caller is a signalling worker so can
746	>	* exit upon (conservatively) detected contention by other threads
747	>	* who will continue to release
748		*/
749	<	private void releaseWaiters() {
750	<	long top;
751	<	while ((top = eventWaiters) != 0L) {
752	<	ForkJoinWorkerThread[] ws = workers;
753	<	int n = ws.length;
754	<	for (;;) {
755	<	int i = ((int)(top & WAITER_ID_MASK)) - 1;
756	<	int e = (int)(top >>> EVENT_COUNT_SHIFT);
757	<	if (i < 0 || e == eventCount)
758	<	return;
759	<	ForkJoinWorkerThread w;
760	<	if (i < n && (w = ws[i]) != null &&
761	<	UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
753	<	top, w.nextWaiter)) {
754	<	LockSupport.unpark(w);
755	<	top = eventWaiters;
756	<	}
757	<	else
758	<	break;      // possibly stale; reread
759	<	}
749	>	private void releaseEventWaiters(boolean signalling) {
750	>	ForkJoinWorkerThread[] ws = workers;
751	>	int n = ws.length;
752	>	long h; // head of stack
753	>	ForkJoinWorkerThread w; int id, ec;
754	>	while ((id = ((int)((h = eventWaiters) & WAITER_ID_MASK)) - 1) >= 0 &&
755	>	(int)(h >>> EVENT_COUNT_SHIFT) != (ec = eventCount) &&
756	>	id < n && (w = ws[id]) != null) {
757	>	if (UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
758	>	h, h = w.nextWaiter))
759	>	LockSupport.unpark(w);
760	>	if (signalling && (eventCount != ec || eventWaiters != h))
761	>	break;
762		}
763		}
764
765		/**
766	<	* Ensures eventCount on exit is different (mod 2^32) than on
767	<	* entry and wakes up all waiters
766	<	*/
767	<	private void signalEvent() {
768	<	int c;
769	<	do {} while (!UNSAFE.compareAndSwapInt(this, eventCountOffset,
770	<	c = eventCount, c+1));
771	<	releaseWaiters();
772	<	}
773	<
774	<	/**
775	<	* Advances eventCount and releases waiters until interference by
776	<	* other releasing threads is detected.
766	>	* Tries to advance eventCount and releases waiters. Called only
767	>	* from workers.
768		*/
769		final void signalWork() {
770	<	int c;
771	<	UNSAFE.compareAndSwapInt(this, eventCountOffset, c=eventCount, c+1);
772	<	long top;
773	<	while ((top = eventWaiters) != 0L) {
783	<	int ec = eventCount;
784	<	ForkJoinWorkerThread[] ws = workers;
785	<	int n = ws.length;
786	<	for (;;) {
787	<	int i = ((int)(top & WAITER_ID_MASK)) - 1;
788	<	int e = (int)(top >>> EVENT_COUNT_SHIFT);
789	<	if (i < 0 || e == ec)
790	<	return;
791	<	ForkJoinWorkerThread w;
792	<	if (i < n && (w = ws[i]) != null &&
793	<	UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
794	<	top, top = w.nextWaiter)) {
795	<	LockSupport.unpark(w);
796	<	if (top != eventWaiters) // let someone else take over
797	<	return;
798	<	}
799	<	else
800	<	break;      // possibly stale; reread
801	<	}
802	<	}
770	>	int c; // try to increment event count -- CAS failure OK
771	>	UNSAFE.compareAndSwapInt(this, eventCountOffset, c = eventCount, c+1);
772	>	if (eventWaiters != 0L)
773	>	releaseEventWaiters(true);
774		}
775
776		/**
777	<	* Blockss worker until terminating or event count
777	>	* Blocks worker until terminating or event count
778		* advances from last value held by worker
779		*
780		* @param w the calling worker thread
781		*/
782		private void eventSync(ForkJoinWorkerThread w) {
783		int wec = w.lastEventCount;
784	<	long nextTop = (((long)wec << EVENT_COUNT_SHIFT) |
785	<	((long)(w.poolIndex + 1)));
815	<	long top;
784	>	long nh = (((long)wec) << EVENT_COUNT_SHIFT) | ((long)(w.poolIndex+1));
785	>	long h;
786		while ((runState < SHUTDOWN || !tryTerminate(false)) &&
787	<	(((int)(top = eventWaiters) & WAITER_ID_MASK) == 0 ||
788	<	(int)(top >>> EVENT_COUNT_SHIFT) == wec) &&
787	>	((h = eventWaiters) == 0L ||
788	>	(int)(h >>> EVENT_COUNT_SHIFT) == wec) &&
789		eventCount == wec) {
790		if (UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
791	<	w.nextWaiter = top, nextTop)) {
792	<	accumulateStealCount(w); // transfer steals while idle
793	<	Thread.interrupted();    // clear/ignore interrupt
794	<	while (eventCount == wec)
795	<	w.doPark();
791	>	w.nextWaiter = h, nh)) {
792	>	while (runState < TERMINATING && eventCount == wec) {
793	>	if (!tryAccumulateStealCount(w))  // transfer while idle
794	>	continue;
795	>	Thread.interrupted();             // clear/ignore interrupt
796	>	if (eventCount != wec)
797	>	break;
798	>	LockSupport.park(w);
799	>	}
800		break;
801		}
802		}
803		w.lastEventCount = eventCount;
804		}
805
806	+	// Maintaining spares
807	+
808	+	/**
809	+	* Pushes worker onto the spare stack
810	+	*/
811	+	final void pushSpare(ForkJoinWorkerThread w) {
812	+	int ns = (++w.spareCount << SPARE_COUNT_SHIFT) | (w.poolIndex+1);
813	+	do {} while (!UNSAFE.compareAndSwapInt(this, spareWaitersOffset,
814	+	w.nextSpare = spareWaiters,ns));
815	+	}
816	+
817	+	/**
818	+	* Tries (once) to resume a spare if running count is less than
819	+	* target parallelism. Fails on contention or stale workers.
820	+	*/
821	+	private void tryResumeSpare() {
822	+	int sw, id;
823	+	ForkJoinWorkerThread w;
824	+	ForkJoinWorkerThread[] ws;
825	+	if ((id = ((sw = spareWaiters) & SPARE_ID_MASK) - 1) >= 0 &&
826	+	id < (ws = workers).length && (w = ws[id]) != null &&
827	+	(workerCounts & RUNNING_COUNT_MASK) < parallelism &&
828	+	eventWaiters == 0L &&
829	+	spareWaiters == sw &&
830	+	UNSAFE.compareAndSwapInt(this, spareWaitersOffset,
831	+	sw, w.nextSpare) &&
832	+	w.tryUnsuspend()) {
833	+	int c; // try increment; if contended, finish after unpark
834	+	boolean inc = UNSAFE.compareAndSwapInt(this, workerCountsOffset,
835	+	c = workerCounts,
836	+	c + ONE_RUNNING);
837	+	LockSupport.unpark(w);
838	+	if (!inc) {
839	+	do {} while(!UNSAFE.compareAndSwapInt(this, workerCountsOffset,
840	+	c = workerCounts,
841	+	c + ONE_RUNNING));
842	+	}
843	+	}
844	+	}
845	+
846	+	/**
847	+	* Callback from oldest spare occasionally waking up.  Tries
848	+	* (once) to shutdown a spare if more than 25% spare overage, or
849	+	* if UNUSED_SPARE_TRIM_RATE_NANOS have elapsed and there are at
850	+	* least #parallelism running threads. Note that we don't need CAS
851	+	* or locks here because the method is called only from the oldest
852	+	* suspended spare occasionally waking (and even misfires are OK).
853	+	*
854	+	* @param now the wake up nanoTime of caller
855	+	*/
856	+	final void tryTrimSpare(long now) {
857	+	long lastTrim = trimTime;
858	+	trimTime = now;
859	+	helpMaintainParallelism(); // first, help wake up any needed spares
860	+	int sw, id;
861	+	ForkJoinWorkerThread w;
862	+	ForkJoinWorkerThread[] ws;
863	+	int pc = parallelism;
864	+	int wc = workerCounts;
865	+	if ((wc & RUNNING_COUNT_MASK) >= pc &&
866	+	(((wc >>> TOTAL_COUNT_SHIFT) - pc) > (pc >>> 2) + 1 ||// approx 25%
867	+	now - lastTrim >= UNUSED_SPARE_TRIM_RATE_NANOS) &&
868	+	(id = ((sw = spareWaiters) & SPARE_ID_MASK) - 1) >= 0 &&
869	+	id < (ws = workers).length && (w = ws[id]) != null &&
870	+	UNSAFE.compareAndSwapInt(this, spareWaitersOffset,
871	+	sw, w.nextSpare))
872	+	w.shutdown(false);
873	+	}
874	+
875	+	/**
876	+	* Does at most one of:
877	+	*
878	+	* 1. Help wake up existing workers waiting for work via
879	+	*    releaseEventWaiters. (If any exist, then it probably doesn't
880	+	*    matter right now if under target parallelism level.)
881	+	*
882	+	* 2. If below parallelism level and a spare exists, try (once)
883	+	*    to resume it via tryResumeSpare.
884	+	*
885	+	* 3. If neither of the above, tries (once) to add a new
886	+	*    worker if either there are not enough total, or if all
887	+	*    existing workers are busy, there are either no running
888	+	*    workers or the deficit is at least twice the surplus.
889	+	*/
890	+	private void helpMaintainParallelism() {
891	+	// uglified to work better when not compiled
892	+	int pc, wc, rc, tc, rs; long h;
893	+	if ((h = eventWaiters) != 0L) {
894	+	if ((int)(h >>> EVENT_COUNT_SHIFT) != eventCount)
895	+	releaseEventWaiters(false); // avoid useless call
896	+	}
897	+	else if ((pc = parallelism) >
898	+	(rc = ((wc = workerCounts) & RUNNING_COUNT_MASK))) {
899	+	if (spareWaiters != 0)
900	+	tryResumeSpare();
901	+	else if ((rs = runState) < TERMINATING &&
902	+	((tc = wc >>> TOTAL_COUNT_SHIFT) < pc ||
903	+	(tc == (rs & ACTIVE_COUNT_MASK) && // all busy
904	+	(rc == 0 ||                       // must add
905	+	rc < pc - ((tc - pc) << 1)) &&   // within slack
906	+	tc < MAX_WORKERS && runState == rs)) && // recheck busy
907	+	workerCounts == wc &&
908	+	UNSAFE.compareAndSwapInt(this, workerCountsOffset, wc,
909	+	wc + (ONE_RUNNING|ONE_TOTAL)))
910	+	addWorker();
911	+	}
912	+	}
913	+
914		/**
915		* Callback from workers invoked upon each top-level action (i.e.,
916		* stealing a task or taking a submission and running
917	<	* it). Performs one or both of the following:
917	>	* it). Performs one or more of the following:
918	>	*
919	>	* 1. If the worker cannot find work (misses > 0), updates its
920	>	*    active status to inactive and updates activeCount unless
921	>	*    this is the first miss and there is contention, in which
922	>	*    case it may try again (either in this or a subsequent
923	>	*    call).
924	>	*
925	>	* 2. If there are at least 2 misses, awaits the next task event
926	>	*    via eventSync
927	>	*
928	>	* 3. If there are too many running threads, suspends this worker
929	>	*    (first forcing inactivation if necessary).  If it is not
930	>	*    needed, it may be killed while suspended via
931	>	*    tryTrimSpare. Otherwise, upon resume it rechecks to make
932	>	*    sure that it is still needed.
933		*
934	<	* * If the worker cannot find work, updates its active status to
935	<	* inactive and updates activeCount unless there is contention, in
839	<	* which case it may try again (either in this or a subsequent
840	<	* call).  Additionally, awaits the next task event and/or helps
841	<	* wake up other releasable waiters.
842	<	*
843	<	* * If there are too many running threads, suspends this worker
844	<	* (first forcing inactivation if necessary).  If it is not
845	<	* resumed before a keepAlive elapses, the worker may be "trimmed"
846	<	* -- killed while suspended within suspendAsSpare. Otherwise,
847	<	* upon resume it rechecks to make sure that it is still needed.
934	>	* 4. Helps release and/or reactivate other workers via
935	>	*    helpMaintainParallelism
936		*
937		* @param w the worker
938	<	* @param retries the number of scans by caller failing to find work
939	<	* find any (in which case it may block waiting for work).
938	>	* @param misses the number of scans by caller failing to find work
939	>	* (saturating at 2 just to avoid wraparound)
940		*/
941	<	final void preStep(ForkJoinWorkerThread w, int retries) {
941	>	final void preStep(ForkJoinWorkerThread w, int misses) {
942		boolean active = w.active;
943	<	boolean inactivate = active && retries > 0;
943	>	int pc = parallelism;
944		for (;;) {
945	<	int rs, wc;
946	<	if (inactivate &&
947	<	UNSAFE.compareAndSwapInt(this, runStateOffset,
948	<	rs = runState, rs - ONE_ACTIVE))
949	<	inactivate = active = w.active = false;
950	<	if (((wc = workerCounts) & RUNNING_COUNT_MASK) <= parallelism) {
951	<	if (retries > 0) {
952	<	if (retries > 1 && !active)
953	<	eventSync(w);
954	<	releaseWaiters();
955	<	}
956	<	break;
945	>	int wc = workerCounts;
946	>	int rc = wc & RUNNING_COUNT_MASK;
947	>	if (active && (misses > 0 || rc > pc)) {
948	>	int rs;                      // try inactivate
949	>	if (UNSAFE.compareAndSwapInt(this, runStateOffset,
950	>	rs = runState, rs - ONE_ACTIVE))
951	>	active = w.active = false;
952	>	else if (misses > 1 || rc > pc ||
953	>	(rs & ACTIVE_COUNT_MASK) >= pc)
954	>	continue;                // force inactivate
955	>	}
956	>	if (misses > 1) {
957	>	misses = 0;                  // don't re-sync
958	>	eventSync(w);                // continue loop to recheck rc
959	>	}
960	>	else if (rc > pc) {
961	>	if (workerCounts == wc &&   // try to suspend as spare
962	>	UNSAFE.compareAndSwapInt(this, workerCountsOffset,
963	>	wc, wc - ONE_RUNNING) &&
964	>	!w.suspendAsSpare())    // false if killed
965	>	break;
966		}
967	<	if (!(inactivate |= active) &&  // must inactivate to suspend
968	<	UNSAFE.compareAndSwapInt(this, workerCountsOffset,
969	<	wc, wc - ONE_RUNNING) &&
873	<	!w.suspendAsSpare())             // false if trimmed
967	>	else {
968	>	if (rc < pc || eventWaiters != 0L)
969	>	helpMaintainParallelism();
970		break;
971	+	}
972		}
973		}
974
975		/**
976	<	* Awaits join of the given task if enough threads, or can resume
977	<	* or create a spare. Fails (in which case the given task might
978	<	* not be done) upon contention or lack of decision about
979	<	* blocking.
980	<	*
884	<	* We allow blocking if:
885	<	*
886	<	* 1. There would still be at least as many running threads as
887	<	*    parallelism level if this thread blocks.
888	<	*
889	<	* 2. A spare is resumed to replace this worker. We tolerate
890	<	*    races in the decision to replace when a spare is found.
891	<	*    This may release too many, but if so, the superfluous ones
892	<	*    will re-suspend via preStep().
893	<	*
894	<	* 3. After #spares repeated retries, there are fewer than #spare
895	<	*    threads not running. We allow this slack to avoid hysteresis
896	<	*    and as a hedge against lag/uncertainty of running count
897	<	*    estimates when signalling or unblocking stalls.
898	<	*
899	<	* 4. All existing workers are busy (as rechecked via #spares
900	<	*    repeated retries by caller) and a new spare is created.
901	<	*
902	<	* If none of the above hold, we escape out by re-incrementing
903	<	* count and returning to caller, which can retry later.
976	>	* Helps and/or blocks awaiting join of the given task.
977	>	* Alternates between helpJoinTask() and helpMaintainParallelism()
978	>	* as many times as there is a deficit in running count (or longer
979	>	* if running count would become zero), then blocks if task still
980	>	* not done.
981		*
982		* @param joinMe the task to join
906	–	* @param retries the number of calls to this method for this join
983		*/
984	<	final void tryAwaitJoin(ForkJoinTask<?> joinMe, int retries) {
985	<	int pc = parallelism;
986	<	boolean running = true; // false when running count decremented
987	<	outer:while (joinMe.status >= 0) {
988	<	int wc = workerCounts;
989	<	int rc = wc & RUNNING_COUNT_MASK;
990	<	int tc = wc >>> TOTAL_COUNT_SHIFT;
991	<	if (running) { // replace with spare or decrement count
992	<	if (rc <= pc && tc > pc &&
993	<	(retries > 0 || tc > (runState & ACTIVE_COUNT_MASK))) {
994	<	ForkJoinWorkerThread[] ws = workers; // search for spare
995	<	int nws = ws.length;
996	<	for (int i = 0; i < nws; ++i) {
921	<	ForkJoinWorkerThread w = ws[i];
922	<	if (w != null && w.isSuspended()) {
923	<	if ((workerCounts & RUNNING_COUNT_MASK) > pc)
924	<	continue outer;
925	<	if (joinMe.status < 0)
926	<	break outer;
927	<	if (w.tryResumeSpare()) {
928	<	running = false;
929	<	break outer;
930	<	}
931	<	continue outer; // rescan on failure to resume
932	<	}
933	<	}
934	<	}
935	<	if ((rc <= pc && (rc == 0 || --retries < 0)) || // no retry
936	<	joinMe.status < 0)
937	<	break;
938	<	if (workerCounts == wc &&
939	<	UNSAFE.compareAndSwapInt(this, workerCountsOffset,
940	<	wc, wc - ONE_RUNNING))
941	<	running = false;
984	>	final void awaitJoin(ForkJoinTask<?> joinMe, ForkJoinWorkerThread worker) {
985	>	int threshold = parallelism;         // descend blocking thresholds
986	>	while (joinMe.status >= 0) {
987	>	boolean block; int wc;
988	>	worker.helpJoinTask(joinMe);
989	>	if (joinMe.status < 0)
990	>	break;
991	>	if (((wc = workerCounts) & RUNNING_COUNT_MASK) <= threshold) {
992	>	if (threshold > 0)
993	>	--threshold;
994	>	else
995	>	advanceEventCount(); // force release
996	>	block = false;
997		}
998	<	else { // allow blocking if enough threads
999	<	int sc = tc - pc + 1;          // = spares, plus the one to add
1000	<	if (sc > 0 && rc > 0 && rc >= pc - sc && rc > pc - retries)
1001	<	break;
1002	<	if (--retries > sc && tc < MAX_THREADS &&
1003	<	tc == (runState & ACTIVE_COUNT_MASK) &&
1004	<	workerCounts == wc &&
1005	<	UNSAFE.compareAndSwapInt(this, workerCountsOffset, wc,
1006	<	wc + (ONE_RUNNING|ONE_TOTAL))) {
1007	<	addWorker();
1008	<	break;
954	<	}
955	<	if (workerCounts == wc &&
956	<	UNSAFE.compareAndSwapInt (this, workerCountsOffset,
957	<	wc, wc + ONE_RUNNING)) {
958	<	running = true;            // back out; allow retry
959	<	break;
960	<	}
998	>	else
999	>	block = UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1000	>	wc, wc - ONE_RUNNING);
1001	>	helpMaintainParallelism();
1002	>	if (block) {
1003	>	int c;
1004	>	joinMe.internalAwaitDone();
1005	>	do {} while (!UNSAFE.compareAndSwapInt
1006	>	(this, workerCountsOffset,
1007	>	c = workerCounts, c + ONE_RUNNING));
1008	>	break;
1009		}
1010		}
963	–	if (!running) { // can block
964	–	int c;                      // to inline incrementRunningCount
965	–	joinMe.internalAwaitDone();
966	–	do {} while (!UNSAFE.compareAndSwapInt
967	–	(this, workerCountsOffset,
968	–	c = workerCounts, c + ONE_RUNNING));
969	–	}
1011		}
1012
1013		/**
1014	<	* Same idea as (and shares many code snippets with) tryAwaitJoin,
974	<	* but self-contained because there are no caller retries.
975	<	* TODO: Rework to use simpler API.
1014	>	* Same idea as awaitJoin, but no helping
1015		*/
1016		final void awaitBlocker(ManagedBlocker blocker)
1017		throws InterruptedException {
1018	<	int pc = parallelism;
1019	<	boolean running = true;
1020	<	int retries = 0;
1021	<	boolean done;
1022	<	outer:while (!(done = blocker.isReleasable())) {
1023	<	int wc = workerCounts;
1024	<	int rc = wc & RUNNING_COUNT_MASK;
1025	<	int tc = wc >>> TOTAL_COUNT_SHIFT;
1026	<	if (running) {
988	<	if (rc <= pc && tc > pc &&
989	<	(retries > 0 || tc > (runState & ACTIVE_COUNT_MASK))) {
990	<	ForkJoinWorkerThread[] ws = workers;
991	<	int nws = ws.length;
992	<	for (int i = 0; i < nws; ++i) {
993	<	ForkJoinWorkerThread w = ws[i];
994	<	if (w != null && w.isSuspended()) {
995	<	if ((workerCounts & RUNNING_COUNT_MASK) > pc)
996	<	continue outer;
997	<	if (done = blocker.isReleasable())
998	<	break outer;
999	<	if (w.tryResumeSpare()) {
1000	<	running = false;
1001	<	break outer;
1002	<	}
1003	<	continue outer;
1004	<	}
1005	<	}
1006	<	if (done = blocker.isReleasable())
1007	<	break;
1008	<	}
1009	<	if (rc > 0 && workerCounts == wc &&
1010	<	UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1011	<	wc, wc - ONE_RUNNING)) {
1012	<	running = false;
1013	<	if (rc > pc)
1014	<	break;
1015	<	}
1018	>	int threshold = parallelism;
1019	>	while (!blocker.isReleasable()) {
1020	>	boolean block; int wc;
1021	>	if (((wc = workerCounts) & RUNNING_COUNT_MASK) <= threshold) {
1022	>	if (threshold > 0)
1023	>	--threshold;
1024	>	else
1025	>	advanceEventCount();
1026	>	block = false;
1027		}
1028	<	else if (rc >= pc)
1029	<	break;
1030	<	else if (tc < MAX_THREADS &&
1031	<	tc == (runState & ACTIVE_COUNT_MASK) &&
1032	<	workerCounts == wc &&
1033	<	UNSAFE.compareAndSwapInt(this, workerCountsOffset, wc,
1034	<	wc + (ONE_RUNNING|ONE_TOTAL))) {
1035	<	addWorker();
1028	>	else
1029	>	block = UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1030	>	wc, wc - ONE_RUNNING);
1031	>	helpMaintainParallelism();
1032	>	if (block) {
1033	>	try {
1034	>	do {} while (!blocker.isReleasable() && !blocker.block());
1035	>	} finally {
1036	>	int c;
1037	>	do {} while (!UNSAFE.compareAndSwapInt
1038	>	(this, workerCountsOffset,
1039	>	c = workerCounts, c + ONE_RUNNING));
1040	>	}
1041		break;
1042		}
1027	–	else if (workerCounts == wc &&
1028	–	UNSAFE.compareAndSwapInt (this, workerCountsOffset,
1029	–	wc, wc + ONE_RUNNING)) {
1030	–	Thread.yield();
1031	–	++retries;
1032	–	running = true;            // allow rescan
1033	–	}
1034	–	}
1035	–
1036	–	try {
1037	–	if (!done)
1038	–	do {} while (!blocker.isReleasable() && !blocker.block());
1039	–	} finally {
1040	–	if (!running) {
1041	–	int c;
1042	–	do {} while (!UNSAFE.compareAndSwapInt
1043	–	(this, workerCountsOffset,
1044	–	c = workerCounts, c + ONE_RUNNING));
1045	–	}
1043		}
1044		}
1045
#	Line 1074 | Line 1071 | public class ForkJoinPool extends Abstra
1071
1072		/**
1073		* Actions on transition to TERMINATING
1074	+	*
1075	+	* Runs up to four passes through workers: (0) shutting down each
1076	+	* quietly (without waking up if parked) to quickly spread
1077	+	* notifications without unnecessary bouncing around event queues
1078	+	* etc (1) wake up and help cancel tasks (2) interrupt (3) mop up
1079	+	* races with interrupted workers
1080		*/
1081		private void startTerminating() {
1082	<	for (int i = 0; i < 2; ++i) { // twice to mop up newly created workers
1083	<	cancelSubmissions();
1084	<	shutdownWorkers();
1085	<	cancelWorkerTasks();
1086	<	signalEvent();
1087	<	interruptWorkers();
1082	>	cancelSubmissions();
1083	>	for (int passes = 0; passes < 4 && workerCounts != 0; ++passes) {
1084	>	advanceEventCount();
1085	>	eventWaiters = 0L; // clobber lists
1086	>	spareWaiters = 0;
1087	>	ForkJoinWorkerThread[] ws = workers;
1088	>	int n = ws.length;
1089	>	for (int i = 0; i < n; ++i) {
1090	>	ForkJoinWorkerThread w = ws[i];
1091	>	if (w != null) {
1092	>	w.shutdown(true);
1093	>	if (passes > 0 && !w.isTerminated()) {
1094	>	w.cancelTasks();
1095	>	LockSupport.unpark(w);
1096	>	if (passes > 1) {
1097	>	try {
1098	>	w.interrupt();
1099	>	} catch (SecurityException ignore) {
1100	>	}
1101	>	}
1102	>	}
1103	>	}
1104	>	}
1105		}
1106		}
1107
#	Line 1098 | Line 1118 | public class ForkJoinPool extends Abstra
1118		}
1119		}
1120
1101	–	/**
1102	–	* Sets all worker run states to at least shutdown,
1103	–	* also resuming suspended workers
1104	–	*/
1105	–	private void shutdownWorkers() {
1106	–	ForkJoinWorkerThread[] ws = workers;
1107	–	int nws = ws.length;
1108	–	for (int i = 0; i < nws; ++i) {
1109	–	ForkJoinWorkerThread w = ws[i];
1110	–	if (w != null)
1111	–	w.shutdown();
1112	–	}
1113	–	}
1114	–
1115	–	/**
1116	–	* Clears out and cancels all locally queued tasks
1117	–	*/
1118	–	private void cancelWorkerTasks() {
1119	–	ForkJoinWorkerThread[] ws = workers;
1120	–	int nws = ws.length;
1121	–	for (int i = 0; i < nws; ++i) {
1122	–	ForkJoinWorkerThread w = ws[i];
1123	–	if (w != null)
1124	–	w.cancelTasks();
1125	–	}
1126	–	}
1127	–
1128	–	/**
1129	–	* Unsticks all workers blocked on joins etc
1130	–	*/
1131	–	private void interruptWorkers() {
1132	–	ForkJoinWorkerThread[] ws = workers;
1133	–	int nws = ws.length;
1134	–	for (int i = 0; i < nws; ++i) {
1135	–	ForkJoinWorkerThread w = ws[i];
1136	–	if (w != null && !w.isTerminated()) {
1137	–	try {
1138	–	w.interrupt();
1139	–	} catch (SecurityException ignore) {
1140	–	}
1141	–	}
1142	–	}
1143	–	}
1144	–
1121		// misc support for ForkJoinWorkerThread
1122
1123		/**
#	Line 1152 | Line 1128 | public class ForkJoinPool extends Abstra
1128		}
1129
1130		/**
1131	<	* Accumulates steal count from a worker, clearing
1132	<	* the worker's value
1131	>	* Tries to accumulates steal count from a worker, clearing
1132	>	* the worker's value.
1133	>	*
1134	>	* @return true if worker steal count now zero
1135		*/
1136	<	final void accumulateStealCount(ForkJoinWorkerThread w) {
1136	>	final boolean tryAccumulateStealCount(ForkJoinWorkerThread w) {
1137		int sc = w.stealCount;
1138	<	if (sc != 0) {
1139	<	long c;
1140	<	w.stealCount = 0;
1141	<	do {} while (!UNSAFE.compareAndSwapLong(this, stealCountOffset,
1142	<	c = stealCount, c + sc));
1138	>	long c = stealCount;
1139	>	// CAS even if zero, for fence effects
1140	>	if (UNSAFE.compareAndSwapLong(this, stealCountOffset, c, c + sc)) {
1141	>	if (sc != 0)
1142	>	w.stealCount = 0;
1143	>	return true;
1144		}
1145	+	return sc == 0;
1146		}
1147
1148		/**
#	Line 1245 | Line 1225 | public class ForkJoinPool extends Abstra
1225		checkPermission();
1226		if (factory == null)
1227		throw new NullPointerException();
1228	<	if (parallelism <= 0 || parallelism > MAX_THREADS)
1228	>	if (parallelism <= 0 || parallelism > MAX_WORKERS)
1229		throw new IllegalArgumentException();
1230		this.parallelism = parallelism;
1231		this.factory = factory;
#	Line 1257 | Line 1237 | public class ForkJoinPool extends Abstra
1237		this.workerLock = new ReentrantLock();
1238		this.termination = new Phaser(1);
1239		this.poolNumber = poolNumberGenerator.incrementAndGet();
1240	+	this.trimTime = System.nanoTime();
1241		}
1242
1243		/**
#	Line 1264 | Line 1245 | public class ForkJoinPool extends Abstra
1245		* @param pc the initial parallelism level
1246		*/
1247		private static int initialArraySizeFor(int pc) {
1248	<	// See Hackers Delight, sec 3.2. We know MAX_THREADS < (1 >>> 16)
1249	<	int size = pc < MAX_THREADS ? pc + 1 : MAX_THREADS;
1248	>	// See Hackers Delight, sec 3.2. We know MAX_WORKERS < (1 >>> 16)
1249	>	int size = pc < MAX_WORKERS ? pc + 1 : MAX_WORKERS;
1250		size |= size >>> 1;
1251		size |= size >>> 2;
1252		size |= size >>> 4;
#	Line 1284 | Line 1265 | public class ForkJoinPool extends Abstra
1265		if (runState >= SHUTDOWN)
1266		throw new RejectedExecutionException();
1267		submissionQueue.offer(task);
1268	<	signalEvent();
1269	<	ensureEnoughTotalWorkers();
1268	>	advanceEventCount();
1269	>	helpMaintainParallelism();         // start or wake up workers
1270		}
1271
1272		/**
#	Line 1532 | Line 1513 | public class ForkJoinPool extends Abstra
1513		public long getQueuedTaskCount() {
1514		long count = 0;
1515		ForkJoinWorkerThread[] ws = workers;
1516	<	int nws = ws.length;
1517	<	for (int i = 0; i < nws; ++i) {
1516	>	int n = ws.length;
1517	>	for (int i = 0; i < n; ++i) {
1518		ForkJoinWorkerThread w = ws[i];
1519		if (w != null)
1520		count += w.getQueueSize();
#	Line 1591 | Line 1572 | public class ForkJoinPool extends Abstra
1572		* @return the number of elements transferred
1573		*/
1574		protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
1575	<	int n = submissionQueue.drainTo(c);
1595	<	ForkJoinWorkerThread[] ws = workers;
1596	<	int nws = ws.length;
1597	<	for (int i = 0; i < nws; ++i) {
1598	<	ForkJoinWorkerThread w = ws[i];
1599	<	if (w != null)
1600	<	n += w.drainTasksTo(c);
1601	<	}
1602	<	return n;
1603	<	}
1604	<
1605	<	/**
1606	<	* Returns count of total parks by existing workers.
1607	<	* Used during development only since not meaningful to users.
1608	<	*/
1609	<	private int collectParkCount() {
1610	<	int count = 0;
1575	>	int count = submissionQueue.drainTo(c);
1576		ForkJoinWorkerThread[] ws = workers;
1577	<	int nws = ws.length;
1578	<	for (int i = 0; i < nws; ++i) {
1577	>	int n = ws.length;
1578	>	for (int i = 0; i < n; ++i) {
1579		ForkJoinWorkerThread w = ws[i];
1580		if (w != null)
1581	<	count += w.parkCount;
1581	>	count += w.drainTasksTo(c);
1582		}
1583		return count;
1584		}
#	Line 1635 | Line 1600 | public class ForkJoinPool extends Abstra
1600		int pc = parallelism;
1601		int rs = runState;
1602		int ac = rs & ACTIVE_COUNT_MASK;
1638	–	//        int pk = collectParkCount();
1603		return super.toString() +
1604		"[" + runLevelToString(rs) +
1605		", parallelism = " + pc +
#	Line 1645 | Line 1609 | public class ForkJoinPool extends Abstra
1609		", steals = " + st +
1610		", tasks = " + qt +
1611		", submissions = " + qs +
1648	–	//            ", parks = " + pk +
1612		"]";
1613		}
1614
#	Line 1752 | Line 1715 | public class ForkJoinPool extends Abstra
1715		* Interface for extending managed parallelism for tasks running
1716		* in {@link ForkJoinPool}s.
1717		*
1718	<	* <p>A {@code ManagedBlocker} provides two methods.
1719	<	* Method {@code isReleasable} must return {@code true} if
1720	<	* blocking is not necessary. Method {@code block} blocks the
1721	<	* current thread if necessary (perhaps internally invoking
1722	<	* {@code isReleasable} before actually blocking).
1718	>	* <p>A {@code ManagedBlocker} provides two methods.  Method
1719	>	* {@code isReleasable} must return {@code true} if blocking is
1720	>	* not necessary. Method {@code block} blocks the current thread
1721	>	* if necessary (perhaps internally invoking {@code isReleasable}
1722	>	* before actually blocking). The unusual methods in this API
1723	>	* accommodate synchronizers that may, but don't usually, block
1724	>	* for long periods. Similarly, they allow more efficient internal
1725	>	* handling of cases in which additional workers may be, but
1726	>	* usually are not, needed to ensure sufficient parallelism.
1727	>	* Toward this end, implementations of method {@code isReleasable}
1728	>	* must be amenable to repeated invocation.
1729		*
1730		* <p>For example, here is a ManagedBlocker based on a
1731		* ReentrantLock:
#	Line 1774 | Line 1743 | public class ForkJoinPool extends Abstra
1743		*     return hasLock || (hasLock = lock.tryLock());
1744		*   }
1745		* }}</pre>
1746	+	*
1747	+	* <p>Here is a class that possibly blocks waiting for an
1748	+	* item on a given queue:
1749	+	*  <pre> {@code
1750	+	* class QueueTaker<E> implements ManagedBlocker {
1751	+	*   final BlockingQueue<E> queue;
1752	+	*   volatile E item = null;
1753	+	*   QueueTaker(BlockingQueue<E> q) { this.queue = q; }
1754	+	*   public boolean block() throws InterruptedException {
1755	+	*     if (item == null)
1756	+	*       item = queue.take
1757	+	*     return true;
1758	+	*   }
1759	+	*   public boolean isReleasable() {
1760	+	*     return item != null || (item = queue.poll) != null;
1761	+	*   }
1762	+	*   public E getItem() { // call after pool.managedBlock completes
1763	+	*     return item;
1764	+	*   }
1765	+	* }}</pre>
1766		*/
1767		public static interface ManagedBlocker {
1768		/**
#	Line 1816 | Line 1805 | public class ForkJoinPool extends Abstra
1805		public static void managedBlock(ManagedBlocker blocker)
1806		throws InterruptedException {
1807		Thread t = Thread.currentThread();
1808	<	if (t instanceof ForkJoinWorkerThread)
1809	<	((ForkJoinWorkerThread) t).pool.awaitBlocker(blocker);
1808	>	if (t instanceof ForkJoinWorkerThread) {
1809	>	ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
1810	>	w.pool.awaitBlocker(blocker);
1811	>	}
1812		else {
1813		do {} while (!blocker.isReleasable() && !blocker.block());
1814		}
#	Line 1848 | Line 1839 | public class ForkJoinPool extends Abstra
1839		objectFieldOffset("eventWaiters",ForkJoinPool.class);
1840		private static final long stealCountOffset =
1841		objectFieldOffset("stealCount",ForkJoinPool.class);
1842	+	private static final long spareWaitersOffset =
1843	+	objectFieldOffset("spareWaiters",ForkJoinPool.class);
1844
1845		private static long objectFieldOffset(String field, Class<?> klazz) {
1846		try {

Diff Legend

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