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.54 by dl, Sun Apr 18 12:51:18 2010 UTC vs.
Revision 1.58 by dl, Fri Jul 23 13:07:43 2010 UTC

#	Line 21 | Line 21 | import java.util.concurrent.CountDownLat
21		/**
22		* An {@link ExecutorService} for running {@link ForkJoinTask}s.
23		* A {@code ForkJoinPool} provides the entry point for submissions
24	<	* from non-{@code ForkJoinTask}s, as well as management and
24	>	* from non-{@code ForkJoinTask} clients, as well as management and
25		* monitoring operations.
26		*
27		* <p>A {@code ForkJoinPool} differs from other kinds of {@link
#	Line 30 | Line 30 | import java.util.concurrent.CountDownLat
30		* execute subtasks created by other active tasks (eventually blocking
31		* waiting for work if none exist). This enables efficient processing
32		* when most tasks spawn other subtasks (as do most {@code
33	<	* ForkJoinTask}s). A {@code ForkJoinPool} may also be used for mixed
34	<	* execution of some plain {@code Runnable}- or {@code Callable}-
35	<	* based activities along with {@code ForkJoinTask}s. When setting
36	<	* {@linkplain #setAsyncMode async mode}, a {@code ForkJoinPool} may
37	<	* also be appropriate for use with fine-grained tasks of any form
38	<	* that are never joined. Otherwise, other {@code ExecutorService}
39	<	* implementations are typically more appropriate choices.
33	>	* ForkJoinTask}s). When setting <em>asyncMode</em> to true in
34	>	* constructors, {@code ForkJoinPool}s may also be appropriate for use
35	>	* with event-style tasks that are never joined.
36		*
37		* <p>A {@code ForkJoinPool} is constructed with a given target
38		* parallelism level; by default, equal to the number of available
39	<	* processors. Unless configured otherwise via {@link
40	<	* #setMaintainsParallelism}, the pool attempts to maintain this
41	<	* number of active (or available) threads by dynamically adding,
42	<	* suspending, or resuming internal worker threads, even if some tasks
43	<	* are stalled waiting to join others. However, no such adjustments
44	<	* are performed in the face of blocked IO or other unmanaged
45	<	* synchronization. The nested {@link ManagedBlocker} interface
50	<	* enables extension of the kinds of synchronization accommodated.
51	<	* The target parallelism level may also be changed dynamically
52	<	* ({@link #setParallelism}). The total number of threads may be
53	<	* limited using method {@link #setMaximumPoolSize}, in which case it
54	<	* may become possible for the activities of a pool to stall due to
55	<	* the lack of available threads to process new tasks. When the pool
56	<	* is executing tasks, these and other configuration setting methods
57	<	* may only gradually affect actual pool sizes. It is normally best
58	<	* practice to invoke these methods only when the pool is known to be
59	<	* quiescent.
39	>	* processors. The pool attempts to maintain enough active (or
40	>	* available) threads by dynamically adding, suspending, or resuming
41	>	* internal worker threads, even if some tasks are stalled waiting to
42	>	* join others. However, no such adjustments are guaranteed in the
43	>	* face of blocked IO or other unmanaged synchronization. The nested
44	>	* {@link ManagedBlocker} interface enables extension of the kinds of
45	>	* synchronization accommodated.
46		*
47		* <p>In addition to execution and lifecycle control methods, this
48		* class provides status check methods (for example
#	Line 65 | Line 51 | import java.util.concurrent.CountDownLat
51		* {@link #toString} returns indications of pool state in a
52		* convenient form for informal monitoring.
53		*
54	+	* <p> As is the case with other ExecutorServices, there are three
55	+	* main task execution methods summarized in the follwoing
56	+	* table. These are designed to be used by clients not already engaged
57	+	* in fork/join computations in the current pool.  The main forms of
58	+	* these methods accept instances of {@code ForkJoinTask}, but
59	+	* overloaded forms also allow mixed execution of plain {@code
60	+	* Runnable}- or {@code Callable}- based activities as well.  However,
61	+	* tasks that are already executing in a pool should normally
62	+	* <em>NOT</em> use these pool execution methods, but instead use the
63	+	* within-computation forms listed in the table.
64	+	*
65	+	* <table BORDER CELLPADDING=3 CELLSPACING=1>
66	+	*  <tr>
67	+	*    <td></td>
68	+	*    <td ALIGN=CENTER> <b>Call from non-fork/join clients</b></td>
69	+	*    <td ALIGN=CENTER> <b>Call from within fork/join computations</b></td>
70	+	*  </tr>
71	+	*  <tr>
72	+	*    <td> <b>Arange async execution</td>
73	+	*    <td> {@link #execute(ForkJoinTask)}</td>
74	+	*    <td> {@link ForkJoinTask#fork}</td>
75	+	*  </tr>
76	+	*  <tr>
77	+	*    <td> <b>Await and obtain result</td>
78	+	*    <td> {@link #invoke(ForkJoinTask)}</td>
79	+	*    <td> {@link ForkJoinTask#invoke}</td>
80	+	*  </tr>
81	+	*  <tr>
82	+	*    <td> <b>Arrange exec and obtain Future</td>
83	+	*    <td> {@link #submit(ForkJoinTask)}</td>
84	+	*    <td> {@link ForkJoinTask#fork} (ForkJoinTasks <em>are</em> Futures)</td>
85	+	*  </tr>
86	+	* </table>
87	+	*
88		* <p><b>Sample Usage.</b> Normally a single {@code ForkJoinPool} is
89		* used for all parallel task execution in a program or subsystem.
90		* Otherwise, use would not usually outweigh the construction and
#	Line 89 | Line 109 | import java.util.concurrent.CountDownLat
109		* {@code IllegalArgumentException}.
110		*
111		* <p>This implementation rejects submitted tasks (that is, by throwing
112	<	* {@link RejectedExecutionException}) only when the pool is shut down.
112	>	* {@link RejectedExecutionException}) only when the pool is shut down
113	>	* or internal resources have been exhuasted.
114		*
115		* @since 1.7
116		* @author Doug Lea
#	Line 116 | Line 137 | public class ForkJoinPool extends Abstra
137		* of tasks profit from cache affinities, but others are harmed by
138		* cache pollution effects.)
139		*
140	+	* Beyond work-stealing support and essential bookkeeping, the
141	+	* main responsibility of this framework is to arrange tactics for
142	+	* when one worker is waiting to join a task stolen (or always
143	+	* held by) another.  Becauae we are multiplexing many tasks on to
144	+	* a pool of workers, we can't just let them block (as in
145	+	* Thread.join).  We also cannot just reassign the joiner's
146	+	* run-time stack with another and replace it later, which would
147	+	* be a form of "continuation", that even if possible is not
148	+	* necessarily a good idea. Given that the creation costs of most
149	+	* threads on most systems mainly surrounds setting up runtime
150	+	* stacks, thread creation and switching is usually not much more
151	+	* expensive than stack creation and switching, and is more
152	+	* flexible). Instead we combine two tactics:
153	+	*
154	+	*   1. Arranging for the joiner to execute some task that it
155	+	*      would be running if the steal had not occurred.  Method
156	+	*      ForkJoinWorkerThread.helpJoinTask tracks joining->stealing
157	+	*      links to try to find such a task.
158	+	*
159	+	*   2. Unless there are already enough live threads, creating or
160	+	*      or re-activating a spare thread to compensate for the
161	+	*      (blocked) joiner until it unblocks.  Spares then suspend
162	+	*      at their next opportunity or eventually die if unused for
163	+	*      too long.  See below and the internal documentation
164	+	*      for tryAwaitJoin for more details about compensation
165	+	*      rules.
166	+	*
167	+	* Because the determining existence of conservatively safe
168	+	* helping targets, the availability of already-created spares,
169	+	* and the apparent need to create new spares are all racy and
170	+	* require heuristic guidance, joins (in
171	+	* ForkJoinWorkerThread.joinTask) interleave these options until
172	+	* successful.  Creating a new spare always succeeds, but also
173	+	* increases application footprint, so we try to avoid it, within
174	+	* reason.
175	+	*
176	+	* The ManagedBlocker extension API can't use option (1) so uses a
177	+	* special version of (2) in method awaitBlocker.
178	+	*
179		* The main throughput advantages of work-stealing stem from
180		* decentralized control -- workers mostly steal tasks from each
181		* other. We do not want to negate this by creating bottlenecks
182	<	* implementing the management responsibilities of this class. So
183	<	* we use a collection of techniques that avoid, reduce, or cope
184	<	* well with contention. These entail several instances of
185	<	* bit-packing into CASable fields to maintain only the minimally
186	<	* required atomicity. To enable such packing, we restrict maximum
187	<	* parallelism to (1<<15)-1 (enabling twice this to fit into a 16
188	<	* bit field), which is far in excess of normal operating range.
189	<	* Even though updates to some of these bookkeeping fields do
190	<	* sometimes contend with each other, they don't normally
191	<	* cache-contend with updates to others enough to warrant memory
192	<	* padding or isolation. So they are all held as fields of
193	<	* ForkJoinPool objects.  The main capabilities are as follows:
182	>	* implementing other management responsibilities. So we use a
183	>	* collection of techniques that avoid, reduce, or cope well with
184	>	* contention. These entail several instances of bit-packing into
185	>	* CASable fields to maintain only the minimally required
186	>	* atomicity. To enable such packing, we restrict maximum
187	>	* parallelism to (1<<15)-1 (enabling twice this (to accommodate
188	>	* unbalanced increments and decrements) to fit into a 16 bit
189	>	* field, which is far in excess of normal operating range.  Even
190	>	* though updates to some of these bookkeeping fields do sometimes
191	>	* contend with each other, they don't normally cache-contend with
192	>	* updates to others enough to warrant memory padding or
193	>	* isolation. So they are all held as fields of ForkJoinPool
194	>	* objects.  The main capabilities are as follows:
195		*
196		* 1. Creating and removing workers. Workers are recorded in the
197		* "workers" array. This is an array as opposed to some other data
#	Line 140 | Line 201 | public class ForkJoinPool extends Abstra
201		* (workerLock) but the array is otherwise concurrently readable,
202		* and accessed directly by workers. To simplify index-based
203		* operations, the array size is always a power of two, and all
204	<	* readers must tolerate null slots. Currently, all but the first
205	<	* worker thread creation is on-demand, triggered by task
206	<	* submissions, replacement of terminated workers, and/or
207	<	* compensation for blocked workers. However, all other support
208	<	* code is set up to work with other policies.
204	>	* readers must tolerate null slots. Currently, all worker thread
205	>	* creation is on-demand, triggered by task submissions,
206	>	* replacement of terminated workers, and/or compensation for
207	>	* blocked workers. However, all other support code is set up to
208	>	* work with other policies.
209		*
210		* 2. Bookkeeping for dynamically adding and removing workers. We
211	<	* maintain a given level of parallelism (or, if
212	<	* maintainsParallelism is false, at least avoid starvation). When
152	<	* some workers are known to be blocked (on joins or via
211	>	* aim to approximately maintain the given level of parallelism.
212	>	* When some workers are known to be blocked (on joins or via
213		* ManagedBlocker), we may create or resume others to take their
214		* place until they unblock (see below). Implementing this
215		* requires counts of the number of "running" threads (i.e., those
216		* that are neither blocked nor artifically suspended) as well as
217		* the total number.  These two values are packed into one field,
218		* "workerCounts" because we need accurate snapshots when deciding
219	<	* to create, resume or suspend.  To support these decisions,
220	<	* updates must be prospective (not retrospective).  For example,
221	<	* the running count is decremented before blocking by a thread
222	<	* about to block, but incremented by the thread about to unblock
163	<	* it. (In a few cases, these prospective updates may need to be
164	<	* rolled back, for example when deciding to create a new worker
165	<	* but the thread factory fails or returns null. In these cases,
166	<	* we are no worse off wrt other decisions than we would be
167	<	* otherwise.)  Updates to the workerCounts field sometimes
168	<	* transiently encounter a fair amount of contention when join
169	<	* dependencies are such that many threads block or unblock at
170	<	* about the same time. We alleviate this by sometimes bundling
171	<	* updates (for example blocking one thread on join and resuming a
172	<	* spare cancel each other out), and in most other cases
173	<	* performing an alternative action (like releasing waiters and
174	<	* finding spares; see below) as a more productive form of
175	<	* backoff.
219	>	* to create, resume or suspend.  Note however that the
220	>	* correspondance of these counts to reality is not guaranteed. In
221	>	* particular updates for unblocked threads may lag until they
222	>	* actually wake up.
223		*
224		* 3. Maintaining global run state. The run state of the pool
225		* consists of a runLevel (SHUTDOWN, TERMINATING, etc) similar to
#	Line 221 | Line 268 | public class ForkJoinPool extends Abstra
268		* that only releases idle workers until it detects interference
269		* by other threads trying to release, and lets them take
270		* over. The net effect is a tree-like diffusion of signals, where
271	<	* released threads and possibly others) help with unparks.  To
271	>	* released threads (and possibly others) help with unparks.  To
272		* further reduce contention effects a bit, failed CASes to
273		* increment field eventCount are tolerated without retries.
274		* Conceptually they are merged into the same event, which is OK
#	Line 230 | Line 277 | public class ForkJoinPool extends Abstra
277		* 5. Managing suspension of extra workers. When a worker is about
278		* to block waiting for a join (or via ManagedBlockers), we may
279		* create a new thread to maintain parallelism level, or at least
280	<	* avoid starvation (see below). Usually, extra threads are needed
281	<	* for only very short periods, yet join dependencies are such
282	<	* that we sometimes need them in bursts. Rather than create new
283	<	* threads each time this happens, we suspend no-longer-needed
284	<	* extra ones as "spares". For most purposes, we don't distinguish
285	<	* "extra" spare threads from normal "core" threads: On each call
286	<	* to preStep (the only point at which we can do this) a worker
280	>	* avoid starvation. Usually, extra threads are needed for only
281	>	* very short periods, yet join dependencies are such that we
282	>	* sometimes need them in bursts. Rather than create new threads
283	>	* each time this happens, we suspend no-longer-needed extra ones
284	>	* as "spares". For most purposes, we don't distinguish "extra"
285	>	* spare threads from normal "core" threads: On each call to
286	>	* preStep (the only point at which we can do this) a worker
287		* checks to see if there are now too many running workers, and if
288	<	* so, suspends itself.  Methods preJoin and doBlock look for
289	<	* suspended threads to resume before considering creating a new
290	<	* replacement. We don't need a special data structure to maintain
291	<	* spares; simply scanning the workers array looking for
292	<	* worker.isSuspended() is fine because the calling thread is
293	<	* otherwise not doing anything useful anyway; we are at least as
294	<	* happy if after locating a spare, the caller doesn't actually
295	<	* block because the join is ready before we try to adjust and
296	<	* compensate.  Note that this is intrinsically racy.  One thread
297	<	* may become a spare at about the same time as another is
298	<	* needlessly being created. We counteract this and related slop
299	<	* in part by requiring resumed spares to immediately recheck (in
300	<	* preStep) to see whether they they should re-suspend. The only
301	<	* effective difference between "extra" and "core" threads is that
302	<	* we allow the "extra" ones to time out and die if they are not
303	<	* resumed within a keep-alive interval of a few seconds. This is
304	<	* implemented mainly within ForkJoinWorkerThread, but requires
288	>	* so, suspends itself.  Methods tryAwaitJoin and awaitBlocker
289	>	* look for suspended threads to resume before considering
290	>	* creating a new replacement. We don't need a special data
291	>	* structure to maintain spares; simply scanning the workers array
292	>	* looking for worker.isSuspended() is fine because the calling
293	>	* thread is otherwise not doing anything useful anyway; we are at
294	>	* least as happy if after locating a spare, the caller doesn't
295	>	* actually block because the join is ready before we try to
296	>	* adjust and compensate.  Note that this is intrinsically racy.
297	>	* One thread may become a spare at about the same time as another
298	>	* is needlessly being created. We counteract this and related
299	>	* slop in part by requiring resumed spares to immediately recheck
300	>	* (in preStep) to see whether they they should re-suspend. The
301	>	* only effective difference between "extra" and "core" threads is
302	>	* 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.
307		*
308		* 6. Deciding when to create new workers. The main dynamic
309		* control in this class is deciding when to create extra threads,
310	<	* in methods preJoin and doBlock. We always need to create one
311	<	* when the number of running threads becomes zero. But because
312	<	* blocked joins are typically dependent, we don't necessarily
313	<	* need or want one-to-one replacement. Using a one-to-one
314	<	* compensation rule often leads to enough useless overhead
315	<	* creating, suspending, resuming, and/or killing threads to
316	<	* signficantly degrade throughput.  We use a rule reflecting the
317	<	* idea that, the more spare threads you already have, the more
318	<	* evidence you need to create another one; where "evidence" is
319	<	* expressed as the current deficit -- target minus running
320	<	* threads. To reduce flickering and drift around target values,
321	<	* the relation is quadratic: adding a spare if (dc*dc)>=(sc*pc)
322	<	* (where dc is deficit, sc is number of spare threads and pc is
323	<	* target parallelism.)  This effectively reduces churn at the
324	<	* price of systematically undershooting target parallelism when
325	<	* many threads are blocked.  However, biasing toward undeshooting
279	<	* partially compensates for the above mechanics to suspend extra
280	<	* threads, that normally lead to overshoot because we can only
281	<	* suspend workers in-between top-level actions. It also better
282	<	* copes with the fact that some of the methods in this class tend
283	<	* to never become compiled (but are interpreted), so some
284	<	* components of the entire set of controls might execute many
285	<	* times faster than others. And similarly for cases where the
286	<	* apparent lack of work is just due to GC stalls and other
287	<	* transient system activity.
288	<	*
289	<	* 7. Maintaining other configuration parameters and monitoring
290	<	* statistics. Updates to fields controlling parallelism level,
291	<	* max size, etc can only meaningfully take effect for individual
292	<	* threads upon their next top-level actions; i.e., between
293	<	* stealing/running tasks/submission, which are separated by calls
294	<	* to preStep.  Memory ordering for these (assumed infrequent)
295	<	* reconfiguration calls is ensured by using reads and writes to
296	<	* volatile field workerCounts (that must be read in preStep anyway)
297	<	* as "fences" -- user-level reads are preceded by reads of
298	<	* workCounts, and writes are followed by no-op CAS to
299	<	* workerCounts. The values reported by other management and
300	<	* monitoring methods are either computed on demand, or are kept
301	<	* in fields that are only updated when threads are otherwise
302	<	* idle.
310	>	* in methods awaitJoin and awaitBlocker. We always need to create
311	>	* one when the number of running threads would become zero and
312	>	* all workers are busy. However, this is not easy to detect
313	>	* reliably in the presence of transients so we use retries and
314	>	* allow slack (in tryAwaitJoin) to reduce false alarms.  These
315	>	* effectively reduce churn at the price of systematically
316	>	* undershooting target parallelism when many threads are blocked.
317	>	* However, biasing toward undeshooting partially compensates for
318	>	* the above mechanics to suspend extra threads, that normally
319	>	* lead to overshoot because we can only suspend workers
320	>	* in-between top-level actions. It also better copes with the
321	>	* fact that some of the methods in this class tend to never
322	>	* become compiled (but are interpreted), so some components of
323	>	* the entire set of controls might execute many times faster than
324	>	* others. And similarly for cases where the apparent lack of work
325	>	* is just due to GC stalls and other transient system activity.
326		*
327		* Beware that there is a lot of representation-level coupling
328		* among classes ForkJoinPool, ForkJoinWorkerThread, and
#	Line 314 | Line 337 | public class ForkJoinPool extends Abstra
337		* "while ((local = field) != 0)") which are usually the simplest
338		* way to ensure read orderings. Also several occurrences of the
339		* unusual "do {} while(!cas...)" which is the simplest way to
340	<	* force an update of a CAS'ed variable. There are also a few
341	<	* other coding oddities that help some methods perform reasonably
342	<	* even when interpreted (not compiled).
340	>	* force an update of a CAS'ed variable. There are also other
341	>	* coding oddities that help some methods perform reasonably even
342	>	* when interpreted (not compiled), at the expense of messiness.
343		*
344		* The order of declarations in this file is: (1) statics (2)
345		* fields (along with constants used when unpacking some of them)
#	Line 345 | Line 368 | public class ForkJoinPool extends Abstra
368		* Default ForkJoinWorkerThreadFactory implementation; creates a
369		* new ForkJoinWorkerThread.
370		*/
371	<	static class  DefaultForkJoinWorkerThreadFactory
371	>	static class DefaultForkJoinWorkerThreadFactory
372		implements ForkJoinWorkerThreadFactory {
373		public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
374		return new ForkJoinWorkerThread(pool);
#	Line 413 | Line 436 | public class ForkJoinPool extends Abstra
436		/**
437		* Latch released upon termination.
438		*/
439	<	private final CountDownLatch terminationLatch;
439	>	private final Phaser termination;
440
441		/**
442		* Creation factory for worker threads.
#	Line 435 | Line 458 | public class ForkJoinPool extends Abstra
458		private volatile long eventWaiters;
459
460		private static final int  EVENT_COUNT_SHIFT = 32;
461	<	private static final long WAITER_INDEX_MASK = (1L << EVENT_COUNT_SHIFT)-1L;
461	>	private static final long WAITER_ID_MASK = (1L << EVENT_COUNT_SHIFT)-1L;
462
463		/**
464		* A counter for events that may wake up worker threads:
#	Line 484 | Line 507 | public class ForkJoinPool extends Abstra
507		private static final int ONE_RUNNING        = 1;
508		private static final int ONE_TOTAL          = 1 << TOTAL_COUNT_SHIFT;
509
487	–	/*
488	–	* Fields parallelism. maxPoolSize, locallyFifo,
489	–	* maintainsParallelism, and ueh are non-volatile, but external
490	–	* reads/writes use workerCount fences to ensure visability.
491	–	*/
492	–
510		/**
511		* The target parallelism level.
512	+	* Accessed directly by ForkJoinWorkerThreads.
513		*/
514	<	private int parallelism;
497	<
498	<	/**
499	<	* The maximum allowed pool size.
500	<	*/
501	<	private int maxPoolSize;
514	>	final int parallelism;
515
516		/**
517		* True if use local fifo, not default lifo, for local polling
518	<	* Replicated by ForkJoinWorkerThreads
518	>	* Read by, and replicated by ForkJoinWorkerThreads
519		*/
520	<	private boolean locallyFifo;
520	>	final boolean locallyFifo;
521
522		/**
523	<	* Controls whether to add spares to maintain parallelism
523	>	* The uncaught exception handler used when any worker abruptly
524	>	* terminates.
525		*/
526	<	private boolean maintainsParallelism;
513	<
514	<	/**
515	<	* The uncaught exception handler used when any worker
516	<	* abruptly terminates
517	<	*/
518	<	private Thread.UncaughtExceptionHandler ueh;
526	>	private final Thread.UncaughtExceptionHandler ueh;
527
528		/**
529		* Pool number, just for assigning useful names to worker threads
530		*/
531		private final int poolNumber;
532
533	<	// utilities for updating fields
533	>	// Utilities for CASing fields. Note that several of these
534	>	// are manually inlined by callers
535
536		/**
537	<	* Adds delta to running count.  Used mainly by ForkJoinTask.
529	<	*
530	<	* @param delta the number to add
537	>	* Increments running count.  Also used by ForkJoinTask.
538		*/
539	<	final void updateRunningCount(int delta) {
540	<	int wc;
539	>	final void incrementRunningCount() {
540	>	int c;
541		do {} while (!UNSAFE.compareAndSwapInt(this, workerCountsOffset,
542	<	wc = workerCounts,
543	<	wc + delta));
542	>	c = workerCounts,
543	>	c + ONE_RUNNING));
544		}
545
546		/**
547	<	* Write fence for user modifications of pool parameters
541	<	* (parallelism. etc).  Note that it doesn't matter if CAS fails.
547	>	* Tries to decrement running count unless already zero
548		*/
549	<	private void workerCountWriteFence() {
550	<	int wc;
551	<	UNSAFE.compareAndSwapInt(this, workerCountsOffset,
552	<	wc = workerCounts, wc);
549	>	final boolean tryDecrementRunningCount() {
550	>	int wc = workerCounts;
551	>	if ((wc & RUNNING_COUNT_MASK) == 0)
552	>	return false;
553	>	return UNSAFE.compareAndSwapInt(this, workerCountsOffset,
554	>	wc, wc - ONE_RUNNING);
555		}
556
557		/**
558	<	* Read fence for external reads of pool parameters
551	<	* (parallelism. maxPoolSize, etc).
558	>	* Tries to increment running count
559		*/
560	<	private void workerCountReadFence() {
561	<	int ignore = workerCounts;
560	>	final boolean tryIncrementRunningCount() {
561	>	int wc;
562	>	return UNSAFE.compareAndSwapInt(this, workerCountsOffset,
563	>	wc = workerCounts, wc + ONE_RUNNING);
564		}
565
566		/**
#	Line 602 | Line 611 | public class ForkJoinPool extends Abstra
611		lock.lock();
612		try {
613		ForkJoinWorkerThread[] ws = workers;
614	<	int len = ws.length;
615	<	if (k < 0 || k >= len || ws[k] != null) {
616	<	for (k = 0; k < len && ws[k] != null; ++k)
614	>	int nws = ws.length;
615	>	if (k < 0 || k >= nws || ws[k] != null) {
616	>	for (k = 0; k < nws && ws[k] != null; ++k)
617		;
618	<	if (k == len)
619	<	ws = Arrays.copyOf(ws, len << 1);
618	>	if (k == nws)
619	>	ws = Arrays.copyOf(ws, nws << 1);
620		}
621		ws[k] = w;
622		workers = ws; // volatile array write ensures slot visibility
#	Line 653 | Line 662 | public class ForkJoinPool extends Abstra
662		return null;
663		}
664		}
665	<	w.start(recordWorker(w), locallyFifo, ueh);
665	>	w.start(recordWorker(w), ueh);
666		return w;
667		}
668
#	Line 661 | Line 670 | public class ForkJoinPool extends Abstra
670		* Adjusts counts upon failure to create worker
671		*/
672		private void onWorkerCreationFailure() {
673	<	int c;
674	<	do {} while (!UNSAFE.compareAndSwapInt(this, workerCountsOffset,
675	<	c = workerCounts,
676	<	c - (ONE_RUNNING|ONE_TOTAL)));
673	>	for (;;) {
674	>	int wc = workerCounts;
675	>	if ((wc >>> TOTAL_COUNT_SHIFT) == 0)
676	>	Thread.yield(); // 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	<	* Create enough total workers to establish target parallelism,
686	<	* giving up if terminating or addWorker fails
685	>	* Creates and/or resumes enough workers to establish target
686	>	* parallelism, giving up if terminating or addWorker fails
687	>	*
688	>	* TODO: recast this to support lazier creation and automated
689	>	* parallelism maintenance
690		*/
691	<	private void ensureEnoughTotalWorkers() {
692	<	int wc;
693	<	while (runState < TERMINATING &&
694	<	((wc = workerCounts) >>> TOTAL_COUNT_SHIFT) < parallelism) {
695	<	if ((UNSAFE.compareAndSwapInt(this, workerCountsOffset,
696	<	wc, wc + (ONE_RUNNING|ONE_TOTAL)) &&
697	<	addWorker() == null))
691	>	private void ensureEnoughWorkers() {
692	>	for (;;) {
693	>	int pc = parallelism;
694	>	int wc = workerCounts;
695	>	int rc = wc & RUNNING_COUNT_MASK;
696	>	int tc = wc >>> TOTAL_COUNT_SHIFT;
697	>	if (tc < pc) {
698	>	if (runState == TERMINATING ||
699	>	(UNSAFE.compareAndSwapInt
700	>	(this, workerCountsOffset,
701	>	wc, wc + (ONE_RUNNING|ONE_TOTAL)) &&
702	>	addWorker() == null))
703	>	break;
704	>	}
705	>	else if (tc > pc && rc < pc &&
706	>	tc > (runState & ACTIVE_COUNT_MASK)) {
707	>	ForkJoinWorkerThread spare = null;
708	>	ForkJoinWorkerThread[] ws = workers;
709	>	int nws = ws.length;
710	>	for (int i = 0; i < nws; ++i) {
711	>	ForkJoinWorkerThread w = ws[i];
712	>	if (w != null && w.isSuspended()) {
713	>	if ((workerCounts & RUNNING_COUNT_MASK) > pc ||
714	>	runState == TERMINATING)
715	>	return;
716	>	if (w.tryResumeSpare())
717	>	incrementRunningCount();
718	>	break;
719	>	}
720	>	}
721	>	}
722	>	else
723		break;
724		}
725		}
#	Line 698 | Line 739 | public class ForkJoinPool extends Abstra
739		}
740		forgetWorker(w);
741
742	<	// decrement total count, and if was running, running count
743	<	int unit = w.isTrimmed()? ONE_TOTAL : (ONE_RUNNING|ONE_TOTAL);
744	<	int wc;
745	<	do {} while (!UNSAFE.compareAndSwapInt(this, workerCountsOffset,
746	<	wc = workerCounts, wc - unit));
742	>	// Decrement total count, and if was running, running count
743	>	// Spin (waiting for other updates) if either would be negative
744	>	int nr = w.isTrimmed() ? 0 : ONE_RUNNING;
745	>	int unit = ONE_TOTAL + nr;
746	>	for (;;) {
747	>	int wc = workerCounts;
748	>	int rc = wc & RUNNING_COUNT_MASK;
749	>	if (rc - nr < 0 || (wc >>> TOTAL_COUNT_SHIFT) == 0)
750	>	Thread.yield(); // back off if waiting for other updates
751	>	else if (UNSAFE.compareAndSwapInt(this, workerCountsOffset,
752	>	wc, wc - unit))
753	>	break;
754	>	}
755
756		accumulateStealCount(w); // collect final count
757		if (!tryTerminate(false))
758	<	ensureEnoughTotalWorkers();
758	>	ensureEnoughWorkers();
759		}
760
761		// Waiting for and signalling events
762
763		/**
715	–	* Ensures eventCount on exit is different (mod 2^32) than on
716	–	* entry.  CAS failures are OK -- any change in count suffices.
717	–	*/
718	–	private void advanceEventCount() {
719	–	int c;
720	–	UNSAFE.compareAndSwapInt(this, eventCountOffset, c = eventCount, c+1);
721	–	}
722	–
723	–	/**
764		* Releases workers blocked on a count not equal to current count.
765	+	* @return true if any released
766		*/
767	<	final void releaseWaiters() {
767	>	private void releaseWaiters() {
768		long top;
769	<	int id;
729	<	while ((id = (int)((top = eventWaiters) & WAITER_INDEX_MASK)) > 0 &&
730	<	(int)(top >>> EVENT_COUNT_SHIFT) != eventCount) {
769	>	while ((top = eventWaiters) != 0L) {
770		ForkJoinWorkerThread[] ws = workers;
771	<	ForkJoinWorkerThread w;
772	<	if (ws.length >= id && (w = ws[id - 1]) != null &&
773	<	UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
774	<	top, w.nextWaiter))
775	<	LockSupport.unpark(w);
771	>	int n = ws.length;
772	>	for (;;) {
773	>	int i = ((int)(top & WAITER_ID_MASK)) - 1;
774	>	if (i < 0 || (int)(top >>> EVENT_COUNT_SHIFT) == eventCount)
775	>	return;
776	>	ForkJoinWorkerThread w;
777	>	if (i < n && (w = ws[i]) != null &&
778	>	UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
779	>	top, w.nextWaiter)) {
780	>	LockSupport.unpark(w);
781	>	top = eventWaiters;
782	>	}
783	>	else
784	>	break;      // possibly stale; reread
785	>	}
786		}
787		}
788
789		/**
790	+	* Ensures eventCount on exit is different (mod 2^32) than on
791	+	* entry and wakes up all waiters
792	+	*/
793	+	private void signalEvent() {
794	+	int c;
795	+	do {} while (!UNSAFE.compareAndSwapInt(this, eventCountOffset,
796	+	c = eventCount, c+1));
797	+	releaseWaiters();
798	+	}
799	+
800	+	/**
801		* Advances eventCount and releases waiters until interference by
802		* other releasing threads is detected.
803		*/
804		final void signalWork() {
805	<	int ec;
806	<	UNSAFE.compareAndSwapInt(this, eventCountOffset, ec=eventCount, ec+1);
807	<	outer:for (;;) {
808	<	long top = eventWaiters;
809	<	ec = eventCount;
805	>	int c;
806	>	UNSAFE.compareAndSwapInt(this, eventCountOffset, c=eventCount, c+1);
807	>	long top;
808	>	while ((top = eventWaiters) != 0L) {
809	>	int ec = eventCount;
810	>	ForkJoinWorkerThread[] ws = workers;
811	>	int n = ws.length;
812		for (;;) {
813	<	ForkJoinWorkerThread[] ws; ForkJoinWorkerThread w;
814	<	int id = (int)(top & WAITER_INDEX_MASK);
753	<	if (id <= 0 || (int)(top >>> EVENT_COUNT_SHIFT) == ec)
754	<	return;
755	<	if ((ws = workers).length < id || (w = ws[id - 1]) == null ||
756	<	!UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
757	<	top, top = w.nextWaiter))
758	<	continue outer;      // possibly stale; reread
759	<	LockSupport.unpark(w);
760	<	if (top != eventWaiters) // let someone else take over
813	>	int i = ((int)(top & WAITER_ID_MASK)) - 1;
814	>	if (i < 0 || (int)(top >>> EVENT_COUNT_SHIFT) == ec)
815		return;
816	+	ForkJoinWorkerThread w;
817	+	if (i < n && (w = ws[i]) != null &&
818	+	UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
819	+	top, top = w.nextWaiter)) {
820	+	LockSupport.unpark(w);
821	+	if (top != eventWaiters) // let someone else take over
822	+	return;
823	+	}
824	+	else
825	+	break;      // possibly stale; reread
826		}
827		}
828		}
#	Line 769 | Line 833 | public class ForkJoinPool extends Abstra
833		* release others.
834		*
835		* @param w the calling worker thread
836	+	* @param retries the number of scans by caller failing to find work
837	+	* @return false if now too many threads running
838		*/
839	<	private void eventSync(ForkJoinWorkerThread w) {
840	<	if (!w.active) {
841	<	int prev = w.lastEventCount;
842	<	long nextTop = (((long)prev << EVENT_COUNT_SHIFT) |
839	>	private boolean eventSync(ForkJoinWorkerThread w, int retries) {
840	>	int wec = w.lastEventCount;
841	>	if (retries > 1) { // can only block after 2nd miss
842	>	long nextTop = (((long)wec << EVENT_COUNT_SHIFT) |
843		((long)(w.poolIndex + 1)));
844		long top;
845		while ((runState < SHUTDOWN || !tryTerminate(false)) &&
846	<	(((int)(top = eventWaiters) & WAITER_INDEX_MASK) == 0 ||
847	<	(int)(top >>> EVENT_COUNT_SHIFT) == prev) &&
848	<	eventCount == prev) {
846	>	(((int)(top = eventWaiters) & WAITER_ID_MASK) == 0 ||
847	>	(int)(top >>> EVENT_COUNT_SHIFT) == wec) &&
848	>	eventCount == wec) {
849		if (UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
850		w.nextWaiter = top, nextTop)) {
851		accumulateStealCount(w); // transfer steals while idle
852		Thread.interrupted();    // clear/ignore interrupt
853	<	while (eventCount == prev)
853	>	while (eventCount == wec)
854		w.doPark();
855		break;
856		}
857		}
858	<	w.lastEventCount = eventCount;
858	>	wec = eventCount;
859		}
860		releaseWaiters();
861	+	int wc = workerCounts;
862	+	if ((wc & RUNNING_COUNT_MASK) <= parallelism) {
863	+	w.lastEventCount = wec;
864	+	return true;
865	+	}
866	+	if (wec != w.lastEventCount) // back up if may re-wait
867	+	w.lastEventCount = wec - (wc >>> TOTAL_COUNT_SHIFT);
868	+	return false;
869		}
870
871		/**
#	Line 812 | Line 886 | public class ForkJoinPool extends Abstra
886		* upon resume it rechecks to make sure that it is still needed.
887		*
888		* @param w the worker
889	<	* @param worked false if the worker scanned for work but didn't
889	>	* @param retries the number of scans by caller failing to find work
890		* find any (in which case it may block waiting for work).
891		*/
892	<	final void preStep(ForkJoinWorkerThread w, boolean worked) {
892	>	final void preStep(ForkJoinWorkerThread w, int retries) {
893		boolean active = w.active;
894	<	boolean inactivate = !worked & active;
894	>	boolean inactivate = active && retries != 0;
895		for (;;) {
896	<	if (inactivate) {
897	<	int c = runState;
898	<	if (UNSAFE.compareAndSwapInt(this, runStateOffset,
899	<	c, c - ONE_ACTIVE))
900	<	inactivate = active = w.active = false;
901	<	}
902	<	int wc = workerCounts;
903	<	if ((wc & RUNNING_COUNT_MASK) <= parallelism) {
830	<	if (!worked)
831	<	eventSync(w);
832	<	return;
896	>	int rs, wc;
897	>	if (inactivate &&
898	>	UNSAFE.compareAndSwapInt(this, runStateOffset,
899	>	rs = runState, rs - ONE_ACTIVE))
900	>	inactivate = active = w.active = false;
901	>	if (((wc = workerCounts) & RUNNING_COUNT_MASK) <= parallelism) {
902	>	if (active || eventSync(w, retries))
903	>	break;
904		}
905	<	if (!(inactivate |= active) &&  // must inactivate to suspend
905	>	else if (!(inactivate |= active) &&  // must inactivate to suspend
906		UNSAFE.compareAndSwapInt(this, workerCountsOffset,
907		wc, wc - ONE_RUNNING) &&
908	<	!w.suspendAsSpare())        // false if trimmed
909	<	return;
908	>	!w.suspendAsSpare())             // false if trimmed
909	>	break;
910		}
911		}
912
913		/**
914	<	* Adjusts counts and creates or resumes compensating threads for
915	<	* a worker about to block on task joinMe, returning early if
916	<	* joinMe becomes ready. First tries resuming an existing spare
917	<	* (which usually also avoids any count adjustment), but must then
918	<	* decrement running count to determine whether a new thread is
919	<	* needed. See above for fuller explanation.
914	>	* Awaits join of the given task if enough threads, or can resume
915	>	* or create a spare. Fails (in which case the given task might
916	>	* not be done) upon contention or lack of decision about
917	>	* blocking. Returns void because caller must check
918	>	* task status on return anyway.
919	>	*
920	>	* We allow blocking if:
921	>	*
922	>	* 1. There would still be at least as many running threads as
923	>	*    parallelism level if this thread blocks.
924	>	*
925	>	* 2. A spare is resumed to replace this worker. We tolerate
926	>	*    slop in the decision to replace if a spare is found without
927	>	*    first decrementing run count.  This may release too many,
928	>	*    but if so, the superfluous ones will re-suspend via
929	>	*    preStep().
930	>	*
931	>	* 3. After #spares repeated checks, there are no fewer than #spare
932	>	*    threads not running. We allow this slack to avoid hysteresis
933	>	*    and as a hedge against lag/uncertainty of running count
934	>	*    estimates when signalling or unblocking stalls.
935	>	*
936	>	* 4. All existing workers are busy (as rechecked via repeated
937	>	*    retries by caller) and a new spare is created.
938	>	*
939	>	* If none of the above hold, we try to escape out by
940	>	* re-incrementing count and returning to caller, which can retry
941	>	* later.
942	>	*
943	>	* @param joinMe the task to join
944	>	* @param retries if negative, then serve only as a precheck
945	>	*   that the thread can be replaced by a spare. Otherwise,
946	>	*   the number of repeated calls to this method returning busy
947	>	* @return true if the call must be retried because there
948	>	*   none of the blocking checks hold
949		*/
950	<	final void preJoin(ForkJoinTask<?> joinMe) {
951	<	boolean dec = false;       // true when running count decremented
952	<	for (;;) {
953	<	releaseWaiters();      // help other threads progress
954	<
955	<	if (joinMe.status < 0) // surround spare search with done checks
956	<	return;
957	<	ForkJoinWorkerThread spare = null;
958	<	for (ForkJoinWorkerThread w : workers) {
959	<	if (w != null && w.isSuspended()) {
960	<	spare = w;
961	<	break;
950	>	final boolean tryAwaitJoin(ForkJoinTask<?> joinMe, int retries) {
951	>	if (joinMe.status < 0) // precheck to prime loop
952	>	return false;
953	>	int pc = parallelism;
954	>	boolean running = true; // false when running count decremented
955	>	outer:for (;;) {
956	>	int wc = workerCounts;
957	>	int rc = wc & RUNNING_COUNT_MASK;
958	>	int tc = wc >>> TOTAL_COUNT_SHIFT;
959	>	if (running) { // replace with spare or decrement count
960	>	if (rc <= pc && tc > pc &&
961	>	(retries > 0 || tc > (runState & ACTIVE_COUNT_MASK))) {
962	>	ForkJoinWorkerThread[] ws = workers;
963	>	int nws = ws.length;
964	>	for (int i = 0; i < nws; ++i) { // search for spare
965	>	ForkJoinWorkerThread w = ws[i];
966	>	if (w != null) {
967	>	if (joinMe.status < 0)
968	>	return false;
969	>	if (w.isSuspended()) {
970	>	if ((workerCounts & RUNNING_COUNT_MASK)>=pc &&
971	>	w.tryResumeSpare()) {
972	>	running = false;
973	>	break outer;
974	>	}
975	>	continue outer; // rescan
976	>	}
977	>	}
978	>	}
979		}
980	+	if (retries < 0 || // < 0 means replacement check only
981	+	rc == 0 || joinMe.status < 0 || workerCounts != wc ||
982	+	!UNSAFE.compareAndSwapInt(this, workerCountsOffset,
983	+	wc, wc - ONE_RUNNING))
984	+	return false; // done or inconsistent or contended
985	+	running = false;
986	+	if (rc > pc)
987	+	break;
988		}
989	<	if (joinMe.status < 0)
990	<	return;
991	<
992	<	if (spare != null && spare.tryUnsuspend()) {
993	<	if (dec || joinMe.requestSignal() < 0) {
994	<	int c;
995	<	do {} while (!UNSAFE.compareAndSwapInt(this,
996	<	workerCountsOffset,
997	<	c = workerCounts,
998	<	c + ONE_RUNNING));
999	<	} // else no net count change
1000	<	LockSupport.unpark(spare);
1001	<	return;
1002	<	}
1003	<
1004	<	int wc = workerCounts; // decrement running count
1005	<	if (!dec && (wc & RUNNING_COUNT_MASK) != 0 &&
1006	<	(dec = UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1007	<	wc, wc -= ONE_RUNNING)) &&
1008	<	joinMe.requestSignal() < 0) { // cannot block
1009	<	int c;                        // back out
885	<	do {} while (!UNSAFE.compareAndSwapInt(this,
886	<	workerCountsOffset,
887	<	c = workerCounts,
888	<	c + ONE_RUNNING));
889	<	return;
890	<	}
891	<
892	<	if (dec) {
893	<	int tc = wc >>> TOTAL_COUNT_SHIFT;
894	<	int pc = parallelism;
895	<	int dc = pc - (wc & RUNNING_COUNT_MASK); // deficit count
896	<	if ((dc < pc && (dc <= 0 || (dc * dc < (tc - pc) * pc) ||
897	<	!maintainsParallelism)) ||
898	<	tc >= maxPoolSize) // cannot add
899	<	return;
900	<	if (spare == null &&
901	<	UNSAFE.compareAndSwapInt(this, workerCountsOffset, wc,
902	<	wc + (ONE_RUNNING|ONE_TOTAL))) {
903	<	addWorker();
904	<	return;
989	>	else { // allow blocking if enough threads
990	>	if (rc >= pc || joinMe.status < 0)
991	>	break;
992	>	int sc = tc - pc + 1; // = spare threads, plus the one to add
993	>	if (retries > sc) {
994	>	if (rc > 0 && rc >= pc - sc) // allow slack
995	>	break;
996	>	if (tc < MAX_THREADS &&
997	>	tc == (runState & ACTIVE_COUNT_MASK) &&
998	>	workerCounts == wc &&
999	>	UNSAFE.compareAndSwapInt(this, workerCountsOffset, wc,
1000	>	wc+(ONE_RUNNING|ONE_TOTAL))) {
1001	>	addWorker();
1002	>	break;
1003	>	}
1004	>	}
1005	>	if (workerCounts == wc &&        // back out to allow rescan
1006	>	UNSAFE.compareAndSwapInt (this, workerCountsOffset,
1007	>	wc, wc + ONE_RUNNING)) {
1008	>	releaseWaiters();            // help others progress
1009	>	return true;                 // let caller retry
1010		}
1011		}
1012		}
1013	+	// arrive here if can block
1014	+	joinMe.internalAwaitDone();
1015	+	int c;                      // to inline incrementRunningCount
1016	+	do {} while (!UNSAFE.compareAndSwapInt
1017	+	(this, workerCountsOffset,
1018	+	c = workerCounts, c + ONE_RUNNING));
1019	+	return false;
1020		}
1021
1022		/**
1023	<	* Same idea as preJoin but with too many differing details to
1024	<	* integrate: There are no task-based signal counts, and only one
1025	<	* way to do the actual blocking. So for simplicity it is directly
914	<	* incorporated into this method.
1023	>	* Same idea as (and shares many code snippets with) tryAwaitJoin,
1024	>	* but self-contained because there are no caller retries.
1025	>	* TODO: Rework to use simpler API.
1026		*/
1027	<	final void doBlock(ManagedBlocker blocker, boolean maintainPar)
1027	>	final void awaitBlocker(ManagedBlocker blocker)
1028		throws InterruptedException {
1029	<	maintainPar &= maintainsParallelism; // override
1030	<	boolean dec = false;
1031	<	boolean done = false;
1032	<	for (;;) {
1033	<	releaseWaiters();
1034	<	if (done = blocker.isReleasable())
1035	<	break;
925	<	ForkJoinWorkerThread spare = null;
926	<	for (ForkJoinWorkerThread w : workers) {
927	<	if (w != null && w.isSuspended()) {
928	<	spare = w;
929	<	break;
930	<	}
931	<	}
932	<	if (done = blocker.isReleasable())
933	<	break;
934	<	if (spare != null && spare.tryUnsuspend()) {
935	<	if (dec) {
936	<	int c;
937	<	do {} while (!UNSAFE.compareAndSwapInt(this,
938	<	workerCountsOffset,
939	<	c = workerCounts,
940	<	c + ONE_RUNNING));
941	<	}
942	<	LockSupport.unpark(spare);
943	<	break;
944	<	}
1029	>	boolean done;
1030	>	if (done = blocker.isReleasable())
1031	>	return;
1032	>	int pc = parallelism;
1033	>	int retries = 0;
1034	>	boolean running = true; // false when running count decremented
1035	>	outer:for (;;) {
1036		int wc = workerCounts;
1037	<	if (!dec && (wc & RUNNING_COUNT_MASK) != 0)
1038	<	dec = UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1039	<	wc, wc -= ONE_RUNNING);
1040	<	if (dec) {
1041	<	int tc = wc >>> TOTAL_COUNT_SHIFT;
1042	<	int pc = parallelism;
1043	<	int dc = pc - (wc & RUNNING_COUNT_MASK);
1044	<	if ((dc < pc && (dc <= 0 || (dc * dc < (tc - pc) * pc) ||
1045	<	!maintainPar)) ||
1046	<	tc >= maxPoolSize)
1037	>	int rc = wc & RUNNING_COUNT_MASK;
1038	>	int tc = wc >>> TOTAL_COUNT_SHIFT;
1039	>	if (running) {
1040	>	if (rc <= pc && tc > pc &&
1041	>	(retries > 0 || tc > (runState & ACTIVE_COUNT_MASK))) {
1042	>	ForkJoinWorkerThread[] ws = workers;
1043	>	int nws = ws.length;
1044	>	for (int i = 0; i < nws; ++i) {
1045	>	ForkJoinWorkerThread w = ws[i];
1046	>	if (w != null) {
1047	>	if (done = blocker.isReleasable())
1048	>	return;
1049	>	if (w.isSuspended()) {
1050	>	if ((workerCounts & RUNNING_COUNT_MASK)>=pc &&
1051	>	w.tryResumeSpare()) {
1052	>	running = false;
1053	>	break outer;
1054	>	}
1055	>	continue outer; // rescan
1056	>	}
1057	>	}
1058	>	}
1059	>	}
1060	>	if (done = blocker.isReleasable())
1061	>	return;
1062	>	if (rc == 0 || workerCounts != wc ||
1063	>	!UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1064	>	wc, wc - ONE_RUNNING))
1065	>	continue;
1066	>	running = false;
1067	>	if (rc > pc)
1068		break;
1069	<	if (spare == null &&
1070	<	UNSAFE.compareAndSwapInt(this, workerCountsOffset, wc,
1071	<	wc + (ONE_RUNNING|ONE_TOTAL))){
960	<	addWorker();
1069	>	}
1070	>	else {
1071	>	if (rc >= pc || (done = blocker.isReleasable()))
1072		break;
1073	+	int sc = tc - pc + 1;
1074	+	if (retries++ > sc) {
1075	+	if (rc > 0 && rc >= pc - sc)
1076	+	break;
1077	+	if (tc < MAX_THREADS &&
1078	+	tc == (runState & ACTIVE_COUNT_MASK) &&
1079	+	workerCounts == wc &&
1080	+	UNSAFE.compareAndSwapInt(this, workerCountsOffset, wc,
1081	+	wc+(ONE_RUNNING|ONE_TOTAL))) {
1082	+	addWorker();
1083	+	break;
1084	+	}
1085		}
1086	+	Thread.yield();
1087		}
1088		}
1089	<
1089	>
1090		try {
1091		if (!done)
1092		do {} while (!blocker.isReleasable() && !blocker.block());
1093		} finally {
1094	<	if (dec) {
1094	>	if (!running) {
1095		int c;
972	–	do {} while (!UNSAFE.compareAndSwapInt(this,
973	–	workerCountsOffset,
974	–	c = workerCounts,
975	–	c + ONE_RUNNING));
976	–	}
977	–	}
978	–	}
979	–
980	–	/**
981	–	* Unless there are not enough other running threads, adjusts
982	–	* counts for a a worker in performing helpJoin that cannot find
983	–	* any work, so that this worker can now block.
984	–	*
985	–	* @return true if worker may block
986	–	*/
987	–	final boolean preBlockHelpingJoin(ForkJoinTask<?> joinMe) {
988	–	while (joinMe.status >= 0) {
989	–	releaseWaiters(); // help other threads progress
990	–
991	–	// if a spare exists, resume it to maintain parallelism level
992	–	if ((workerCounts & RUNNING_COUNT_MASK) <= parallelism) {
993	–	ForkJoinWorkerThread spare = null;
994	–	for (ForkJoinWorkerThread w : workers) {
995	–	if (w != null && w.isSuspended()) {
996	–	spare = w;
997	–	break;
998	–	}
999	–	}
1000	–	if (joinMe.status < 0)
1001	–	break;
1002	–	if (spare != null) {
1003	–	if (spare.tryUnsuspend()) {
1004	–	boolean canBlock = true;
1005	–	if (joinMe.requestSignal() < 0) {
1006	–	canBlock = false; // already done
1007	–	int c;
1008	–	do {} while (!UNSAFE.compareAndSwapInt
1009	–	(this, workerCountsOffset,
1010	–	c = workerCounts, c + ONE_RUNNING));
1011	–	}
1012	–	LockSupport.unpark(spare);
1013	–	return canBlock;
1014	–	}
1015	–	continue; // recheck -- another spare may exist
1016	–	}
1017	–	}
1018	–
1019	–	int wc = workerCounts; // reread to shorten CAS window
1020	–	int rc = wc & RUNNING_COUNT_MASK;
1021	–	if (rc <= 2) // keep this and at most one other thread alive
1022	–	break;
1023	–
1024	–	if (UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1025	–	wc, wc - ONE_RUNNING)) {
1026	–	if (joinMe.requestSignal() >= 0)
1027	–	return true;
1028	–	int c;                        // back out
1096		do {} while (!UNSAFE.compareAndSwapInt
1097		(this, workerCountsOffset,
1098		c = workerCounts, c + ONE_RUNNING));
1032	–	break;
1099		}
1100		}
1101	<	return false;
1036	<	}
1101	>	}
1102
1103		/**
1104		* Possibly initiates and/or completes termination.
#	Line 1056 | Line 1121 | public class ForkJoinPool extends Abstra
1121		// Finish now if all threads terminated; else in some subsequent call
1122		if ((workerCounts >>> TOTAL_COUNT_SHIFT) == 0) {
1123		advanceRunLevel(TERMINATED);
1124	<	terminationLatch.countDown();
1124	>	termination.arrive();
1125		}
1126		return true;
1127		}
#	Line 1065 | Line 1130 | public class ForkJoinPool extends Abstra
1130		* Actions on transition to TERMINATING
1131		*/
1132		private void startTerminating() {
1133	<	// Clear out and cancel submissions, ignoring exceptions
1133	>	for (int i = 0; i < 2; ++i) { // twice to mop up newly created workers
1134	>	cancelSubmissions();
1135	>	shutdownWorkers();
1136	>	cancelWorkerTasks();
1137	>	signalEvent();
1138	>	interruptWorkers();
1139	>	}
1140	>	}
1141	>
1142	>	/**
1143	>	* Clear out and cancel submissions, ignoring exceptions
1144	>	*/
1145	>	private void cancelSubmissions() {
1146		ForkJoinTask<?> task;
1147		while ((task = submissionQueue.poll()) != null) {
1148		try {
#	Line 1073 | Line 1150 | public class ForkJoinPool extends Abstra
1150		} catch (Throwable ignore) {
1151		}
1152		}
1153	<	// Propagate run level
1154	<	for (ForkJoinWorkerThread w : workers) {
1153	>	}
1154	>
1155	>	/**
1156	>	* Sets all worker run states to at least shutdown,
1157	>	* also resuming suspended workers
1158	>	*/
1159	>	private void shutdownWorkers() {
1160	>	ForkJoinWorkerThread[] ws = workers;
1161	>	int nws = ws.length;
1162	>	for (int i = 0; i < nws; ++i) {
1163	>	ForkJoinWorkerThread w = ws[i];
1164		if (w != null)
1165	<	w.shutdown();    // also resumes suspended workers
1165	>	w.shutdown();
1166		}
1167	<	// Ensure no straggling local tasks
1168	<	for (ForkJoinWorkerThread w : workers) {
1167	>	}
1168	>
1169	>	/**
1170	>	* Clears out and cancels all locally queued tasks
1171	>	*/
1172	>	private void cancelWorkerTasks() {
1173	>	ForkJoinWorkerThread[] ws = workers;
1174	>	int nws = ws.length;
1175	>	for (int i = 0; i < nws; ++i) {
1176	>	ForkJoinWorkerThread w = ws[i];
1177		if (w != null)
1178		w.cancelTasks();
1179		}
1180	<	// Wake up idle workers
1181	<	advanceEventCount();
1182	<	releaseWaiters();
1183	<	// Unstick pending joins
1184	<	for (ForkJoinWorkerThread w : workers) {
1180	>	}
1181	>
1182	>	/**
1183	>	* Unsticks all workers blocked on joins etc
1184	>	*/
1185	>	private void interruptWorkers() {
1186	>	ForkJoinWorkerThread[] ws = workers;
1187	>	int nws = ws.length;
1188	>	for (int i = 0; i < nws; ++i) {
1189	>	ForkJoinWorkerThread w = ws[i];
1190		if (w != null && !w.isTerminated()) {
1191		try {
1192		w.interrupt();
#	Line 1125 | Line 1224 | public class ForkJoinPool extends Abstra
1224		* active thread.
1225		*/
1226		final int idlePerActive() {
1227	+	int pc = parallelism; // use parallelism, not rc
1228		int ac = runState;    // no mask -- artifically boosts during shutdown
1129	–	int pc = parallelism; // use targeted parallelism, not rc
1229		// Use exact results for small values, saturate past 4
1230		return pc <= ac? 0 : pc >>> 1 <= ac? 1 : pc >>> 2 <= ac? 3 : pc >>> 3;
1231		}
#	Line 1137 | Line 1236 | public class ForkJoinPool extends Abstra
1236
1237		/**
1238		* Creates a {@code ForkJoinPool} with parallelism equal to {@link
1239	<	* java.lang.Runtime#availableProcessors}, and using the {@linkplain
1240	<	* #defaultForkJoinWorkerThreadFactory default thread factory}.
1239	>	* java.lang.Runtime#availableProcessors}, using the {@linkplain
1240	>	* #defaultForkJoinWorkerThreadFactory default thread factory},
1241	>	* no UncaughtExceptionHandler, and non-async LIFO processing mode.
1242		*
1243		* @throws SecurityException if a security manager exists and
1244		*         the caller is not permitted to modify threads
#	Line 1147 | Line 1247 | public class ForkJoinPool extends Abstra
1247		*/
1248		public ForkJoinPool() {
1249		this(Runtime.getRuntime().availableProcessors(),
1250	<	defaultForkJoinWorkerThreadFactory);
1250	>	defaultForkJoinWorkerThreadFactory, null, false);
1251		}
1252
1253		/**
1254		* Creates a {@code ForkJoinPool} with the indicated parallelism
1255	<	* level and using the {@linkplain
1256	<	* #defaultForkJoinWorkerThreadFactory default thread factory}.
1255	>	* level, the {@linkplain
1256	>	* #defaultForkJoinWorkerThreadFactory default thread factory},
1257	>	* no UncaughtExceptionHandler, and non-async LIFO processing mode.
1258		*
1259		* @param parallelism the parallelism level
1260		* @throws IllegalArgumentException if parallelism less than or
#	Line 1164 | Line 1265 | public class ForkJoinPool extends Abstra
1265		*         java.lang.RuntimePermission}{@code ("modifyThread")}
1266		*/
1267		public ForkJoinPool(int parallelism) {
1268	<	this(parallelism, defaultForkJoinWorkerThreadFactory);
1168	<	}
1169	<
1170	<	/**
1171	<	* Creates a {@code ForkJoinPool} with parallelism equal to {@link
1172	<	* java.lang.Runtime#availableProcessors}, and using the given
1173	<	* thread factory.
1174	<	*
1175	<	* @param factory the factory for creating new threads
1176	<	* @throws NullPointerException if the factory is null
1177	<	* @throws SecurityException if a security manager exists and
1178	<	*         the caller is not permitted to modify threads
1179	<	*         because it does not hold {@link
1180	<	*         java.lang.RuntimePermission}{@code ("modifyThread")}
1181	<	*/
1182	<	public ForkJoinPool(ForkJoinWorkerThreadFactory factory) {
1183	<	this(Runtime.getRuntime().availableProcessors(), factory);
1268	>	this(parallelism, defaultForkJoinWorkerThreadFactory, null, false);
1269		}
1270
1271		/**
1272	<	* Creates a {@code ForkJoinPool} with the given parallelism and
1188	<	* thread factory.
1272	>	* Creates a {@code ForkJoinPool} with the given parameters.
1273		*
1274	<	* @param parallelism the parallelism level
1275	<	* @param factory the factory for creating new threads
1274	>	* @param parallelism the parallelism level. For default value,
1275	>	* use {@link java.lang.Runtime#availableProcessors}.
1276	>	* @param factory the factory for creating new threads. For default value,
1277	>	* use {@link #defaultForkJoinWorkerThreadFactory}.
1278	>	* @param handler the handler for internal worker threads that
1279	>	* terminate due to unrecoverable errors encountered while executing
1280	>	* tasks. For default value, use <code>null</code>.
1281	>	* @param asyncMode if true,
1282	>	* establishes local first-in-first-out scheduling mode for forked
1283	>	* tasks that are never joined. This mode may be more appropriate
1284	>	* than default locally stack-based mode in applications in which
1285	>	* worker threads only process event-style asynchronous tasks.
1286	>	* For default value, use <code>false</code>.
1287		* @throws IllegalArgumentException if parallelism less than or
1288		*         equal to zero, or greater than implementation limit
1289		* @throws NullPointerException if the factory is null
#	Line 1197 | Line 1292 | public class ForkJoinPool extends Abstra
1292		*         because it does not hold {@link
1293		*         java.lang.RuntimePermission}{@code ("modifyThread")}
1294		*/
1295	<	public ForkJoinPool(int parallelism, ForkJoinWorkerThreadFactory factory) {
1295	>	public ForkJoinPool(int parallelism,
1296	>	ForkJoinWorkerThreadFactory factory,
1297	>	Thread.UncaughtExceptionHandler handler,
1298	>	boolean asyncMode) {
1299		checkPermission();
1300		if (factory == null)
1301		throw new NullPointerException();
1302		if (parallelism <= 0 || parallelism > MAX_THREADS)
1303		throw new IllegalArgumentException();
1206	–	this.poolNumber = poolNumberGenerator.incrementAndGet();
1207	–	int arraySize = initialArraySizeFor(parallelism);
1304		this.parallelism = parallelism;
1305		this.factory = factory;
1306	<	this.maxPoolSize = MAX_THREADS;
1307	<	this.maintainsParallelism = true;
1306	>	this.ueh = handler;
1307	>	this.locallyFifo = asyncMode;
1308	>	int arraySize = initialArraySizeFor(parallelism);
1309		this.workers = new ForkJoinWorkerThread[arraySize];
1310		this.submissionQueue = new LinkedTransferQueue<ForkJoinTask<?>>();
1311		this.workerLock = new ReentrantLock();
1312	<	this.terminationLatch = new CountDownLatch(1);
1313	<	// Start first worker; remaining workers added upon first submission
1217	<	workerCounts = ONE_RUNNING | ONE_TOTAL;
1218	<	addWorker();
1312	>	this.termination = new Phaser(1);
1313	>	this.poolNumber = poolNumberGenerator.incrementAndGet();
1314		}
1315
1316		/**
#	Line 1243 | Line 1338 | public class ForkJoinPool extends Abstra
1338		if (runState >= SHUTDOWN)
1339		throw new RejectedExecutionException();
1340		submissionQueue.offer(task);
1341	<	advanceEventCount();
1342	<	releaseWaiters();
1248	<	if ((workerCounts >>> TOTAL_COUNT_SHIFT) < parallelism)
1249	<	ensureEnoughTotalWorkers();
1341	>	signalEvent();
1342	>	ensureEnoughWorkers();
1343		}
1344
1345		/**
1346		* Performs the given task, returning its result upon completion.
1347	+	* If the caller is already engaged in a fork/join computation in
1348	+	* the current pool, this method is equivalent in effect to
1349	+	* {@link ForkJoinTask#invoke}.
1350		*
1351		* @param task the task
1352		* @return the task's result
#	Line 1265 | Line 1361 | public class ForkJoinPool extends Abstra
1361
1362		/**
1363		* Arranges for (asynchronous) execution of the given task.
1364	+	* If the caller is already engaged in a fork/join computation in
1365	+	* the current pool, this method is equivalent in effect to
1366	+	* {@link ForkJoinTask#fork}.
1367		*
1368		* @param task the task
1369		* @throws NullPointerException if the task is null
#	Line 1292 | Line 1391 | public class ForkJoinPool extends Abstra
1391		}
1392
1393		/**
1394	+	* Submits a ForkJoinTask for execution.
1395	+	* If the caller is already engaged in a fork/join computation in
1396	+	* the current pool, this method is equivalent in effect to
1397	+	* {@link ForkJoinTask#fork}.
1398	+	*
1399	+	* @param task the task to submit
1400	+	* @return the task
1401	+	* @throws NullPointerException if the task is null
1402	+	* @throws RejectedExecutionException if the task cannot be
1403	+	*         scheduled for execution
1404	+	*/
1405	+	public <T> ForkJoinTask<T> submit(ForkJoinTask<T> task) {
1406	+	doSubmit(task);
1407	+	return task;
1408	+	}
1409	+
1410	+	/**
1411		* @throws NullPointerException if the task is null
1412		* @throws RejectedExecutionException if the task cannot be
1413		*         scheduled for execution
#	Line 1329 | Line 1445 | public class ForkJoinPool extends Abstra
1445		}
1446
1447		/**
1332	–	* Submits a ForkJoinTask for execution.
1333	–	*
1334	–	* @param task the task to submit
1335	–	* @return the task
1336	–	* @throws NullPointerException if the task is null
1337	–	* @throws RejectedExecutionException if the task cannot be
1338	–	*         scheduled for execution
1339	–	*/
1340	–	public <T> ForkJoinTask<T> submit(ForkJoinTask<T> task) {
1341	–	doSubmit(task);
1342	–	return task;
1343	–	}
1344	–
1345	–	/**
1448		* @throws NullPointerException       {@inheritDoc}
1449		* @throws RejectedExecutionException {@inheritDoc}
1450		*/
#	Line 1384 | Line 1486 | public class ForkJoinPool extends Abstra
1486		* @return the handler, or {@code null} if none
1487		*/
1488		public Thread.UncaughtExceptionHandler getUncaughtExceptionHandler() {
1387	–	workerCountReadFence();
1489		return ueh;
1490		}
1491
1492		/**
1392	–	* Sets the handler for internal worker threads that terminate due
1393	–	* to unrecoverable errors encountered while executing tasks.
1394	–	* Unless set, the current default or ThreadGroup handler is used
1395	–	* as handler.
1396	–	*
1397	–	* @param h the new handler
1398	–	* @return the old handler, or {@code null} if none
1399	–	* @throws SecurityException if a security manager exists and
1400	–	*         the caller is not permitted to modify threads
1401	–	*         because it does not hold {@link
1402	–	*         java.lang.RuntimePermission}{@code ("modifyThread")}
1403	–	*/
1404	–	public Thread.UncaughtExceptionHandler
1405	–	setUncaughtExceptionHandler(Thread.UncaughtExceptionHandler h) {
1406	–	checkPermission();
1407	–	workerCountReadFence();
1408	–	Thread.UncaughtExceptionHandler old = ueh;
1409	–	if (h != old) {
1410	–	ueh = h;
1411	–	workerCountWriteFence();
1412	–	for (ForkJoinWorkerThread w : workers) {
1413	–	if (w != null)
1414	–	w.setUncaughtExceptionHandler(h);
1415	–	}
1416	–	}
1417	–	return old;
1418	–	}
1419	–
1420	–	/**
1421	–	* Sets the target parallelism level of this pool.
1422	–	*
1423	–	* @param parallelism the target parallelism
1424	–	* @throws IllegalArgumentException if parallelism less than or
1425	–	* equal to zero or greater than maximum size bounds
1426	–	* @throws SecurityException if a security manager exists and
1427	–	*         the caller is not permitted to modify threads
1428	–	*         because it does not hold {@link
1429	–	*         java.lang.RuntimePermission}{@code ("modifyThread")}
1430	–	*/
1431	–	public void setParallelism(int parallelism) {
1432	–	checkPermission();
1433	–	if (parallelism <= 0 || parallelism > maxPoolSize)
1434	–	throw new IllegalArgumentException();
1435	–	workerCountReadFence();
1436	–	int pc = this.parallelism;
1437	–	if (pc != parallelism) {
1438	–	this.parallelism = parallelism;
1439	–	workerCountWriteFence();
1440	–	// Release spares. If too many, some will die after re-suspend
1441	–	for (ForkJoinWorkerThread w : workers) {
1442	–	if (w != null && w.tryUnsuspend()) {
1443	–	updateRunningCount(1);
1444	–	LockSupport.unpark(w);
1445	–	}
1446	–	}
1447	–	ensureEnoughTotalWorkers();
1448	–	advanceEventCount();
1449	–	releaseWaiters(); // force config recheck by existing workers
1450	–	}
1451	–	}
1452	–
1453	–	/**
1493		* Returns the targeted parallelism level of this pool.
1494		*
1495		* @return the targeted parallelism level of this pool
1496		*/
1497		public int getParallelism() {
1459	–	//        workerCountReadFence(); // inlined below
1460	–	int ignore = workerCounts;
1498		return parallelism;
1499		}
1500
#	Line 1474 | Line 1511 | public class ForkJoinPool extends Abstra
1511		}
1512
1513		/**
1477	–	* Returns the maximum number of threads allowed to exist in the
1478	–	* pool. Unless set using {@link #setMaximumPoolSize}, the
1479	–	* maximum is an implementation-defined value designed only to
1480	–	* prevent runaway growth.
1481	–	*
1482	–	* @return the maximum
1483	–	*/
1484	–	public int getMaximumPoolSize() {
1485	–	workerCountReadFence();
1486	–	return maxPoolSize;
1487	–	}
1488	–
1489	–	/**
1490	–	* Sets the maximum number of threads allowed to exist in the
1491	–	* pool. The given value should normally be greater than or equal
1492	–	* to the {@link #getParallelism parallelism} level. Setting this
1493	–	* value has no effect on current pool size. It controls
1494	–	* construction of new threads. The use of this method may cause
1495	–	* tasks that intrinsically require extra threads for dependent
1496	–	* computations to indefinitely stall. If you are instead trying
1497	–	* to minimize internal thread creation, consider setting {link
1498	–	* #setMaintainsParallelism} as false.
1499	–	*
1500	–	* @throws IllegalArgumentException if negative or greater than
1501	–	* internal implementation limit
1502	–	*/
1503	–	public void setMaximumPoolSize(int newMax) {
1504	–	if (newMax < 0 || newMax > MAX_THREADS)
1505	–	throw new IllegalArgumentException();
1506	–	maxPoolSize = newMax;
1507	–	workerCountWriteFence();
1508	–	}
1509	–
1510	–	/**
1511	–	* Returns {@code true} if this pool dynamically maintains its
1512	–	* target parallelism level. If false, new threads are added only
1513	–	* to avoid possible starvation.  This setting is by default true.
1514	–	*
1515	–	* @return {@code true} if maintains parallelism
1516	–	*/
1517	–	public boolean getMaintainsParallelism() {
1518	–	workerCountReadFence();
1519	–	return maintainsParallelism;
1520	–	}
1521	–
1522	–	/**
1523	–	* Sets whether this pool dynamically maintains its target
1524	–	* parallelism level. If false, new threads are added only to
1525	–	* avoid possible starvation.
1526	–	*
1527	–	* @param enable {@code true} to maintain parallelism
1528	–	*/
1529	–	public void setMaintainsParallelism(boolean enable) {
1530	–	maintainsParallelism = enable;
1531	–	workerCountWriteFence();
1532	–	}
1533	–
1534	–	/**
1535	–	* Establishes local first-in-first-out scheduling mode for forked
1536	–	* tasks that are never joined. This mode may be more appropriate
1537	–	* than default locally stack-based mode in applications in which
1538	–	* worker threads only process asynchronous tasks.  This method is
1539	–	* designed to be invoked only when the pool is quiescent, and
1540	–	* typically only before any tasks are submitted. The effects of
1541	–	* invocations at other times may be unpredictable.
1542	–	*
1543	–	* @param async if {@code true}, use locally FIFO scheduling
1544	–	* @return the previous mode
1545	–	* @see #getAsyncMode
1546	–	*/
1547	–	public boolean setAsyncMode(boolean async) {
1548	–	workerCountReadFence();
1549	–	boolean oldMode = locallyFifo;
1550	–	if (oldMode != async) {
1551	–	locallyFifo = async;
1552	–	workerCountWriteFence();
1553	–	for (ForkJoinWorkerThread w : workers) {
1554	–	if (w != null)
1555	–	w.setAsyncMode(async);
1556	–	}
1557	–	}
1558	–	return oldMode;
1559	–	}
1560	–
1561	–	/**
1514		* Returns {@code true} if this pool uses local first-in-first-out
1515		* scheduling mode for forked tasks that are never joined.
1516		*
1517		* @return {@code true} if this pool uses async mode
1566	–	* @see #setAsyncMode
1518		*/
1519		public boolean getAsyncMode() {
1569	–	workerCountReadFence();
1520		return locallyFifo;
1521		}
1522
#	Line 1635 | Line 1585 | public class ForkJoinPool extends Abstra
1585		*/
1586		public long getQueuedTaskCount() {
1587		long count = 0;
1588	<	for (ForkJoinWorkerThread w : workers) {
1588	>	ForkJoinWorkerThread[] ws = workers;
1589	>	int nws = ws.length;
1590	>	for (int i = 0; i < nws; ++i) {
1591	>	ForkJoinWorkerThread w = ws[i];
1592		if (w != null)
1593		count += w.getQueueSize();
1594		}
#	Line 1693 | Line 1646 | public class ForkJoinPool extends Abstra
1646		*/
1647		protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
1648		int n = submissionQueue.drainTo(c);
1649	<	for (ForkJoinWorkerThread w : workers) {
1649	>	ForkJoinWorkerThread[] ws = workers;
1650	>	int nws = ws.length;
1651	>	for (int i = 0; i < nws; ++i) {
1652	>	ForkJoinWorkerThread w = ws[i];
1653		if (w != null)
1654		n += w.drainTasksTo(c);
1655		}
#	Line 1701 | Line 1657 | public class ForkJoinPool extends Abstra
1657		}
1658
1659		/**
1660	+	* Returns count of total parks by existing workers.
1661	+	* Used during development only since not meaningful to users.
1662	+	*/
1663	+	private int collectParkCount() {
1664	+	int count = 0;
1665	+	ForkJoinWorkerThread[] ws = workers;
1666	+	int nws = ws.length;
1667	+	for (int i = 0; i < nws; ++i) {
1668	+	ForkJoinWorkerThread w = ws[i];
1669	+	if (w != null)
1670	+	count += w.parkCount;
1671	+	}
1672	+	return count;
1673	+	}
1674	+
1675	+	/**
1676		* Returns a string identifying this pool, as well as its state,
1677		* including indications of run state, parallelism level, and
1678		* worker and task counts.
#	Line 1717 | Line 1689 | public class ForkJoinPool extends Abstra
1689		int pc = parallelism;
1690		int rs = runState;
1691		int ac = rs & ACTIVE_COUNT_MASK;
1692	+	//        int pk = collectParkCount();
1693		return super.toString() +
1694		"[" + runLevelToString(rs) +
1695		", parallelism = " + pc +
#	Line 1726 | Line 1699 | public class ForkJoinPool extends Abstra
1699		", steals = " + st +
1700		", tasks = " + qt +
1701		", submissions = " + qs +
1702	+	//            ", parks = " + pk +
1703		"]";
1704		}
1705
#	Line 1821 | Line 1795 | public class ForkJoinPool extends Abstra
1795		*/
1796		public boolean awaitTermination(long timeout, TimeUnit unit)
1797		throws InterruptedException {
1798	<	return terminationLatch.await(timeout, unit);
1798	>	try {
1799	>	return termination.awaitAdvanceInterruptibly(0, timeout, unit) > 0;
1800	>	} catch(TimeoutException ex) {
1801	>	return false;
1802	>	}
1803		}
1804
1805		/**
#	Line 1873 | Line 1851 | public class ForkJoinPool extends Abstra
1851		* Blocks in accord with the given blocker.  If the current thread
1852		* is a {@link ForkJoinWorkerThread}, this method possibly
1853		* arranges for a spare thread to be activated if necessary to
1854	<	* ensure parallelism while the current thread is blocked.
1877	<	*
1878	<	* <p>If {@code maintainParallelism} is {@code true} and the pool
1879	<	* supports it ({@link #getMaintainsParallelism}), this method
1880	<	* attempts to maintain the pool's nominal parallelism. Otherwise
1881	<	* it activates a thread only if necessary to avoid complete
1882	<	* starvation. This option may be preferable when blockages use
1883	<	* timeouts, or are almost always brief.
1854	>	* ensure sufficient parallelism while the current thread is blocked.
1855		*
1856		* <p>If the caller is not a {@link ForkJoinTask}, this method is
1857		* behaviorally equivalent to
#	Line 1894 | Line 1865 | public class ForkJoinPool extends Abstra
1865		* first be expanded to ensure parallelism, and later adjusted.
1866		*
1867		* @param blocker the blocker
1897	–	* @param maintainParallelism if {@code true} and supported by
1898	–	* this pool, attempt to maintain the pool's nominal parallelism;
1899	–	* otherwise activate a thread only if necessary to avoid
1900	–	* complete starvation.
1868		* @throws InterruptedException if blocker.block did so
1869		*/
1870	<	public static void managedBlock(ManagedBlocker blocker,
1904	<	boolean maintainParallelism)
1870	>	public static void managedBlock(ManagedBlocker blocker)
1871		throws InterruptedException {
1872		Thread t = Thread.currentThread();
1873		if (t instanceof ForkJoinWorkerThread)
1874	<	((ForkJoinWorkerThread) t).pool.
1875	<	doBlock(blocker, maintainParallelism);
1876	<	else
1877	<	awaitBlocker(blocker);
1912	<	}
1913	<
1914	<	/**
1915	<	* Performs Non-FJ blocking
1916	<	*/
1917	<	private static void awaitBlocker(ManagedBlocker blocker)
1918	<	throws InterruptedException {
1919	<	do {} while (!blocker.isReleasable() && !blocker.block());
1874	>	((ForkJoinWorkerThread) t).pool.awaitBlocker(blocker);
1875	>	else {
1876	>	do {} while (!blocker.isReleasable() && !blocker.block());
1877	>	}
1878		}
1879
1880		// AbstractExecutorService overrides.  These rely on undocumented
#	Line 1945 | Line 1903 | public class ForkJoinPool extends Abstra
1903		private static final long stealCountOffset =
1904		objectFieldOffset("stealCount",ForkJoinPool.class);
1905
1948	–
1906		private static long objectFieldOffset(String field, Class<?> klazz) {
1907		try {
1908		return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field));

Diff Legend

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