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.4 by dl, Mon Jan 12 17:16:18 2009 UTC vs.
Revision 1.84 by dl, Sat Nov 13 13:11:51 2010 UTC

# Line 5 | Line 5
5   */
6  
7   package jsr166y;
8 < import java.util.*;
9 < import java.util.concurrent.*;
10 < import java.util.concurrent.locks.*;
11 < import java.util.concurrent.atomic.*;
12 < import sun.misc.Unsafe;
13 < import java.lang.reflect.*;
8 >
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.concurrent.AbstractExecutorService;
15 > import java.util.concurrent.Callable;
16 > import java.util.concurrent.ExecutorService;
17 > import java.util.concurrent.Future;
18 > import java.util.concurrent.RejectedExecutionException;
19 > import java.util.concurrent.RunnableFuture;
20 > import java.util.concurrent.TimeUnit;
21 > import java.util.concurrent.TimeoutException;
22 > import java.util.concurrent.atomic.AtomicInteger;
23 > import java.util.concurrent.locks.LockSupport;
24 > import java.util.concurrent.locks.ReentrantLock;
25  
26   /**
27 < * An {@link ExecutorService} for running {@link ForkJoinTask}s.  A
28 < * ForkJoinPool provides the entry point for submissions from
29 < * non-ForkJoinTasks, as well as management and monitoring operations.
30 < * Normally a single ForkJoinPool is used for a large number of
20 < * submitted tasks. Otherwise, use would not usually outweigh the
21 < * construction and bookkeeping overhead of creating a large set of
22 < * threads.
27 > * An {@link ExecutorService} for running {@link ForkJoinTask}s.
28 > * A {@code ForkJoinPool} provides the entry point for submissions
29 > * from non-{@code ForkJoinTask} clients, as well as management and
30 > * monitoring operations.
31   *
32 < * <p>ForkJoinPools differ from other kinds of Executors mainly in
33 < * that they provide <em>work-stealing</em>: all threads in the pool
34 < * attempt to find and execute subtasks created by other active tasks
35 < * (eventually blocking if none exist). This makes them efficient when
36 < * most tasks spawn other subtasks (as do most ForkJoinTasks), as well
37 < * as the mixed execution of some plain Runnable- or Callable- based
38 < * activities along with ForkJoinTasks. Otherwise, other
39 < * ExecutorService implementations are typically more appropriate
40 < * choices.
32 > * <p>A {@code ForkJoinPool} differs from other kinds of {@link
33 > * ExecutorService} mainly by virtue of employing
34 > * <em>work-stealing</em>: all threads in the pool attempt to find and
35 > * execute subtasks created by other active tasks (eventually blocking
36 > * waiting for work if none exist). This enables efficient processing
37 > * when most tasks spawn other subtasks (as do most {@code
38 > * ForkJoinTask}s). When setting <em>asyncMode</em> to true in
39 > * constructors, {@code ForkJoinPool}s may also be appropriate for use
40 > * with event-style tasks that are never joined.
41   *
42 < * <p>A ForkJoinPool may be constructed with a given parallelism level
43 < * (target pool size), which it attempts to maintain by dynamically
44 < * adding, suspending, or resuming threads, even if some tasks are
45 < * waiting to join others. However, no such adjustments are performed
46 < * in the face of blocked IO or other unmanaged synchronization. The
47 < * nested <code>ManagedBlocker</code> interface enables extension of
48 < * the kinds of synchronization accommodated.  The target parallelism
49 < * level may also be changed dynamically (<code>setParallelism</code>)
50 < * and dynamically thread construction can be limited using methods
43 < * <code>setMaximumPoolSize</code> and/or
44 < * <code>setMaintainsParallelism</code>.
42 > * <p>A {@code ForkJoinPool} is constructed with a given target
43 > * parallelism level; by default, equal to the number of available
44 > * processors. The pool attempts to maintain enough active (or
45 > * available) threads by dynamically adding, suspending, or resuming
46 > * internal worker threads, even if some tasks are stalled waiting to
47 > * join others. However, no such adjustments are guaranteed in the
48 > * face of blocked IO or other unmanaged synchronization. The nested
49 > * {@link ManagedBlocker} interface enables extension of the kinds of
50 > * synchronization accommodated.
51   *
52   * <p>In addition to execution and lifecycle control methods, this
53   * class provides status check methods (for example
54 < * <code>getStealCount</code>) that are intended to aid in developing,
54 > * {@link #getStealCount}) that are intended to aid in developing,
55   * tuning, and monitoring fork/join applications. Also, method
56 < * <code>toString</code> returns indications of pool state in a
56 > * {@link #toString} returns indications of pool state in a
57   * convenient form for informal monitoring.
58   *
59 + * <p> As is the case with other ExecutorServices, there are three
60 + * main task execution methods summarized in the following
61 + * table. These are designed to be used by clients not already engaged
62 + * in fork/join computations in the current pool.  The main forms of
63 + * these methods accept instances of {@code ForkJoinTask}, but
64 + * overloaded forms also allow mixed execution of plain {@code
65 + * Runnable}- or {@code Callable}- based activities as well.  However,
66 + * tasks that are already executing in a pool should normally
67 + * <em>NOT</em> use these pool execution methods, but instead use the
68 + * within-computation forms listed in the table.
69 + *
70 + * <table BORDER CELLPADDING=3 CELLSPACING=1>
71 + *  <tr>
72 + *    <td></td>
73 + *    <td ALIGN=CENTER> <b>Call from non-fork/join clients</b></td>
74 + *    <td ALIGN=CENTER> <b>Call from within fork/join computations</b></td>
75 + *  </tr>
76 + *  <tr>
77 + *    <td> <b>Arrange async execution</td>
78 + *    <td> {@link #execute(ForkJoinTask)}</td>
79 + *    <td> {@link ForkJoinTask#fork}</td>
80 + *  </tr>
81 + *  <tr>
82 + *    <td> <b>Await and obtain result</td>
83 + *    <td> {@link #invoke(ForkJoinTask)}</td>
84 + *    <td> {@link ForkJoinTask#invoke}</td>
85 + *  </tr>
86 + *  <tr>
87 + *    <td> <b>Arrange exec and obtain Future</td>
88 + *    <td> {@link #submit(ForkJoinTask)}</td>
89 + *    <td> {@link ForkJoinTask#fork} (ForkJoinTasks <em>are</em> Futures)</td>
90 + *  </tr>
91 + * </table>
92 + *
93 + * <p><b>Sample Usage.</b> Normally a single {@code ForkJoinPool} is
94 + * used for all parallel task execution in a program or subsystem.
95 + * Otherwise, use would not usually outweigh the construction and
96 + * bookkeeping overhead of creating a large set of threads. For
97 + * example, a common pool could be used for the {@code SortTasks}
98 + * illustrated in {@link RecursiveAction}. Because {@code
99 + * ForkJoinPool} uses threads in {@linkplain java.lang.Thread#isDaemon
100 + * daemon} mode, there is typically no need to explicitly {@link
101 + * #shutdown} such a pool upon program exit.
102 + *
103 + * <pre>
104 + * static final ForkJoinPool mainPool = new ForkJoinPool();
105 + * ...
106 + * public void sort(long[] array) {
107 + *   mainPool.invoke(new SortTask(array, 0, array.length));
108 + * }
109 + * </pre>
110 + *
111   * <p><b>Implementation notes</b>: This implementation restricts the
112   * maximum number of running threads to 32767. Attempts to create
113 < * pools with greater than the maximum result in
114 < * IllegalArgumentExceptions.
113 > * pools with greater than the maximum number result in
114 > * {@code IllegalArgumentException}.
115 > *
116 > * <p>This implementation rejects submitted tasks (that is, by throwing
117 > * {@link RejectedExecutionException}) only when the pool is shut down
118 > * or internal resources have been exhausted.
119 > *
120 > * @since 1.7
121 > * @author Doug Lea
122   */
123   public class ForkJoinPool extends AbstractExecutorService {
124  
125      /*
126 <     * See the extended comments interspersed below for design,
127 <     * rationale, and walkthroughs.
126 >     * Implementation Overview
127 >     *
128 >     * This class provides the central bookkeeping and control for a
129 >     * set of worker threads: Submissions from non-FJ threads enter
130 >     * into a submission queue. Workers take these tasks and typically
131 >     * split them into subtasks that may be stolen by other workers.
132 >     * The main work-stealing mechanics implemented in class
133 >     * ForkJoinWorkerThread give first priority to processing tasks
134 >     * from their own queues (LIFO or FIFO, depending on mode), then
135 >     * to randomized FIFO steals of tasks in other worker queues, and
136 >     * lastly to new submissions. These mechanics do not consider
137 >     * affinities, loads, cache localities, etc, so rarely provide the
138 >     * best possible performance on a given machine, but portably
139 >     * provide good throughput by averaging over these factors.
140 >     * (Further, even if we did try to use such information, we do not
141 >     * usually have a basis for exploiting it. For example, some sets
142 >     * of tasks profit from cache affinities, but others are harmed by
143 >     * cache pollution effects.)
144 >     *
145 >     * Beyond work-stealing support and essential bookkeeping, the
146 >     * main responsibility of this framework is to take actions when
147 >     * one worker is waiting to join a task stolen (or always held by)
148 >     * another.  Because we are multiplexing many tasks on to a pool
149 >     * of workers, we can't just let them block (as in Thread.join).
150 >     * We also cannot just reassign the joiner's run-time stack with
151 >     * another and replace it later, which would be a form of
152 >     * "continuation", that even if possible is not necessarily a good
153 >     * idea. Given that the creation costs of most threads on most
154 >     * systems mainly surrounds setting up runtime stacks, thread
155 >     * creation and switching is usually not much more expensive than
156 >     * stack creation and switching, and is more flexible). Instead we
157 >     * combine two tactics:
158 >     *
159 >     *   Helping: Arranging for the joiner to execute some task that it
160 >     *      would be running if the steal had not occurred.  Method
161 >     *      ForkJoinWorkerThread.helpJoinTask tracks joining->stealing
162 >     *      links to try to find such a task.
163 >     *
164 >     *   Compensating: Unless there are already enough live threads,
165 >     *      method helpMaintainParallelism() may create or
166 >     *      re-activate a spare thread to compensate for blocked
167 >     *      joiners until they unblock.
168 >     *
169 >     * It is impossible to keep exactly the target (parallelism)
170 >     * number of threads running at any given time.  Determining
171 >     * existence of conservatively safe helping targets, the
172 >     * availability of already-created spares, and the apparent need
173 >     * to create new spares are all racy and require heuristic
174 >     * guidance, so we rely on multiple retries of each.  Compensation
175 >     * occurs in slow-motion. It is triggered only upon timeouts of
176 >     * Object.wait used for joins. This reduces poor decisions that
177 >     * would otherwise be made when threads are waiting for others
178 >     * that are stalled because of unrelated activities such as
179 >     * garbage collection.
180 >     *
181 >     * The ManagedBlocker extension API can't use helping so relies
182 >     * only on compensation in method awaitBlocker.
183 >     *
184 >     * The main throughput advantages of work-stealing stem from
185 >     * decentralized control -- workers mostly steal tasks from each
186 >     * other. We do not want to negate this by creating bottlenecks
187 >     * implementing other management responsibilities. So we use a
188 >     * collection of techniques that avoid, reduce, or cope well with
189 >     * contention. These entail several instances of bit-packing into
190 >     * CASable fields to maintain only the minimally required
191 >     * atomicity. To enable such packing, we restrict maximum
192 >     * parallelism to (1<<15)-1 (enabling twice this (to accommodate
193 >     * unbalanced increments and decrements) to fit into a 16 bit
194 >     * field, which is far in excess of normal operating range.  Even
195 >     * though updates to some of these bookkeeping fields do sometimes
196 >     * contend with each other, they don't normally cache-contend with
197 >     * updates to others enough to warrant memory padding or
198 >     * isolation. So they are all held as fields of ForkJoinPool
199 >     * objects.  The main capabilities are as follows:
200 >     *
201 >     * 1. Creating and removing workers. Workers are recorded in the
202 >     * "workers" array. This is an array as opposed to some other data
203 >     * structure to support index-based random steals by workers.
204 >     * Updates to the array recording new workers and unrecording
205 >     * terminated ones are protected from each other by a lock
206 >     * (workerLock) but the array is otherwise concurrently readable,
207 >     * and accessed directly by workers. To simplify index-based
208 >     * operations, the array size is always a power of two, and all
209 >     * readers must tolerate null slots. Currently, all worker thread
210 >     * creation is on-demand, triggered by task submissions,
211 >     * replacement of terminated workers, and/or compensation for
212 >     * blocked workers. However, all other support code is set up to
213 >     * work with other policies.
214 >     *
215 >     * To ensure that we do not hold on to worker references that
216 >     * would prevent GC, ALL accesses to workers are via indices into
217 >     * the workers array (which is one source of some of the unusual
218 >     * code constructions here). In essence, the workers array serves
219 >     * as a WeakReference mechanism. Thus for example the event queue
220 >     * stores worker indices, not worker references. Access to the
221 >     * workers in associated methods (for example releaseEventWaiters)
222 >     * must both index-check and null-check the IDs. All such accesses
223 >     * ignore bad IDs by returning out early from what they are doing,
224 >     * since this can only be associated with shutdown, in which case
225 >     * it is OK to give up. On termination, we just clobber these
226 >     * data structures without trying to use them.
227 >     *
228 >     * 2. Bookkeeping for dynamically adding and removing workers. We
229 >     * aim to approximately maintain the given level of parallelism.
230 >     * When some workers are known to be blocked (on joins or via
231 >     * ManagedBlocker), we may create or resume others to take their
232 >     * place until they unblock (see below). Implementing this
233 >     * requires counts of the number of "running" threads (i.e., those
234 >     * that are neither blocked nor artificially suspended) as well as
235 >     * the total number.  These two values are packed into one field,
236 >     * "workerCounts" because we need accurate snapshots when deciding
237 >     * to create, resume or suspend.  Note however that the
238 >     * correspondence of these counts to reality is not guaranteed. In
239 >     * particular updates for unblocked threads may lag until they
240 >     * actually wake up.
241 >     *
242 >     * 3. Maintaining global run state. The run state of the pool
243 >     * consists of a runLevel (SHUTDOWN, TERMINATING, etc) similar to
244 >     * those in other Executor implementations, as well as a count of
245 >     * "active" workers -- those that are, or soon will be, or
246 >     * recently were executing tasks. The runLevel and active count
247 >     * are packed together in order to correctly trigger shutdown and
248 >     * termination. Without care, active counts can be subject to very
249 >     * high contention.  We substantially reduce this contention by
250 >     * relaxing update rules.  A worker must claim active status
251 >     * prospectively, by activating if it sees that a submitted or
252 >     * stealable task exists (it may find after activating that the
253 >     * task no longer exists). It stays active while processing this
254 >     * task (if it exists) and any other local subtasks it produces,
255 >     * until it cannot find any other tasks. It then tries
256 >     * inactivating (see method preStep), but upon update contention
257 >     * instead scans for more tasks, later retrying inactivation if it
258 >     * doesn't find any.
259 >     *
260 >     * 4. Managing idle workers waiting for tasks. We cannot let
261 >     * workers spin indefinitely scanning for tasks when none are
262 >     * available. On the other hand, we must quickly prod them into
263 >     * action when new tasks are submitted or generated.  We
264 >     * park/unpark these idle workers using an event-count scheme.
265 >     * Field eventCount is incremented upon events that may enable
266 >     * workers that previously could not find a task to now find one:
267 >     * Submission of a new task to the pool, or another worker pushing
268 >     * a task onto a previously empty queue.  (We also use this
269 >     * mechanism for configuration and termination actions that
270 >     * require wakeups of idle workers).  Each worker maintains its
271 >     * last known event count, and blocks when a scan for work did not
272 >     * find a task AND its lastEventCount matches the current
273 >     * eventCount. Waiting idle workers are recorded in a variant of
274 >     * Treiber stack headed by field eventWaiters which, when nonzero,
275 >     * encodes the thread index and count awaited for by the worker
276 >     * thread most recently calling eventSync. This thread in turn has
277 >     * a record (field nextEventWaiter) for the next waiting worker.
278 >     * In addition to allowing simpler decisions about need for
279 >     * wakeup, the event count bits in eventWaiters serve the role of
280 >     * tags to avoid ABA errors in Treiber stacks. Upon any wakeup,
281 >     * released threads also try to release at most two others.  The
282 >     * net effect is a tree-like diffusion of signals, where released
283 >     * threads (and possibly others) help with unparks.  To further
284 >     * reduce contention effects a bit, failed CASes to increment
285 >     * field eventCount are tolerated without retries in signalWork.
286 >     * Conceptually they are merged into the same event, which is OK
287 >     * when their only purpose is to enable workers to scan for work.
288 >     *
289 >     * 5. Managing suspension of extra workers. When a worker notices
290 >     * (usually upon timeout of a wait()) that there are too few
291 >     * running threads, we may create a new thread to maintain
292 >     * parallelism level, or at least avoid starvation. Usually, extra
293 >     * threads are needed for only very short periods, yet join
294 >     * dependencies are such that we sometimes need them in
295 >     * bursts. Rather than create new threads each time this happens,
296 >     * we suspend no-longer-needed extra ones as "spares". For most
297 >     * purposes, we don't distinguish "extra" spare threads from
298 >     * normal "core" threads: On each call to preStep (the only point
299 >     * at which we can do this) a worker checks to see if there are
300 >     * now too many running workers, and if so, suspends itself.
301 >     * Method helpMaintainParallelism looks for suspended threads to
302 >     * resume before considering creating a new replacement. The
303 >     * spares themselves are encoded on another variant of a Treiber
304 >     * Stack, headed at field "spareWaiters".  Note that the use of
305 >     * spares is intrinsically racy.  One thread may become a spare at
306 >     * about the same time as another is needlessly being created. We
307 >     * counteract this and related slop in part by requiring resumed
308 >     * spares to immediately recheck (in preStep) to see whether they
309 >     * should re-suspend.
310 >     *
311 >     * 6. Killing off unneeded workers. A timeout mechanism is used to
312 >     * shed unused workers: The oldest (first) event queue waiter uses
313 >     * a timed rather than hard wait. When this wait times out without
314 >     * a normal wakeup, it tries to shutdown any one (for convenience
315 >     * the newest) other spare or event waiter via
316 >     * tryShutdownUnusedWorker. This eventually reduces the number of
317 >     * worker threads to a minimum of one after a long enough period
318 >     * without use.
319 >     *
320 >     * 7. Deciding when to create new workers. The main dynamic
321 >     * control in this class is deciding when to create extra threads
322 >     * in method helpMaintainParallelism. We would like to keep
323 >     * exactly #parallelism threads running, which is an impossible
324 >     * task. We always need to create one when the number of running
325 >     * threads would become zero and all workers are busy. Beyond
326 >     * this, we must rely on heuristics that work well in the
327 >     * presence of transient phenomena such as GC stalls, dynamic
328 >     * compilation, and wake-up lags. These transients are extremely
329 >     * common -- we are normally trying to fully saturate the CPUs on
330 >     * a machine, so almost any activity other than running tasks
331 >     * impedes accuracy. Our main defense is to allow parallelism to
332 >     * lapse for a while during joins, and use a timeout to see if,
333 >     * after the resulting settling, there is still a need for
334 >     * additional workers.  This also better copes with the fact that
335 >     * some of the methods in this class tend to never become compiled
336 >     * (but are interpreted), so some components of the entire set of
337 >     * controls might execute 100 times faster than others. And
338 >     * similarly for cases where the apparent lack of work is just due
339 >     * to GC stalls and other transient system activity.
340 >     *
341 >     * Beware that there is a lot of representation-level coupling
342 >     * among classes ForkJoinPool, ForkJoinWorkerThread, and
343 >     * ForkJoinTask.  For example, direct access to "workers" array by
344 >     * workers, and direct access to ForkJoinTask.status by both
345 >     * ForkJoinPool and ForkJoinWorkerThread.  There is little point
346 >     * trying to reduce this, since any associated future changes in
347 >     * representations will need to be accompanied by algorithmic
348 >     * changes anyway.
349 >     *
350 >     * Style notes: There are lots of inline assignments (of form
351 >     * "while ((local = field) != 0)") which are usually the simplest
352 >     * way to ensure the required read orderings (which are sometimes
353 >     * critical). Also several occurrences of the unusual "do {}
354 >     * while (!cas...)" which is the simplest way to force an update of
355 >     * a CAS'ed variable. There are also other coding oddities that
356 >     * help some methods perform reasonably even when interpreted (not
357 >     * compiled), at the expense of some messy constructions that
358 >     * reduce byte code counts.
359 >     *
360 >     * The order of declarations in this file is: (1) statics (2)
361 >     * fields (along with constants used when unpacking some of them)
362 >     * (3) internal control methods (4) callbacks and other support
363 >     * for ForkJoinTask and ForkJoinWorkerThread classes, (5) exported
364 >     * methods (plus a few little helpers).
365       */
366  
65    /** Mask for packing and unpacking shorts */
66    private static final int  shortMask = 0xffff;
67
68    /** Max pool size -- must be a power of two minus 1 */
69    private static final int MAX_THREADS =  0x7FFF;
70
367      /**
368 <     * Factory for creating new ForkJoinWorkerThreads.  A
369 <     * ForkJoinWorkerThreadFactory must be defined and used for
370 <     * ForkJoinWorkerThread subclasses that extend base functionality
371 <     * or initialize threads with different contexts.
368 >     * Factory for creating new {@link ForkJoinWorkerThread}s.
369 >     * A {@code ForkJoinWorkerThreadFactory} must be defined and used
370 >     * for {@code ForkJoinWorkerThread} subclasses that extend base
371 >     * functionality or initialize threads with different contexts.
372       */
373      public static interface ForkJoinWorkerThreadFactory {
374          /**
375           * Returns a new worker thread operating in the given pool.
376           *
377           * @param pool the pool this thread works in
378 <         * @throws NullPointerException if pool is null;
378 >         * @throws NullPointerException if the pool is null
379           */
380          public ForkJoinWorkerThread newThread(ForkJoinPool pool);
381      }
382  
383      /**
384 <     * Default ForkJoinWorkerThreadFactory implementation, creates a
384 >     * Default ForkJoinWorkerThreadFactory implementation; creates a
385       * new ForkJoinWorkerThread.
386       */
387 <    static class  DefaultForkJoinWorkerThreadFactory
387 >    static class DefaultForkJoinWorkerThreadFactory
388          implements ForkJoinWorkerThreadFactory {
389          public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
390 <            try {
95 <                return new ForkJoinWorkerThread(pool);
96 <            } catch (OutOfMemoryError oom)  {
97 <                return null;
98 <            }
390 >            return new ForkJoinWorkerThread(pool);
391          }
392      }
393  
# Line 131 | Line 423 | public class ForkJoinPool extends Abstra
423          new AtomicInteger();
424  
425      /**
426 <     * Array holding all worker threads in the pool. Array size must
427 <     * be a power of two.  Updates and replacements are protected by
428 <     * workerLock, but it is always kept in a consistent enough state
429 <     * to be randomly accessed without locking by workers performing
430 <     * work-stealing.
426 >     * The time to block in a join (see awaitJoin) before checking if
427 >     * a new worker should be (re)started to maintain parallelism
428 >     * level. The value should be short enough to maintain global
429 >     * responsiveness and progress but long enough to avoid
430 >     * counterproductive firings during GC stalls or unrelated system
431 >     * activity, and to not bog down systems with continual re-firings
432 >     * on GCs or legitimately long waits.
433       */
434 <    volatile ForkJoinWorkerThread[] workers;
434 >    private static final long JOIN_TIMEOUT_MILLIS = 250L; // 4 per second
435  
436      /**
437 <     * Lock protecting access to workers.
437 >     * The wakeup interval (in nanoseconds) for the oldest worker
438 >     * waiting for an event to invoke tryShutdownUnusedWorker to
439 >     * shrink the number of workers.  The exact value does not matter
440 >     * too much. It must be short enough to release resources during
441 >     * sustained periods of idleness, but not so short that threads
442 >     * are continually re-created.
443       */
444 <    private final ReentrantLock workerLock;
444 >    private static final long SHRINK_RATE_NANOS =
445 >        30L * 1000L * 1000L * 1000L; // 2 per minute
446  
447      /**
448 <     * Condition for awaitTermination.
448 >     * Absolute bound for parallelism level. Twice this number plus
449 >     * one (i.e., 0xfff) must fit into a 16bit field to enable
450 >     * word-packing for some counts and indices.
451       */
452 <    private final Condition termination;
452 >    private static final int MAX_WORKERS   = 0x7fff;
453  
454      /**
455 <     * The uncaught exception handler used when any worker
456 <     * abrupty terminates
455 >     * Array holding all worker threads in the pool.  Array size must
456 >     * be a power of two.  Updates and replacements are protected by
457 >     * workerLock, but the array is always kept in a consistent enough
458 >     * state to be randomly accessed without locking by workers
459 >     * performing work-stealing, as well as other traversal-based
460 >     * methods in this class. All readers must tolerate that some
461 >     * array slots may be null.
462       */
463 <    private Thread.UncaughtExceptionHandler ueh;
463 >    volatile ForkJoinWorkerThread[] workers;
464  
465      /**
466 <     * Creation factory for worker threads.
466 >     * Queue for external submissions.
467       */
468 <    private final ForkJoinWorkerThreadFactory factory;
468 >    private final LinkedTransferQueue<ForkJoinTask<?>> submissionQueue;
469  
470      /**
471 <     * Head of stack of threads that were created to maintain
165 <     * parallelism when other threads blocked, but have since
166 <     * suspended when the parallelism level rose.
471 >     * Lock protecting updates to workers array.
472       */
473 <    private volatile WaitQueueNode spareStack;
473 >    private final ReentrantLock workerLock;
474  
475      /**
476 <     * Sum of per-thread steal counts, updated only when threads are
172 <     * idle or terminating.
476 >     * Latch released upon termination.
477       */
478 <    private final AtomicLong stealCount;
478 >    private final Phaser termination;
479  
480      /**
481 <     * Queue for external submissions.
481 >     * Creation factory for worker threads.
482       */
483 <    private final LinkedTransferQueue<ForkJoinTask<?>> submissionQueue;
483 >    private final ForkJoinWorkerThreadFactory factory;
484  
485      /**
486 <     * Head of Treiber stack for barrier sync. See below for explanation
486 >     * Sum of per-thread steal counts, updated only when threads are
487 >     * idle or terminating.
488       */
489 <    private volatile WaitQueueNode syncStack;
489 >    private volatile long stealCount;
490  
491      /**
492 <     * The count for event barrier
492 >     * Encoded record of top of Treiber stack of threads waiting for
493 >     * events. The top 32 bits contain the count being waited for. The
494 >     * bottom 16 bits contains one plus the pool index of waiting
495 >     * worker thread. (Bits 16-31 are unused.)
496       */
497 <    private volatile long eventCount;
497 >    private volatile long eventWaiters;
498 >
499 >    private static final int  EVENT_COUNT_SHIFT = 32;
500 >    private static final long WAITER_ID_MASK    = (1L << 16) - 1L;
501  
502      /**
503 <     * Pool number, just for assigning useful names to worker threads
503 >     * A counter for events that may wake up worker threads:
504 >     *   - Submission of a new task to the pool
505 >     *   - A worker pushing a task on an empty queue
506 >     *   - termination
507       */
508 <    private final int poolNumber;
508 >    private volatile int eventCount;
509  
510      /**
511 <     * The maximum allowed pool size
511 >     * Encoded record of top of Treiber stack of spare threads waiting
512 >     * for resumption. The top 16 bits contain an arbitrary count to
513 >     * avoid ABA effects. The bottom 16bits contains one plus the pool
514 >     * index of waiting worker thread.
515       */
516 <    private volatile int maxPoolSize;
516 >    private volatile int spareWaiters;
517 >
518 >    private static final int SPARE_COUNT_SHIFT = 16;
519 >    private static final int SPARE_ID_MASK     = (1 << 16) - 1;
520  
521      /**
522 <     * The desired parallelism level, updated only under workerLock.
523 <     */
524 <    private volatile int parallelism;
522 >     * Lifecycle control. The low word contains the number of workers
523 >     * that are (probably) executing tasks. This value is atomically
524 >     * incremented before a worker gets a task to run, and decremented
525 >     * when a worker has no tasks and cannot find any.  Bits 16-18
526 >     * contain runLevel value. When all are zero, the pool is
527 >     * running. Level transitions are monotonic (running -> shutdown
528 >     * -> terminating -> terminated) so each transition adds a bit.
529 >     * These are bundled together to ensure consistent read for
530 >     * termination checks (i.e., that runLevel is at least SHUTDOWN
531 >     * and active threads is zero).
532 >     *
533 >     * Notes: Most direct CASes are dependent on these bitfield
534 >     * positions.  Also, this field is non-private to enable direct
535 >     * performance-sensitive CASes in ForkJoinWorkerThread.
536 >     */
537 >    volatile int runState;
538 >
539 >    // Note: The order among run level values matters.
540 >    private static final int RUNLEVEL_SHIFT     = 16;
541 >    private static final int SHUTDOWN           = 1 << RUNLEVEL_SHIFT;
542 >    private static final int TERMINATING        = 1 << (RUNLEVEL_SHIFT + 1);
543 >    private static final int TERMINATED         = 1 << (RUNLEVEL_SHIFT + 2);
544 >    private static final int ACTIVE_COUNT_MASK  = (1 << RUNLEVEL_SHIFT) - 1;
545  
546      /**
547       * Holds number of total (i.e., created and not yet terminated)
548       * and running (i.e., not blocked on joins or other managed sync)
549 <     * threads, packed into one int to ensure consistent snapshot when
549 >     * threads, packed together to ensure consistent snapshot when
550       * making decisions about creating and suspending spare
551 <     * threads. Updated only by CAS.  Note: CASes in
552 <     * updateRunningCount and preJoin running active count is in low
553 <     * word, so need to be modified if this changes
551 >     * threads. Updated only by CAS. Note that adding a new worker
552 >     * requires incrementing both counts, since workers start off in
553 >     * running state.
554       */
555      private volatile int workerCounts;
556  
557 <    private static int totalCountOf(int s)           { return s >>> 16;  }
558 <    private static int runningCountOf(int s)         { return s & shortMask; }
559 <    private static int workerCountsFor(int t, int r) { return (t << 16) + r; }
557 >    private static final int TOTAL_COUNT_SHIFT  = 16;
558 >    private static final int RUNNING_COUNT_MASK = (1 << TOTAL_COUNT_SHIFT) - 1;
559 >    private static final int ONE_RUNNING        = 1;
560 >    private static final int ONE_TOTAL          = 1 << TOTAL_COUNT_SHIFT;
561  
562      /**
563 <     * Add delta (which may be negative) to running count.  This must
564 <     * be called before (with negative arg) and after (with positive)
224 <     * any managed synchronization (i.e., mainly, joins)
225 <     * @param delta the number to add
563 >     * The target parallelism level.
564 >     * Accessed directly by ForkJoinWorkerThreads.
565       */
566 <    final void updateRunningCount(int delta) {
228 <        int s;
229 <        do;while (!casWorkerCounts(s = workerCounts, s + delta));
230 <    }
566 >    final int parallelism;
567  
568      /**
569 <     * Add delta (which may be negative) to both total and running
570 <     * count.  This must be called upon creation and termination of
235 <     * worker threads.
236 <     * @param delta the number to add
569 >     * True if use local fifo, not default lifo, for local polling
570 >     * Read by, and replicated by ForkJoinWorkerThreads
571       */
572 <    private void updateWorkerCount(int delta) {
239 <        int d = delta + (delta << 16); // add to both lo and hi parts
240 <        int s;
241 <        do;while (!casWorkerCounts(s = workerCounts, s + d));
242 <    }
572 >    final boolean locallyFifo;
573  
574      /**
575 <     * Lifecycle control. High word contains runState, low word
576 <     * contains the number of workers that are (probably) executing
247 <     * tasks. This value is atomically incremented before a worker
248 <     * gets a task to run, and decremented when worker has no tasks
249 <     * and cannot find any. These two fields are bundled together to
250 <     * support correct termination triggering.  Note: activeCount
251 <     * CAS'es cheat by assuming active count is in low word, so need
252 <     * to be modified if this changes
575 >     * The uncaught exception handler used when any worker abruptly
576 >     * terminates.
577       */
578 <    private volatile int runControl;
578 >    private final Thread.UncaughtExceptionHandler ueh;
579  
580 <    // RunState values. Order among values matters
581 <    private static final int RUNNING     = 0;
582 <    private static final int SHUTDOWN    = 1;
583 <    private static final int TERMINATING = 2;
260 <    private static final int TERMINATED  = 3;
580 >    /**
581 >     * Pool number, just for assigning useful names to worker threads
582 >     */
583 >    private final int poolNumber;
584  
585 <    private static int runStateOf(int c)             { return c >>> 16; }
586 <    private static int activeCountOf(int c)          { return c & shortMask; }
264 <    private static int runControlFor(int r, int a)   { return (r << 16) + a; }
585 >    // Utilities for CASing fields. Note that most of these
586 >    // are usually manually inlined by callers
587  
588      /**
589 <     * Try incrementing active count; fail on contention. Called by
268 <     * workers before/during executing tasks.
269 <     * @return true on success;
589 >     * Increments running count part of workerCounts
590       */
591 <    final boolean tryIncrementActiveCount() {
592 <        int c = runControl;
593 <        return casRunControl(c, c+1);
591 >    final void incrementRunningCount() {
592 >        int c;
593 >        do {} while (!UNSAFE.compareAndSwapInt(this, workerCountsOffset,
594 >                                               c = workerCounts,
595 >                                               c + ONE_RUNNING));
596      }
597  
598      /**
599 <     * Try decrementing active count; fail on contention.
278 <     * Possibly trigger termination on success
279 <     * Called by workers when they can't find tasks.
280 <     * @return true on success
599 >     * Tries to decrement running count unless already zero
600       */
601 <    final boolean tryDecrementActiveCount() {
602 <        int c = runControl;
603 <        int nextc = c - 1;
285 <        if (!casRunControl(c, nextc))
601 >    final boolean tryDecrementRunningCount() {
602 >        int wc = workerCounts;
603 >        if ((wc & RUNNING_COUNT_MASK) == 0)
604              return false;
605 <        if (canTerminateOnShutdown(nextc))
606 <            terminateOnShutdown();
607 <        return true;
605 >        return UNSAFE.compareAndSwapInt(this, workerCountsOffset,
606 >                                        wc, wc - ONE_RUNNING);
607 >    }
608 >
609 >    /**
610 >     * Forces decrement of encoded workerCounts, awaiting nonzero if
611 >     * (rarely) necessary when other count updates lag.
612 >     *
613 >     * @param dr -- either zero or ONE_RUNNING
614 >     * @param dt -- either zero or ONE_TOTAL
615 >     */
616 >    private void decrementWorkerCounts(int dr, int dt) {
617 >        for (;;) {
618 >            int wc = workerCounts;
619 >            if ((wc & RUNNING_COUNT_MASK)  - dr < 0 ||
620 >                (wc >>> TOTAL_COUNT_SHIFT) - dt < 0) {
621 >                if ((runState & TERMINATED) != 0)
622 >                    return; // lagging termination on a backout
623 >                Thread.yield();
624 >            }
625 >            if (UNSAFE.compareAndSwapInt(this, workerCountsOffset,
626 >                                         wc, wc - (dr + dt)))
627 >                return;
628 >        }
629      }
630  
631      /**
632 <     * Return true if argument represents zero active count and
633 <     * nonzero runstate, which is the triggering condition for
295 <     * terminating on shutdown.
632 >     * Tries decrementing active count; fails on contention.
633 >     * Called when workers cannot find tasks to run.
634       */
635 <    private static boolean canTerminateOnShutdown(int c) {
636 <        return ((c & -c) >>> 16) != 0; // i.e. least bit is nonzero runState bit
635 >    final boolean tryDecrementActiveCount() {
636 >        int c;
637 >        return UNSAFE.compareAndSwapInt(this, runStateOffset,
638 >                                        c = runState, c - 1);
639      }
640  
641      /**
642 <     * Transition run state to at least the given state. Return true
643 <     * if not already at least given state.
642 >     * Advances to at least the given level. Returns true if not
643 >     * already in at least the given level.
644       */
645 <    private boolean transitionRunStateTo(int state) {
645 >    private boolean advanceRunLevel(int level) {
646          for (;;) {
647 <            int c = runControl;
648 <            if (runStateOf(c) >= state)
647 >            int s = runState;
648 >            if ((s & level) != 0)
649                  return false;
650 <            if (casRunControl(c, runControlFor(state, activeCountOf(c))))
650 >            if (UNSAFE.compareAndSwapInt(this, runStateOffset, s, s | level))
651                  return true;
652          }
653      }
654  
655 +    // workers array maintenance
656 +
657      /**
658 <     * Controls whether to add spares to maintain parallelism
658 >     * Records and returns a workers array index for new worker.
659       */
660 <    private volatile boolean maintainsParallelism;
660 >    private int recordWorker(ForkJoinWorkerThread w) {
661 >        // Try using slot totalCount-1. If not available, scan and/or resize
662 >        int k = (workerCounts >>> TOTAL_COUNT_SHIFT) - 1;
663 >        final ReentrantLock lock = this.workerLock;
664 >        lock.lock();
665 >        try {
666 >            ForkJoinWorkerThread[] ws = workers;
667 >            int n = ws.length;
668 >            if (k < 0 || k >= n || ws[k] != null) {
669 >                for (k = 0; k < n && ws[k] != null; ++k)
670 >                    ;
671 >                if (k == n)
672 >                    ws = Arrays.copyOf(ws, n << 1);
673 >            }
674 >            ws[k] = w;
675 >            workers = ws; // volatile array write ensures slot visibility
676 >        } finally {
677 >            lock.unlock();
678 >        }
679 >        return k;
680 >    }
681  
682 <    // Constructors
682 >    /**
683 >     * Nulls out record of worker in workers array.
684 >     */
685 >    private void forgetWorker(ForkJoinWorkerThread w) {
686 >        int idx = w.poolIndex;
687 >        // Locking helps method recordWorker avoid unnecessary expansion
688 >        final ReentrantLock lock = this.workerLock;
689 >        lock.lock();
690 >        try {
691 >            ForkJoinWorkerThread[] ws = workers;
692 >            if (idx >= 0 && idx < ws.length && ws[idx] == w) // verify
693 >                ws[idx] = null;
694 >        } finally {
695 >            lock.unlock();
696 >        }
697 >    }
698  
699      /**
700 <     * Creates a ForkJoinPool with a pool size equal to the number of
701 <     * processors available on the system and using the default
702 <     * ForkJoinWorkerThreadFactory,
703 <     * @throws SecurityException if a security manager exists and
704 <     *         the caller is not permitted to modify threads
328 <     *         because it does not hold {@link
329 <     *         java.lang.RuntimePermission}<code>("modifyThread")</code>,
700 >     * Final callback from terminating worker.  Removes record of
701 >     * worker from array, and adjusts counts. If pool is shutting
702 >     * down, tries to complete termination.
703 >     *
704 >     * @param w the worker
705       */
706 <    public ForkJoinPool() {
707 <        this(Runtime.getRuntime().availableProcessors(),
708 <             defaultForkJoinWorkerThreadFactory);
706 >    final void workerTerminated(ForkJoinWorkerThread w) {
707 >        forgetWorker(w);
708 >        decrementWorkerCounts(w.isTrimmed() ? 0 : ONE_RUNNING, ONE_TOTAL);
709 >        while (w.stealCount != 0) // collect final count
710 >            tryAccumulateStealCount(w);
711 >        tryTerminate(false);
712      }
713  
714 +    // Waiting for and signalling events
715 +
716      /**
717 <     * Creates a ForkJoinPool with the indicated parellelism level
718 <     * threads, and using the default ForkJoinWorkerThreadFactory,
719 <     * @param parallelism the number of worker threads
720 <     * @throws IllegalArgumentException if parallelism less than or
341 <     * equal to zero
342 <     * @throws SecurityException if a security manager exists and
343 <     *         the caller is not permitted to modify threads
344 <     *         because it does not hold {@link
345 <     *         java.lang.RuntimePermission}<code>("modifyThread")</code>,
717 >     * Releases workers blocked on a count not equal to current count.
718 >     * Normally called after precheck that eventWaiters isn't zero to
719 >     * avoid wasted array checks. Gives up upon a change in count or
720 >     * upon releasing two workers, letting others take over.
721       */
722 <    public ForkJoinPool(int parallelism) {
723 <        this(parallelism, defaultForkJoinWorkerThreadFactory);
722 >    private void releaseEventWaiters() {
723 >        ForkJoinWorkerThread[] ws = workers;
724 >        int n = ws.length;
725 >        long h = eventWaiters;
726 >        int ec = eventCount;
727 >        boolean releasedOne = false;
728 >        ForkJoinWorkerThread w; int id;
729 >        while ((id = ((int)(h & WAITER_ID_MASK)) - 1) >= 0 &&
730 >               (int)(h >>> EVENT_COUNT_SHIFT) != ec &&
731 >               id < n && (w = ws[id]) != null) {
732 >            if (UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
733 >                                          h,  w.nextWaiter)) {
734 >                LockSupport.unpark(w);
735 >                if (releasedOne) // exit on second release
736 >                    break;
737 >                releasedOne = true;
738 >            }
739 >            if (eventCount != ec)
740 >                break;
741 >            h = eventWaiters;
742 >        }
743      }
744  
745      /**
746 <     * Creates a ForkJoinPool with parallelism equal to the number of
747 <     * processors available on the system and using the given
354 <     * ForkJoinWorkerThreadFactory,
355 <     * @param factory the factory for creating new threads
356 <     * @throws NullPointerException if factory is null
357 <     * @throws SecurityException if a security manager exists and
358 <     *         the caller is not permitted to modify threads
359 <     *         because it does not hold {@link
360 <     *         java.lang.RuntimePermission}<code>("modifyThread")</code>,
746 >     * Tries to advance eventCount and releases waiters. Called only
747 >     * from workers.
748       */
749 <    public ForkJoinPool(ForkJoinWorkerThreadFactory factory) {
750 <        this(Runtime.getRuntime().availableProcessors(), factory);
749 >    final void signalWork() {
750 >        int c; // try to increment event count -- CAS failure OK
751 >        UNSAFE.compareAndSwapInt(this, eventCountOffset, c = eventCount, c+1);
752 >        if (eventWaiters != 0L)
753 >            releaseEventWaiters();
754      }
755  
756      /**
757 <     * Creates a ForkJoinPool with the given parallelism and factory.
757 >     * Adds the given worker to event queue and blocks until
758 >     * terminating or event count advances from the given value
759       *
760 <     * @param parallelism the targeted number of worker threads
761 <     * @param factory the factory for creating new threads
371 <     * @throws IllegalArgumentException if parallelism less than or
372 <     * equal to zero, or greater than implementation limit.
373 <     * @throws NullPointerException if factory is null
374 <     * @throws SecurityException if a security manager exists and
375 <     *         the caller is not permitted to modify threads
376 <     *         because it does not hold {@link
377 <     *         java.lang.RuntimePermission}<code>("modifyThread")</code>,
760 >     * @param w the calling worker thread
761 >     * @param ec the count
762       */
763 <    public ForkJoinPool(int parallelism, ForkJoinWorkerThreadFactory factory) {
764 <        if (parallelism <= 0 || parallelism > MAX_THREADS)
765 <            throw new IllegalArgumentException();
766 <        if (factory == null)
767 <            throw new NullPointerException();
768 <        checkPermission();
769 <        this.factory = factory;
770 <        this.parallelism = parallelism;
771 <        this.maxPoolSize = MAX_THREADS;
772 <        this.maintainsParallelism = true;
773 <        this.poolNumber = poolNumberGenerator.incrementAndGet();
774 <        this.workerLock = new ReentrantLock();
775 <        this.termination = workerLock.newCondition();
392 <        this.stealCount = new AtomicLong();
393 <        this.submissionQueue = new LinkedTransferQueue<ForkJoinTask<?>>();
394 <        createAndStartInitialWorkers(parallelism);
763 >    private void eventSync(ForkJoinWorkerThread w, int ec) {
764 >        long nh = (((long)ec) << EVENT_COUNT_SHIFT) | ((long)(w.poolIndex+1));
765 >        long h;
766 >        while ((runState < SHUTDOWN || !tryTerminate(false)) &&
767 >               (((int)((h = eventWaiters) & WAITER_ID_MASK)) == 0 ||
768 >                (int)(h >>> EVENT_COUNT_SHIFT) == ec) &&
769 >               eventCount == ec) {
770 >            if (UNSAFE.compareAndSwapLong(this, eventWaitersOffset,
771 >                                          w.nextWaiter = h, nh)) {
772 >                awaitEvent(w, ec);
773 >                break;
774 >            }
775 >        }
776      }
777  
778      /**
779 <     * Create new worker using factory.
780 <     * @param index the index to assign worker
781 <     * @return new worker, or null of factory failed
779 >     * Blocks the given worker (that has already been entered as an
780 >     * event waiter) until terminating or event count advances from
781 >     * the given value. The oldest (first) waiter uses a timed wait to
782 >     * occasionally one-by-one shrink the number of workers (to a
783 >     * minimum of one) if the pool has not been used for extended
784 >     * periods.
785 >     *
786 >     * @param w the calling worker thread
787 >     * @param ec the count
788       */
789 <    private ForkJoinWorkerThread createWorker(int index) {
790 <        Thread.UncaughtExceptionHandler h = ueh;
791 <        ForkJoinWorkerThread w = factory.newThread(this);
792 <        if (w != null) {
793 <            w.poolIndex = index;
794 <            w.setDaemon(true);
795 <            w.setName("ForkJoinPool-" + poolNumber + "-worker-" + index);
796 <            if (h != null)
797 <                w.setUncaughtExceptionHandler(h);
789 >    private void awaitEvent(ForkJoinWorkerThread w, int ec) {
790 >        while (eventCount == ec) {
791 >            if (tryAccumulateStealCount(w)) { // transfer while idle
792 >                boolean untimed = (w.nextWaiter != 0L ||
793 >                                   (workerCounts & RUNNING_COUNT_MASK) <= 1);
794 >                long startTime = untimed ? 0 : System.nanoTime();
795 >                Thread.interrupted();         // clear/ignore interrupt
796 >                if (eventCount != ec || w.isTerminating())
797 >                    break;                    // recheck after clear
798 >                if (untimed)
799 >                    LockSupport.park(w);
800 >                else {
801 >                    LockSupport.parkNanos(w, SHRINK_RATE_NANOS);
802 >                    if (eventCount != ec || w.isTerminating())
803 >                        break;
804 >                    if (System.nanoTime() - startTime >= SHRINK_RATE_NANOS)
805 >                        tryShutdownUnusedWorker(ec);
806 >                }
807 >            }
808          }
412        return w;
809      }
810  
811 +    // Maintaining parallelism
812 +
813      /**
814 <     * Return a good size for worker array given pool size.
417 <     * Currently requires size to be a power of two.
814 >     * Pushes worker onto the spare stack.
815       */
816 <    private static int arraySizeFor(int ps) {
817 <        return ps <= 1? 1 : (1 << (32 - Integer.numberOfLeadingZeros(ps-1)));
816 >    final void pushSpare(ForkJoinWorkerThread w) {
817 >        int ns = (++w.spareCount << SPARE_COUNT_SHIFT) | (w.poolIndex + 1);
818 >        do {} while (!UNSAFE.compareAndSwapInt(this, spareWaitersOffset,
819 >                                               w.nextSpare = spareWaiters,ns));
820      }
821  
822      /**
823 <     * Create or resize array if necessary to hold newLength
824 <     * @return the array
823 >     * Tries (once) to resume a spare if the number of running
824 >     * threads is less than target.
825       */
826 <    private ForkJoinWorkerThread[] ensureWorkerArrayCapacity(int newLength) {
826 >    private void tryResumeSpare() {
827 >        int sw, id;
828          ForkJoinWorkerThread[] ws = workers;
829 <        if (ws == null)
830 <            return workers = new ForkJoinWorkerThread[arraySizeFor(newLength)];
831 <        else if (newLength > ws.length)
832 <            return workers = Arrays.copyOf(ws, arraySizeFor(newLength));
833 <        else
834 <            return ws;
829 >        int n = ws.length;
830 >        ForkJoinWorkerThread w;
831 >        if ((sw = spareWaiters) != 0 &&
832 >            (id = (sw & SPARE_ID_MASK) - 1) >= 0 &&
833 >            id < n && (w = ws[id]) != null &&
834 >            (workerCounts & RUNNING_COUNT_MASK) < parallelism &&
835 >            spareWaiters == sw &&
836 >            UNSAFE.compareAndSwapInt(this, spareWaitersOffset,
837 >                                     sw, w.nextSpare)) {
838 >            int c; // increment running count before resume
839 >            do {} while (!UNSAFE.compareAndSwapInt
840 >                         (this, workerCountsOffset,
841 >                          c = workerCounts, c + ONE_RUNNING));
842 >            if (w.tryUnsuspend())
843 >                LockSupport.unpark(w);
844 >            else   // back out if w was shutdown
845 >                decrementWorkerCounts(ONE_RUNNING, 0);
846 >        }
847 >    }
848 >
849 >    /**
850 >     * Tries to increase the number of running workers if below target
851 >     * parallelism: If a spare exists tries to resume it via
852 >     * tryResumeSpare.  Otherwise, if not enough total workers or all
853 >     * existing workers are busy, adds a new worker. In all cases also
854 >     * helps wake up releasable workers waiting for work.
855 >     */
856 >    private void helpMaintainParallelism() {
857 >        int pc = parallelism;
858 >        int wc, rs, tc;
859 >        while (((wc = workerCounts) & RUNNING_COUNT_MASK) < pc &&
860 >               (rs = runState) < TERMINATING) {
861 >            if (spareWaiters != 0)
862 >                tryResumeSpare();
863 >            else if ((tc = wc >>> TOTAL_COUNT_SHIFT) >= MAX_WORKERS ||
864 >                     (tc >= pc && (rs & ACTIVE_COUNT_MASK) != tc))
865 >                break;   // enough total
866 >            else if (runState == rs && workerCounts == wc &&
867 >                     UNSAFE.compareAndSwapInt(this, workerCountsOffset, wc,
868 >                                              wc + (ONE_RUNNING|ONE_TOTAL))) {
869 >                ForkJoinWorkerThread w = null;
870 >                Throwable fail = null;
871 >                try {
872 >                    w = factory.newThread(this);
873 >                } catch (Throwable ex) {
874 >                    fail = ex;
875 >                }
876 >                if (w == null) { // null or exceptional factory return
877 >                    decrementWorkerCounts(ONE_RUNNING, ONE_TOTAL);
878 >                    tryTerminate(false); // handle failure during shutdown
879 >                    // If originating from an external caller,
880 >                    // propagate exception, else ignore
881 >                    if (fail != null && runState < TERMINATING &&
882 >                        !(Thread.currentThread() instanceof
883 >                          ForkJoinWorkerThread))
884 >                        UNSAFE.throwException(fail);
885 >                    break;
886 >                }
887 >                w.start(recordWorker(w), ueh);
888 >                if ((workerCounts >>> TOTAL_COUNT_SHIFT) >= pc) {
889 >                    int c; // advance event count
890 >                    UNSAFE.compareAndSwapInt(this, eventCountOffset,
891 >                                             c = eventCount, c+1);
892 >                    break; // add at most one unless total below target
893 >                }
894 >            }
895 >        }
896 >        if (eventWaiters != 0L)
897 >            releaseEventWaiters();
898      }
899  
900      /**
901 <     * Try to shrink workers into smaller array after one or more terminate
901 >     * Callback from the oldest waiter in awaitEvent waking up after a
902 >     * period of non-use. If all workers are idle, tries (once) to
903 >     * shutdown an event waiter or a spare, if one exists. Note that
904 >     * we don't need CAS or locks here because the method is called
905 >     * only from one thread occasionally waking (and even misfires are
906 >     * OK). Note that until the shutdown worker fully terminates,
907 >     * workerCounts will overestimate total count, which is tolerable.
908 >     *
909 >     * @param ec the event count waited on by caller (to abort
910 >     * attempt if count has since changed).
911       */
912 <    private void tryShrinkWorkerArray() {
913 <        ForkJoinWorkerThread[] ws = workers;
914 <        int len = ws.length;
915 <        int last = len - 1;
916 <        while (last >= 0 && ws[last] == null)
917 <            --last;
918 <        int newLength = arraySizeFor(last+1);
919 <        if (newLength < len)
920 <            workers = Arrays.copyOf(ws, newLength);
912 >    private void tryShutdownUnusedWorker(int ec) {
913 >        if (runState == 0 && eventCount == ec) { // only trigger if all idle
914 >            ForkJoinWorkerThread[] ws = workers;
915 >            int n = ws.length;
916 >            ForkJoinWorkerThread w = null;
917 >            boolean shutdown = false;
918 >            int sw;
919 >            long h;
920 >            if ((sw = spareWaiters) != 0) { // prefer killing spares
921 >                int id = (sw & SPARE_ID_MASK) - 1;
922 >                if (id >= 0 && id < n && (w = ws[id]) != null &&
923 >                    UNSAFE.compareAndSwapInt(this, spareWaitersOffset,
924 >                                             sw, w.nextSpare))
925 >                    shutdown = true;
926 >            }
927 >            else if ((h = eventWaiters) != 0L) {
928 >                long nh;
929 >                int id = ((int)(h & WAITER_ID_MASK)) - 1;
930 >                if (id >= 0 && id < n && (w = ws[id]) != null &&
931 >                    (nh = w.nextWaiter) != 0L && // keep at least one worker
932 >                    UNSAFE.compareAndSwapLong(this, eventWaitersOffset, h, nh))
933 >                    shutdown = true;
934 >            }
935 >            if (w != null && shutdown) {
936 >                w.shutdown();
937 >                LockSupport.unpark(w);
938 >            }
939 >        }
940 >        releaseEventWaiters(); // in case of interference
941      }
942  
943      /**
944 <     * Initial worker array and worker creation and startup. (This
945 <     * must be done under lock to avoid interference by some of the
946 <     * newly started threads while creating others.)
944 >     * Callback from workers invoked upon each top-level action (i.e.,
945 >     * stealing a task or taking a submission and running it).
946 >     * Performs one or more of the following:
947 >     *
948 >     * 1. If the worker is active and either did not run a task
949 >     *    or there are too many workers, try to set its active status
950 >     *    to inactive and update activeCount. On contention, we may
951 >     *    try again in this or a subsequent call.
952 >     *
953 >     * 2. If not enough total workers, help create some.
954 >     *
955 >     * 3. If there are too many running workers, suspend this worker
956 >     *    (first forcing inactive if necessary).  If it is not needed,
957 >     *    it may be shutdown while suspended (via
958 >     *    tryShutdownUnusedWorker).  Otherwise, upon resume it
959 >     *    rechecks running thread count and need for event sync.
960 >     *
961 >     * 4. If worker did not run a task, await the next task event via
962 >     *    eventSync if necessary (first forcing inactivation), upon
963 >     *    which the worker may be shutdown via
964 >     *    tryShutdownUnusedWorker.  Otherwise, help release any
965 >     *    existing event waiters that are now releasable,
966 >     *
967 >     * @param w the worker
968 >     * @param ran true if worker ran a task since last call to this method
969       */
970 <    private void createAndStartInitialWorkers(int ps) {
971 <        final ReentrantLock lock = this.workerLock;
972 <        lock.lock();
973 <        try {
974 <            ForkJoinWorkerThread[] ws = ensureWorkerArrayCapacity(ps);
975 <            for (int i = 0; i < ps; ++i) {
976 <                ForkJoinWorkerThread w = createWorker(i);
977 <                if (w != null) {
978 <                    ws[i] = w;
979 <                    w.start();
980 <                    updateWorkerCount(1);
970 >    final void preStep(ForkJoinWorkerThread w, boolean ran) {
971 >        int wec = w.lastEventCount;
972 >        boolean active = w.active;
973 >        boolean inactivate = false;
974 >        int pc = parallelism;
975 >        while (w.runState == 0) {
976 >            int rs = runState;
977 >            if (rs >= TERMINATING) { // propagate shutdown
978 >                w.shutdown();
979 >                break;
980 >            }
981 >            if ((inactivate || (active && (rs & ACTIVE_COUNT_MASK) >= pc)) &&
982 >                UNSAFE.compareAndSwapInt(this, runStateOffset, rs, rs - 1))
983 >                inactivate = active = w.active = false;
984 >            int wc = workerCounts;
985 >            if ((wc & RUNNING_COUNT_MASK) > pc) {
986 >                if (!(inactivate |= active) && // must inactivate to suspend
987 >                    workerCounts == wc &&      // try to suspend as spare
988 >                    UNSAFE.compareAndSwapInt(this, workerCountsOffset,
989 >                                             wc, wc - ONE_RUNNING))
990 >                    w.suspendAsSpare();
991 >            }
992 >            else if ((wc >>> TOTAL_COUNT_SHIFT) < pc)
993 >                helpMaintainParallelism();     // not enough workers
994 >            else if (!ran) {
995 >                long h = eventWaiters;
996 >                int ec = eventCount;
997 >                if (h != 0L && (int)(h >>> EVENT_COUNT_SHIFT) != ec)
998 >                    releaseEventWaiters();     // release others before waiting
999 >                else if (ec != wec) {
1000 >                    w.lastEventCount = ec;     // no need to wait
1001 >                    break;
1002                  }
1003 +                else if (!(inactivate |= active))
1004 +                    eventSync(w, wec);         // must inactivate before sync
1005              }
1006 <        } finally {
1007 <            lock.unlock();
1006 >            else
1007 >                break;
1008          }
1009      }
1010  
1011      /**
1012 <     * Worker creation and startup for threads added via setParallelism.
1013 <     */
1014 <    private void createAndStartAddedWorkers() {
1015 <        resumeAllSpares();  // Allow spares to convert to nonspare
1016 <        int ps = parallelism;
1017 <        ForkJoinWorkerThread[] ws = ensureWorkerArrayCapacity(ps);
1018 <        int len = ws.length;
1019 <        // Sweep through slots, to keep lowest indices most populated
1020 <        int k = 0;
1021 <        while (k < len) {
1022 <            if (ws[k] != null) {
1023 <                ++k;
1024 <                continue;
1012 >     * Helps and/or blocks awaiting join of the given task.
1013 >     * See above for explanation.
1014 >     *
1015 >     * @param joinMe the task to join
1016 >     * @param worker the current worker thread
1017 >     * @param timed true if wait should time out
1018 >     * @param nanos timeout value if timed
1019 >     */
1020 >    final void awaitJoin(ForkJoinTask<?> joinMe, ForkJoinWorkerThread worker,
1021 >                         boolean timed, long nanos) {
1022 >        long startTime = timed? System.nanoTime() : 0L;
1023 >        int retries = 2 + (parallelism >> 2); // #helpJoins before blocking
1024 >        while (joinMe.status >= 0) {
1025 >            int wc;
1026 >            long nt = 0L;
1027 >            if (runState >= TERMINATING) {
1028 >                joinMe.cancelIgnoringExceptions();
1029 >                break;
1030              }
1031 <            int s = workerCounts;
1032 <            int tc = totalCountOf(s);
491 <            int rc = runningCountOf(s);
492 <            if (rc >= ps || tc >= ps)
1031 >            worker.helpJoinTask(joinMe);
1032 >            if (joinMe.status < 0)
1033                  break;
1034 <            if (casWorkerCounts (s, workerCountsFor(tc+1, rc+1))) {
1035 <                ForkJoinWorkerThread w = createWorker(k);
1036 <                if (w != null) {
1037 <                    ws[k++] = w;
1038 <                    w.start();
1034 >            else if (retries > 0)
1035 >                --retries;
1036 >            else if (timed &&
1037 >                     (nt = nanos - (System.nanoTime() - startTime)) <= 0L)
1038 >                break;
1039 >            else if (((wc = workerCounts) & RUNNING_COUNT_MASK) != 0 &&
1040 >                     UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1041 >                                              wc, wc - ONE_RUNNING)) {
1042 >                int stat, c; long h;
1043 >                while ((stat = joinMe.status) >= 0 &&
1044 >                       (h = eventWaiters) != 0L && // help release others
1045 >                       (int)(h >>> EVENT_COUNT_SHIFT) != eventCount)
1046 >                    releaseEventWaiters();
1047 >                if (stat >= 0) {
1048 >                    if ((workerCounts & RUNNING_COUNT_MASK) != 0) {
1049 >                        long ms; int ns;
1050 >                        if (!timed) {
1051 >                            ms = JOIN_TIMEOUT_MILLIS;
1052 >                            ns = 0;
1053 >                        }
1054 >                        else { // at most JOIN_TIMEOUT_MILLIS per wait
1055 >                            ms = nt / 1000000;
1056 >                            if (ms > JOIN_TIMEOUT_MILLIS) {
1057 >                                ms = JOIN_TIMEOUT_MILLIS;
1058 >                                ns = 0;
1059 >                            }
1060 >                            else
1061 >                                ns = (int) (nt % 1000000);
1062 >                        }
1063 >                        stat = joinMe.internalAwaitDone(ms, ns);
1064 >                    }
1065 >                    if (stat >= 0) // timeout or no running workers
1066 >                        helpMaintainParallelism();
1067                  }
1068 <                else {
1069 <                    updateWorkerCount(-1); // back out on failed creation
1070 <                    break;
1068 >                do {} while (!UNSAFE.compareAndSwapInt
1069 >                             (this, workerCountsOffset,
1070 >                              c = workerCounts, c + ONE_RUNNING));
1071 >                if (stat < 0)
1072 >                    break;   // else restart
1073 >            }
1074 >        }
1075 >    }
1076 >
1077 >    /**
1078 >     * Same idea as awaitJoin, but no helping, retries, or timeouts.
1079 >     */
1080 >    final void awaitBlocker(ManagedBlocker blocker)
1081 >        throws InterruptedException {
1082 >        while (!blocker.isReleasable()) {
1083 >            int wc = workerCounts;
1084 >            if ((wc & RUNNING_COUNT_MASK) != 0 &&
1085 >                UNSAFE.compareAndSwapInt(this, workerCountsOffset,
1086 >                                         wc, wc - ONE_RUNNING)) {
1087 >                try {
1088 >                    while (!blocker.isReleasable()) {
1089 >                        long h = eventWaiters;
1090 >                        if (h != 0L &&
1091 >                            (int)(h >>> EVENT_COUNT_SHIFT) != eventCount)
1092 >                            releaseEventWaiters();
1093 >                        else if ((workerCounts & RUNNING_COUNT_MASK) == 0 &&
1094 >                                 runState < TERMINATING)
1095 >                            helpMaintainParallelism();
1096 >                        else if (blocker.block())
1097 >                            break;
1098 >                    }
1099 >                } finally {
1100 >                    int c;
1101 >                    do {} while (!UNSAFE.compareAndSwapInt
1102 >                                 (this, workerCountsOffset,
1103 >                                  c = workerCounts, c + ONE_RUNNING));
1104                  }
1105 +                break;
1106              }
1107          }
1108      }
1109  
1110 +    /**
1111 +     * Possibly initiates and/or completes termination.
1112 +     *
1113 +     * @param now if true, unconditionally terminate, else only
1114 +     * if shutdown and empty queue and no active workers
1115 +     * @return true if now terminating or terminated
1116 +     */
1117 +    private boolean tryTerminate(boolean now) {
1118 +        if (now)
1119 +            advanceRunLevel(SHUTDOWN); // ensure at least SHUTDOWN
1120 +        else if (runState < SHUTDOWN ||
1121 +                 !submissionQueue.isEmpty() ||
1122 +                 (runState & ACTIVE_COUNT_MASK) != 0)
1123 +            return false;
1124 +
1125 +        if (advanceRunLevel(TERMINATING))
1126 +            startTerminating();
1127 +
1128 +        // Finish now if all threads terminated; else in some subsequent call
1129 +        if ((workerCounts >>> TOTAL_COUNT_SHIFT) == 0) {
1130 +            advanceRunLevel(TERMINATED);
1131 +            termination.forceTermination();
1132 +        }
1133 +        return true;
1134 +    }
1135 +
1136 +
1137 +    /**
1138 +     * Actions on transition to TERMINATING
1139 +     *
1140 +     * Runs up to four passes through workers: (0) shutting down each
1141 +     * (without waking up if parked) to quickly spread notifications
1142 +     * without unnecessary bouncing around event queues etc (1) wake
1143 +     * up and help cancel tasks (2) interrupt (3) mop up races with
1144 +     * interrupted workers
1145 +     */
1146 +    private void startTerminating() {
1147 +        cancelSubmissions();
1148 +        for (int passes = 0; passes < 4 && workerCounts != 0; ++passes) {
1149 +            int c; // advance event count
1150 +            UNSAFE.compareAndSwapInt(this, eventCountOffset,
1151 +                                     c = eventCount, c+1);
1152 +            eventWaiters = 0L; // clobber lists
1153 +            spareWaiters = 0;
1154 +            for (ForkJoinWorkerThread w : workers) {
1155 +                if (w != null) {
1156 +                    w.shutdown();
1157 +                    if (passes > 0 && !w.isTerminated()) {
1158 +                        w.cancelTasks();
1159 +                        LockSupport.unpark(w);
1160 +                        if (passes > 1 && !w.isInterrupted()) {
1161 +                            try {
1162 +                                w.interrupt();
1163 +                            } catch (SecurityException ignore) {
1164 +                            }
1165 +                        }
1166 +                    }
1167 +                }
1168 +            }
1169 +        }
1170 +    }
1171 +
1172 +    /**
1173 +     * Clears out and cancels submissions, ignoring exceptions.
1174 +     */
1175 +    private void cancelSubmissions() {
1176 +        ForkJoinTask<?> task;
1177 +        while ((task = submissionQueue.poll()) != null) {
1178 +            try {
1179 +                task.cancel(false);
1180 +            } catch (Throwable ignore) {
1181 +            }
1182 +        }
1183 +    }
1184 +
1185 +    // misc support for ForkJoinWorkerThread
1186 +
1187 +    /**
1188 +     * Returns pool number.
1189 +     */
1190 +    final int getPoolNumber() {
1191 +        return poolNumber;
1192 +    }
1193 +
1194 +    /**
1195 +     * Tries to accumulate steal count from a worker, clearing
1196 +     * the worker's value if successful.
1197 +     *
1198 +     * @return true if worker steal count now zero
1199 +     */
1200 +    final boolean tryAccumulateStealCount(ForkJoinWorkerThread w) {
1201 +        int sc = w.stealCount;
1202 +        long c = stealCount;
1203 +        // CAS even if zero, for fence effects
1204 +        if (UNSAFE.compareAndSwapLong(this, stealCountOffset, c, c + sc)) {
1205 +            if (sc != 0)
1206 +                w.stealCount = 0;
1207 +            return true;
1208 +        }
1209 +        return sc == 0;
1210 +    }
1211 +
1212 +    /**
1213 +     * Returns the approximate (non-atomic) number of idle threads per
1214 +     * active thread.
1215 +     */
1216 +    final int idlePerActive() {
1217 +        int pc = parallelism; // use parallelism, not rc
1218 +        int ac = runState;    // no mask -- artificially boosts during shutdown
1219 +        // Use exact results for small values, saturate past 4
1220 +        return ((pc <= ac) ? 0 :
1221 +                (pc >>> 1 <= ac) ? 1 :
1222 +                (pc >>> 2 <= ac) ? 3 :
1223 +                pc >>> 3);
1224 +    }
1225 +
1226 +    // Public and protected methods
1227 +
1228 +    // Constructors
1229 +
1230 +    /**
1231 +     * Creates a {@code ForkJoinPool} with parallelism equal to {@link
1232 +     * java.lang.Runtime#availableProcessors}, using the {@linkplain
1233 +     * #defaultForkJoinWorkerThreadFactory default thread factory},
1234 +     * no UncaughtExceptionHandler, and non-async LIFO processing mode.
1235 +     *
1236 +     * @throws SecurityException if a security manager exists and
1237 +     *         the caller is not permitted to modify threads
1238 +     *         because it does not hold {@link
1239 +     *         java.lang.RuntimePermission}{@code ("modifyThread")}
1240 +     */
1241 +    public ForkJoinPool() {
1242 +        this(Runtime.getRuntime().availableProcessors(),
1243 +             defaultForkJoinWorkerThreadFactory, null, false);
1244 +    }
1245 +
1246 +    /**
1247 +     * Creates a {@code ForkJoinPool} with the indicated parallelism
1248 +     * level, the {@linkplain
1249 +     * #defaultForkJoinWorkerThreadFactory default thread factory},
1250 +     * no UncaughtExceptionHandler, and non-async LIFO processing mode.
1251 +     *
1252 +     * @param parallelism the parallelism level
1253 +     * @throws IllegalArgumentException if parallelism less than or
1254 +     *         equal to zero, or greater than implementation limit
1255 +     * @throws SecurityException if a security manager exists and
1256 +     *         the caller is not permitted to modify threads
1257 +     *         because it does not hold {@link
1258 +     *         java.lang.RuntimePermission}{@code ("modifyThread")}
1259 +     */
1260 +    public ForkJoinPool(int parallelism) {
1261 +        this(parallelism, defaultForkJoinWorkerThreadFactory, null, false);
1262 +    }
1263 +
1264 +    /**
1265 +     * Creates a {@code ForkJoinPool} with the given parameters.
1266 +     *
1267 +     * @param parallelism the parallelism level. For default value,
1268 +     * use {@link java.lang.Runtime#availableProcessors}.
1269 +     * @param factory the factory for creating new threads. For default value,
1270 +     * use {@link #defaultForkJoinWorkerThreadFactory}.
1271 +     * @param handler the handler for internal worker threads that
1272 +     * terminate due to unrecoverable errors encountered while executing
1273 +     * tasks. For default value, use {@code null}.
1274 +     * @param asyncMode if true,
1275 +     * establishes local first-in-first-out scheduling mode for forked
1276 +     * tasks that are never joined. This mode may be more appropriate
1277 +     * than default locally stack-based mode in applications in which
1278 +     * worker threads only process event-style asynchronous tasks.
1279 +     * For default value, use {@code false}.
1280 +     * @throws IllegalArgumentException if parallelism less than or
1281 +     *         equal to zero, or greater than implementation limit
1282 +     * @throws NullPointerException if the factory is null
1283 +     * @throws SecurityException if a security manager exists and
1284 +     *         the caller is not permitted to modify threads
1285 +     *         because it does not hold {@link
1286 +     *         java.lang.RuntimePermission}{@code ("modifyThread")}
1287 +     */
1288 +    public ForkJoinPool(int parallelism,
1289 +                        ForkJoinWorkerThreadFactory factory,
1290 +                        Thread.UncaughtExceptionHandler handler,
1291 +                        boolean asyncMode) {
1292 +        checkPermission();
1293 +        if (factory == null)
1294 +            throw new NullPointerException();
1295 +        if (parallelism <= 0 || parallelism > MAX_WORKERS)
1296 +            throw new IllegalArgumentException();
1297 +        this.parallelism = parallelism;
1298 +        this.factory = factory;
1299 +        this.ueh = handler;
1300 +        this.locallyFifo = asyncMode;
1301 +        int arraySize = initialArraySizeFor(parallelism);
1302 +        this.workers = new ForkJoinWorkerThread[arraySize];
1303 +        this.submissionQueue = new LinkedTransferQueue<ForkJoinTask<?>>();
1304 +        this.workerLock = new ReentrantLock();
1305 +        this.termination = new Phaser(1);
1306 +        this.poolNumber = poolNumberGenerator.incrementAndGet();
1307 +    }
1308 +
1309 +    /**
1310 +     * Returns initial power of two size for workers array.
1311 +     * @param pc the initial parallelism level
1312 +     */
1313 +    private static int initialArraySizeFor(int pc) {
1314 +        // If possible, initially allocate enough space for one spare
1315 +        int size = pc < MAX_WORKERS ? pc + 1 : MAX_WORKERS;
1316 +        // See Hackers Delight, sec 3.2. We know MAX_WORKERS < (1 >>> 16)
1317 +        size |= size >>> 1;
1318 +        size |= size >>> 2;
1319 +        size |= size >>> 4;
1320 +        size |= size >>> 8;
1321 +        return size + 1;
1322 +    }
1323 +
1324      // Execution methods
1325  
1326      /**
1327 <     * Common code for execute, invoke and submit
1327 >     * Submits task and creates, starts, or resumes some workers if necessary
1328       */
1329      private <T> void doSubmit(ForkJoinTask<T> task) {
514        if (isShutdown())
515            throw new RejectedExecutionException();
1330          submissionQueue.offer(task);
1331 <        signalIdleWorkers();
1331 >        int c; // try to increment event count -- CAS failure OK
1332 >        UNSAFE.compareAndSwapInt(this, eventCountOffset, c = eventCount, c+1);
1333 >        helpMaintainParallelism();
1334      }
1335  
1336      /**
1337 <     * Performs the given task; returning its result upon completion
1337 >     * Performs the given task, returning its result upon completion.
1338 >     *
1339       * @param task the task
1340       * @return the task's result
1341 <     * @throws NullPointerException if task is null
1342 <     * @throws RejectedExecutionException if pool is shut down
1341 >     * @throws NullPointerException if the task is null
1342 >     * @throws RejectedExecutionException if the task cannot be
1343 >     *         scheduled for execution
1344       */
1345      public <T> T invoke(ForkJoinTask<T> task) {
1346 <        doSubmit(task);
1347 <        return task.join();
1346 >        if (task == null)
1347 >            throw new NullPointerException();
1348 >        if (runState >= SHUTDOWN)
1349 >            throw new RejectedExecutionException();
1350 >        Thread t = Thread.currentThread();
1351 >        if ((t instanceof ForkJoinWorkerThread) &&
1352 >            ((ForkJoinWorkerThread)t).pool == this)
1353 >            return task.invoke();  // bypass submit if in same pool
1354 >        else {
1355 >            doSubmit(task);
1356 >            return task.join();
1357 >        }
1358 >    }
1359 >
1360 >    /**
1361 >     * Unless terminating, forks task if within an ongoing FJ
1362 >     * computation in the current pool, else submits as external task.
1363 >     */
1364 >    private <T> void forkOrSubmit(ForkJoinTask<T> task) {
1365 >        if (runState >= SHUTDOWN)
1366 >            throw new RejectedExecutionException();
1367 >        Thread t = Thread.currentThread();
1368 >        if ((t instanceof ForkJoinWorkerThread) &&
1369 >            ((ForkJoinWorkerThread)t).pool == this)
1370 >            task.fork();
1371 >        else
1372 >            doSubmit(task);
1373      }
1374  
1375      /**
1376       * Arranges for (asynchronous) execution of the given task.
1377 +     *
1378       * @param task the task
1379 <     * @throws NullPointerException if task is null
1380 <     * @throws RejectedExecutionException if pool is shut down
1379 >     * @throws NullPointerException if the task is null
1380 >     * @throws RejectedExecutionException if the task cannot be
1381 >     *         scheduled for execution
1382       */
1383 <    public <T> void execute(ForkJoinTask<T> task) {
1384 <        doSubmit(task);
1383 >    public void execute(ForkJoinTask<?> task) {
1384 >        if (task == null)
1385 >            throw new NullPointerException();
1386 >        forkOrSubmit(task);
1387      }
1388  
1389      // AbstractExecutorService methods
1390  
1391 +    /**
1392 +     * @throws NullPointerException if the task is null
1393 +     * @throws RejectedExecutionException if the task cannot be
1394 +     *         scheduled for execution
1395 +     */
1396      public void execute(Runnable task) {
1397 <        doSubmit(new AdaptedRunnable<Void>(task, null));
1397 >        if (task == null)
1398 >            throw new NullPointerException();
1399 >        ForkJoinTask<?> job;
1400 >        if (task instanceof ForkJoinTask<?>) // avoid re-wrap
1401 >            job = (ForkJoinTask<?>) task;
1402 >        else
1403 >            job = ForkJoinTask.adapt(task, null);
1404 >        forkOrSubmit(job);
1405      }
1406  
1407 <    public <T> ForkJoinTask<T> submit(Callable<T> task) {
1408 <        ForkJoinTask<T> job = new AdaptedCallable<T>(task);
1409 <        doSubmit(job);
1410 <        return job;
1407 >    /**
1408 >     * Submits a ForkJoinTask for execution.
1409 >     *
1410 >     * @param task the task to submit
1411 >     * @return the task
1412 >     * @throws NullPointerException if the task is null
1413 >     * @throws RejectedExecutionException if the task cannot be
1414 >     *         scheduled for execution
1415 >     */
1416 >    public <T> ForkJoinTask<T> submit(ForkJoinTask<T> task) {
1417 >        if (task == null)
1418 >            throw new NullPointerException();
1419 >        forkOrSubmit(task);
1420 >        return task;
1421      }
1422  
1423 <    public <T> ForkJoinTask<T> submit(Runnable task, T result) {
1424 <        ForkJoinTask<T> job = new AdaptedRunnable<T>(task, result);
1425 <        doSubmit(job);
1423 >    /**
1424 >     * @throws NullPointerException if the task is null
1425 >     * @throws RejectedExecutionException if the task cannot be
1426 >     *         scheduled for execution
1427 >     */
1428 >    public <T> ForkJoinTask<T> submit(Callable<T> task) {
1429 >        if (task == null)
1430 >            throw new NullPointerException();
1431 >        ForkJoinTask<T> job = ForkJoinTask.adapt(task);
1432 >        forkOrSubmit(job);
1433          return job;
1434      }
1435  
1436 <    public ForkJoinTask<?> submit(Runnable task) {
1437 <        ForkJoinTask<Void> job = new AdaptedRunnable<Void>(task, null);
1438 <        doSubmit(job);
1436 >    /**
1437 >     * @throws NullPointerException if the task is null
1438 >     * @throws RejectedExecutionException if the task cannot be
1439 >     *         scheduled for execution
1440 >     */
1441 >    public <T> ForkJoinTask<T> submit(Runnable task, T result) {
1442 >        if (task == null)
1443 >            throw new NullPointerException();
1444 >        ForkJoinTask<T> job = ForkJoinTask.adapt(task, result);
1445 >        forkOrSubmit(job);
1446          return job;
1447      }
1448  
1449      /**
1450 <     * Adaptor for Runnables. This implements RunnableFuture
1451 <     * to be compliant with AbstractExecutorService constraints
1450 >     * @throws NullPointerException if the task is null
1451 >     * @throws RejectedExecutionException if the task cannot be
1452 >     *         scheduled for execution
1453       */
1454 <    static final class AdaptedRunnable<T> extends ForkJoinTask<T>
1455 <        implements RunnableFuture<T> {
1456 <        final Runnable runnable;
1457 <        final T resultOnCompletion;
1458 <        T result;
1459 <        AdaptedRunnable(Runnable runnable, T result) {
1460 <            if (runnable == null) throw new NullPointerException();
1461 <            this.runnable = runnable;
1462 <            this.resultOnCompletion = result;
1463 <        }
580 <        public T getRawResult() { return result; }
581 <        public void setRawResult(T v) { result = v; }
582 <        public boolean exec() {
583 <            runnable.run();
584 <            result = resultOnCompletion;
585 <            return true;
586 <        }
587 <        public void run() { invoke(); }
1454 >    public ForkJoinTask<?> submit(Runnable task) {
1455 >        if (task == null)
1456 >            throw new NullPointerException();
1457 >        ForkJoinTask<?> job;
1458 >        if (task instanceof ForkJoinTask<?>) // avoid re-wrap
1459 >            job = (ForkJoinTask<?>) task;
1460 >        else
1461 >            job = ForkJoinTask.adapt(task, null);
1462 >        forkOrSubmit(job);
1463 >        return job;
1464      }
1465  
1466      /**
1467 <     * Adaptor for Callables
1467 >     * @throws NullPointerException       {@inheritDoc}
1468 >     * @throws RejectedExecutionException {@inheritDoc}
1469       */
593    static final class AdaptedCallable<T> extends ForkJoinTask<T>
594        implements RunnableFuture<T> {
595        final Callable<T> callable;
596        T result;
597        AdaptedCallable(Callable<T> callable) {
598            if (callable == null) throw new NullPointerException();
599            this.callable = callable;
600        }
601        public T getRawResult() { return result; }
602        public void setRawResult(T v) { result = v; }
603        public boolean exec() {
604            try {
605                result = callable.call();
606                return true;
607            } catch (Error err) {
608                throw err;
609            } catch (RuntimeException rex) {
610                throw rex;
611            } catch (Exception ex) {
612                throw new RuntimeException(ex);
613            }
614        }
615        public void run() { invoke(); }
616    }
617
1470      public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) {
1471 <        ArrayList<ForkJoinTask<T>> ts =
1471 >        ArrayList<ForkJoinTask<T>> forkJoinTasks =
1472              new ArrayList<ForkJoinTask<T>>(tasks.size());
1473 <        for (Callable<T> c : tasks)
1474 <            ts.add(new AdaptedCallable<T>(c));
1475 <        invoke(new InvokeAll<T>(ts));
1476 <        return (List<Future<T>>)(List)ts;
1473 >        for (Callable<T> task : tasks)
1474 >            forkJoinTasks.add(ForkJoinTask.adapt(task));
1475 >        invoke(new InvokeAll<T>(forkJoinTasks));
1476 >
1477 >        @SuppressWarnings({"unchecked", "rawtypes"})
1478 >            List<Future<T>> futures = (List<Future<T>>) (List) forkJoinTasks;
1479 >        return futures;
1480      }
1481  
1482      static final class InvokeAll<T> extends RecursiveAction {
1483          final ArrayList<ForkJoinTask<T>> tasks;
1484          InvokeAll(ArrayList<ForkJoinTask<T>> tasks) { this.tasks = tasks; }
1485          public void compute() {
1486 <            try { invokeAll(tasks); } catch(Exception ignore) {}
1486 >            try { invokeAll(tasks); }
1487 >            catch (Exception ignore) {}
1488          }
1489 +        private static final long serialVersionUID = -7914297376763021607L;
1490      }
1491  
635    // Configuration and status settings and queries
636
1492      /**
1493 <     * Returns the factory used for constructing new workers
1493 >     * Returns the factory used for constructing new workers.
1494       *
1495       * @return the factory used for constructing new workers
1496       */
# Line 646 | Line 1501 | public class ForkJoinPool extends Abstra
1501      /**
1502       * Returns the handler for internal worker threads that terminate
1503       * due to unrecoverable errors encountered while executing tasks.
649     * @return the handler, or null if none
650     */
651    public Thread.UncaughtExceptionHandler getUncaughtExceptionHandler() {
652        Thread.UncaughtExceptionHandler h;
653        final ReentrantLock lock = this.workerLock;
654        lock.lock();
655        try {
656            h = ueh;
657        } finally {
658            lock.unlock();
659        }
660        return h;
661    }
662
663    /**
664     * Sets the handler for internal worker threads that terminate due
665     * to unrecoverable errors encountered while executing tasks.
666     * Unless set, the current default or ThreadGroup handler is used
667     * as handler.
1504       *
1505 <     * @param h the new handler
670 <     * @return the old handler, or null if none
671 <     * @throws SecurityException if a security manager exists and
672 <     *         the caller is not permitted to modify threads
673 <     *         because it does not hold {@link
674 <     *         java.lang.RuntimePermission}<code>("modifyThread")</code>,
1505 >     * @return the handler, or {@code null} if none
1506       */
1507 <    public Thread.UncaughtExceptionHandler
1508 <        setUncaughtExceptionHandler(Thread.UncaughtExceptionHandler h) {
678 <        checkPermission();
679 <        Thread.UncaughtExceptionHandler old = null;
680 <        final ReentrantLock lock = this.workerLock;
681 <        lock.lock();
682 <        try {
683 <            old = ueh;
684 <            ueh = h;
685 <            ForkJoinWorkerThread[] ws = workers;
686 <            for (int i = 0; i < ws.length; ++i) {
687 <                ForkJoinWorkerThread w = ws[i];
688 <                if (w != null)
689 <                    w.setUncaughtExceptionHandler(h);
690 <            }
691 <        } finally {
692 <            lock.unlock();
693 <        }
694 <        return old;
695 <    }
696 <
697 <
698 <    /**
699 <     * Sets the target paralleism level of this pool.
700 <     * @param parallelism the target parallelism
701 <     * @throws IllegalArgumentException if parallelism less than or
702 <     * equal to zero or greater than maximum size bounds.
703 <     * @throws SecurityException if a security manager exists and
704 <     *         the caller is not permitted to modify threads
705 <     *         because it does not hold {@link
706 <     *         java.lang.RuntimePermission}<code>("modifyThread")</code>,
707 <     */
708 <    public void setParallelism(int parallelism) {
709 <        checkPermission();
710 <        if (parallelism <= 0 || parallelism > maxPoolSize)
711 <            throw new IllegalArgumentException();
712 <        final ReentrantLock lock = this.workerLock;
713 <        lock.lock();
714 <        try {
715 <            if (!isTerminating()) {
716 <                int p = this.parallelism;
717 <                this.parallelism = parallelism;
718 <                if (parallelism > p)
719 <                    createAndStartAddedWorkers();
720 <                else
721 <                    trimSpares();
722 <            }
723 <        } finally {
724 <            lock.unlock();
725 <        }
726 <        signalIdleWorkers();
1507 >    public Thread.UncaughtExceptionHandler getUncaughtExceptionHandler() {
1508 >        return ueh;
1509      }
1510  
1511      /**
1512 <     * Returns the targeted number of worker threads in this pool.
1512 >     * Returns the targeted parallelism level of this pool.
1513       *
1514 <     * @return the targeted number of worker threads in this pool
1514 >     * @return the targeted parallelism level of this pool
1515       */
1516      public int getParallelism() {
1517          return parallelism;
# Line 737 | Line 1519 | public class ForkJoinPool extends Abstra
1519  
1520      /**
1521       * Returns the number of worker threads that have started but not
1522 <     * yet terminated.  This result returned by this method may differ
1523 <     * from <code>getParallelism</code> when threads are created to
1522 >     * yet terminated.  The result returned by this method may differ
1523 >     * from {@link #getParallelism} when threads are created to
1524       * maintain parallelism when others are cooperatively blocked.
1525       *
1526       * @return the number of worker threads
1527       */
1528      public int getPoolSize() {
1529 <        return totalCountOf(workerCounts);
748 <    }
749 <
750 <    /**
751 <     * Returns the maximum number of threads allowed to exist in the
752 <     * pool, even if there are insufficient unblocked running threads.
753 <     * @return the maximum
754 <     */
755 <    public int getMaximumPoolSize() {
756 <        return maxPoolSize;
757 <    }
758 <
759 <    /**
760 <     * Sets the maximum number of threads allowed to exist in the
761 <     * pool, even if there are insufficient unblocked running threads.
762 <     * Setting this value has no effect on current pool size. It
763 <     * controls construction of new threads.
764 <     * @throws IllegalArgumentException if negative or greater then
765 <     * internal implementation limit.
766 <     */
767 <    public void setMaximumPoolSize(int newMax) {
768 <        if (newMax < 0 || newMax > MAX_THREADS)
769 <            throw new IllegalArgumentException();
770 <        maxPoolSize = newMax;
771 <    }
772 <
773 <
774 <    /**
775 <     * Returns true if this pool dynamically maintains its target
776 <     * parallelism level. If false, new threads are added only to
777 <     * avoid possible starvation.
778 <     * This setting is by default true;
779 <     * @return true if maintains parallelism
780 <     */
781 <    public boolean getMaintainsParallelism() {
782 <        return maintainsParallelism;
1529 >        return workerCounts >>> TOTAL_COUNT_SHIFT;
1530      }
1531  
1532      /**
1533 <     * Sets whether this pool dynamically maintains its target
1534 <     * parallelism level. If false, new threads are added only to
1535 <     * avoid possible starvation.
1536 <     * @param enable true to maintains parallelism
1533 >     * Returns {@code true} if this pool uses local first-in-first-out
1534 >     * scheduling mode for forked tasks that are never joined.
1535 >     *
1536 >     * @return {@code true} if this pool uses async mode
1537       */
1538 <    public void setMaintainsParallelism(boolean enable) {
1539 <        maintainsParallelism = enable;
1538 >    public boolean getAsyncMode() {
1539 >        return locallyFifo;
1540      }
1541  
1542      /**
1543       * Returns an estimate of the number of worker threads that are
1544       * not blocked waiting to join tasks or for other managed
1545 <     * synchronization.
1545 >     * synchronization. This method may overestimate the
1546 >     * number of running threads.
1547       *
1548       * @return the number of worker threads
1549       */
1550      public int getRunningThreadCount() {
1551 <        return runningCountOf(workerCounts);
1551 >        return workerCounts & RUNNING_COUNT_MASK;
1552      }
1553  
1554      /**
1555       * Returns an estimate of the number of threads that are currently
1556       * stealing or executing tasks. This method may overestimate the
1557       * number of active threads.
1558 <     * @return the number of active threads.
1558 >     *
1559 >     * @return the number of active threads
1560       */
1561      public int getActiveThreadCount() {
1562 <        return activeCountOf(runControl);
814 <    }
815 <
816 <    /**
817 <     * Returns an estimate of the number of threads that are currently
818 <     * idle waiting for tasks. This method may underestimate the
819 <     * number of idle threads.
820 <     * @return the number of idle threads.
821 <     */
822 <    final int getIdleThreadCount() {
823 <        int c = runningCountOf(workerCounts) - activeCountOf(runControl);
824 <        return (c <= 0)? 0 : c;
1562 >        return runState & ACTIVE_COUNT_MASK;
1563      }
1564  
1565      /**
1566 <     * Returns true if all worker threads are currently idle. An idle
1567 <     * worker is one that cannot obtain a task to execute because none
1568 <     * are available to steal from other threads, and there are no
1569 <     * pending submissions to the pool. This method is conservative:
1570 <     * It might not return true immediately upon idleness of all
1571 <     * threads, but will eventually become true if threads remain
1572 <     * inactive.
1573 <     * @return true if all threads are currently idle
1566 >     * Returns {@code true} if all worker threads are currently idle.
1567 >     * An idle worker is one that cannot obtain a task to execute
1568 >     * because none are available to steal from other threads, and
1569 >     * there are no pending submissions to the pool. This method is
1570 >     * conservative; it might not return {@code true} immediately upon
1571 >     * idleness of all threads, but will eventually become true if
1572 >     * threads remain inactive.
1573 >     *
1574 >     * @return {@code true} if all threads are currently idle
1575       */
1576      public boolean isQuiescent() {
1577 <        return activeCountOf(runControl) == 0;
1577 >        return (runState & ACTIVE_COUNT_MASK) == 0;
1578      }
1579  
1580      /**
# Line 843 | Line 1582 | public class ForkJoinPool extends Abstra
1582       * one thread's work queue by another. The reported value
1583       * underestimates the actual total number of steals when the pool
1584       * is not quiescent. This value may be useful for monitoring and
1585 <     * tuning fork/join programs: In general, steal counts should be
1585 >     * tuning fork/join programs: in general, steal counts should be
1586       * high enough to keep threads busy, but low enough to avoid
1587       * overhead and contention across threads.
1588 <     * @return the number of steals.
1588 >     *
1589 >     * @return the number of steals
1590       */
1591      public long getStealCount() {
1592 <        return stealCount.get();
853 <    }
854 <
855 <    /**
856 <     * Accumulate steal count from a worker. Call only
857 <     * when worker known to be idle.
858 <     */
859 <    private void updateStealCount(ForkJoinWorkerThread w) {
860 <        int sc = w.getAndClearStealCount();
861 <        if (sc != 0)
862 <            stealCount.addAndGet(sc);
1592 >        return stealCount;
1593      }
1594  
1595      /**
# Line 869 | Line 1599 | public class ForkJoinPool extends Abstra
1599       * an approximation, obtained by iterating across all threads in
1600       * the pool. This method may be useful for tuning task
1601       * granularities.
1602 <     * @return the number of queued tasks.
1602 >     *
1603 >     * @return the number of queued tasks
1604       */
1605      public long getQueuedTaskCount() {
1606          long count = 0;
1607 <        ForkJoinWorkerThread[] ws = workers;
1608 <        for (int i = 0; i < ws.length; ++i) {
1609 <            ForkJoinWorkerThread t = ws[i];
879 <            if (t != null)
880 <                count += t.getQueueSize();
881 <        }
1607 >        for (ForkJoinWorkerThread w : workers)
1608 >            if (w != null)
1609 >                count += w.getQueueSize();
1610          return count;
1611      }
1612  
1613      /**
1614 <     * Returns an estimate of the number tasks submitted to this pool
1615 <     * that have not yet begun executing. This method takes time
1614 >     * Returns an estimate of the number of tasks submitted to this
1615 >     * pool that have not yet begun executing.  This method takes time
1616       * proportional to the number of submissions.
1617 <     * @return the number of queued submissions.
1617 >     *
1618 >     * @return the number of queued submissions
1619       */
1620      public int getQueuedSubmissionCount() {
1621          return submissionQueue.size();
1622      }
1623  
1624      /**
1625 <     * Returns true if there are any tasks submitted to this pool
1626 <     * that have not yet begun executing.
1627 <     * @return <code>true</code> if there are any queued submissions.
1625 >     * Returns {@code true} if there are any tasks submitted to this
1626 >     * pool that have not yet begun executing.
1627 >     *
1628 >     * @return {@code true} if there are any queued submissions
1629       */
1630      public boolean hasQueuedSubmissions() {
1631          return !submissionQueue.isEmpty();
# Line 905 | Line 1635 | public class ForkJoinPool extends Abstra
1635       * Removes and returns the next unexecuted submission if one is
1636       * available.  This method may be useful in extensions to this
1637       * class that re-assign work in systems with multiple pools.
1638 <     * @return the next submission, or null if none
1638 >     *
1639 >     * @return the next submission, or {@code null} if none
1640       */
1641      protected ForkJoinTask<?> pollSubmission() {
1642          return submissionQueue.poll();
1643      }
1644  
1645      /**
1646 +     * Removes all available unexecuted submitted and forked tasks
1647 +     * from scheduling queues and adds them to the given collection,
1648 +     * without altering their execution status. These may include
1649 +     * artificially generated or wrapped tasks. This method is
1650 +     * designed to be invoked only when the pool is known to be
1651 +     * quiescent. Invocations at other times may not remove all
1652 +     * tasks. A failure encountered while attempting to add elements
1653 +     * to collection {@code c} may result in elements being in
1654 +     * neither, either or both collections when the associated
1655 +     * exception is thrown.  The behavior of this operation is
1656 +     * undefined if the specified collection is modified while the
1657 +     * operation is in progress.
1658 +     *
1659 +     * @param c the collection to transfer elements into
1660 +     * @return the number of elements transferred
1661 +     */
1662 +    protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
1663 +        int count = submissionQueue.drainTo(c);
1664 +        for (ForkJoinWorkerThread w : workers)
1665 +            if (w != null)
1666 +                count += w.drainTasksTo(c);
1667 +        return count;
1668 +    }
1669 +
1670 +    /**
1671       * Returns a string identifying this pool, as well as its state,
1672       * including indications of run state, parallelism level, and
1673       * worker and task counts.
# Line 919 | Line 1675 | public class ForkJoinPool extends Abstra
1675       * @return a string identifying this pool, as well as its state
1676       */
1677      public String toString() {
922        int ps = parallelism;
923        int wc = workerCounts;
924        int rc = runControl;
1678          long st = getStealCount();
1679          long qt = getQueuedTaskCount();
1680          long qs = getQueuedSubmissionCount();
1681 +        int wc = workerCounts;
1682 +        int tc = wc >>> TOTAL_COUNT_SHIFT;
1683 +        int rc = wc & RUNNING_COUNT_MASK;
1684 +        int pc = parallelism;
1685 +        int rs = runState;
1686 +        int ac = rs & ACTIVE_COUNT_MASK;
1687          return super.toString() +
1688 <            "[" + runStateToString(runStateOf(rc)) +
1689 <            ", parallelism = " + ps +
1690 <            ", size = " + totalCountOf(wc) +
1691 <            ", active = " + activeCountOf(rc) +
1692 <            ", running = " + runningCountOf(wc) +
1688 >            "[" + runLevelToString(rs) +
1689 >            ", parallelism = " + pc +
1690 >            ", size = " + tc +
1691 >            ", active = " + ac +
1692 >            ", running = " + rc +
1693              ", steals = " + st +
1694              ", tasks = " + qt +
1695              ", submissions = " + qs +
1696              "]";
1697      }
1698  
1699 <    private static String runStateToString(int rs) {
1700 <        switch(rs) {
1701 <        case RUNNING: return "Running";
1702 <        case SHUTDOWN: return "Shutting down";
1703 <        case TERMINATING: return "Terminating";
945 <        case TERMINATED: return "Terminated";
946 <        default: throw new Error("Unknown run state");
947 <        }
1699 >    private static String runLevelToString(int s) {
1700 >        return ((s & TERMINATED) != 0 ? "Terminated" :
1701 >                ((s & TERMINATING) != 0 ? "Terminating" :
1702 >                 ((s & SHUTDOWN) != 0 ? "Shutting down" :
1703 >                  "Running")));
1704      }
1705  
950    // lifecycle control
951
1706      /**
1707       * Initiates an orderly shutdown in which previously submitted
1708       * tasks are executed, but no new tasks will be accepted.
1709       * Invocation has no additional effect if already shut down.
1710       * Tasks that are in the process of being submitted concurrently
1711       * during the course of this method may or may not be rejected.
1712 +     *
1713       * @throws SecurityException if a security manager exists and
1714       *         the caller is not permitted to modify threads
1715       *         because it does not hold {@link
1716 <     *         java.lang.RuntimePermission}<code>("modifyThread")</code>,
1716 >     *         java.lang.RuntimePermission}{@code ("modifyThread")}
1717       */
1718      public void shutdown() {
1719          checkPermission();
1720 <        transitionRunStateTo(SHUTDOWN);
1721 <        if (canTerminateOnShutdown(runControl))
967 <            terminateOnShutdown();
1720 >        advanceRunLevel(SHUTDOWN);
1721 >        tryTerminate(false);
1722      }
1723  
1724      /**
1725 <     * Attempts to stop all actively executing tasks, and cancels all
1726 <     * waiting tasks.  Tasks that are in the process of being
1727 <     * submitted or executed concurrently during the course of this
1728 <     * method may or may not be rejected. Unlike some other executors,
1729 <     * this method cancels rather than collects non-executed tasks,
1730 <     * so always returns an empty list.
1725 >     * Attempts to cancel and/or stop all tasks, and reject all
1726 >     * subsequently submitted tasks.  Tasks that are in the process of
1727 >     * being submitted or executed concurrently during the course of
1728 >     * this method may or may not be rejected. This method cancels
1729 >     * both existing and unexecuted tasks, in order to permit
1730 >     * termination in the presence of task dependencies. So the method
1731 >     * always returns an empty list (unlike the case for some other
1732 >     * Executors).
1733 >     *
1734       * @return an empty list
1735       * @throws SecurityException if a security manager exists and
1736       *         the caller is not permitted to modify threads
1737       *         because it does not hold {@link
1738 <     *         java.lang.RuntimePermission}<code>("modifyThread")</code>,
1738 >     *         java.lang.RuntimePermission}{@code ("modifyThread")}
1739       */
1740      public List<Runnable> shutdownNow() {
1741          checkPermission();
1742 <        terminate();
1742 >        tryTerminate(true);
1743          return Collections.emptyList();
1744      }
1745  
1746      /**
1747 <     * Returns <code>true</code> if all tasks have completed following shut down.
1747 >     * Returns {@code true} if all tasks have completed following shut down.
1748       *
1749 <     * @return <code>true</code> if all tasks have completed following shut down
1749 >     * @return {@code true} if all tasks have completed following shut down
1750       */
1751      public boolean isTerminated() {
1752 <        return runStateOf(runControl) == TERMINATED;
1752 >        return runState >= TERMINATED;
1753      }
1754  
1755      /**
1756 <     * Returns <code>true</code> if the process of termination has
1757 <     * commenced but possibly not yet completed.
1756 >     * Returns {@code true} if the process of termination has
1757 >     * commenced but not yet completed.  This method may be useful for
1758 >     * debugging. A return of {@code true} reported a sufficient
1759 >     * period after shutdown may indicate that submitted tasks have
1760 >     * ignored or suppressed interruption, causing this executor not
1761 >     * to properly terminate.
1762       *
1763 <     * @return <code>true</code> if terminating
1763 >     * @return {@code true} if terminating but not yet terminated
1764       */
1765      public boolean isTerminating() {
1766 <        return runStateOf(runControl) >= TERMINATING;
1766 >        return (runState & (TERMINATING|TERMINATED)) == TERMINATING;
1767      }
1768  
1769      /**
1770 <     * Returns <code>true</code> if this pool has been shut down.
1770 >     * Returns true if terminating or terminated. Used by ForkJoinWorkerThread.
1771 >     */
1772 >    final boolean isAtLeastTerminating() {
1773 >        return runState >= TERMINATING;
1774 >    }
1775 >
1776 >    /**
1777 >     * Returns {@code true} if this pool has been shut down.
1778       *
1779 <     * @return <code>true</code> if this pool has been shut down
1779 >     * @return {@code true} if this pool has been shut down
1780       */
1781      public boolean isShutdown() {
1782 <        return runStateOf(runControl) >= SHUTDOWN;
1782 >        return runState >= SHUTDOWN;
1783      }
1784  
1785      /**
# Line 1021 | Line 1789 | public class ForkJoinPool extends Abstra
1789       *
1790       * @param timeout the maximum time to wait
1791       * @param unit the time unit of the timeout argument
1792 <     * @return <code>true</code> if this executor terminated and
1793 <     *         <code>false</code> if the timeout elapsed before termination
1792 >     * @return {@code true} if this executor terminated and
1793 >     *         {@code false} if the timeout elapsed before termination
1794       * @throws InterruptedException if interrupted while waiting
1795       */
1796      public boolean awaitTermination(long timeout, TimeUnit unit)
1797          throws InterruptedException {
1030        long nanos = unit.toNanos(timeout);
1031        final ReentrantLock lock = this.workerLock;
1032        lock.lock();
1033        try {
1034            for (;;) {
1035                if (isTerminated())
1036                    return true;
1037                if (nanos <= 0)
1038                    return false;
1039                nanos = termination.awaitNanos(nanos);
1040            }
1041        } finally {
1042            lock.unlock();
1043        }
1044    }
1045
1046    // Shutdown and termination support
1047
1048    /**
1049     * Callback from terminating worker. Null out the corresponding
1050     * workers slot, and if terminating, try to terminate, else try to
1051     * shrink workers array.
1052     * @param w the worker
1053     */
1054    final void workerTerminated(ForkJoinWorkerThread w) {
1055        updateStealCount(w);
1056        updateWorkerCount(-1);
1057        final ReentrantLock lock = this.workerLock;
1058        lock.lock();
1059        try {
1060            ForkJoinWorkerThread[] ws = workers;
1061            int idx = w.poolIndex;
1062            if (idx >= 0 && idx < ws.length && ws[idx] == w)
1063                ws[idx] = null;
1064            if (totalCountOf(workerCounts) == 0) {
1065                terminate(); // no-op if already terminating
1066                transitionRunStateTo(TERMINATED);
1067                termination.signalAll();
1068            }
1069            else if (!isTerminating()) {
1070                tryShrinkWorkerArray();
1071                tryResumeSpare(true); // allow replacement
1072            }
1073        } finally {
1074            lock.unlock();
1075        }
1076        signalIdleWorkers();
1077    }
1078
1079    /**
1080     * Initiate termination.
1081     */
1082    private void terminate() {
1083        if (transitionRunStateTo(TERMINATING)) {
1084            stopAllWorkers();
1085            resumeAllSpares();
1086            signalIdleWorkers();
1087            cancelQueuedSubmissions();
1088            cancelQueuedWorkerTasks();
1089            interruptUnterminatedWorkers();
1090            signalIdleWorkers(); // resignal after interrupt
1091        }
1092    }
1093
1094    /**
1095     * Possibly terminate when on shutdown state
1096     */
1097    private void terminateOnShutdown() {
1098        if (!hasQueuedSubmissions() && canTerminateOnShutdown(runControl))
1099            terminate();
1100    }
1101
1102    /**
1103     * Clear out and cancel submissions
1104     */
1105    private void cancelQueuedSubmissions() {
1106        ForkJoinTask<?> task;
1107        while ((task = pollSubmission()) != null)
1108            task.cancel(false);
1109    }
1110
1111    /**
1112     * Clean out worker queues.
1113     */
1114    private void cancelQueuedWorkerTasks() {
1115        final ReentrantLock lock = this.workerLock;
1116        lock.lock();
1117        try {
1118            ForkJoinWorkerThread[] ws = workers;
1119            for (int i = 0; i < ws.length; ++i) {
1120                ForkJoinWorkerThread t = ws[i];
1121                if (t != null)
1122                    t.cancelTasks();
1123            }
1124        } finally {
1125            lock.unlock();
1126        }
1127    }
1128
1129    /**
1130     * Set each worker's status to terminating. Requires lock to avoid
1131     * conflicts with add/remove
1132     */
1133    private void stopAllWorkers() {
1134        final ReentrantLock lock = this.workerLock;
1135        lock.lock();
1136        try {
1137            ForkJoinWorkerThread[] ws = workers;
1138            for (int i = 0; i < ws.length; ++i) {
1139                ForkJoinWorkerThread t = ws[i];
1140                if (t != null)
1141                    t.shutdownNow();
1142            }
1143        } finally {
1144            lock.unlock();
1145        }
1146    }
1147
1148    /**
1149     * Interrupt all unterminated workers.  This is not required for
1150     * sake of internal control, but may help unstick user code during
1151     * shutdown.
1152     */
1153    private void interruptUnterminatedWorkers() {
1154        final ReentrantLock lock = this.workerLock;
1155        lock.lock();
1798          try {
1799 <            ForkJoinWorkerThread[] ws = workers;
1800 <            for (int i = 0; i < ws.length; ++i) {
1159 <                ForkJoinWorkerThread t = ws[i];
1160 <                if (t != null && !t.isTerminated()) {
1161 <                    try {
1162 <                        t.interrupt();
1163 <                    } catch (SecurityException ignore) {
1164 <                    }
1165 <                }
1166 <            }
1167 <        } finally {
1168 <            lock.unlock();
1169 <        }
1170 <    }
1171 <
1172 <
1173 <    /*
1174 <     * Nodes for event barrier to manage idle threads.  Queue nodes
1175 <     * are basic Treiber stack nodes, also used for spare stack.
1176 <     *
1177 <     * The event barrier has an event count and a wait queue (actually
1178 <     * a Treiber stack).  Workers are enabled to look for work when
1179 <     * the eventCount is incremented. If they fail to find work, they
1180 <     * may wait for next count. Upon release, threads help others wake
1181 <     * up.
1182 <     *
1183 <     * Synchronization events occur only in enough contexts to
1184 <     * maintain overall liveness:
1185 <     *
1186 <     *   - Submission of a new task to the pool
1187 <     *   - Resizes or other changes to the workers array
1188 <     *   - pool termination
1189 <     *   - A worker pushing a task on an empty queue
1190 <     *
1191 <     * The case of pushing a task occurs often enough, and is heavy
1192 <     * enough compared to simple stack pushes, to require special
1193 <     * handling: Method signalWork returns without advancing count if
1194 <     * the queue appears to be empty.  This would ordinarily result in
1195 <     * races causing some queued waiters not to be woken up. To avoid
1196 <     * this, the first worker enqueued in method sync (see
1197 <     * syncIsReleasable) rescans for tasks after being enqueued, and
1198 <     * helps signal if any are found. This works well because the
1199 <     * worker has nothing better to do, and so might as well help
1200 <     * alleviate the overhead and contention on the threads actually
1201 <     * doing work.  Also, since event counts increments on task
1202 <     * availability exist to maintain liveness (rather than to force
1203 <     * refreshes etc), it is OK for callers to exit early if
1204 <     * contending with another signaller.
1205 <     */
1206 <    static final class WaitQueueNode {
1207 <        WaitQueueNode next; // only written before enqueued
1208 <        volatile ForkJoinWorkerThread thread; // nulled to cancel wait
1209 <        final long count; // unused for spare stack
1210 <
1211 <        WaitQueueNode(long c, ForkJoinWorkerThread w) {
1212 <            count = c;
1213 <            thread = w;
1214 <        }
1215 <
1216 <        /**
1217 <         * Wake up waiter, returning false if known to already
1218 <         */
1219 <        boolean signal() {
1220 <            ForkJoinWorkerThread t = thread;
1221 <            if (t == null)
1222 <                return false;
1223 <            thread = null;
1224 <            LockSupport.unpark(t);
1225 <            return true;
1226 <        }
1227 <
1228 <        /**
1229 <         * Await release on sync
1230 <         */
1231 <        void awaitSyncRelease(ForkJoinPool p) {
1232 <            while (thread != null && !p.syncIsReleasable(this))
1233 <                LockSupport.park(this);
1234 <        }
1235 <
1236 <        /**
1237 <         * Await resumption as spare
1238 <         */
1239 <        void awaitSpareRelease() {
1240 <            while (thread != null) {
1241 <                if (!Thread.interrupted())
1242 <                    LockSupport.park(this);
1243 <            }
1244 <        }
1245 <    }
1246 <
1247 <    /**
1248 <     * Ensures that no thread is waiting for count to advance from the
1249 <     * current value of eventCount read on entry to this method, by
1250 <     * releasing waiting threads if necessary.
1251 <     * @return the count
1252 <     */
1253 <    final long ensureSync() {
1254 <        long c = eventCount;
1255 <        WaitQueueNode q;
1256 <        while ((q = syncStack) != null && q.count < c) {
1257 <            if (casBarrierStack(q, null)) {
1258 <                do {
1259 <                    q.signal();
1260 <                } while ((q = q.next) != null);
1261 <                break;
1262 <            }
1263 <        }
1264 <        return c;
1265 <    }
1266 <
1267 <    /**
1268 <     * Increments event count and releases waiting threads.
1269 <     */
1270 <    private void signalIdleWorkers() {
1271 <        long c;
1272 <        do;while (!casEventCount(c = eventCount, c+1));
1273 <        ensureSync();
1274 <    }
1275 <
1276 <    /**
1277 <     * Signal threads waiting to poll a task. Because method sync
1278 <     * rechecks availability, it is OK to only proceed if queue
1279 <     * appears to be non-empty, and OK to skip under contention to
1280 <     * increment count (since some other thread succeeded).
1281 <     */
1282 <    final void signalWork() {
1283 <        long c;
1284 <        WaitQueueNode q;
1285 <        if (syncStack != null &&
1286 <            casEventCount(c = eventCount, c+1) &&
1287 <            (((q = syncStack) != null && q.count <= c) &&
1288 <             (!casBarrierStack(q, q.next) || !q.signal())))
1289 <            ensureSync();
1290 <    }
1291 <
1292 <    /**
1293 <     * Waits until event count advances from last value held by
1294 <     * caller, or if excess threads, caller is resumed as spare, or
1295 <     * caller or pool is terminating. Updates caller's event on exit.
1296 <     * @param w the calling worker thread
1297 <     */
1298 <    final void sync(ForkJoinWorkerThread w) {
1299 <        updateStealCount(w); // Transfer w's count while it is idle
1300 <
1301 <        while (!w.isShutdown() && !isTerminating() && !suspendIfSpare(w)) {
1302 <            long prev = w.lastEventCount;
1303 <            WaitQueueNode node = null;
1304 <            WaitQueueNode h;
1305 <            while (eventCount == prev &&
1306 <                   ((h = syncStack) == null || h.count == prev)) {
1307 <                if (node == null)
1308 <                    node = new WaitQueueNode(prev, w);
1309 <                if (casBarrierStack(node.next = h, node)) {
1310 <                    node.awaitSyncRelease(this);
1311 <                    break;
1312 <                }
1313 <            }
1314 <            long ec = ensureSync();
1315 <            if (ec != prev) {
1316 <                w.lastEventCount = ec;
1317 <                break;
1318 <            }
1319 <        }
1320 <    }
1321 <
1322 <    /**
1323 <     * Returns true if worker waiting on sync can proceed:
1324 <     *  - on signal (thread == null)
1325 <     *  - on event count advance (winning race to notify vs signaller)
1326 <     *  - on Interrupt
1327 <     *  - if the first queued node, we find work available
1328 <     * If node was not signalled and event count not advanced on exit,
1329 <     * then we also help advance event count.
1330 <     * @return true if node can be released
1331 <     */
1332 <    final boolean syncIsReleasable(WaitQueueNode node) {
1333 <        long prev = node.count;
1334 <        if (!Thread.interrupted() && node.thread != null &&
1335 <            (node.next != null ||
1336 <             !ForkJoinWorkerThread.hasQueuedTasks(workers)) &&
1337 <            eventCount == prev)
1799 >            termination.awaitAdvanceInterruptibly(0, timeout, unit);
1800 >        } catch (TimeoutException ex) {
1801              return false;
1339        if (node.thread != null) {
1340            node.thread = null;
1341            long ec = eventCount;
1342            if (prev <= ec) // help signal
1343                casEventCount(ec, ec+1);
1802          }
1803          return true;
1804      }
1805  
1806      /**
1349     * Returns true if a new sync event occurred since last call to
1350     * sync or this method, if so, updating caller's count.
1351     */
1352    final boolean hasNewSyncEvent(ForkJoinWorkerThread w) {
1353        long lc = w.lastEventCount;
1354        long ec = ensureSync();
1355        if (ec == lc)
1356            return false;
1357        w.lastEventCount = ec;
1358        return true;
1359    }
1360
1361    //  Parallelism maintenance
1362
1363    /**
1364     * Decrement running count; if too low, add spare.
1365     *
1366     * Conceptually, all we need to do here is add or resume a
1367     * spare thread when one is about to block (and remove or
1368     * suspend it later when unblocked -- see suspendIfSpare).
1369     * However, implementing this idea requires coping with
1370     * several problems: We have imperfect information about the
1371     * states of threads. Some count updates can and usually do
1372     * lag run state changes, despite arrangements to keep them
1373     * accurate (for example, when possible, updating counts
1374     * before signalling or resuming), especially when running on
1375     * dynamic JVMs that don't optimize the infrequent paths that
1376     * update counts. Generating too many threads can make these
1377     * problems become worse, because excess threads are more
1378     * likely to be context-switched with others, slowing them all
1379     * down, especially if there is no work available, so all are
1380     * busy scanning or idling.  Also, excess spare threads can
1381     * only be suspended or removed when they are idle, not
1382     * immediately when they aren't needed. So adding threads will
1383     * raise parallelism level for longer than necessary.  Also,
1384     * FJ applications often enounter highly transient peaks when
1385     * many threads are blocked joining, but for less time than it
1386     * takes to create or resume spares.
1387     *
1388     * @param joinMe if non-null, return early if done
1389     * @param maintainParallelism if true, try to stay within
1390     * target counts, else create only to avoid starvation
1391     * @return true if joinMe known to be done
1392     */
1393    final boolean preJoin(ForkJoinTask<?> joinMe, boolean maintainParallelism) {
1394        maintainParallelism &= maintainsParallelism; // overrride
1395        boolean dec = false;  // true when running count decremented
1396        while (spareStack == null || !tryResumeSpare(dec)) {
1397            int counts = workerCounts;
1398            if (dec || (dec = casWorkerCounts(counts, --counts))) { // CAS cheat
1399                if (!needSpare(counts, maintainParallelism))
1400                    break;
1401                if (joinMe.status < 0)
1402                    return true;
1403                if (tryAddSpare(counts))
1404                    break;
1405            }
1406        }
1407        return false;
1408    }
1409
1410    /**
1411     * Same idea as preJoin
1412     */
1413    final boolean preBlock(ManagedBlocker blocker, boolean maintainParallelism){
1414        maintainParallelism &= maintainsParallelism;
1415        boolean dec = false;
1416        while (spareStack == null || !tryResumeSpare(dec)) {
1417            int counts = workerCounts;
1418            if (dec || (dec = casWorkerCounts(counts, --counts))) {
1419                if (!needSpare(counts, maintainParallelism))
1420                    break;
1421                if (blocker.isReleasable())
1422                    return true;
1423                if (tryAddSpare(counts))
1424                    break;
1425            }
1426        }
1427        return false;
1428    }
1429
1430    /**
1431     * Returns true if a spare thread appears to be needed.  If
1432     * maintaining parallelism, returns true when the deficit in
1433     * running threads is more than the surplus of total threads, and
1434     * there is apparently some work to do.  This self-limiting rule
1435     * means that the more threads that have already been added, the
1436     * less parallelism we will tolerate before adding another.
1437     * @param counts current worker counts
1438     * @param maintainParallelism try to maintain parallelism
1439     */
1440    private boolean needSpare(int counts, boolean maintainParallelism) {
1441        int ps = parallelism;
1442        int rc = runningCountOf(counts);
1443        int tc = totalCountOf(counts);
1444        int runningDeficit = ps - rc;
1445        int totalSurplus = tc - ps;
1446        return (tc < maxPoolSize &&
1447                (rc == 0 || totalSurplus < 0 ||
1448                 (maintainParallelism &&
1449                  runningDeficit > totalSurplus &&
1450                  ForkJoinWorkerThread.hasQueuedTasks(workers))));
1451    }
1452    
1453    /**
1454     * Add a spare worker if lock available and no more than the
1455     * expected numbers of threads exist
1456     * @return true if successful
1457     */
1458    private boolean tryAddSpare(int expectedCounts) {
1459        final ReentrantLock lock = this.workerLock;
1460        int expectedRunning = runningCountOf(expectedCounts);
1461        int expectedTotal = totalCountOf(expectedCounts);
1462        boolean success = false;
1463        boolean locked = false;
1464        // confirm counts while locking; CAS after obtaining lock
1465        try {
1466            for (;;) {
1467                int s = workerCounts;
1468                int tc = totalCountOf(s);
1469                int rc = runningCountOf(s);
1470                if (rc > expectedRunning || tc > expectedTotal)
1471                    break;
1472                if (!locked && !(locked = lock.tryLock()))
1473                    break;
1474                if (casWorkerCounts(s, workerCountsFor(tc+1, rc+1))) {
1475                    createAndStartSpare(tc);
1476                    success = true;
1477                    break;
1478                }
1479            }
1480        } finally {
1481            if (locked)
1482                lock.unlock();
1483        }
1484        return success;
1485    }
1486
1487    /**
1488     * Add the kth spare worker. On entry, pool coounts are already
1489     * adjusted to reflect addition.
1490     */
1491    private void createAndStartSpare(int k) {
1492        ForkJoinWorkerThread w = null;
1493        ForkJoinWorkerThread[] ws = ensureWorkerArrayCapacity(k + 1);
1494        int len = ws.length;
1495        // Probably, we can place at slot k. If not, find empty slot
1496        if (k < len && ws[k] != null) {
1497            for (k = 0; k < len && ws[k] != null; ++k)
1498                ;
1499        }
1500        if (k < len && !isTerminating() && (w = createWorker(k)) != null) {
1501            ws[k] = w;
1502            w.start();
1503        }
1504        else
1505            updateWorkerCount(-1); // adjust on failure
1506        signalIdleWorkers();
1507    }
1508
1509    /**
1510     * Suspend calling thread w if there are excess threads.  Called
1511     * only from sync.  Spares are enqueued in a Treiber stack
1512     * using the same WaitQueueNodes as barriers.  They are resumed
1513     * mainly in preJoin, but are also woken on pool events that
1514     * require all threads to check run state.
1515     * @param w the caller
1516     */
1517    private boolean suspendIfSpare(ForkJoinWorkerThread w) {
1518        WaitQueueNode node = null;
1519        int s;
1520        while (parallelism < runningCountOf(s = workerCounts)) {
1521            if (node == null)
1522                node = new WaitQueueNode(0, w);
1523            if (casWorkerCounts(s, s-1)) { // representation-dependent
1524                // push onto stack
1525                do;while (!casSpareStack(node.next = spareStack, node));
1526                // block until released by resumeSpare
1527                node.awaitSpareRelease();
1528                return true;
1529            }
1530        }
1531        return false;
1532    }
1533
1534    /**
1535     * Try to pop and resume a spare thread.
1536     * @param updateCount if true, increment running count on success
1537     * @return true if successful
1538     */
1539    private boolean tryResumeSpare(boolean updateCount) {
1540        WaitQueueNode q;
1541        while ((q = spareStack) != null) {
1542            if (casSpareStack(q, q.next)) {
1543                if (updateCount)
1544                    updateRunningCount(1);
1545                q.signal();
1546                return true;
1547            }
1548        }
1549        return false;
1550    }
1551
1552    /**
1553     * Pop and resume all spare threads. Same idea as ensureSync.
1554     * @return true if any spares released
1555     */
1556    private boolean resumeAllSpares() {
1557        WaitQueueNode q;
1558        while ( (q = spareStack) != null) {
1559            if (casSpareStack(q, null)) {
1560                do {
1561                    updateRunningCount(1);
1562                    q.signal();
1563                } while ((q = q.next) != null);
1564                return true;
1565            }
1566        }
1567        return false;
1568    }
1569
1570    /**
1571     * Pop and shutdown excessive spare threads. Call only while
1572     * holding lock. This is not guaranteed to eliminate all excess
1573     * threads, only those suspended as spares, which are the ones
1574     * unlikely to be needed in the future.
1575     */
1576    private void trimSpares() {
1577        int surplus = totalCountOf(workerCounts) - parallelism;
1578        WaitQueueNode q;
1579        while (surplus > 0 && (q = spareStack) != null) {
1580            if (casSpareStack(q, null)) {
1581                do {
1582                    updateRunningCount(1);
1583                    ForkJoinWorkerThread w = q.thread;
1584                    if (w != null && surplus > 0 &&
1585                        runningCountOf(workerCounts) > 0 && w.shutdown())
1586                        --surplus;
1587                    q.signal();
1588                } while ((q = q.next) != null);
1589            }
1590        }
1591    }
1592
1593    /**
1807       * Interface for extending managed parallelism for tasks running
1808 <     * in ForkJoinPools. A ManagedBlocker provides two methods.
1809 <     * Method <code>isReleasable</code> must return true if blocking is not
1810 <     * necessary. Method <code>block</code> blocks the current thread
1811 <     * if necessary (perhaps internally invoking isReleasable before
1812 <     * actually blocking.).
1808 >     * in {@link ForkJoinPool}s.
1809 >     *
1810 >     * <p>A {@code ManagedBlocker} provides two methods.  Method
1811 >     * {@code isReleasable} must return {@code true} if blocking is
1812 >     * not necessary. Method {@code block} blocks the current thread
1813 >     * if necessary (perhaps internally invoking {@code isReleasable}
1814 >     * before actually blocking). The unusual methods in this API
1815 >     * accommodate synchronizers that may, but don't usually, block
1816 >     * for long periods. Similarly, they allow more efficient internal
1817 >     * handling of cases in which additional workers may be, but
1818 >     * usually are not, needed to ensure sufficient parallelism.
1819 >     * Toward this end, implementations of method {@code isReleasable}
1820 >     * must be amenable to repeated invocation.
1821 >     *
1822       * <p>For example, here is a ManagedBlocker based on a
1823       * ReentrantLock:
1824 <     * <pre>
1825 <     *   class ManagedLocker implements ManagedBlocker {
1826 <     *     final ReentrantLock lock;
1827 <     *     boolean hasLock = false;
1828 <     *     ManagedLocker(ReentrantLock lock) { this.lock = lock; }
1829 <     *     public boolean block() {
1830 <     *        if (!hasLock)
1831 <     *           lock.lock();
1832 <     *        return true;
1833 <     *     }
1834 <     *     public boolean isReleasable() {
1835 <     *        return hasLock || (hasLock = lock.tryLock());
1836 <     *     }
1824 >     *  <pre> {@code
1825 >     * class ManagedLocker implements ManagedBlocker {
1826 >     *   final ReentrantLock lock;
1827 >     *   boolean hasLock = false;
1828 >     *   ManagedLocker(ReentrantLock lock) { this.lock = lock; }
1829 >     *   public boolean block() {
1830 >     *     if (!hasLock)
1831 >     *       lock.lock();
1832 >     *     return true;
1833 >     *   }
1834 >     *   public boolean isReleasable() {
1835 >     *     return hasLock || (hasLock = lock.tryLock());
1836 >     *   }
1837 >     * }}</pre>
1838 >     *
1839 >     * <p>Here is a class that possibly blocks waiting for an
1840 >     * item on a given queue:
1841 >     *  <pre> {@code
1842 >     * class QueueTaker<E> implements ManagedBlocker {
1843 >     *   final BlockingQueue<E> queue;
1844 >     *   volatile E item = null;
1845 >     *   QueueTaker(BlockingQueue<E> q) { this.queue = q; }
1846 >     *   public boolean block() throws InterruptedException {
1847 >     *     if (item == null)
1848 >     *       item = queue.take();
1849 >     *     return true;
1850 >     *   }
1851 >     *   public boolean isReleasable() {
1852 >     *     return item != null || (item = queue.poll()) != null;
1853 >     *   }
1854 >     *   public E getItem() { // call after pool.managedBlock completes
1855 >     *     return item;
1856       *   }
1857 <     * </pre>
1857 >     * }}</pre>
1858       */
1859      public static interface ManagedBlocker {
1860          /**
1861           * Possibly blocks the current thread, for example waiting for
1862           * a lock or condition.
1863 <         * @return true if no additional blocking is necessary (i.e.,
1864 <         * if isReleasable would return true).
1863 >         *
1864 >         * @return {@code true} if no additional blocking is necessary
1865 >         * (i.e., if isReleasable would return true)
1866           * @throws InterruptedException if interrupted while waiting
1867 <         * (the method is not required to do so, but is allowe to).
1867 >         * (the method is not required to do so, but is allowed to)
1868           */
1869          boolean block() throws InterruptedException;
1870  
1871          /**
1872 <         * Returns true if blocking is unnecessary.
1872 >         * Returns {@code true} if blocking is unnecessary.
1873           */
1874          boolean isReleasable();
1875      }
1876  
1877      /**
1878       * Blocks in accord with the given blocker.  If the current thread
1879 <     * is a ForkJoinWorkerThread, this method possibly arranges for a
1880 <     * spare thread to be activated if necessary to ensure parallelism
1881 <     * while the current thread is blocked.  If
1882 <     * <code>maintainParallelism</code> is true and the pool supports
1883 <     * it ({@link #getMaintainsParallelism}), this method attempts to
1884 <     * maintain the pool's nominal parallelism. Otherwise if activates
1885 <     * a thread only if necessary to avoid complete starvation. This
1886 <     * option may be preferable when blockages use timeouts, or are
1887 <     * almost always brief.
1888 <     *
1889 <     * <p> If the caller is not a ForkJoinTask, this method is behaviorally
1890 <     * equivalent to
1891 <     * <pre>
1892 <     *   while (!blocker.isReleasable())
1651 <     *      if (blocker.block())
1652 <     *         return;
1653 <     * </pre>
1654 <     * If the caller is a ForkJoinTask, then the pool may first
1655 <     * be expanded to ensure parallelism, and later adjusted.
1879 >     * is a {@link ForkJoinWorkerThread}, this method possibly
1880 >     * arranges for a spare thread to be activated if necessary to
1881 >     * ensure sufficient parallelism while the current thread is blocked.
1882 >     *
1883 >     * <p>If the caller is not a {@link ForkJoinTask}, this method is
1884 >     * behaviorally equivalent to
1885 >     *  <pre> {@code
1886 >     * while (!blocker.isReleasable())
1887 >     *   if (blocker.block())
1888 >     *     return;
1889 >     * }</pre>
1890 >     *
1891 >     * If the caller is a {@code ForkJoinTask}, then the pool may
1892 >     * first be expanded to ensure parallelism, and later adjusted.
1893       *
1894       * @param blocker the blocker
1895 <     * @param maintainParallelism if true and supported by this pool,
1659 <     * attempt to maintain the pool's nominal parallelism; otherwise
1660 <     * activate a thread only if necessary to avoid complete
1661 <     * starvation.
1662 <     * @throws InterruptedException if blocker.block did so.
1895 >     * @throws InterruptedException if blocker.block did so
1896       */
1897 <    public static void managedBlock(ManagedBlocker blocker,
1665 <                                    boolean maintainParallelism)
1897 >    public static void managedBlock(ManagedBlocker blocker)
1898          throws InterruptedException {
1899          Thread t = Thread.currentThread();
1900 <        ForkJoinPool pool = (t instanceof ForkJoinWorkerThread?
1901 <                             ((ForkJoinWorkerThread)t).pool : null);
1902 <        if (!blocker.isReleasable()) {
1903 <            try {
1904 <                if (pool == null ||
1905 <                    !pool.preBlock(blocker, maintainParallelism))
1674 <                    awaitBlocker(blocker);
1675 <            } finally {
1676 <                if (pool != null)
1677 <                    pool.updateRunningCount(1);
1678 <            }
1900 >        if (t instanceof ForkJoinWorkerThread) {
1901 >            ForkJoinWorkerThread w = (ForkJoinWorkerThread) t;
1902 >            w.pool.awaitBlocker(blocker);
1903 >        }
1904 >        else {
1905 >            do {} while (!blocker.isReleasable() && !blocker.block());
1906          }
1907      }
1908  
1909 <    private static void awaitBlocker(ManagedBlocker blocker)
1910 <        throws InterruptedException {
1911 <        do;while (!blocker.isReleasable() && !blocker.block());
1685 <    }
1686 <
1687 <    // AbstractExecutorService overrides
1909 >    // AbstractExecutorService overrides.  These rely on undocumented
1910 >    // fact that ForkJoinTask.adapt returns ForkJoinTasks that also
1911 >    // implement RunnableFuture.
1912  
1913      protected <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value) {
1914 <        return new AdaptedRunnable(runnable, value);
1914 >        return (RunnableFuture<T>) ForkJoinTask.adapt(runnable, value);
1915      }
1916  
1917      protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
1918 <        return new AdaptedCallable(callable);
1918 >        return (RunnableFuture<T>) ForkJoinTask.adapt(callable);
1919      }
1920  
1921 +    // Unsafe mechanics
1922  
1923 <    // Temporary Unsafe mechanics for preliminary release
1924 <
1925 <    static final Unsafe _unsafe;
1926 <    static final long eventCountOffset;
1927 <    static final long workerCountsOffset;
1928 <    static final long runControlOffset;
1929 <    static final long syncStackOffset;
1930 <    static final long spareStackOffset;
1923 >    private static final sun.misc.Unsafe UNSAFE = getUnsafe();
1924 >    private static final long workerCountsOffset =
1925 >        objectFieldOffset("workerCounts", ForkJoinPool.class);
1926 >    private static final long runStateOffset =
1927 >        objectFieldOffset("runState", ForkJoinPool.class);
1928 >    private static final long eventCountOffset =
1929 >        objectFieldOffset("eventCount", ForkJoinPool.class);
1930 >    private static final long eventWaitersOffset =
1931 >        objectFieldOffset("eventWaiters", ForkJoinPool.class);
1932 >    private static final long stealCountOffset =
1933 >        objectFieldOffset("stealCount", ForkJoinPool.class);
1934 >    private static final long spareWaitersOffset =
1935 >        objectFieldOffset("spareWaiters", ForkJoinPool.class);
1936  
1937 <    static {
1937 >    private static long objectFieldOffset(String field, Class<?> klazz) {
1938          try {
1939 <            if (ForkJoinPool.class.getClassLoader() != null) {
1940 <                Field f = Unsafe.class.getDeclaredField("theUnsafe");
1941 <                f.setAccessible(true);
1942 <                _unsafe = (Unsafe)f.get(null);
1943 <            }
1944 <            else
1715 <                _unsafe = Unsafe.getUnsafe();
1716 <            eventCountOffset = _unsafe.objectFieldOffset
1717 <                (ForkJoinPool.class.getDeclaredField("eventCount"));
1718 <            workerCountsOffset = _unsafe.objectFieldOffset
1719 <                (ForkJoinPool.class.getDeclaredField("workerCounts"));
1720 <            runControlOffset = _unsafe.objectFieldOffset
1721 <                (ForkJoinPool.class.getDeclaredField("runControl"));
1722 <            syncStackOffset = _unsafe.objectFieldOffset
1723 <                (ForkJoinPool.class.getDeclaredField("syncStack"));
1724 <            spareStackOffset = _unsafe.objectFieldOffset
1725 <                (ForkJoinPool.class.getDeclaredField("spareStack"));
1726 <        } catch (Exception e) {
1727 <            throw new RuntimeException("Could not initialize intrinsics", e);
1939 >            return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field));
1940 >        } catch (NoSuchFieldException e) {
1941 >            // Convert Exception to corresponding Error
1942 >            NoSuchFieldError error = new NoSuchFieldError(field);
1943 >            error.initCause(e);
1944 >            throw error;
1945          }
1946      }
1947  
1948 <    private boolean casEventCount(long cmp, long val) {
1949 <        return _unsafe.compareAndSwapLong(this, eventCountOffset, cmp, val);
1950 <    }
1951 <    private boolean casWorkerCounts(int cmp, int val) {
1952 <        return _unsafe.compareAndSwapInt(this, workerCountsOffset, cmp, val);
1953 <    }
1954 <    private boolean casRunControl(int cmp, int val) {
1955 <        return _unsafe.compareAndSwapInt(this, runControlOffset, cmp, val);
1956 <    }
1957 <    private boolean casSpareStack(WaitQueueNode cmp, WaitQueueNode val) {
1958 <        return _unsafe.compareAndSwapObject(this, spareStackOffset, cmp, val);
1959 <    }
1960 <    private boolean casBarrierStack(WaitQueueNode cmp, WaitQueueNode val) {
1961 <        return _unsafe.compareAndSwapObject(this, syncStackOffset, cmp, val);
1948 >    /**
1949 >     * Returns a sun.misc.Unsafe.  Suitable for use in a 3rd party package.
1950 >     * Replace with a simple call to Unsafe.getUnsafe when integrating
1951 >     * into a jdk.
1952 >     *
1953 >     * @return a sun.misc.Unsafe
1954 >     */
1955 >    private static sun.misc.Unsafe getUnsafe() {
1956 >        try {
1957 >            return sun.misc.Unsafe.getUnsafe();
1958 >        } catch (SecurityException se) {
1959 >            try {
1960 >                return java.security.AccessController.doPrivileged
1961 >                    (new java.security
1962 >                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
1963 >                        public sun.misc.Unsafe run() throws Exception {
1964 >                            java.lang.reflect.Field f = sun.misc
1965 >                                .Unsafe.class.getDeclaredField("theUnsafe");
1966 >                            f.setAccessible(true);
1967 >                            return (sun.misc.Unsafe) f.get(null);
1968 >                        }});
1969 >            } catch (java.security.PrivilegedActionException e) {
1970 >                throw new RuntimeException("Could not initialize intrinsics",
1971 >                                           e.getCause());
1972 >            }
1973 >        }
1974      }
1975   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines