ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166y/ForkJoinPool.java
(Generate patch)

Comparing jsr166/src/jsr166y/ForkJoinPool.java (file contents):
Revision 1.73 by jsr166, Tue Sep 7 06:28:36 2010 UTC vs.
Revision 1.95 by dl, Fri Mar 4 13:29:39 2011 UTC

# Line 6 | Line 6
6  
7   package jsr166y;
8  
9 import java.util.concurrent.*;
9   import java.util.ArrayList;
10   import java.util.Arrays;
11   import java.util.Collection;
12   import java.util.Collections;
13   import java.util.List;
14 + import java.util.Random;
15 + import java.util.concurrent.AbstractExecutorService;
16 + import java.util.concurrent.Callable;
17 + import java.util.concurrent.ExecutorService;
18 + import java.util.concurrent.Future;
19 + import java.util.concurrent.RejectedExecutionException;
20 + import java.util.concurrent.RunnableFuture;
21 + import java.util.concurrent.TimeUnit;
22 + import java.util.concurrent.TimeoutException;
23 + import java.util.concurrent.atomic.AtomicInteger;
24   import java.util.concurrent.locks.LockSupport;
25   import java.util.concurrent.locks.ReentrantLock;
26 < import java.util.concurrent.atomic.AtomicInteger;
18 < import java.util.concurrent.CountDownLatch;
26 > import java.util.concurrent.locks.Condition;
27  
28   /**
29   * An {@link ExecutorService} for running {@link ForkJoinTask}s.
# Line 123 | Line 131 | public class ForkJoinPool extends Abstra
131       * set of worker threads: Submissions from non-FJ threads enter
132       * into a submission queue. Workers take these tasks and typically
133       * split them into subtasks that may be stolen by other workers.
134 <     * The main work-stealing mechanics implemented in class
135 <     * ForkJoinWorkerThread give first priority to processing tasks
136 <     * from their own queues (LIFO or FIFO, depending on mode), then
137 <     * to randomized FIFO steals of tasks in other worker queues, and
138 <     * lastly to new submissions. These mechanics do not consider
139 <     * affinities, loads, cache localities, etc, so rarely provide the
140 <     * best possible performance on a given machine, but portably
141 <     * provide good throughput by averaging over these factors.
142 <     * (Further, even if we did try to use such information, we do not
143 <     * usually have a basis for exploiting it. For example, some sets
144 <     * of tasks profit from cache affinities, but others are harmed by
145 <     * cache pollution effects.)
146 <     *
147 <     * Beyond work-stealing support and essential bookkeeping, the
148 <     * main responsibility of this framework is to take actions when
149 <     * one worker is waiting to join a task stolen (or always held by)
150 <     * another.  Because we are multiplexing many tasks on to a pool
151 <     * of workers, we can't just let them block (as in Thread.join).
152 <     * We also cannot just reassign the joiner's run-time stack with
153 <     * another and replace it later, which would be a form of
154 <     * "continuation", that even if possible is not necessarily a good
155 <     * idea. Given that the creation costs of most threads on most
156 <     * systems mainly surrounds setting up runtime stacks, thread
157 <     * creation and switching is usually not much more expensive than
158 <     * stack creation and switching, and is more flexible). Instead we
134 >     * Preference rules give first priority to processing tasks from
135 >     * their own queues (LIFO or FIFO, depending on mode), then to
136 >     * randomized FIFO steals of tasks in other worker queues, and
137 >     * lastly to new submissions.
138 >     *
139 >     * The main throughput advantages of work-stealing stem from
140 >     * decentralized control -- workers mostly take tasks from
141 >     * themselves or each other. We cannot negate this in the
142 >     * implementation of other management responsibilities. The main
143 >     * tactic for avoiding bottlenecks is packing nearly all
144 >     * essentially atomic control state into a single 64bit volatile
145 >     * variable ("ctl"). This variable is read on the order of 10-100
146 >     * times as often as it is modified (always via CAS). (There is
147 >     * some additional control state, for example variable "shutdown"
148 >     * for which we can cope with uncoordinated updates.)  This
149 >     * streamlines synchronization and control at the expense of messy
150 >     * constructions needed to repack status bits upon updates.
151 >     * Updates tend not to contend with each other except during
152 >     * bursts while submitted tasks begin or end.  In some cases when
153 >     * they do contend, threads can instead do something else
154 >     * (usually, scan for tasks) until contention subsides.
155 >     *
156 >     * To enable packing, we restrict maximum parallelism to (1<<15)-1
157 >     * (which is far in excess of normal operating range) to allow
158 >     * ids, counts, and their negations (used for thresholding) to fit
159 >     * into 16bit fields.
160 >     *
161 >     * Recording Workers.  Workers are recorded in the "workers" array
162 >     * that is created upon pool construction and expanded if (rarely)
163 >     * necessary.  This is an array as opposed to some other data
164 >     * structure to support index-based random steals by workers.
165 >     * Updates to the array recording new workers and unrecording
166 >     * terminated ones are protected from each other by a seqLock
167 >     * (scanGuard) but the array is otherwise concurrently readable,
168 >     * and accessed directly by workers. To simplify index-based
169 >     * operations, the array size is always a power of two, and all
170 >     * readers must tolerate null slots. To avoid flailing during
171 >     * start-up, the array is presized to hold twice #parallelism
172 >     * workers (which is unlikely to need further resizing during
173 >     * execution). But to avoid dealing with so many null slots,
174 >     * variable scanGuard includes a mask for the nearest power of two
175 >     * that contains all current workers.  All worker thread creation
176 >     * is on-demand, triggered by task submissions, replacement of
177 >     * terminated workers, and/or compensation for blocked
178 >     * workers. However, all other support code is set up to work with
179 >     * other policies.  To ensure that we do not hold on to worker
180 >     * references that would prevent GC, ALL accesses to workers are
181 >     * via indices into the workers array (which is one source of some
182 >     * of the messy code constructions here). In essence, the workers
183 >     * array serves as a weak reference mechanism. Thus for example
184 >     * the wait queue field of ctl stores worker indices, not worker
185 >     * references.  Access to the workers in associated methods (for
186 >     * example signalWork) must both index-check and null-check the
187 >     * IDs. All such accesses ignore bad IDs by returning out early
188 >     * from what they are doing, since this can only be associated
189 >     * with termination, in which case it is OK to give up.
190 >     *
191 >     * All uses of the workers array, as well as queue arrays, check
192 >     * that the array is non-null (even if previously non-null). This
193 >     * allows nulling during termination, which is currently not
194 >     * necessary, but remains an option for resource-revocation-based
195 >     * shutdown schemes.
196 >     *
197 >     * Wait Queuing. Unlike HPC work-stealing frameworks, we cannot
198 >     * let workers spin indefinitely scanning for tasks when none can
199 >     * be found immediately, and we cannot start/resume workers unless
200 >     * there appear to be tasks available.  On the other hand, we must
201 >     * quickly prod them into action when new tasks are submitted or
202 >     * generated.  We park/unpark workers after placing in an event
203 >     * wait queue when they cannot find work. This "queue" is actually
204 >     * a simple Treiber stack, headed by the "id" field of ctl, plus a
205 >     * 15bit counter value to both wake up waiters (by advancing their
206 >     * count) and avoid ABA effects. Successors are held in worker
207 >     * field "nextWait".  Queuing deals with several intrinsic races,
208 >     * mainly that a task-producing thread can miss seeing (and
209 >     * signalling) another thread that gave up looking for work but
210 >     * has not yet entered the wait queue. We solve this by requiring
211 >     * a full sweep of all workers both before (in scan()) and after
212 >     * (in tryAwaitWork()) a newly waiting worker is added to the wait
213 >     * queue. During a rescan, the worker might release some other
214 >     * queued worker rather than itself, which has the same net
215 >     * effect. Because enqueued workers may actually be rescanning
216 >     * rather than waiting, we set and clear the "parked" field of
217 >     * ForkJoinWorkerThread to reduce unnecessary calls to unpark.
218 >     * (Use of the parked field requires a secondary recheck to avoid
219 >     * missed signals.)
220 >     *
221 >     * Signalling.  We create or wake up workers only when there
222 >     * appears to be at least one task they might be able to find and
223 >     * execute.  When a submission is added or another worker adds a
224 >     * task to a queue that previously had two or fewer tasks, they
225 >     * signal waiting workers (or trigger creation of new ones if
226 >     * fewer than the given parallelism level -- see signalWork).
227 >     * These primary signals are buttressed by signals during rescans
228 >     * as well as those performed when a worker steals a task and
229 >     * notices that there are more tasks too; together these cover the
230 >     * signals needed in cases when more than two tasks are pushed
231 >     * but untaken.
232 >     *
233 >     * Trimming workers. To release resources after periods of lack of
234 >     * use, a worker starting to wait when the pool is quiescent will
235 >     * time out and terminate if the pool has remained quiescent for
236 >     * SHRINK_RATE nanosecs. This will slowly propagate, eventually
237 >     * terminating all workers after long periods of non-use.
238 >     *
239 >     * Submissions. External submissions are maintained in an
240 >     * array-based queue that is structured identically to
241 >     * ForkJoinWorkerThread queues except for the use of
242 >     * submissionLock in method addSubmission. Unlike the case for
243 >     * worker queues, multiple external threads can add new
244 >     * submissions, so adding requires a lock.
245 >     *
246 >     * Compensation. Beyond work-stealing support and lifecycle
247 >     * control, the main responsibility of this framework is to take
248 >     * actions when one worker is waiting to join a task stolen (or
249 >     * always held by) another.  Because we are multiplexing many
250 >     * tasks on to a pool of workers, we can't just let them block (as
251 >     * in Thread.join).  We also cannot just reassign the joiner's
252 >     * run-time stack with another and replace it later, which would
253 >     * be a form of "continuation", that even if possible is not
254 >     * necessarily a good idea since we sometimes need both an
255 >     * unblocked task and its continuation to progress. Instead we
256       * combine two tactics:
257       *
258       *   Helping: Arranging for the joiner to execute some task that it
259       *      would be running if the steal had not occurred.  Method
260 <     *      ForkJoinWorkerThread.helpJoinTask tracks joining->stealing
260 >     *      ForkJoinWorkerThread.joinTask tracks joining->stealing
261       *      links to try to find such a task.
262       *
263       *   Compensating: Unless there are already enough live threads,
264 <     *      method helpMaintainParallelism() may create or
265 <     *      re-activate a spare thread to compensate for blocked
266 <     *      joiners until they unblock.
162 <     *
163 <     * It is impossible to keep exactly the target (parallelism)
164 <     * number of threads running at any given time.  Determining
165 <     * existence of conservatively safe helping targets, the
166 <     * availability of already-created spares, and the apparent need
167 <     * to create new spares are all racy and require heuristic
168 <     * guidance, so we rely on multiple retries of each.  Compensation
169 <     * occurs in slow-motion. It is triggered only upon timeouts of
170 <     * Object.wait used for joins. This reduces poor decisions that
171 <     * would otherwise be made when threads are waiting for others
172 <     * that are stalled because of unrelated activities such as
173 <     * garbage collection.
264 >     *      method tryPreBlock() may create or re-activate a spare
265 >     *      thread to compensate for blocked joiners until they
266 >     *      unblock.
267       *
268       * The ManagedBlocker extension API can't use helping so relies
269       * only on compensation in method awaitBlocker.
270       *
271 <     * The main throughput advantages of work-stealing stem from
272 <     * decentralized control -- workers mostly steal tasks from each
273 <     * other. We do not want to negate this by creating bottlenecks
274 <     * implementing other management responsibilities. So we use a
275 <     * collection of techniques that avoid, reduce, or cope well with
276 <     * contention. These entail several instances of bit-packing into
277 <     * CASable fields to maintain only the minimally required
278 <     * atomicity. To enable such packing, we restrict maximum
279 <     * parallelism to (1<<15)-1 (enabling twice this (to accommodate
280 <     * unbalanced increments and decrements) to fit into a 16 bit
281 <     * field, which is far in excess of normal operating range.  Even
282 <     * though updates to some of these bookkeeping fields do sometimes
283 <     * contend with each other, they don't normally cache-contend with
284 <     * updates to others enough to warrant memory padding or
285 <     * isolation. So they are all held as fields of ForkJoinPool
286 <     * objects.  The main capabilities are as follows:
287 <     *
288 <     * 1. Creating and removing workers. Workers are recorded in the
289 <     * "workers" array. This is an array as opposed to some other data
290 <     * structure to support index-based random steals by workers.
291 <     * Updates to the array recording new workers and unrecording
292 <     * terminated ones are protected from each other by a lock
293 <     * (workerLock) but the array is otherwise concurrently readable,
294 <     * and accessed directly by workers. To simplify index-based
295 <     * operations, the array size is always a power of two, and all
296 <     * readers must tolerate null slots. Currently, all worker thread
297 <     * creation is on-demand, triggered by task submissions,
298 <     * replacement of terminated workers, and/or compensation for
299 <     * blocked workers. However, all other support code is set up to
207 <     * work with other policies.
208 <     *
209 <     * To ensure that we do not hold on to worker references that
210 <     * would prevent GC, ALL accesses to workers are via indices into
211 <     * the workers array (which is one source of some of the unusual
212 <     * code constructions here). In essence, the workers array serves
213 <     * as a WeakReference mechanism. Thus for example the event queue
214 <     * stores worker indices, not worker references. Access to the
215 <     * workers in associated methods (for example releaseEventWaiters)
216 <     * must both index-check and null-check the IDs. All such accesses
217 <     * ignore bad IDs by returning out early from what they are doing,
218 <     * since this can only be associated with shutdown, in which case
219 <     * it is OK to give up. On termination, we just clobber these
220 <     * data structures without trying to use them.
221 <     *
222 <     * 2. Bookkeeping for dynamically adding and removing workers. We
223 <     * aim to approximately maintain the given level of parallelism.
224 <     * When some workers are known to be blocked (on joins or via
225 <     * ManagedBlocker), we may create or resume others to take their
226 <     * place until they unblock (see below). Implementing this
227 <     * requires counts of the number of "running" threads (i.e., those
228 <     * that are neither blocked nor artificially suspended) as well as
229 <     * the total number.  These two values are packed into one field,
230 <     * "workerCounts" because we need accurate snapshots when deciding
231 <     * to create, resume or suspend.  Note however that the
232 <     * correspondence of these counts to reality is not guaranteed. In
233 <     * particular updates for unblocked threads may lag until they
234 <     * actually wake up.
235 <     *
236 <     * 3. Maintaining global run state. The run state of the pool
237 <     * consists of a runLevel (SHUTDOWN, TERMINATING, etc) similar to
238 <     * those in other Executor implementations, as well as a count of
239 <     * "active" workers -- those that are, or soon will be, or
240 <     * recently were executing tasks. The runLevel and active count
241 <     * are packed together in order to correctly trigger shutdown and
242 <     * termination. Without care, active counts can be subject to very
243 <     * high contention.  We substantially reduce this contention by
244 <     * relaxing update rules.  A worker must claim active status
245 <     * prospectively, by activating if it sees that a submitted or
246 <     * stealable task exists (it may find after activating that the
247 <     * task no longer exists). It stays active while processing this
248 <     * task (if it exists) and any other local subtasks it produces,
249 <     * until it cannot find any other tasks. It then tries
250 <     * inactivating (see method preStep), but upon update contention
251 <     * instead scans for more tasks, later retrying inactivation if it
252 <     * doesn't find any.
253 <     *
254 <     * 4. Managing idle workers waiting for tasks. We cannot let
255 <     * workers spin indefinitely scanning for tasks when none are
256 <     * available. On the other hand, we must quickly prod them into
257 <     * action when new tasks are submitted or generated.  We
258 <     * park/unpark these idle workers using an event-count scheme.
259 <     * Field eventCount is incremented upon events that may enable
260 <     * workers that previously could not find a task to now find one:
261 <     * Submission of a new task to the pool, or another worker pushing
262 <     * a task onto a previously empty queue.  (We also use this
263 <     * mechanism for configuration and termination actions that
264 <     * require wakeups of idle workers).  Each worker maintains its
265 <     * last known event count, and blocks when a scan for work did not
266 <     * find a task AND its lastEventCount matches the current
267 <     * eventCount. Waiting idle workers are recorded in a variant of
268 <     * Treiber stack headed by field eventWaiters which, when nonzero,
269 <     * encodes the thread index and count awaited for by the worker
270 <     * thread most recently calling eventSync. This thread in turn has
271 <     * a record (field nextEventWaiter) for the next waiting worker.
272 <     * In addition to allowing simpler decisions about need for
273 <     * wakeup, the event count bits in eventWaiters serve the role of
274 <     * tags to avoid ABA errors in Treiber stacks. Upon any wakeup,
275 <     * released threads also try to release at most two others.  The
276 <     * net effect is a tree-like diffusion of signals, where released
277 <     * threads (and possibly others) help with unparks.  To further
278 <     * reduce contention effects a bit, failed CASes to increment
279 <     * field eventCount are tolerated without retries in signalWork.
280 <     * Conceptually they are merged into the same event, which is OK
281 <     * when their only purpose is to enable workers to scan for work.
282 <     *
283 <     * 5. Managing suspension of extra workers. When a worker notices
284 <     * (usually upon timeout of a wait()) that there are too few
285 <     * running threads, we may create a new thread to maintain
286 <     * parallelism level, or at least avoid starvation. Usually, extra
287 <     * threads are needed for only very short periods, yet join
288 <     * dependencies are such that we sometimes need them in
289 <     * bursts. Rather than create new threads each time this happens,
290 <     * we suspend no-longer-needed extra ones as "spares". For most
291 <     * purposes, we don't distinguish "extra" spare threads from
292 <     * normal "core" threads: On each call to preStep (the only point
293 <     * at which we can do this) a worker checks to see if there are
294 <     * now too many running workers, and if so, suspends itself.
295 <     * Method helpMaintainParallelism looks for suspended threads to
296 <     * resume before considering creating a new replacement. The
297 <     * spares themselves are encoded on another variant of a Treiber
298 <     * Stack, headed at field "spareWaiters".  Note that the use of
299 <     * spares is intrinsically racy.  One thread may become a spare at
300 <     * about the same time as another is needlessly being created. We
301 <     * counteract this and related slop in part by requiring resumed
302 <     * spares to immediately recheck (in preStep) to see whether they
303 <     * should re-suspend.
304 <     *
305 <     * 6. Killing off unneeded workers. A timeout mechanism is used to
306 <     * shed unused workers: The oldest (first) event queue waiter uses
307 <     * a timed rather than hard wait. When this wait times out without
308 <     * a normal wakeup, it tries to shutdown any one (for convenience
309 <     * the newest) other spare or event waiter via
310 <     * tryShutdownUnusedWorker. This eventually reduces the number of
311 <     * worker threads to a minimum of one after a long enough period
312 <     * without use.
313 <     *
314 <     * 7. Deciding when to create new workers. The main dynamic
315 <     * control in this class is deciding when to create extra threads
316 <     * in method helpMaintainParallelism. We would like to keep
317 <     * exactly #parallelism threads running, which is an impossible
318 <     * task. We always need to create one when the number of running
319 <     * threads would become zero and all workers are busy. Beyond
320 <     * this, we must rely on heuristics that work well in the
321 <     * presence of transient phenomena such as GC stalls, dynamic
322 <     * compilation, and wake-up lags. These transients are extremely
323 <     * common -- we are normally trying to fully saturate the CPUs on
324 <     * a machine, so almost any activity other than running tasks
325 <     * impedes accuracy. Our main defense is to allow parallelism to
326 <     * lapse for a while during joins, and use a timeout to see if,
327 <     * after the resulting settling, there is still a need for
328 <     * additional workers.  This also better copes with the fact that
329 <     * some of the methods in this class tend to never become compiled
330 <     * (but are interpreted), so some components of the entire set of
331 <     * controls might execute 100 times faster than others. And
332 <     * similarly for cases where the apparent lack of work is just due
333 <     * to GC stalls and other transient system activity.
271 >     * It is impossible to keep exactly the target parallelism number
272 >     * of threads running at any given time.  Determining the
273 >     * existence of conservatively safe helping targets, the
274 >     * availability of already-created spares, and the apparent need
275 >     * to create new spares are all racy and require heuristic
276 >     * guidance, so we rely on multiple retries of each.  Currently,
277 >     * in keeping with on-demand signalling policy, we compensate only
278 >     * if blocking would leave less than one active (non-waiting,
279 >     * non-blocked) worker. Additionally, to avoid some false alarms
280 >     * due to GC, lagging counters, system activity, etc, compensated
281 >     * blocking for joins is only attempted after rechecks stabilize
282 >     * (retries are interspersed with Thread.yield, for good
283 >     * citizenship).  The variable blockedCount, incremented before
284 >     * blocking and decremented after, is sometimes needed to
285 >     * distinguish cases of waiting for work vs blocking on joins or
286 >     * other managed sync. Both cases are equivalent for most pool
287 >     * control, so we can update non-atomically. (Additionally,
288 >     * contention on blockedCount alleviates some contention on ctl).
289 >     *
290 >     * Shutdown and Termination. A call to shutdownNow atomically sets
291 >     * the ctl stop bit and then (non-atomically) sets each workers
292 >     * "terminate" status, cancels all unprocessed tasks, and wakes up
293 >     * all waiting workers.  Detecting whether termination should
294 >     * commence after a non-abrupt shutdown() call requires more work
295 >     * and bookkeeping. We need consensus about quiesence (i.e., that
296 >     * there is no more work) which is reflected in active counts so
297 >     * long as there are no current blockers, as well as possible
298 >     * re-evaluations during independent changes in blocking or
299 >     * quiescing workers.
300       *
301 <     * Beware that there is a lot of representation-level coupling
301 >     * Style notes: There is a lot of representation-level coupling
302       * among classes ForkJoinPool, ForkJoinWorkerThread, and
303 <     * ForkJoinTask.  For example, direct access to "workers" array by
303 >     * ForkJoinTask.  Most fields of ForkJoinWorkerThread maintain
304 >     * data structures managed by ForkJoinPool, so are directly
305 >     * accessed.  Conversely we allow access to "workers" array by
306       * workers, and direct access to ForkJoinTask.status by both
307       * ForkJoinPool and ForkJoinWorkerThread.  There is little point
308       * trying to reduce this, since any associated future changes in
309       * representations will need to be accompanied by algorithmic
310 <     * changes anyway.
311 <     *
312 <     * Style notes: There are lots of inline assignments (of form
313 <     * "while ((local = field) != 0)") which are usually the simplest
314 <     * way to ensure the required read orderings (which are sometimes
315 <     * critical). Also several occurrences of the unusual "do {}
316 <     * while (!cas...)" which is the simplest way to force an update of
317 <     * a CAS'ed variable. There are also other coding oddities that
318 <     * help some methods perform reasonably even when interpreted (not
319 <     * compiled), at the expense of some messy constructions that
320 <     * reduce byte code counts.
321 <     *
322 <     * The order of declarations in this file is: (1) statics (2)
323 <     * fields (along with constants used when unpacking some of them)
324 <     * (3) internal control methods (4) callbacks and other support
325 <     * for ForkJoinTask and ForkJoinWorkerThread classes, (5) exported
326 <     * methods (plus a few little helpers).
310 >     * changes anyway. All together, these low-level implementation
311 >     * choices produce as much as a factor of 4 performance
312 >     * improvement compared to naive implementations, and enable the
313 >     * processing of billions of tasks per second, at the expense of
314 >     * some ugliness.
315 >     *
316 >     * Methods signalWork() and scan() are the main bottlenecks so are
317 >     * especially heavily micro-optimized/mangled.  There are lots of
318 >     * inline assignments (of form "while ((local = field) != 0)")
319 >     * which are usually the simplest way to ensure the required read
320 >     * orderings (which are sometimes critical). This leads to a
321 >     * "C"-like style of listing declarations of these locals at the
322 >     * heads of methods or blocks.  There are several occurrences of
323 >     * the unusual "do {} while (!cas...)"  which is the simplest way
324 >     * to force an update of a CAS'ed variable. There are also other
325 >     * coding oddities that help some methods perform reasonably even
326 >     * when interpreted (not compiled).
327 >     *
328 >     * The order of declarations in this file is: (1) declarations of
329 >     * statics (2) fields (along with constants used when unpacking
330 >     * some of them), listed in an order that tends to reduce
331 >     * contention among them a bit under most JVMs.  (3) internal
332 >     * control methods (4) callbacks and other support for
333 >     * ForkJoinTask and ForkJoinWorkerThread classes, (5) exported
334 >     * methods (plus a few little helpers). (6) static block
335 >     * initializing all statics in a minimally dependent order.
336       */
337  
338      /**
# Line 390 | Line 367 | public class ForkJoinPool extends Abstra
367       * overridden in ForkJoinPool constructors.
368       */
369      public static final ForkJoinWorkerThreadFactory
370 <        defaultForkJoinWorkerThreadFactory =
394 <        new DefaultForkJoinWorkerThreadFactory();
370 >        defaultForkJoinWorkerThreadFactory;
371  
372      /**
373       * Permission required for callers of methods that may start or
374       * kill threads.
375       */
376 <    private static final RuntimePermission modifyThreadPermission =
401 <        new RuntimePermission("modifyThread");
376 >    private static final RuntimePermission modifyThreadPermission;
377  
378      /**
379       * If there is a security manager, makes sure caller has
# Line 413 | Line 388 | public class ForkJoinPool extends Abstra
388      /**
389       * Generator for assigning sequence numbers as pool names.
390       */
391 <    private static final AtomicInteger poolNumberGenerator =
417 <        new AtomicInteger();
391 >    private static final AtomicInteger poolNumberGenerator;
392  
393      /**
394 <     * The time to block in a join (see awaitJoin) before checking if
395 <     * a new worker should be (re)started to maintain parallelism
396 <     * level. The value should be short enough to maintain global
397 <     * responsiveness and progress but long enough to avoid
398 <     * counterproductive firings during GC stalls or unrelated system
425 <     * activity, and to not bog down systems with continual re-firings
426 <     * on GCs or legitimately long waits.
394 >     * Generator for initial random seeds for worker victim
395 >     * selection. This is used only to create initial seeds. Random
396 >     * steals use a cheaper xorshift generator per steal attempt. We
397 >     * don't expect much contention on seedGenerator, so just use a
398 >     * plain Random.
399       */
400 <    private static final long JOIN_TIMEOUT_MILLIS = 250L; // 4 per second
400 >    static final Random workerSeedGenerator;
401  
402      /**
403 <     * The wakeup interval (in nanoseconds) for the oldest worker
404 <     * waiting for an event invokes tryShutdownUnusedWorker to shrink
405 <     * the number of workers.  The exact value does not matter too
406 <     * much, but should be long enough to slowly release resources
407 <     * during long periods without use without disrupting normal use.
403 >     * Array holding all worker threads in the pool.  Initialized upon
404 >     * construction. Array size must be a power of two.  Updates and
405 >     * replacements are protected by scanGuard, but the array is
406 >     * always kept in a consistent enough state to be randomly
407 >     * accessed without locking by workers performing work-stealing,
408 >     * as well as other traversal-based methods in this class, so long
409 >     * as reads memory-acquire by first reading ctl. All readers must
410 >     * tolerate that some array slots may be null.
411       */
412 <    private static final long SHRINK_RATE_NANOS =
438 <        30L * 1000L * 1000L * 1000L; // 2 per minute
412 >    ForkJoinWorkerThread[] workers;
413  
414      /**
415 <     * Absolute bound for parallelism level. Twice this number plus
416 <     * one (i.e., 0xfff) must fit into a 16bit field to enable
417 <     * word-packing for some counts and indices.
415 >     * Initial size for submission queue array. Must be a power of
416 >     * two.  In many applications, these always stay small so we use a
417 >     * small initial cap.
418       */
419 <    private static final int MAX_WORKERS   = 0x7fff;
419 >    private static final int INITIAL_QUEUE_CAPACITY = 8;
420  
421      /**
422 <     * Array holding all worker threads in the pool.  Array size must
423 <     * be a power of two.  Updates and replacements are protected by
424 <     * workerLock, but the array is always kept in a consistent enough
425 <     * state to be randomly accessed without locking by workers
452 <     * performing work-stealing, as well as other traversal-based
453 <     * methods in this class. All readers must tolerate that some
454 <     * array slots may be null.
422 >     * Maximum size for submission queue array. Must be a power of two
423 >     * less than or equal to 1 << (31 - width of array entry) to
424 >     * ensure lack of index wraparound, but is capped at a lower
425 >     * value to help users trap runaway computations.
426       */
427 <    volatile ForkJoinWorkerThread[] workers;
427 >    private static final int MAXIMUM_QUEUE_CAPACITY = 1 << 24; // 16M
428  
429      /**
430 <     * Queue for external submissions.
430 >     * Array serving as submission queue. Initialized upon construction.
431       */
432 <    private final LinkedTransferQueue<ForkJoinTask<?>> submissionQueue;
432 >    private ForkJoinTask<?>[] submissionQueue;
433  
434      /**
435 <     * Lock protecting updates to workers array.
435 >     * Lock protecting submissions array for addSubmission
436       */
437 <    private final ReentrantLock workerLock;
437 >    private final ReentrantLock submissionLock;
438  
439      /**
440 <     * Latch released upon termination.
440 >     * Condition for awaitTermination, using submissionLock for
441 >     * convenience.
442       */
443 <    private final Phaser termination;
443 >    private final Condition termination;
444  
445      /**
446       * Creation factory for worker threads.
# Line 476 | Line 448 | public class ForkJoinPool extends Abstra
448      private final ForkJoinWorkerThreadFactory factory;
449  
450      /**
451 <     * Sum of per-thread steal counts, updated only when threads are
452 <     * idle or terminating.
451 >     * The uncaught exception handler used when any worker abruptly
452 >     * terminates.
453       */
454 <    private volatile long stealCount;
454 >    final Thread.UncaughtExceptionHandler ueh;
455  
456      /**
457 <     * Encoded record of top of Treiber stack of threads waiting for
486 <     * events. The top 32 bits contain the count being waited for. The
487 <     * bottom 16 bits contains one plus the pool index of waiting
488 <     * worker thread. (Bits 16-31 are unused.)
457 >     * Prefix for assigning names to worker threads
458       */
459 <    private volatile long eventWaiters;
491 <
492 <    private static final int  EVENT_COUNT_SHIFT = 32;
493 <    private static final long WAITER_ID_MASK    = (1L << 16) - 1L;
459 >    private final String workerNamePrefix;
460  
461      /**
462 <     * A counter for events that may wake up worker threads:
463 <     *   - Submission of a new task to the pool
498 <     *   - A worker pushing a task on an empty queue
499 <     *   - termination
462 >     * Sum of per-thread steal counts, updated only when threads are
463 >     * idle or terminating.
464       */
465 <    private volatile int eventCount;
465 >    private volatile long stealCount;
466  
467      /**
468 <     * Encoded record of top of Treiber stack of spare threads waiting
469 <     * for resumption. The top 16 bits contain an arbitrary count to
470 <     * avoid ABA effects. The bottom 16bits contains one plus the pool
471 <     * index of waiting worker thread.
472 <     */
473 <    private volatile int spareWaiters;
474 <
475 <    private static final int SPARE_COUNT_SHIFT = 16;
476 <    private static final int SPARE_ID_MASK     = (1 << 16) - 1;
468 >     * Main pool control -- a long packed with:
469 >     * AC: Number of active running workers minus target parallelism (16 bits)
470 >     * TC: Number of total workers minus target parallelism (16bits)
471 >     * ST: true if pool is terminating (1 bit)
472 >     * EC: the wait count of top waiting thread (15 bits)
473 >     * ID: ~poolIndex of top of Treiber stack of waiting threads (16 bits)
474 >     *
475 >     * When convenient, we can extract the upper 32 bits of counts and
476 >     * the lower 32 bits of queue state, u = (int)(ctl >>> 32) and e =
477 >     * (int)ctl.  The ec field is never accessed alone, but always
478 >     * together with id and st. The offsets of counts by the target
479 >     * parallelism and the positionings of fields makes it possible to
480 >     * perform the most common checks via sign tests of fields: When
481 >     * ac is negative, there are not enough active workers, when tc is
482 >     * negative, there are not enough total workers, when id is
483 >     * negative, there is at least one waiting worker, and when e is
484 >     * negative, the pool is terminating.  To deal with these possibly
485 >     * negative fields, we use casts in and out of "short" and/or
486 >     * signed shifts to maintain signedness.
487 >     */
488 >    volatile long ctl;
489 >
490 >    // bit positions/shifts for fields
491 >    private static final int  AC_SHIFT   = 48;
492 >    private static final int  TC_SHIFT   = 32;
493 >    private static final int  ST_SHIFT   = 31;
494 >    private static final int  EC_SHIFT   = 16;
495 >
496 >    // bounds
497 >    private static final int  MAX_ID     = 0x7fff;  // max poolIndex
498 >    private static final int  SMASK      = 0xffff;  // mask short bits
499 >    private static final int  SHORT_SIGN = 1 << 15;
500 >    private static final int  INT_SIGN   = 1 << 31;
501 >
502 >    // masks
503 >    private static final long STOP_BIT   = 0x0001L << ST_SHIFT;
504 >    private static final long AC_MASK    = ((long)SMASK) << AC_SHIFT;
505 >    private static final long TC_MASK    = ((long)SMASK) << TC_SHIFT;
506 >
507 >    // units for incrementing and decrementing
508 >    private static final long TC_UNIT    = 1L << TC_SHIFT;
509 >    private static final long AC_UNIT    = 1L << AC_SHIFT;
510 >
511 >    // masks and units for dealing with u = (int)(ctl >>> 32)
512 >    private static final int  UAC_SHIFT  = AC_SHIFT - 32;
513 >    private static final int  UTC_SHIFT  = TC_SHIFT - 32;
514 >    private static final int  UAC_MASK   = SMASK << UAC_SHIFT;
515 >    private static final int  UTC_MASK   = SMASK << UTC_SHIFT;
516 >    private static final int  UAC_UNIT   = 1 << UAC_SHIFT;
517 >    private static final int  UTC_UNIT   = 1 << UTC_SHIFT;
518 >
519 >    // masks and units for dealing with e = (int)ctl
520 >    private static final int  E_MASK     = 0x7fffffff; // no STOP_BIT
521 >    private static final int  EC_UNIT    = 1 << EC_SHIFT;
522  
523      /**
524 <     * Lifecycle control. The low word contains the number of workers
516 <     * that are (probably) executing tasks. This value is atomically
517 <     * incremented before a worker gets a task to run, and decremented
518 <     * when worker has no tasks and cannot find any.  Bits 16-18
519 <     * contain runLevel value. When all are zero, the pool is
520 <     * running. Level transitions are monotonic (running -> shutdown
521 <     * -> terminating -> terminated) so each transition adds a bit.
522 <     * These are bundled together to ensure consistent read for
523 <     * termination checks (i.e., that runLevel is at least SHUTDOWN
524 <     * and active threads is zero).
525 <     *
526 <     * Notes: Most direct CASes are dependent on these bitfield
527 <     * positions.  Also, this field is non-private to enable direct
528 <     * performance-sensitive CASes in ForkJoinWorkerThread.
524 >     * The target parallelism level.
525       */
526 <    volatile int runState;
531 <
532 <    // Note: The order among run level values matters.
533 <    private static final int RUNLEVEL_SHIFT     = 16;
534 <    private static final int SHUTDOWN           = 1 << RUNLEVEL_SHIFT;
535 <    private static final int TERMINATING        = 1 << (RUNLEVEL_SHIFT + 1);
536 <    private static final int TERMINATED         = 1 << (RUNLEVEL_SHIFT + 2);
537 <    private static final int ACTIVE_COUNT_MASK  = (1 << RUNLEVEL_SHIFT) - 1;
526 >    final int parallelism;
527  
528      /**
529 <     * Holds number of total (i.e., created and not yet terminated)
530 <     * and running (i.e., not blocked on joins or other managed sync)
531 <     * threads, packed together to ensure consistent snapshot when
532 <     * making decisions about creating and suspending spare
544 <     * threads. Updated only by CAS. Note that adding a new worker
545 <     * requires incrementing both counts, since workers start off in
546 <     * running state.
529 >     * Index (mod submission queue length) of next element to take
530 >     * from submission queue. Usage is identical to that for
531 >     * per-worker queues -- see ForkJoinWorkerThread internal
532 >     * documentation.
533       */
534 <    private volatile int workerCounts;
534 >    volatile int queueBase;
535  
536 <    private static final int TOTAL_COUNT_SHIFT  = 16;
537 <    private static final int RUNNING_COUNT_MASK = (1 << TOTAL_COUNT_SHIFT) - 1;
538 <    private static final int ONE_RUNNING        = 1;
539 <    private static final int ONE_TOTAL          = 1 << TOTAL_COUNT_SHIFT;
536 >    /**
537 >     * Index (mod submission queue length) of next element to add
538 >     * in submission queue. Usage is identical to that for
539 >     * per-worker queues -- see ForkJoinWorkerThread internal
540 >     * documentation.
541 >     */
542 >    int queueTop;
543  
544      /**
545 <     * The target parallelism level.
557 <     * Accessed directly by ForkJoinWorkerThreads.
545 >     * True when shutdown() has been called.
546       */
547 <    final int parallelism;
547 >    volatile boolean shutdown;
548  
549      /**
550       * True if use local fifo, not default lifo, for local polling
# Line 565 | Line 553 | public class ForkJoinPool extends Abstra
553      final boolean locallyFifo;
554  
555      /**
556 <     * The uncaught exception handler used when any worker abruptly
557 <     * terminates.
556 >     * The number of threads in ForkJoinWorkerThreads.helpQuiescePool.
557 >     * When non-zero, suppresses automatic shutdown when active
558 >     * counts become zero.
559       */
560 <    private final Thread.UncaughtExceptionHandler ueh;
560 >    volatile int quiescerCount;
561  
562      /**
563 <     * Pool number, just for assigning useful names to worker threads
563 >     * The number of threads blocked in join.
564       */
565 <    private final int poolNumber;
577 <
578 <    // Utilities for CASing fields. Note that most of these
579 <    // are usually manually inlined by callers
565 >    volatile int blockedCount;
566  
567      /**
568 <     * Increments running count part of workerCounts
568 >     * Counter for worker Thread names (unrelated to their poolIndex)
569       */
570 <    final void incrementRunningCount() {
585 <        int c;
586 <        do {} while (!UNSAFE.compareAndSwapInt(this, workerCountsOffset,
587 <                                               c = workerCounts,
588 <                                               c + ONE_RUNNING));
589 <    }
570 >    private volatile int nextWorkerNumber;
571  
572      /**
573 <     * Tries to decrement running count unless already zero
573 >     * The index for the next created worker. Accessed under scanGuard.
574       */
575 <    final boolean tryDecrementRunningCount() {
595 <        int wc = workerCounts;
596 <        if ((wc & RUNNING_COUNT_MASK) == 0)
597 <            return false;
598 <        return UNSAFE.compareAndSwapInt(this, workerCountsOffset,
599 <                                        wc, wc - ONE_RUNNING);
600 <    }
575 >    private int nextWorkerIndex;
576  
577      /**
578 <     * Forces decrement of encoded workerCounts, awaiting nonzero if
579 <     * (rarely) necessary when other count updates lag.
580 <     *
581 <     * @param dr -- either zero or ONE_RUNNING
582 <     * @param dt == either zero or ONE_TOTAL
578 >     * SeqLock and index masking for updates to workers array.  Locked
579 >     * when SG_UNIT is set. Unlocking clears bit by adding
580 >     * SG_UNIT. Staleness of read-only operations can be checked by
581 >     * comparing scanGuard to value before the reads. The low 16 bits
582 >     * (i.e, anding with SMASK) hold (the smallest power of two
583 >     * covering all worker indices, minus one, and is used to avoid
584 >     * dealing with large numbers of null slots when the workers array
585 >     * is overallocated.
586       */
587 <    private void decrementWorkerCounts(int dr, int dt) {
588 <        for (;;) {
589 <            int wc = workerCounts;
612 <            if ((wc & RUNNING_COUNT_MASK)  - dr < 0 ||
613 <                (wc >>> TOTAL_COUNT_SHIFT) - dt < 0) {
614 <                if ((runState & TERMINATED) != 0)
615 <                    return; // lagging termination on a backout
616 <                Thread.yield();
617 <            }
618 <            if (UNSAFE.compareAndSwapInt(this, workerCountsOffset,
619 <                                         wc, wc - (dr + dt)))
620 <                return;
621 <        }
622 <    }
587 >    volatile int scanGuard;
588 >
589 >    private static final int SG_UNIT = 1 << 16;
590  
591      /**
592 <     * Tries decrementing active count; fails on contention.
593 <     * Called when workers cannot find tasks to run.
592 >     * The wakeup interval (in nanoseconds) for a worker waiting for a
593 >     * task when the pool is quiescent to instead try to shrink the
594 >     * number of workers.  The exact value does not matter too
595 >     * much. It must be short enough to release resources during
596 >     * sustained periods of idleness, but not so short that threads
597 >     * are continually re-created.
598       */
599 <    final boolean tryDecrementActiveCount() {
600 <        int c;
630 <        return UNSAFE.compareAndSwapInt(this, runStateOffset,
631 <                                        c = runState, c - 1);
632 <    }
599 >    private static final long SHRINK_RATE =
600 >        4L * 1000L * 1000L * 1000L; // 4 seconds
601  
602      /**
603 <     * Advances to at least the given level. Returns true if not
604 <     * already in at least the given level.
603 >     * Top-level loop for worker threads: On each step: if the
604 >     * previous step swept through all queues and found no tasks, or
605 >     * there are excess threads, then possibly blocks. Otherwise,
606 >     * scans for and, if found, executes a task. Returns when pool
607 >     * and/or worker terminate.
608 >     *
609 >     * @param w the worker
610       */
611 <    private boolean advanceRunLevel(int level) {
612 <        for (;;) {
613 <            int s = runState;
614 <            if ((s & level) != 0)
615 <                return false;
616 <            if (UNSAFE.compareAndSwapInt(this, runStateOffset, s, s | level))
617 <                return true;
611 >    final void work(ForkJoinWorkerThread w) {
612 >        boolean swept = false;                // true on empty scans
613 >        long c;
614 >        while (!w.terminate && (int)(c = ctl) >= 0) {
615 >            int a;                            // active count
616 >            if (!swept && (a = (int)(c >> AC_SHIFT)) <= 0)
617 >                swept = scan(w, a);
618 >            else if (tryAwaitWork(w, c))
619 >                swept = false;
620          }
621      }
622  
623 <    // workers array maintenance
623 >    // Signalling
624  
625      /**
626 <     * Records and returns a workers array index for new worker.
626 >     * Wakes up or creates a worker.
627       */
628 <    private int recordWorker(ForkJoinWorkerThread w) {
629 <        // Try using slot totalCount-1. If not available, scan and/or resize
630 <        int k = (workerCounts >>> TOTAL_COUNT_SHIFT) - 1;
631 <        final ReentrantLock lock = this.workerLock;
632 <        lock.lock();
633 <        try {
634 <            ForkJoinWorkerThread[] ws = workers;
635 <            int n = ws.length;
636 <            if (k < 0 || k >= n || ws[k] != null) {
637 <                for (k = 0; k < n && ws[k] != null; ++k)
638 <                    ;
639 <                if (k == n)
640 <                    ws = Arrays.copyOf(ws, n << 1);
628 >    final void signalWork() {
629 >        /*
630 >         * The while condition is true if: (there is are too few total
631 >         * workers OR there is at least one waiter) AND (there are too
632 >         * few active workers OR the pool is terminating).  The value
633 >         * of e distinguishes the remaining cases: zero (no waiters)
634 >         * for create, negative if terminating (in which case do
635 >         * nothing), else release a waiter. The secondary checks for
636 >         * release (non-null array etc) can fail if the pool begins
637 >         * terminating after the test, and don't impose any added cost
638 >         * because JVMs must perform null and bounds checks anyway.
639 >         */
640 >        long c; int e, u;
641 >        while ((((e = (int)(c = ctl)) | (u = (int)(c >>> 32))) &
642 >                (INT_SIGN|SHORT_SIGN)) == (INT_SIGN|SHORT_SIGN) && e >= 0) {
643 >            if (e > 0) {                         // release a waiting worker
644 >                int i; ForkJoinWorkerThread w; ForkJoinWorkerThread[] ws;
645 >                if ((ws = workers) == null ||
646 >                    (i = ~e & SMASK) >= ws.length ||
647 >                    (w = ws[i]) == null)
648 >                    break;
649 >                long nc = (((long)(w.nextWait & E_MASK)) |
650 >                           ((long)(u + UAC_UNIT) << 32));
651 >                if (w.eventCount == e &&
652 >                    UNSAFE.compareAndSwapLong(this, ctlOffset, c, nc)) {
653 >                    w.eventCount = (e + EC_UNIT) & E_MASK;
654 >                    if (w.parked)
655 >                        UNSAFE.unpark(w);
656 >                    break;
657 >                }
658 >            }
659 >            else if (UNSAFE.compareAndSwapLong
660 >                     (this, ctlOffset, c,
661 >                      (long)(((u + UTC_UNIT) & UTC_MASK) |
662 >                             ((u + UAC_UNIT) & UAC_MASK)) << 32)) {
663 >                addWorker();
664 >                break;
665              }
667            ws[k] = w;
668            workers = ws; // volatile array write ensures slot visibility
669        } finally {
670            lock.unlock();
666          }
672        return k;
667      }
668  
669      /**
670 <     * Nulls out record of worker in workers array.
670 >     * Variant of signalWork to help release waiters on rescans.
671 >     * Tries once to release a waiter if active count < 0.
672 >     *
673 >     * @return false if failed due to contention, else true
674       */
675 <    private void forgetWorker(ForkJoinWorkerThread w) {
676 <        int idx = w.poolIndex;
677 <        // Locking helps method recordWorker avoid unnecessary expansion
678 <        final ReentrantLock lock = this.workerLock;
679 <        lock.lock();
680 <        try {
681 <            ForkJoinWorkerThread[] ws = workers;
682 <            if (idx >= 0 && idx < ws.length && ws[idx] == w) // verify
683 <                ws[idx] = null;
684 <        } finally {
685 <            lock.unlock();
675 >    private boolean tryReleaseWaiter() {
676 >        long c; int e, i; ForkJoinWorkerThread w; ForkJoinWorkerThread[] ws;
677 >        if ((e = (int)(c = ctl)) > 0 &&
678 >            (int)(c >> AC_SHIFT) < 0 &&
679 >            (ws = workers) != null &&
680 >            (i = ~e & SMASK) < ws.length &&
681 >            (w = ws[i]) != null) {
682 >            long nc = ((long)(w.nextWait & E_MASK) |
683 >                       ((c + AC_UNIT) & (AC_MASK|TC_MASK)));
684 >            if (w.eventCount != e ||
685 >                !UNSAFE.compareAndSwapLong(this, ctlOffset, c, nc))
686 >                return false;
687 >            w.eventCount = (e + EC_UNIT) & E_MASK;
688 >            if (w.parked)
689 >                UNSAFE.unpark(w);
690          }
691 +        return true;
692      }
693  
694 +    // Scanning for tasks
695 +
696      /**
697 <     * Final callback from terminating worker.  Removes record of
698 <     * worker from array, and adjusts counts. If pool is shutting
699 <     * down, tries to complete termination.
697 >     * Scans for and, if found, executes one task. Scans start at a
698 >     * random index of workers array, and randomly select the first
699 >     * (2*#workers)-1 probes, and then, if all empty, resort to 2
700 >     * circular sweeps, which is necessary to check quiescence. and
701 >     * taking a submission only if no stealable tasks were found.  The
702 >     * steal code inside the loop is a specialized form of
703 >     * ForkJoinWorkerThread.deqTask, followed bookkeeping to support
704 >     * helpJoinTask and signal propagation. The code for submission
705 >     * queues is almost identical. On each steal, the worker completes
706 >     * not only the task, but also all local tasks that this task may
707 >     * have generated. On detecting staleness or contention when
708 >     * trying to take a task, this method returns without finishing
709 >     * sweep, which allows global state rechecks before retry.
710       *
711       * @param w the worker
712 +     * @param a the number of active workers
713 +     * @return true if swept all queues without finding a task
714       */
715 <    final void workerTerminated(ForkJoinWorkerThread w) {
716 <        forgetWorker(w);
717 <        decrementWorkerCounts(w.isTrimmed()? 0 : ONE_RUNNING, ONE_TOTAL);
702 <        while (w.stealCount != 0) // collect final count
703 <            tryAccumulateStealCount(w);
704 <        tryTerminate(false);
705 <    }
706 <
707 <    // Waiting for and signalling events
708 <
709 <    /**
710 <     * Releases workers blocked on a count not equal to current count.
711 <     * Normally called after precheck that eventWaiters isn't zero to
712 <     * avoid wasted array checks. Gives up upon a change in count or
713 <     * upon releasing two workers, letting others take over.
714 <     */
715 <    private void releaseEventWaiters() {
715 >    private boolean scan(ForkJoinWorkerThread w, int a) {
716 >        int g = scanGuard; // mask 0 avoids useless scans if only one active
717 >        int m = parallelism == 1 - a? 0 : g & SMASK;
718          ForkJoinWorkerThread[] ws = workers;
719 <        int n = ws.length;
720 <        long h = eventWaiters;
721 <        int ec = eventCount;
722 <        boolean releasedOne = false;
723 <        ForkJoinWorkerThread w; int id;
724 <        while ((id = ((int)(h & WAITER_ID_MASK)) - 1) >= 0 &&
725 <               (int)(h >>> EVENT_COUNT_SHIFT) != ec &&
726 <               id < n && (w = ws[id]) != null) {
727 <            if (UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
728 <                                          h,  w.nextWaiter)) {
729 <                LockSupport.unpark(w);
730 <                if (releasedOne) // exit on second release
731 <                    break;
732 <                releasedOne = true;
719 >        if (ws == null || ws.length <= m)         // staleness check
720 >            return false;
721 >        for (int r = w.seed, k = r, j = -(m + m); j <= m + m; ++j) {
722 >            ForkJoinTask<?> t; ForkJoinTask<?>[] q; int b, i;
723 >            ForkJoinWorkerThread v = ws[k & m];
724 >            if (v != null && (b = v.queueBase) != v.queueTop &&
725 >                (q = v.queue) != null && (i = (q.length - 1) & b) >= 0) {
726 >                long u = (i << ASHIFT) + ABASE;
727 >                if ((t = q[i]) != null && v.queueBase == b &&
728 >                    UNSAFE.compareAndSwapObject(q, u, t, null)) {
729 >                    int d = (v.queueBase = b + 1) - v.queueTop;
730 >                    v.stealHint = w.poolIndex;
731 >                    if (d != 0)
732 >                        signalWork();             // propagate if nonempty
733 >                    w.execTask(t);
734 >                }
735 >                r ^= r << 13; r ^= r >>> 17; w.seed = r ^ (r << 5);
736 >                return false;                     // store next seed
737              }
738 <            if (eventCount != ec)
739 <                break;
740 <            h = eventWaiters;
738 >            else if (j < 0) {                     // xorshift
739 >                r ^= r << 13; r ^= r >>> 17; k = r ^= r << 5;
740 >            }
741 >            else
742 >                ++k;
743 >        }
744 >        if (scanGuard != g)                       // staleness check
745 >            return false;
746 >        else {                                    // try to take submission
747 >            ForkJoinTask<?> t; ForkJoinTask<?>[] q; int b, i;
748 >            if ((b = queueBase) != queueTop &&
749 >                (q = submissionQueue) != null &&
750 >                (i = (q.length - 1) & b) >= 0) {
751 >                long u = (i << ASHIFT) + ABASE;
752 >                if ((t = q[i]) != null && queueBase == b &&
753 >                    UNSAFE.compareAndSwapObject(q, u, t, null)) {
754 >                    queueBase = b + 1;
755 >                    w.execTask(t);
756 >                }
757 >                return false;
758 >            }
759 >            return true;                         // all queues empty
760          }
761      }
762  
763      /**
764 <     * Tries to advance eventCount and releases waiters. Called only
765 <     * from workers.
766 <     */
767 <    final void signalWork() {
768 <        int c; // try to increment event count -- CAS failure OK
769 <        UNSAFE.compareAndSwapInt(this, eventCountOffset, c = eventCount, c+1);
770 <        if (eventWaiters != 0L)
771 <            releaseEventWaiters();
772 <    }
773 <
774 <    /**
775 <     * Adds the given worker to event queue and blocks until
776 <     * terminating or event count advances from the given value
777 <     *
778 <     * @param w the calling worker thread
779 <     * @param ec the count
780 <     */
781 <    private void eventSync(ForkJoinWorkerThread w, int ec) {
782 <        long nh = (((long)ec) << EVENT_COUNT_SHIFT) | ((long)(w.poolIndex+1));
783 <        long h;
784 <        while ((runState < SHUTDOWN || !tryTerminate(false)) &&
785 <               (((int)((h = eventWaiters) & WAITER_ID_MASK)) == 0 ||
786 <                (int)(h >>> EVENT_COUNT_SHIFT) == ec) &&
787 <               eventCount == ec) {
788 <            if (UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
789 <                                          w.nextWaiter = h, nh)) {
790 <                awaitEvent(w, ec);
791 <                break;
764 >     * Tries to enqueue worker w in wait queue and await change in
765 >     * worker's eventCount.  If the pool is quiescent, possibly
766 >     * terminates worker upon exit.  Otherwise, before blocking,
767 >     * rescans queues to avoid missed signals.  Upon finding work,
768 >     * releases at least one worker (which may be the current
769 >     * worker). Rescans restart upon detected staleness or failure to
770 >     * release due to contention. Note the unusual conventions about
771 >     * Thread.interrupt here and elsewhere: Because interrupts are
772 >     * used solely to alert threads to check termination, which is
773 >     * checked here anyway, we clear status (using Thread.interrupted)
774 >     * before any call to park, so that park does not immediately
775 >     * return due to status being set via some other unrelated call to
776 >     * interrupt in user code.
777 >     *
778 >     * @param w the calling worker
779 >     * @param c the ctl value on entry
780 >     * @return true if waited or another thread was released upon enq
781 >     */
782 >    private boolean tryAwaitWork(ForkJoinWorkerThread w, long c) {
783 >        int v = w.eventCount;
784 >        w.nextWait = (int)c;                      // w's successor record
785 >        long nc = (long)(v & E_MASK) | ((c - AC_UNIT) & (AC_MASK|TC_MASK));
786 >        if (ctl != c || !UNSAFE.compareAndSwapLong(this, ctlOffset, c, nc)) {
787 >            long d = ctl; // return true if lost to a deq, to force scan
788 >            return (int)d != (int)c && ((d - c) & AC_MASK) >= 0L;
789 >        }
790 >        for (int sc = w.stealCount; sc != 0;) {   // accumulate stealCount
791 >            long s = stealCount;
792 >            if (UNSAFE.compareAndSwapLong(this, stealCountOffset, s, s + sc))
793 >                sc = w.stealCount = 0;
794 >            else if (w.eventCount != v)
795 >                return true;                      // update next time
796 >        }
797 >        if (parallelism + (int)(nc >> AC_SHIFT) == 0 &&
798 >            blockedCount == 0 && quiescerCount == 0)
799 >            idleAwaitWork(w, nc, c, v);           // quiescent
800 >        for (boolean rescanned = false;;) {
801 >            if (w.eventCount != v)
802 >                return true;
803 >            if (!rescanned) {
804 >                int g = scanGuard, m = g & SMASK;
805 >                ForkJoinWorkerThread[] ws = workers;
806 >                if (ws != null && m < ws.length) {
807 >                    rescanned = true;
808 >                    for (int i = 0; i <= m; ++i) {
809 >                        ForkJoinWorkerThread u = ws[i];
810 >                        if (u != null) {
811 >                            if (u.queueBase != u.queueTop &&
812 >                                !tryReleaseWaiter())
813 >                                rescanned = false; // contended
814 >                            if (w.eventCount != v)
815 >                                return true;
816 >                        }
817 >                    }
818 >                }
819 >                if (scanGuard != g ||              // stale
820 >                    (queueBase != queueTop && !tryReleaseWaiter()))
821 >                    rescanned = false;
822 >                if (!rescanned)
823 >                    Thread.yield();                // reduce contention
824 >                else
825 >                    Thread.interrupted();          // clear before park
826 >            }
827 >            else {
828 >                w.parked = true;                   // must recheck
829 >                if (w.eventCount != v) {
830 >                    w.parked = false;
831 >                    return true;
832 >                }
833 >                LockSupport.park(this);
834 >                rescanned = w.parked = false;
835              }
836          }
837      }
838  
839      /**
840 <     * Blocks the given worker (that has already been entered as an
841 <     * event waiter) until terminating or event count advances from
842 <     * the given value. The oldest (first) waiter uses a timed wait to
843 <     * occasionally one-by-one shrink the number of workers (to a
844 <     * minimum of one) if the pool has not been used for extended
845 <     * periods.
846 <     *
847 <     * @param w the calling worker thread
848 <     * @param ec the count
849 <     */
850 <    private void awaitEvent(ForkJoinWorkerThread w, int ec) {
851 <        while (eventCount == ec) {
852 <            if (tryAccumulateStealCount(w)) { // transfer while idle
853 <                boolean untimed = (w.nextWaiter != 0L ||
854 <                                   (workerCounts & RUNNING_COUNT_MASK) <= 1);
855 <                long startTime = untimed? 0 : System.nanoTime();
856 <                Thread.interrupted();         // clear/ignore interrupt
857 <                if (eventCount != ec || w.runState != 0 ||
858 <                    runState >= TERMINATING)  // recheck after clear
840 >     * If inactivating worker w has caused pool to become
841 >     * quiescent, check for pool termination, and wait for event
842 >     * for up to SHRINK_RATE nanosecs (rescans are unnecessary in
843 >     * this case because quiescence reflects consensus about lack
844 >     * of work). On timeout, if ctl has not changed, terminate the
845 >     * worker. Upon its termination (see deregisterWorker), it may
846 >     * wake up another worker to possibly repeat this process.
847 >     *
848 >     * @param w the calling worker
849 >     * @param currentCtl the ctl value after enqueuing w
850 >     * @param prevCtl the ctl value if w terminated
851 >     * @param v the eventCount w awaits change
852 >     */
853 >    private void idleAwaitWork(ForkJoinWorkerThread w, long currentCtl,
854 >                               long prevCtl, int v) {
855 >        if (w.eventCount == v) {
856 >            if (shutdown)
857 >                tryTerminate(false);
858 >            ForkJoinTask.helpExpungeStaleExceptions(); // help clean weak refs
859 >            while (ctl == currentCtl) {
860 >                long startTime = System.nanoTime();
861 >                w.parked = true;
862 >                if (w.eventCount == v)             // must recheck
863 >                    LockSupport.parkNanos(this, SHRINK_RATE);
864 >                w.parked = false;
865 >                if (w.eventCount != v)
866 >                    break;
867 >                else if (System.nanoTime() - startTime < SHRINK_RATE)
868 >                    Thread.interrupted();          // spurious wakeup
869 >                else if (UNSAFE.compareAndSwapLong(this, ctlOffset,
870 >                                                   currentCtl, prevCtl)) {
871 >                    w.terminate = true;            // restore previous
872 >                    w.eventCount = ((int)currentCtl + EC_UNIT) & E_MASK;
873                      break;
792                if (untimed)
793                    LockSupport.park(w);
794                else {
795                    LockSupport.parkNanos(w, SHRINK_RATE_NANOS);
796                    if (eventCount != ec || w.runState != 0 ||
797                        runState >= TERMINATING)
798                        break;
799                    if (System.nanoTime() - startTime >= SHRINK_RATE_NANOS)
800                        tryShutdownUnusedWorker(ec);
874                  }
875              }
876          }
877      }
878  
879 <    // Maintaining parallelism
879 >    // Submissions
880  
881      /**
882 <     * Pushes worker onto the spare stack
882 >     * Enqueues the given task in the submissionQueue.  Same idea as
883 >     * ForkJoinWorkerThread.pushTask except for use of submissionLock.
884 >     *
885 >     * @param t the task
886       */
887 <    final void pushSpare(ForkJoinWorkerThread w) {
888 <        int ns = (++w.spareCount << SPARE_COUNT_SHIFT) | (w.poolIndex + 1);
889 <        do {} while (!UNSAFE.compareAndSwapInt(this, spareWaitersOffset,
890 <                                               w.nextSpare = spareWaiters,ns));
887 >    private void addSubmission(ForkJoinTask<?> t) {
888 >        final ReentrantLock lock = this.submissionLock;
889 >        lock.lock();
890 >        try {
891 >            ForkJoinTask<?>[] q; int s, m;
892 >            if ((q = submissionQueue) != null) {    // ignore if queue removed
893 >                long u = (((s = queueTop) & (m = q.length-1)) << ASHIFT)+ABASE;
894 >                UNSAFE.putOrderedObject(q, u, t);
895 >                queueTop = s + 1;
896 >                if (s - queueBase == m)
897 >                    growSubmissionQueue();
898 >            }
899 >        } finally {
900 >            lock.unlock();
901 >        }
902 >        signalWork();
903      }
904  
905 +    //  (pollSubmission is defined below with exported methods)
906 +
907      /**
908 <     * Tries (once) to resume a spare if the number of running
909 <     * threads is less than target.
908 >     * Creates or doubles submissionQueue array.
909 >     * Basically identical to ForkJoinWorkerThread version.
910       */
911 <    private void tryResumeSpare() {
912 <        int sw, id;
913 <        ForkJoinWorkerThread[] ws = workers;
914 <        int n = ws.length;
915 <        ForkJoinWorkerThread w;
916 <        if ((sw = spareWaiters) != 0 &&
917 <            (id = (sw & SPARE_ID_MASK) - 1) >= 0 &&
918 <            id < n && (w = ws[id]) != null &&
919 <            (workerCounts & RUNNING_COUNT_MASK) < parallelism &&
920 <            spareWaiters == sw &&
921 <            UNSAFE.compareAndSwapInt(this, spareWaitersOffset,
922 <                                     sw, w.nextSpare)) {
923 <            int c; // increment running count before resume
924 <            do {} while (!UNSAFE.compareAndSwapInt
925 <                         (this, workerCountsOffset,
926 <                          c = workerCounts, c + ONE_RUNNING));
927 <            if (w.tryUnsuspend())
928 <                LockSupport.unpark(w);
929 <            else   // back out if w was shutdown
840 <                decrementWorkerCounts(ONE_RUNNING, 0);
911 >    private void growSubmissionQueue() {
912 >        ForkJoinTask<?>[] oldQ = submissionQueue;
913 >        int size = oldQ != null ? oldQ.length << 1 : INITIAL_QUEUE_CAPACITY;
914 >        if (size > MAXIMUM_QUEUE_CAPACITY)
915 >            throw new RejectedExecutionException("Queue capacity exceeded");
916 >        if (size < INITIAL_QUEUE_CAPACITY)
917 >            size = INITIAL_QUEUE_CAPACITY;
918 >        ForkJoinTask<?>[] q = submissionQueue = new ForkJoinTask<?>[size];
919 >        int mask = size - 1;
920 >        int top = queueTop;
921 >        int oldMask;
922 >        if (oldQ != null && (oldMask = oldQ.length - 1) >= 0) {
923 >            for (int b = queueBase; b != top; ++b) {
924 >                long u = ((b & oldMask) << ASHIFT) + ABASE;
925 >                Object x = UNSAFE.getObjectVolatile(oldQ, u);
926 >                if (x != null && UNSAFE.compareAndSwapObject(oldQ, u, x, null))
927 >                    UNSAFE.putObjectVolatile
928 >                        (q, ((b & mask) << ASHIFT) + ABASE, x);
929 >            }
930          }
931      }
932  
933 +    // Blocking support
934 +
935      /**
936 <     * Tries to increase the number of running workers if below target
937 <     * parallelism: If a spare exists tries to resume it via
938 <     * tryResumeSpare.  Otherwise, if not enough total workers or all
939 <     * existing workers are busy, adds a new worker. In all cases also
940 <     * helps wake up releasable workers waiting for work.
941 <     */
942 <    private void helpMaintainParallelism() {
943 <        int pc = parallelism;
944 <        int wc, rs, tc;
945 <        while (((wc = workerCounts) & RUNNING_COUNT_MASK) < pc &&
946 <               (rs = runState) < TERMINATING) {
947 <            if (spareWaiters != 0)
948 <                tryResumeSpare();
949 <            else if ((tc = wc >>> TOTAL_COUNT_SHIFT) >= MAX_WORKERS ||
950 <                     (tc >= pc && (rs & ACTIVE_COUNT_MASK) != tc))
951 <                break;   // enough total
952 <            else if (runState == rs && workerCounts == wc &&
953 <                     UNSAFE.compareAndSwapInt(this, workerCountsOffset, wc,
954 <                                              wc + (ONE_RUNNING|ONE_TOTAL))) {
955 <                ForkJoinWorkerThread w = null;
956 <                try {
957 <                    w = factory.newThread(this);
958 <                } finally { // adjust on null or exceptional factory return
959 <                    if (w == null) {
960 <                        decrementWorkerCounts(ONE_RUNNING, ONE_TOTAL);
961 <                        tryTerminate(false); // handle failure during shutdown
936 >     * Tries to increment blockedCount, decrement active count
937 >     * (sometimes implicitly) and possibly release or create a
938 >     * compensating worker in preparation for blocking. Fails
939 >     * on contention or termination.
940 >     *
941 >     * @return true if the caller can block, else should recheck and retry
942 >     */
943 >    private boolean tryPreBlock() {
944 >        int b = blockedCount;
945 >        if (UNSAFE.compareAndSwapInt(this, blockedCountOffset, b, b + 1)) {
946 >            int pc = parallelism;
947 >            do {
948 >                ForkJoinWorkerThread[] ws; ForkJoinWorkerThread w;
949 >                int e, ac, tc, rc, i;
950 >                long c = ctl;
951 >                int u = (int)(c >>> 32);
952 >                if ((e = (int)c) < 0) {
953 >                                                 // skip -- terminating
954 >                }
955 >                else if ((ac = (u >> UAC_SHIFT)) <= 0 && e != 0 &&
956 >                         (ws = workers) != null &&
957 >                         (i = ~e & SMASK) < ws.length &&
958 >                         (w = ws[i]) != null) {
959 >                    long nc = ((long)(w.nextWait & E_MASK) |
960 >                               (c & (AC_MASK|TC_MASK)));
961 >                    if (w.eventCount == e &&
962 >                        UNSAFE.compareAndSwapLong(this, ctlOffset, c, nc)) {
963 >                        w.eventCount = (e + EC_UNIT) & E_MASK;
964 >                        if (w.parked)
965 >                            UNSAFE.unpark(w);
966 >                        return true;             // release an idle worker
967                      }
968                  }
969 <                if (w == null)
970 <                    break;
971 <                w.start(recordWorker(w), ueh);
972 <                if ((workerCounts >>> TOTAL_COUNT_SHIFT) >= pc) {
877 <                    int c; // advance event count
878 <                    UNSAFE.compareAndSwapInt(this, eventCountOffset,
879 <                                             c = eventCount, c+1);
880 <                    break; // add at most one unless total below target
969 >                else if ((tc = (short)(u >>> UTC_SHIFT)) >= 0 && ac + pc > 1) {
970 >                    long nc = ((c - AC_UNIT) & AC_MASK) | (c & ~AC_MASK);
971 >                    if (UNSAFE.compareAndSwapLong(this, ctlOffset, c, nc))
972 >                        return true;             // no compensation needed
973                  }
974 <            }
974 >                else if (tc + pc < MAX_ID) {
975 >                    long nc = ((c + TC_UNIT) & TC_MASK) | (c & ~TC_MASK);
976 >                    if (UNSAFE.compareAndSwapLong(this, ctlOffset, c, nc)) {
977 >                        addWorker();
978 >                        return true;            // create a replacement
979 >                    }
980 >                }
981 >                // try to back out on any failure and let caller retry
982 >            } while (!UNSAFE.compareAndSwapInt(this, blockedCountOffset,
983 >                                               b = blockedCount, b - 1));
984          }
985 <        if (eventWaiters != 0L)
885 <            releaseEventWaiters();
985 >        return false;
986      }
987  
988      /**
989 <     * Callback from the oldest waiter in awaitEvent waking up after a
890 <     * period of non-use. If all workers are idle, tries (once) to
891 <     * shutdown an event waiter or a spare, if one exists. Note that
892 <     * we don't need CAS or locks here because the method is called
893 <     * only from one thread occasionally waking (and even misfires are
894 <     * OK). Note that until the shutdown worker fully terminates,
895 <     * workerCounts will overestimate total count, which is tolerable.
896 <     *
897 <     * @param ec the event count waited on by caller (to abort
898 <     * attempt if count has since changed).
989 >     * Decrements blockedCount and increments active count
990       */
991 <    private void tryShutdownUnusedWorker(int ec) {
992 <        if (runState == 0 && eventCount == ec) { // only trigger if all idle
993 <            ForkJoinWorkerThread[] ws = workers;
994 <            int n = ws.length;
995 <            ForkJoinWorkerThread w = null;
996 <            boolean shutdown = false;
997 <            int sw;
907 <            long h;
908 <            if ((sw = spareWaiters) != 0) { // prefer killing spares
909 <                int id = (sw & SPARE_ID_MASK) - 1;
910 <                if (id >= 0 && id < n && (w = ws[id]) != null &&
911 <                    UNSAFE.compareAndSwapInt(this, spareWaitersOffset,
912 <                                             sw, w.nextSpare))
913 <                    shutdown = true;
914 <            }
915 <            else if ((h = eventWaiters) != 0L) {
916 <                long nh;
917 <                int id = ((int)(h & WAITER_ID_MASK)) - 1;
918 <                if (id >= 0 && id < n && (w = ws[id]) != null &&
919 <                    (nh = w.nextWaiter) != 0L && // keep at least one worker
920 <                    UNSAFE.compareAndSwapLong(this, eventWaitersOffset, h, nh))
921 <                    shutdown = true;
922 <            }
923 <            if (w != null && shutdown) {
924 <                w.shutdown();
925 <                LockSupport.unpark(w);
926 <            }
927 <        }
928 <        releaseEventWaiters(); // in case of interference
991 >    private void postBlock() {
992 >        long c;
993 >        do {} while (!UNSAFE.compareAndSwapLong(this, ctlOffset,  // no mask
994 >                                                c = ctl, c + AC_UNIT));
995 >        int b;
996 >        do {} while(!UNSAFE.compareAndSwapInt(this, blockedCountOffset,
997 >                                              b = blockedCount, b - 1));
998      }
999  
1000      /**
1001 <     * Callback from workers invoked upon each top-level action (i.e.,
1002 <     * stealing a task or taking a submission and running it).
934 <     * Performs one or more of the following:
935 <     *
936 <     * 1. If the worker is active and either did not run a task
937 <     *    or there are too many workers, try to set its active status
938 <     *    to inactive and update activeCount. On contention, we may
939 <     *    try again in this or a subsequent call.
940 <     *
941 <     * 2. If not enough total workers, help create some.
942 <     *
943 <     * 3. If there are too many running workers, suspend this worker
944 <     *    (first forcing inactive if necessary).  If it is not needed,
945 <     *    it may be shutdown while suspended (via
946 <     *    tryShutdownUnusedWorker).  Otherwise, upon resume it
947 <     *    rechecks running thread count and need for event sync.
948 <     *
949 <     * 4. If worker did not run a task, await the next task event via
950 <     *    eventSync if necessary (first forcing inactivation), upon
951 <     *    which the worker may be shutdown via
952 <     *    tryShutdownUnusedWorker.  Otherwise, help release any
953 <     *    existing event waiters that are now releasable,
1001 >     * Possibly blocks waiting for the given task to complete, or
1002 >     * cancels the task if terminating.  Fails to wait if contended.
1003       *
1004 <     * @param w the worker
956 <     * @param ran true if worker ran a task since last call to this method
1004 >     * @param joinMe the task
1005       */
1006 <    final void preStep(ForkJoinWorkerThread w, boolean ran) {
1007 <        int wec = w.lastEventCount;
1008 <        boolean active = w.active;
1009 <        boolean inactivate = false;
1010 <        int pc = parallelism;
1011 <        int rs;
1012 <        while (w.runState == 0 && (rs = runState) < TERMINATING) {
965 <            if ((inactivate || (active && (rs & ACTIVE_COUNT_MASK) >= pc)) &&
966 <                UNSAFE.compareAndSwapInt(this, runStateOffset, rs, rs - 1))
967 <                inactivate = active = w.active = false;
968 <            int wc = workerCounts;
969 <            if ((wc & RUNNING_COUNT_MASK) > pc) {
970 <                if (!(inactivate |= active) && // must inactivate to suspend
971 <                    workerCounts == wc &&      // try to suspend as spare
972 <                    UNSAFE.compareAndSwapInt(this, workerCountsOffset,
973 <                                             wc, wc - ONE_RUNNING))
974 <                    w.suspendAsSpare();
975 <            }
976 <            else if ((wc >>> TOTAL_COUNT_SHIFT) < pc)
977 <                helpMaintainParallelism();     // not enough workers
978 <            else if (!ran) {
979 <                long h = eventWaiters;
980 <                int ec = eventCount;
981 <                if (h != 0L && (int)(h >>> EVENT_COUNT_SHIFT) != ec)
982 <                    releaseEventWaiters();     // release others before waiting
983 <                else if (ec != wec) {
984 <                    w.lastEventCount = ec;     // no need to wait
985 <                    break;
986 <                }
987 <                else if (!(inactivate |= active))
988 <                    eventSync(w, wec);         // must inactivate before sync
1006 >    final void tryAwaitJoin(ForkJoinTask<?> joinMe) {
1007 >        int s;
1008 >        Thread.interrupted(); // clear interrupts before checking termination
1009 >        if (joinMe.status >= 0) {
1010 >            if (tryPreBlock()) {
1011 >                joinMe.tryAwaitDone(0L);
1012 >                postBlock();
1013              }
1014 <            else
1015 <                break;
1014 >            else if ((ctl & STOP_BIT) != 0L)
1015 >                joinMe.cancelIgnoringExceptions();
1016          }
1017      }
1018  
1019      /**
1020 <     * Helps and/or blocks awaiting join of the given task.
1021 <     * See above for explanation.
1020 >     * Possibly blocks the given worker waiting for joinMe to
1021 >     * complete or timeout
1022       *
1023 <     * @param joinMe the task to join
1024 <     * @param worker the current worker thread
1023 >     * @param joinMe the task
1024 >     * @param millis the wait time for underlying Object.wait
1025       */
1026 <    final void awaitJoin(ForkJoinTask<?> joinMe, ForkJoinWorkerThread worker) {
1003 <        int retries = 2 + (parallelism >> 2); // #helpJoins before blocking
1026 >    final void timedAwaitJoin(ForkJoinTask<?> joinMe, long nanos) {
1027          while (joinMe.status >= 0) {
1028 <            int wc;
1029 <            worker.helpJoinTask(joinMe);
1030 <            if (joinMe.status < 0)
1028 >            Thread.interrupted();
1029 >            if ((ctl & STOP_BIT) != 0L) {
1030 >                joinMe.cancelIgnoringExceptions();
1031 >                break;
1032 >            }
1033 >            if (tryPreBlock()) {
1034 >                long last = System.nanoTime();
1035 >                while (joinMe.status >= 0) {
1036 >                    long millis = TimeUnit.NANOSECONDS.toMillis(nanos);
1037 >                    if (millis <= 0)
1038 >                        break;
1039 >                    joinMe.tryAwaitDone(millis);
1040 >                    if (joinMe.status < 0)
1041 >                        break;
1042 >                    if ((ctl & STOP_BIT) != 0L) {
1043 >                        joinMe.cancelIgnoringExceptions();
1044 >                        break;
1045 >                    }
1046 >                    long now = System.nanoTime();
1047 >                    nanos -= now - last;
1048 >                    last = now;
1049 >                }
1050 >                postBlock();
1051                  break;
1009            else if (retries > 0)
1010                --retries;
1011            else if (((wc = workerCounts) & RUNNING_COUNT_MASK) != 0 &&
1012                     UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1013                                              wc, wc - ONE_RUNNING)) {
1014                int stat, c; long h;
1015                while ((stat = joinMe.status) >= 0 &&
1016                       (h = eventWaiters) != 0L && // help release others
1017                       (int)(h >>> EVENT_COUNT_SHIFT) != eventCount)
1018                    releaseEventWaiters();
1019                if (stat >= 0 &&
1020                    ((workerCounts & RUNNING_COUNT_MASK) == 0 ||
1021                     (stat =
1022                      joinMe.internalAwaitDone(JOIN_TIMEOUT_MILLIS)) >= 0))
1023                    helpMaintainParallelism(); // timeout or no running workers
1024                do {} while (!UNSAFE.compareAndSwapInt
1025                             (this, workerCountsOffset,
1026                              c = workerCounts, c + ONE_RUNNING));
1027                if (stat < 0)
1028                    break;   // else restart
1052              }
1053          }
1054      }
1055  
1056      /**
1057 <     * Same idea as awaitJoin, but no helping, retries, or timeouts.
1057 >     * If necessary, compensates for blocker, and blocks
1058       */
1059 <    final void awaitBlocker(ManagedBlocker blocker)
1059 >    private void awaitBlocker(ManagedBlocker blocker)
1060          throws InterruptedException {
1061          while (!blocker.isReleasable()) {
1062 <            int wc = workerCounts;
1040 <            if ((wc & RUNNING_COUNT_MASK) != 0 &&
1041 <                UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1042 <                                         wc, wc - ONE_RUNNING)) {
1062 >            if (tryPreBlock()) {
1063                  try {
1064 <                    while (!blocker.isReleasable()) {
1045 <                        long h = eventWaiters;
1046 <                        if (h != 0L &&
1047 <                            (int)(h >>> EVENT_COUNT_SHIFT) != eventCount)
1048 <                            releaseEventWaiters();
1049 <                        else if ((workerCounts & RUNNING_COUNT_MASK) == 0 &&
1050 <                                 runState < TERMINATING)
1051 <                            helpMaintainParallelism();
1052 <                        else if (blocker.block())
1053 <                            break;
1054 <                    }
1064 >                    do {} while (!blocker.isReleasable() && !blocker.block());
1065                  } finally {
1066 <                    int c;
1057 <                    do {} while (!UNSAFE.compareAndSwapInt
1058 <                                 (this, workerCountsOffset,
1059 <                                  c = workerCounts, c + ONE_RUNNING));
1066 >                    postBlock();
1067                  }
1068                  break;
1069              }
1070          }
1071      }
1072  
1073 +    // Creating, registering and deregistring workers
1074 +
1075 +    /**
1076 +     * Tries to create and start a worker; minimally rolls back counts
1077 +     * on failure.
1078 +     */
1079 +    private void addWorker() {
1080 +        Throwable ex = null;
1081 +        ForkJoinWorkerThread t = null;
1082 +        try {
1083 +            t = factory.newThread(this);
1084 +        } catch (Throwable e) {
1085 +            ex = e;
1086 +        }
1087 +        if (t == null) {  // null or exceptional factory return
1088 +            long c;       // adjust counts
1089 +            do {} while (!UNSAFE.compareAndSwapLong
1090 +                         (this, ctlOffset, c = ctl,
1091 +                          (((c - AC_UNIT) & AC_MASK) |
1092 +                           ((c - TC_UNIT) & TC_MASK) |
1093 +                           (c & ~(AC_MASK|TC_MASK)))));
1094 +            // Propagate exception if originating from an external caller
1095 +            if (!tryTerminate(false) && ex != null &&
1096 +                !(Thread.currentThread() instanceof ForkJoinWorkerThread))
1097 +                UNSAFE.throwException(ex);
1098 +        }
1099 +        else
1100 +            t.start();
1101 +    }
1102 +
1103 +    /**
1104 +     * Callback from ForkJoinWorkerThread constructor to assign a
1105 +     * public name
1106 +     */
1107 +    final String nextWorkerName() {
1108 +        for (int n;;) {
1109 +            if (UNSAFE.compareAndSwapInt(this, nextWorkerNumberOffset,
1110 +                                         n = nextWorkerNumber, ++n))
1111 +                return workerNamePrefix + n;
1112 +        }
1113 +    }
1114 +
1115 +    /**
1116 +     * Callback from ForkJoinWorkerThread constructor to
1117 +     * determine its poolIndex and record in workers array.
1118 +     *
1119 +     * @param w the worker
1120 +     * @return the worker's pool index
1121 +     */
1122 +    final int registerWorker(ForkJoinWorkerThread w) {
1123 +        /*
1124 +         * In the typical case, a new worker acquires the lock, uses
1125 +         * next available index and returns quickly.  Since we should
1126 +         * not block callers (ultimately from signalWork or
1127 +         * tryPreBlock) waiting for the lock needed to do this, we
1128 +         * instead help release other workers while waiting for the
1129 +         * lock.
1130 +         */
1131 +        for (int g;;) {
1132 +            ForkJoinWorkerThread[] ws;
1133 +            if (((g = scanGuard) & SG_UNIT) == 0 &&
1134 +                UNSAFE.compareAndSwapInt(this, scanGuardOffset,
1135 +                                         g, g | SG_UNIT)) {
1136 +                int k = nextWorkerIndex;
1137 +                try {
1138 +                    if ((ws = workers) != null) { // ignore on shutdown
1139 +                        int n = ws.length;
1140 +                        if (k < 0 || k >= n || ws[k] != null) {
1141 +                            for (k = 0; k < n && ws[k] != null; ++k)
1142 +                                ;
1143 +                            if (k == n)
1144 +                                ws = workers = Arrays.copyOf(ws, n << 1);
1145 +                        }
1146 +                        ws[k] = w;
1147 +                        nextWorkerIndex = k + 1;
1148 +                        int m = g & SMASK;
1149 +                        g = k >= m? ((m << 1) + 1) & SMASK : g + (SG_UNIT<<1);
1150 +                    }
1151 +                } finally {
1152 +                    scanGuard = g;
1153 +                }
1154 +                return k;
1155 +            }
1156 +            else if ((ws = workers) != null) { // help release others
1157 +                for (ForkJoinWorkerThread u : ws) {
1158 +                    if (u != null && u.queueBase != u.queueTop) {
1159 +                        if (tryReleaseWaiter())
1160 +                            break;
1161 +                    }
1162 +                }
1163 +            }
1164 +        }
1165 +    }
1166 +
1167 +    /**
1168 +     * Final callback from terminating worker.  Removes record of
1169 +     * worker from array, and adjusts counts. If pool is shutting
1170 +     * down, tries to complete termination.
1171 +     *
1172 +     * @param w the worker
1173 +     */
1174 +    final void deregisterWorker(ForkJoinWorkerThread w, Throwable ex) {
1175 +        int idx = w.poolIndex;
1176 +        int sc = w.stealCount;
1177 +        int steps = 0;
1178 +        // Remove from array, adjust worker counts and collect steal count.
1179 +        // We can intermix failed removes or adjusts with steal updates
1180 +        do {
1181 +            long s, c;
1182 +            int g;
1183 +            if (steps == 0 && ((g = scanGuard) & SG_UNIT) == 0 &&
1184 +                UNSAFE.compareAndSwapInt(this, scanGuardOffset,
1185 +                                         g, g |= SG_UNIT)) {
1186 +                ForkJoinWorkerThread[] ws = workers;
1187 +                if (ws != null && idx >= 0 &&
1188 +                    idx < ws.length && ws[idx] == w)
1189 +                    ws[idx] = null;    // verify
1190 +                nextWorkerIndex = idx;
1191 +                scanGuard = g + SG_UNIT;
1192 +                steps = 1;
1193 +            }
1194 +            if (steps == 1 &&
1195 +                UNSAFE.compareAndSwapLong(this, ctlOffset, c = ctl,
1196 +                                          (((c - AC_UNIT) & AC_MASK) |
1197 +                                           ((c - TC_UNIT) & TC_MASK) |
1198 +                                           (c & ~(AC_MASK|TC_MASK)))))
1199 +                steps = 2;
1200 +            if (sc != 0 &&
1201 +                UNSAFE.compareAndSwapLong(this, stealCountOffset,
1202 +                                          s = stealCount, s + sc))
1203 +                sc = 0;
1204 +        } while (steps != 2 || sc != 0);
1205 +        if (!tryTerminate(false)) {
1206 +            if (ex != null)   // possibly replace if died abnormally
1207 +                signalWork();
1208 +            else
1209 +                tryReleaseWaiter();
1210 +        }
1211 +    }
1212 +
1213 +    // Shutdown and termination
1214 +
1215      /**
1216       * Possibly initiates and/or completes termination.
1217       *
# Line 1071 | Line 1220 | public class ForkJoinPool extends Abstra
1220       * @return true if now terminating or terminated
1221       */
1222      private boolean tryTerminate(boolean now) {
1223 <        if (now)
1224 <            advanceRunLevel(SHUTDOWN); // ensure at least SHUTDOWN
1225 <        else if (runState < SHUTDOWN ||
1226 <                 !submissionQueue.isEmpty() ||
1227 <                 (runState & ACTIVE_COUNT_MASK) != 0)
1228 <            return false;
1229 <
1230 <        if (advanceRunLevel(TERMINATING))
1231 <            startTerminating();
1232 <
1233 <        // Finish now if all threads terminated; else in some subsequent call
1234 <        if ((workerCounts >>> TOTAL_COUNT_SHIFT) == 0) {
1235 <            advanceRunLevel(TERMINATED);
1236 <            termination.arrive();
1223 >        long c;
1224 >        while (((c = ctl) & STOP_BIT) == 0) {
1225 >            if (!now) {
1226 >                if ((int)(c >> AC_SHIFT) != -parallelism)
1227 >                    return false;
1228 >                if (!shutdown || blockedCount != 0 || quiescerCount != 0 ||
1229 >                    queueBase != queueTop) {
1230 >                    if (ctl == c) // staleness check
1231 >                        return false;
1232 >                    continue;
1233 >                }
1234 >            }
1235 >            if (UNSAFE.compareAndSwapLong(this, ctlOffset, c, c | STOP_BIT))
1236 >                startTerminating();
1237 >        }
1238 >        if ((short)(c >>> TC_SHIFT) == -parallelism) { // signal when 0 workers
1239 >            final ReentrantLock lock = this.submissionLock;
1240 >            lock.lock();
1241 >            try {
1242 >                termination.signalAll();
1243 >            } finally {
1244 >                lock.unlock();
1245 >            }
1246          }
1247          return true;
1248      }
1249  
1250      /**
1251 <     * Actions on transition to TERMINATING
1252 <     *
1253 <     * Runs up to four passes through workers: (0) shutting down each
1254 <     * (without waking up if parked) to quickly spread notifications
1255 <     * without unnecessary bouncing around event queues etc (1) wake
1256 <     * up and help cancel tasks (2) interrupt (3) mop up races with
1099 <     * interrupted workers
1251 >     * Runs up to three passes through workers: (0) Setting
1252 >     * termination status for each worker, followed by wakeups up to
1253 >     * queued workers; (1) helping cancel tasks; (2) interrupting
1254 >     * lagging threads (likely in external tasks, but possibly also
1255 >     * blocked in joins).  Each pass repeats previous steps because of
1256 >     * potential lagging thread creation.
1257       */
1258      private void startTerminating() {
1259          cancelSubmissions();
1260 <        for (int passes = 0; passes < 4 && workerCounts != 0; ++passes) {
1261 <            int c; // advance event count
1262 <            UNSAFE.compareAndSwapInt(this, eventCountOffset,
1263 <                                     c = eventCount, c+1);
1264 <            eventWaiters = 0L; // clobber lists
1265 <            spareWaiters = 0;
1266 <            for (ForkJoinWorkerThread w : workers) {
1267 <                if (w != null) {
1268 <                    w.shutdown();
1269 <                    if (passes > 0 && !w.isTerminated()) {
1270 <                        w.cancelTasks();
1271 <                        LockSupport.unpark(w);
1272 <                        if (passes > 1) {
1116 <                            try {
1117 <                                w.interrupt();
1118 <                            } catch (SecurityException ignore) {
1260 >        for (int pass = 0; pass < 3; ++pass) {
1261 >            ForkJoinWorkerThread[] ws = workers;
1262 >            if (ws != null) {
1263 >                for (ForkJoinWorkerThread w : ws) {
1264 >                    if (w != null) {
1265 >                        w.terminate = true;
1266 >                        if (pass > 0) {
1267 >                            w.cancelTasks();
1268 >                            if (pass > 1 && !w.isInterrupted()) {
1269 >                                try {
1270 >                                    w.interrupt();
1271 >                                } catch (SecurityException ignore) {
1272 >                                }
1273                              }
1274                          }
1275                      }
1276                  }
1277 +                terminateWaiters();
1278              }
1279          }
1280      }
1281  
1282      /**
1283 <     * Clears out and cancels submissions, ignoring exceptions.
1283 >     * Polls and cancels all submissions. Called only during termination.
1284       */
1285      private void cancelSubmissions() {
1286 <        ForkJoinTask<?> task;
1287 <        while ((task = submissionQueue.poll()) != null) {
1288 <            try {
1289 <                task.cancel(false);
1290 <            } catch (Throwable ignore) {
1286 >        while (queueBase != queueTop) {
1287 >            ForkJoinTask<?> task = pollSubmission();
1288 >            if (task != null) {
1289 >                try {
1290 >                    task.cancel(false);
1291 >                } catch (Throwable ignore) {
1292 >                }
1293              }
1294          }
1295      }
1296  
1297 <    // misc support for ForkJoinWorkerThread
1297 >    /**
1298 >     * Tries to set the termination status of waiting workers, and
1299 >     * then wakes them up (after which they will terminate).
1300 >     */
1301 >    private void terminateWaiters() {
1302 >        ForkJoinWorkerThread[] ws = workers;
1303 >        if (ws != null) {
1304 >            ForkJoinWorkerThread w; long c; int i, e;
1305 >            int n = ws.length;
1306 >            while ((i = ~(e = (int)(c = ctl)) & SMASK) < n &&
1307 >                   (w = ws[i]) != null && w.eventCount == (e & E_MASK)) {
1308 >                if (UNSAFE.compareAndSwapLong(this, ctlOffset, c,
1309 >                                              (long)(w.nextWait & E_MASK) |
1310 >                                              ((c + AC_UNIT) & AC_MASK) |
1311 >                                              (c & (TC_MASK|STOP_BIT)))) {
1312 >                    w.terminate = true;
1313 >                    w.eventCount = e + EC_UNIT;
1314 >                    if (w.parked)
1315 >                        UNSAFE.unpark(w);
1316 >                }
1317 >            }
1318 >        }
1319 >    }
1320 >
1321 >    // misc ForkJoinWorkerThread support
1322  
1323      /**
1324 <     * Returns pool number.
1324 >     * Increment or decrement quiescerCount. Needed only to prevent
1325 >     * triggering shutdown if a worker is transiently inactive while
1326 >     * checking quiescence.
1327 >     *
1328 >     * @param delta 1 for increment, -1 for decrement
1329       */
1330 <    final int getPoolNumber() {
1331 <        return poolNumber;
1330 >    final void addQuiescerCount(int delta) {
1331 >        int c;
1332 >        do {} while(!UNSAFE.compareAndSwapInt(this, quiescerCountOffset,
1333 >                                              c = quiescerCount, c + delta));
1334      }
1335  
1336      /**
1337 <     * Tries to accumulate steal count from a worker, clearing
1338 <     * the worker's value if successful.
1337 >     * Directly increment or decrement active count without
1338 >     * queuing. This method is used to transiently assert inactivation
1339 >     * while checking quiescence.
1340       *
1341 <     * @return true if worker steal count now zero
1341 >     * @param delta 1 for increment, -1 for decrement
1342       */
1343 <    final boolean tryAccumulateStealCount(ForkJoinWorkerThread w) {
1344 <        int sc = w.stealCount;
1345 <        long c = stealCount;
1346 <        // CAS even if zero, for fence effects
1347 <        if (UNSAFE.compareAndSwapLong(this, stealCountOffset, c, c + sc)) {
1348 <            if (sc != 0)
1161 <                w.stealCount = 0;
1162 <            return true;
1163 <        }
1164 <        return sc == 0;
1343 >    final void addActiveCount(int delta) {
1344 >        long d = delta < 0 ? -AC_UNIT : AC_UNIT;
1345 >        long c;
1346 >        do {} while (!UNSAFE.compareAndSwapLong(this, ctlOffset, c = ctl,
1347 >                                                ((c + d) & AC_MASK) |
1348 >                                                (c & ~AC_MASK)));
1349      }
1350  
1351      /**
# Line 1169 | Line 1353 | public class ForkJoinPool extends Abstra
1353       * active thread.
1354       */
1355      final int idlePerActive() {
1356 <        int pc = parallelism; // use parallelism, not rc
1357 <        int ac = runState;    // no mask -- artificially boosts during shutdown
1358 <        // Use exact results for small values, saturate past 4
1359 <        return ((pc <= ac) ? 0 :
1360 <                (pc >>> 1 <= ac) ? 1 :
1361 <                (pc >>> 2 <= ac) ? 3 :
1362 <                pc >>> 3);
1356 >        // Approximate at powers of two for small values, saturate past 4
1357 >        int p = parallelism;
1358 >        int a = p + (int)(ctl >> AC_SHIFT);
1359 >        return (a > (p >>>= 1) ? 0 :
1360 >                a > (p >>>= 1) ? 1 :
1361 >                a > (p >>>= 1) ? 2 :
1362 >                a > (p >>>= 1) ? 4 :
1363 >                8);
1364      }
1365  
1366 <    // Public and protected methods
1366 >    // Exported methods
1367  
1368      // Constructors
1369  
# Line 1247 | Line 1432 | public class ForkJoinPool extends Abstra
1432          checkPermission();
1433          if (factory == null)
1434              throw new NullPointerException();
1435 <        if (parallelism <= 0 || parallelism > MAX_WORKERS)
1435 >        if (parallelism <= 0 || parallelism > MAX_ID)
1436              throw new IllegalArgumentException();
1437          this.parallelism = parallelism;
1438          this.factory = factory;
1439          this.ueh = handler;
1440          this.locallyFifo = asyncMode;
1441 <        int arraySize = initialArraySizeFor(parallelism);
1442 <        this.workers = new ForkJoinWorkerThread[arraySize];
1443 <        this.submissionQueue = new LinkedTransferQueue<ForkJoinTask<?>>();
1444 <        this.workerLock = new ReentrantLock();
1445 <        this.termination = new Phaser(1);
1446 <        this.poolNumber = poolNumberGenerator.incrementAndGet();
1447 <    }
1448 <
1449 <    /**
1450 <     * Returns initial power of two size for workers array.
1451 <     * @param pc the initial parallelism level
1452 <     */
1453 <    private static int initialArraySizeFor(int pc) {
1454 <        // If possible, initially allocate enough space for one spare
1455 <        int size = pc < MAX_WORKERS ? pc + 1 : MAX_WORKERS;
1456 <        // See Hackers Delight, sec 3.2. We know MAX_WORKERS < (1 >>> 16)
1457 <        size |= size >>> 1;
1273 <        size |= size >>> 2;
1274 <        size |= size >>> 4;
1275 <        size |= size >>> 8;
1276 <        return size + 1;
1441 >        long np = (long)(-parallelism); // offset ctl counts
1442 >        this.ctl = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
1443 >        this.submissionQueue = new ForkJoinTask<?>[INITIAL_QUEUE_CAPACITY];
1444 >        // initialize workers array with room for 2*parallelism if possible
1445 >        int n = parallelism << 1;
1446 >        if (n >= MAX_ID)
1447 >            n = MAX_ID;
1448 >        else { // See Hackers Delight, sec 3.2, where n < (1 << 16)
1449 >            n |= n >>> 1; n |= n >>> 2; n |= n >>> 4; n |= n >>> 8;
1450 >        }
1451 >        workers = new ForkJoinWorkerThread[n + 1];
1452 >        this.submissionLock = new ReentrantLock();
1453 >        this.termination = submissionLock.newCondition();
1454 >        StringBuilder sb = new StringBuilder("ForkJoinPool-");
1455 >        sb.append(poolNumberGenerator.incrementAndGet());
1456 >        sb.append("-worker-");
1457 >        this.workerNamePrefix = sb.toString();
1458      }
1459  
1460      // Execution methods
1461  
1462      /**
1282     * Common code for execute, invoke and submit
1283     */
1284    private <T> void doSubmit(ForkJoinTask<T> task) {
1285        if (task == null)
1286            throw new NullPointerException();
1287        if (runState >= SHUTDOWN)
1288            throw new RejectedExecutionException();
1289        submissionQueue.offer(task);
1290        int c; // try to increment event count -- CAS failure OK
1291        UNSAFE.compareAndSwapInt(this, eventCountOffset, c = eventCount, c+1);
1292        helpMaintainParallelism(); // create, start, or resume some workers
1293    }
1294
1295    /**
1463       * Performs the given task, returning its result upon completion.
1464 +     * If the computation encounters an unchecked Exception or Error,
1465 +     * it is rethrown as the outcome of this invocation.  Rethrown
1466 +     * exceptions behave in the same way as regular exceptions, but,
1467 +     * when possible, contain stack traces (as displayed for example
1468 +     * using {@code ex.printStackTrace()}) of both the current thread
1469 +     * as well as the thread actually encountering the exception;
1470 +     * minimally only the latter.
1471       *
1472       * @param task the task
1473       * @return the task's result
# Line 1302 | Line 1476 | public class ForkJoinPool extends Abstra
1476       *         scheduled for execution
1477       */
1478      public <T> T invoke(ForkJoinTask<T> task) {
1479 <        doSubmit(task);
1480 <        return task.join();
1479 >        Thread t = Thread.currentThread();
1480 >        if (task == null)
1481 >            throw new NullPointerException();
1482 >        if (shutdown)
1483 >            throw new RejectedExecutionException();
1484 >        if ((t instanceof ForkJoinWorkerThread) &&
1485 >            ((ForkJoinWorkerThread)t).pool == this)
1486 >            return task.invoke();  // bypass submit if in same pool
1487 >        else {
1488 >            addSubmission(task);
1489 >            return task.join();
1490 >        }
1491 >    }
1492 >
1493 >    /**
1494 >     * Unless terminating, forks task if within an ongoing FJ
1495 >     * computation in the current pool, else submits as external task.
1496 >     */
1497 >    private <T> void forkOrSubmit(ForkJoinTask<T> task) {
1498 >        ForkJoinWorkerThread w;
1499 >        Thread t = Thread.currentThread();
1500 >        if (shutdown)
1501 >            throw new RejectedExecutionException();
1502 >        if ((t instanceof ForkJoinWorkerThread) &&
1503 >            (w = (ForkJoinWorkerThread)t).pool == this)
1504 >            w.pushTask(task);
1505 >        else
1506 >            addSubmission(task);
1507      }
1508  
1509      /**
# Line 1315 | Line 1515 | public class ForkJoinPool extends Abstra
1515       *         scheduled for execution
1516       */
1517      public void execute(ForkJoinTask<?> task) {
1518 <        doSubmit(task);
1518 >        if (task == null)
1519 >            throw new NullPointerException();
1520 >        forkOrSubmit(task);
1521      }
1522  
1523      // AbstractExecutorService methods
# Line 1326 | Line 1528 | public class ForkJoinPool extends Abstra
1528       *         scheduled for execution
1529       */
1530      public void execute(Runnable task) {
1531 +        if (task == null)
1532 +            throw new NullPointerException();
1533          ForkJoinTask<?> job;
1534          if (task instanceof ForkJoinTask<?>) // avoid re-wrap
1535              job = (ForkJoinTask<?>) task;
1536          else
1537              job = ForkJoinTask.adapt(task, null);
1538 <        doSubmit(job);
1538 >        forkOrSubmit(job);
1539      }
1540  
1541      /**
# Line 1344 | Line 1548 | public class ForkJoinPool extends Abstra
1548       *         scheduled for execution
1549       */
1550      public <T> ForkJoinTask<T> submit(ForkJoinTask<T> task) {
1551 <        doSubmit(task);
1551 >        if (task == null)
1552 >            throw new NullPointerException();
1553 >        forkOrSubmit(task);
1554          return task;
1555      }
1556  
# Line 1354 | Line 1560 | public class ForkJoinPool extends Abstra
1560       *         scheduled for execution
1561       */
1562      public <T> ForkJoinTask<T> submit(Callable<T> task) {
1563 +        if (task == null)
1564 +            throw new NullPointerException();
1565          ForkJoinTask<T> job = ForkJoinTask.adapt(task);
1566 <        doSubmit(job);
1566 >        forkOrSubmit(job);
1567          return job;
1568      }
1569  
# Line 1365 | Line 1573 | public class ForkJoinPool extends Abstra
1573       *         scheduled for execution
1574       */
1575      public <T> ForkJoinTask<T> submit(Runnable task, T result) {
1576 +        if (task == null)
1577 +            throw new NullPointerException();
1578          ForkJoinTask<T> job = ForkJoinTask.adapt(task, result);
1579 <        doSubmit(job);
1579 >        forkOrSubmit(job);
1580          return job;
1581      }
1582  
# Line 1376 | Line 1586 | public class ForkJoinPool extends Abstra
1586       *         scheduled for execution
1587       */
1588      public ForkJoinTask<?> submit(Runnable task) {
1589 +        if (task == null)
1590 +            throw new NullPointerException();
1591          ForkJoinTask<?> job;
1592          if (task instanceof ForkJoinTask<?>) // avoid re-wrap
1593              job = (ForkJoinTask<?>) task;
1594          else
1595              job = ForkJoinTask.adapt(task, null);
1596 <        doSubmit(job);
1596 >        forkOrSubmit(job);
1597          return job;
1598      }
1599  
# Line 1441 | Line 1653 | public class ForkJoinPool extends Abstra
1653  
1654      /**
1655       * Returns the number of worker threads that have started but not
1656 <     * yet terminated.  This result returned by this method may differ
1656 >     * yet terminated.  The result returned by this method may differ
1657       * from {@link #getParallelism} when threads are created to
1658       * maintain parallelism when others are cooperatively blocked.
1659       *
1660       * @return the number of worker threads
1661       */
1662      public int getPoolSize() {
1663 <        return workerCounts >>> TOTAL_COUNT_SHIFT;
1663 >        return parallelism + (short)(ctl >>> TC_SHIFT);
1664      }
1665  
1666      /**
# Line 1470 | Line 1682 | public class ForkJoinPool extends Abstra
1682       * @return the number of worker threads
1683       */
1684      public int getRunningThreadCount() {
1685 <        return workerCounts & RUNNING_COUNT_MASK;
1685 >        int r = parallelism + (int)(ctl >> AC_SHIFT);
1686 >        return r <= 0? 0 : r; // suppress momentarily negative values
1687      }
1688  
1689      /**
# Line 1481 | Line 1694 | public class ForkJoinPool extends Abstra
1694       * @return the number of active threads
1695       */
1696      public int getActiveThreadCount() {
1697 <        return runState & ACTIVE_COUNT_MASK;
1697 >        int r = parallelism + (int)(ctl >> AC_SHIFT) + blockedCount;
1698 >        return r <= 0? 0 : r; // suppress momentarily negative values
1699      }
1700  
1701      /**
# Line 1496 | Line 1710 | public class ForkJoinPool extends Abstra
1710       * @return {@code true} if all threads are currently idle
1711       */
1712      public boolean isQuiescent() {
1713 <        return (runState & ACTIVE_COUNT_MASK) == 0;
1713 >        return parallelism + (int)(ctl >> AC_SHIFT) + blockedCount == 0;
1714      }
1715  
1716      /**
# Line 1526 | Line 1740 | public class ForkJoinPool extends Abstra
1740       */
1741      public long getQueuedTaskCount() {
1742          long count = 0;
1743 <        for (ForkJoinWorkerThread w : workers)
1744 <            if (w != null)
1745 <                count += w.getQueueSize();
1743 >        ForkJoinWorkerThread[] ws;
1744 >        if ((short)(ctl >>> TC_SHIFT) > -parallelism &&
1745 >            (ws = workers) != null) {
1746 >            for (ForkJoinWorkerThread w : ws)
1747 >                if (w != null)
1748 >                    count -= w.queueBase - w.queueTop; // must read base first
1749 >        }
1750          return count;
1751      }
1752  
1753      /**
1754       * Returns an estimate of the number of tasks submitted to this
1755 <     * pool that have not yet begun executing.  This method takes time
1756 <     * proportional to the number of submissions.
1755 >     * pool that have not yet begun executing.  This method may take
1756 >     * time proportional to the number of submissions.
1757       *
1758       * @return the number of queued submissions
1759       */
1760      public int getQueuedSubmissionCount() {
1761 <        return submissionQueue.size();
1761 >        return -queueBase + queueTop;
1762      }
1763  
1764      /**
# Line 1550 | Line 1768 | public class ForkJoinPool extends Abstra
1768       * @return {@code true} if there are any queued submissions
1769       */
1770      public boolean hasQueuedSubmissions() {
1771 <        return !submissionQueue.isEmpty();
1771 >        return queueBase != queueTop;
1772      }
1773  
1774      /**
# Line 1561 | Line 1779 | public class ForkJoinPool extends Abstra
1779       * @return the next submission, or {@code null} if none
1780       */
1781      protected ForkJoinTask<?> pollSubmission() {
1782 <        return submissionQueue.poll();
1782 >        ForkJoinTask<?> t; ForkJoinTask<?>[] q; int b, i;
1783 >        while ((b = queueBase) != queueTop &&
1784 >               (q = submissionQueue) != null &&
1785 >               (i = (q.length - 1) & b) >= 0) {
1786 >            long u = (i << ASHIFT) + ABASE;
1787 >            if ((t = q[i]) != null &&
1788 >                queueBase == b &&
1789 >                UNSAFE.compareAndSwapObject(q, u, t, null)) {
1790 >                queueBase = b + 1;
1791 >                return t;
1792 >            }
1793 >        }
1794 >        return null;
1795      }
1796  
1797      /**
# Line 1582 | Line 1812 | public class ForkJoinPool extends Abstra
1812       * @return the number of elements transferred
1813       */
1814      protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
1815 <        int count = submissionQueue.drainTo(c);
1816 <        for (ForkJoinWorkerThread w : workers)
1817 <            if (w != null)
1818 <                count += w.drainTasksTo(c);
1815 >        int count = 0;
1816 >        while (queueBase != queueTop) {
1817 >            ForkJoinTask<?> t = pollSubmission();
1818 >            if (t != null) {
1819 >                c.add(t);
1820 >                ++count;
1821 >            }
1822 >        }
1823 >        ForkJoinWorkerThread[] ws;
1824 >        if ((short)(ctl >>> TC_SHIFT) > -parallelism &&
1825 >            (ws = workers) != null) {
1826 >            for (ForkJoinWorkerThread w : ws)
1827 >                if (w != null)
1828 >                    count += w.drainTasksTo(c);
1829 >        }
1830          return count;
1831      }
1832  
# Line 1600 | Line 1841 | public class ForkJoinPool extends Abstra
1841          long st = getStealCount();
1842          long qt = getQueuedTaskCount();
1843          long qs = getQueuedSubmissionCount();
1603        int wc = workerCounts;
1604        int tc = wc >>> TOTAL_COUNT_SHIFT;
1605        int rc = wc & RUNNING_COUNT_MASK;
1844          int pc = parallelism;
1845 <        int rs = runState;
1846 <        int ac = rs & ACTIVE_COUNT_MASK;
1845 >        long c = ctl;
1846 >        int tc = pc + (short)(c >>> TC_SHIFT);
1847 >        int rc = pc + (int)(c >> AC_SHIFT);
1848 >        if (rc < 0) // ignore transient negative
1849 >            rc = 0;
1850 >        int ac = rc + blockedCount;
1851 >        String level;
1852 >        if ((c & STOP_BIT) != 0)
1853 >            level = (tc == 0)? "Terminated" : "Terminating";
1854 >        else
1855 >            level = shutdown? "Shutting down" : "Running";
1856          return super.toString() +
1857 <            "[" + runLevelToString(rs) +
1857 >            "[" + level +
1858              ", parallelism = " + pc +
1859              ", size = " + tc +
1860              ", active = " + ac +
# Line 1618 | Line 1865 | public class ForkJoinPool extends Abstra
1865              "]";
1866      }
1867  
1621    private static String runLevelToString(int s) {
1622        return ((s & TERMINATED) != 0 ? "Terminated" :
1623                ((s & TERMINATING) != 0 ? "Terminating" :
1624                 ((s & SHUTDOWN) != 0 ? "Shutting down" :
1625                  "Running")));
1626    }
1627
1868      /**
1869       * Initiates an orderly shutdown in which previously submitted
1870       * tasks are executed, but no new tasks will be accepted.
# Line 1639 | Line 1879 | public class ForkJoinPool extends Abstra
1879       */
1880      public void shutdown() {
1881          checkPermission();
1882 <        advanceRunLevel(SHUTDOWN);
1882 >        shutdown = true;
1883          tryTerminate(false);
1884      }
1885  
# Line 1661 | Line 1901 | public class ForkJoinPool extends Abstra
1901       */
1902      public List<Runnable> shutdownNow() {
1903          checkPermission();
1904 +        shutdown = true;
1905          tryTerminate(true);
1906          return Collections.emptyList();
1907      }
# Line 1671 | Line 1912 | public class ForkJoinPool extends Abstra
1912       * @return {@code true} if all tasks have completed following shut down
1913       */
1914      public boolean isTerminated() {
1915 <        return runState >= TERMINATED;
1915 >        long c = ctl;
1916 >        return ((c & STOP_BIT) != 0L &&
1917 >                (short)(c >>> TC_SHIFT) == -parallelism);
1918      }
1919  
1920      /**
# Line 1679 | Line 1922 | public class ForkJoinPool extends Abstra
1922       * commenced but not yet completed.  This method may be useful for
1923       * debugging. A return of {@code true} reported a sufficient
1924       * period after shutdown may indicate that submitted tasks have
1925 <     * ignored or suppressed interruption, causing this executor not
1926 <     * to properly terminate.
1925 >     * ignored or suppressed interruption, or are waiting for IO,
1926 >     * causing this executor not to properly terminate. (See the
1927 >     * advisory notes for class {@link ForkJoinTask} stating that
1928 >     * tasks should not normally entail blocking operations.  But if
1929 >     * they do, they must abort them on interrupt.)
1930       *
1931       * @return {@code true} if terminating but not yet terminated
1932       */
1933      public boolean isTerminating() {
1934 <        return (runState & (TERMINATING|TERMINATED)) == TERMINATING;
1934 >        long c = ctl;
1935 >        return ((c & STOP_BIT) != 0L &&
1936 >                (short)(c >>> TC_SHIFT) != -parallelism);
1937 >    }
1938 >
1939 >    /**
1940 >     * Returns true if terminating or terminated. Used by ForkJoinWorkerThread.
1941 >     */
1942 >    final boolean isAtLeastTerminating() {
1943 >        return (ctl & STOP_BIT) != 0L;
1944      }
1945  
1946      /**
# Line 1694 | Line 1949 | public class ForkJoinPool extends Abstra
1949       * @return {@code true} if this pool has been shut down
1950       */
1951      public boolean isShutdown() {
1952 <        return runState >= SHUTDOWN;
1952 >        return shutdown;
1953      }
1954  
1955      /**
# Line 1710 | Line 1965 | public class ForkJoinPool extends Abstra
1965       */
1966      public boolean awaitTermination(long timeout, TimeUnit unit)
1967          throws InterruptedException {
1968 +        long nanos = unit.toNanos(timeout);
1969 +        final ReentrantLock lock = this.submissionLock;
1970 +        lock.lock();
1971          try {
1972 <            return termination.awaitAdvanceInterruptibly(0, timeout, unit) > 0;
1973 <        } catch (TimeoutException ex) {
1974 <            return false;
1972 >            for (;;) {
1973 >                if (isTerminated())
1974 >                    return true;
1975 >                if (nanos <= 0)
1976 >                    return false;
1977 >                nanos = termination.awaitNanos(nanos);
1978 >            }
1979 >        } finally {
1980 >            lock.unlock();
1981          }
1982      }
1983  
# Line 1725 | Line 1989 | public class ForkJoinPool extends Abstra
1989       * {@code isReleasable} must return {@code true} if blocking is
1990       * not necessary. Method {@code block} blocks the current thread
1991       * if necessary (perhaps internally invoking {@code isReleasable}
1992 <     * before actually blocking). The unusual methods in this API
1993 <     * accommodate synchronizers that may, but don't usually, block
1994 <     * for long periods. Similarly, they allow more efficient internal
1995 <     * handling of cases in which additional workers may be, but
1996 <     * usually are not, needed to ensure sufficient parallelism.
1997 <     * Toward this end, implementations of method {@code isReleasable}
1998 <     * must be amenable to repeated invocation.
1992 >     * before actually blocking). These actions are performed by any
1993 >     * thread invoking {@link ForkJoinPool#managedBlock}.  The
1994 >     * unusual methods in this API accommodate synchronizers that may,
1995 >     * but don't usually, block for long periods. Similarly, they
1996 >     * allow more efficient internal handling of cases in which
1997 >     * additional workers may be, but usually are not, needed to
1998 >     * ensure sufficient parallelism.  Toward this end,
1999 >     * implementations of method {@code isReleasable} must be amenable
2000 >     * to repeated invocation.
2001       *
2002       * <p>For example, here is a ManagedBlocker based on a
2003       * ReentrantLock:
# Line 1833 | Line 2099 | public class ForkJoinPool extends Abstra
2099      }
2100  
2101      // Unsafe mechanics
2102 <
2103 <    private static final sun.misc.Unsafe UNSAFE = getUnsafe();
2104 <    private static final long workerCountsOffset =
2105 <        objectFieldOffset("workerCounts", ForkJoinPool.class);
2106 <    private static final long runStateOffset =
2107 <        objectFieldOffset("runState", ForkJoinPool.class);
2108 <    private static final long eventCountOffset =
2109 <        objectFieldOffset("eventCount", ForkJoinPool.class);
2110 <    private static final long eventWaitersOffset =
2111 <        objectFieldOffset("eventWaiters",ForkJoinPool.class);
2112 <    private static final long stealCountOffset =
2113 <        objectFieldOffset("stealCount",ForkJoinPool.class);
2114 <    private static final long spareWaitersOffset =
2115 <        objectFieldOffset("spareWaiters",ForkJoinPool.class);
2116 <
2117 <    private static long objectFieldOffset(String field, Class<?> klazz) {
2102 >    private static final sun.misc.Unsafe UNSAFE;
2103 >    private static final long ctlOffset;
2104 >    private static final long stealCountOffset;
2105 >    private static final long blockedCountOffset;
2106 >    private static final long quiescerCountOffset;
2107 >    private static final long scanGuardOffset;
2108 >    private static final long nextWorkerNumberOffset;
2109 >    private static final long ABASE;
2110 >    private static final int ASHIFT;
2111 >
2112 >    static {
2113 >        poolNumberGenerator = new AtomicInteger();
2114 >        workerSeedGenerator = new Random();
2115 >        modifyThreadPermission = new RuntimePermission("modifyThread");
2116 >        defaultForkJoinWorkerThreadFactory =
2117 >            new DefaultForkJoinWorkerThreadFactory();
2118 >        int s;
2119          try {
2120 <            return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field));
2121 <        } catch (NoSuchFieldException e) {
2122 <            // Convert Exception to corresponding Error
2123 <            NoSuchFieldError error = new NoSuchFieldError(field);
2124 <            error.initCause(e);
2125 <            throw error;
2126 <        }
2120 >            UNSAFE = getUnsafe();
2121 >            Class k = ForkJoinPool.class;
2122 >            ctlOffset = UNSAFE.objectFieldOffset
2123 >                (k.getDeclaredField("ctl"));
2124 >            stealCountOffset = UNSAFE.objectFieldOffset
2125 >                (k.getDeclaredField("stealCount"));
2126 >            blockedCountOffset = UNSAFE.objectFieldOffset
2127 >                (k.getDeclaredField("blockedCount"));
2128 >            quiescerCountOffset = UNSAFE.objectFieldOffset
2129 >                (k.getDeclaredField("quiescerCount"));
2130 >            scanGuardOffset = UNSAFE.objectFieldOffset
2131 >                (k.getDeclaredField("scanGuard"));
2132 >            nextWorkerNumberOffset = UNSAFE.objectFieldOffset
2133 >                (k.getDeclaredField("nextWorkerNumber"));
2134 >            Class a = ForkJoinTask[].class;
2135 >            ABASE = UNSAFE.arrayBaseOffset(a);
2136 >            s = UNSAFE.arrayIndexScale(a);
2137 >        } catch (Exception e) {
2138 >            throw new Error(e);
2139 >        }
2140 >        if ((s & (s-1)) != 0)
2141 >            throw new Error("data type scale not a power of two");
2142 >        ASHIFT = 31 - Integer.numberOfLeadingZeros(s);
2143      }
2144  
2145      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines