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.2 by dl, Wed Jan 7 16:07:37 2009 UTC vs.
Revision 1.63 by dl, Fri Aug 13 16:21:23 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines