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

Comparing jsr166/src/jsr166e/ForkJoinPool.java (file contents):
Revision 1.10 by jsr166, Tue Oct 30 16:05:35 2012 UTC vs.
Revision 1.56 by jsr166, Wed Feb 13 18:30:47 2013 UTC

# Line 11 | Line 11 | import java.util.Arrays;
11   import java.util.Collection;
12   import java.util.Collections;
13   import java.util.List;
14 import java.util.Random;
14   import java.util.concurrent.AbstractExecutorService;
15   import java.util.concurrent.Callable;
16   import java.util.concurrent.ExecutorService;
17   import java.util.concurrent.Future;
18   import java.util.concurrent.RejectedExecutionException;
19   import java.util.concurrent.RunnableFuture;
21 import java.util.concurrent.ThreadLocalRandom;
20   import java.util.concurrent.TimeUnit;
23 import java.util.concurrent.atomic.AtomicInteger;
24 import java.util.concurrent.atomic.AtomicLong;
25 import java.util.concurrent.locks.AbstractQueuedSynchronizer;
26 import java.util.concurrent.locks.Condition;
21  
22   /**
23   * An {@link ExecutorService} for running {@link ForkJoinTask}s.
# Line 43 | Line 37 | import java.util.concurrent.locks.Condit
37   * ForkJoinPool}s may also be appropriate for use with event-style
38   * tasks that are never joined.
39   *
40 < * <p>A static {@link #commonPool} is available and appropriate for
40 > * <p>A static {@link #commonPool()} is available and appropriate for
41   * most applications. The common pool is used by any ForkJoinTask that
42   * is not explicitly submitted to a specified pool. Using the common
43   * pool normally reduces resource usage (its threads are slowly
44   * reclaimed during periods of non-use, and reinstated upon subsequent
45 < * use).  The common pool is by default constructed with default
52 < * parameters, but these may be controlled by setting any or all of
53 < * the three properties {@code
54 < * java.util.concurrent.ForkJoinPool.common.{parallelism,
55 < * threadFactory, exceptionHandler}}.
45 > * use).
46   *
47   * <p>For applications that require separate or custom pools, a {@code
48   * ForkJoinPool} may be constructed with a given target parallelism
# Line 61 | Line 51 | import java.util.concurrent.locks.Condit
51   * dynamically adding, suspending, or resuming internal worker
52   * threads, even if some tasks are stalled waiting to join
53   * others. However, no such adjustments are guaranteed in the face of
54 < * blocked IO or other unmanaged synchronization. The nested {@link
54 > * blocked I/O or other unmanaged synchronization. The nested {@link
55   * ManagedBlocker} interface enables extension of the kinds of
56   * synchronization accommodated.
57   *
# Line 72 | Line 62 | import java.util.concurrent.locks.Condit
62   * {@link #toString} returns indications of pool state in a
63   * convenient form for informal monitoring.
64   *
65 < * <p> As is the case with other ExecutorServices, there are three
65 > * <p>As is the case with other ExecutorServices, there are three
66   * main task execution methods summarized in the following table.
67   * These are designed to be used primarily by clients not already
68   * engaged in fork/join computations in the current pool.  The main
# Line 107 | Line 97 | import java.util.concurrent.locks.Condit
97   *  </tr>
98   * </table>
99   *
100 + * <p>The common pool is by default constructed with default
101 + * parameters, but these may be controlled by setting three {@link
102 + * System#getProperty system properties} with prefix {@code
103 + * java.util.concurrent.ForkJoinPool.common}: {@code parallelism} --
104 + * an integer greater than zero, {@code threadFactory} -- the class
105 + * name of a {@link ForkJoinWorkerThreadFactory}, and {@code
106 + * exceptionHandler} -- the class name of a {@link
107 + * java.lang.Thread.UncaughtExceptionHandler
108 + * Thread.UncaughtExceptionHandler}. Upon any error in establishing
109 + * these settings, default parameters are used.
110 + *
111   * <p><b>Implementation notes</b>: This implementation restricts the
112   * maximum number of running threads to 32767. Attempts to create
113   * pools with greater than the maximum number result in
# Line 193 | Line 194 | public class ForkJoinPool extends Abstra
194       * WorkQueues are also used in a similar way for tasks submitted
195       * to the pool. We cannot mix these tasks in the same queues used
196       * for work-stealing (this would contaminate lifo/fifo
197 <     * processing). Instead, we loosely associate submission queues
197 >     * processing). Instead, we randomly associate submission queues
198       * with submitting threads, using a form of hashing.  The
199       * ThreadLocal Submitter class contains a value initially used as
200       * a hash code for choosing existing queues, but may be randomly
201       * repositioned upon contention with other submitters.  In
202 <     * essence, submitters act like workers except that they never
203 <     * take tasks, and they are multiplexed on to a finite number of
204 <     * shared work queues. However, classes are set up so that future
205 <     * extensions could allow submitters to optionally help perform
206 <     * tasks as well. Insertion of tasks in shared mode requires a
207 <     * lock (mainly to protect in the case of resizing) but we use
208 <     * only a simple spinlock (using bits in field runState), because
209 <     * submitters encountering a busy queue move on to try or create
210 <     * other queues -- they block only when creating and registering
211 <     * new queues.
202 >     * essence, submitters act like workers except that they are
203 >     * restricted to executing local tasks that they submitted (or in
204 >     * the case of CountedCompleters, others with the same root task).
205 >     * However, because most shared/external queue operations are more
206 >     * expensive than internal, and because, at steady state, external
207 >     * submitters will compete for CPU with workers, ForkJoinTask.join
208 >     * and related methods disable them from repeatedly helping to
209 >     * process tasks if all workers are active.  Insertion of tasks in
210 >     * shared mode requires a lock (mainly to protect in the case of
211 >     * resizing) but we use only a simple spinlock (using bits in
212 >     * field qlock), because submitters encountering a busy queue move
213 >     * on to try or create other queues -- they block only when
214 >     * creating and registering new queues.
215       *
216       * Management
217       * ==========
# Line 229 | Line 233 | public class ForkJoinPool extends Abstra
233       * and their negations (used for thresholding) to fit into 16bit
234       * fields.
235       *
236 <     * Field "runState" contains 32 bits needed to register and
237 <     * deregister WorkQueues, as well as to enable shutdown. It is
238 <     * only modified under a lock (normally briefly held, but
239 <     * occasionally protecting allocations and resizings) but even
240 <     * when locked remains available to check consistency.
236 >     * Field "plock" is a form of sequence lock with a saturating
237 >     * shutdown bit (similarly for per-queue "qlocks"), mainly
238 >     * protecting updates to the workQueues array, as well as to
239 >     * enable shutdown.  When used as a lock, it is normally only very
240 >     * briefly held, so is nearly always available after at most a
241 >     * brief spin, but we use a monitor-based backup strategy to
242 >     * block when needed.
243       *
244       * Recording WorkQueues.  WorkQueues are recorded in the
245       * "workQueues" array that is created upon first use and expanded
# Line 242 | Line 248 | public class ForkJoinPool extends Abstra
248       * by a lock but the array is otherwise concurrently readable, and
249       * accessed directly.  To simplify index-based operations, the
250       * array size is always a power of two, and all readers must
251 <     * tolerate null slots. Shared (submission) queues are at even
252 <     * indices, worker queues at odd indices. Grouping them together
253 <     * in this way simplifies and speeds up task scanning.
251 >     * tolerate null slots. Worker queues are at odd indices. Shared
252 >     * (submission) queues are at even indices, up to a maximum of 64
253 >     * slots, to limit growth even if array needs to expand to add
254 >     * more workers. Grouping them together in this way simplifies and
255 >     * speeds up task scanning.
256       *
257       * All worker thread creation is on-demand, triggered by task
258       * submissions, replacement of terminated workers, and/or
# Line 305 | Line 313 | public class ForkJoinPool extends Abstra
313       *
314       * Signalling.  We create or wake up workers only when there
315       * appears to be at least one task they might be able to find and
316 <     * execute.  When a submission is added or another worker adds a
317 <     * task to a queue that previously had fewer than two tasks, they
318 <     * signal waiting workers (or trigger creation of new ones if
319 <     * fewer than the given parallelism level -- see signalWork).
320 <     * These primary signals are buttressed by signals during rescans;
321 <     * together these cover the signals needed in cases when more
322 <     * tasks are pushed but untaken, and improve performance compared
323 <     * to having one thread wake up all workers.
316 >     * execute. However, many other threads may notice the same task
317 >     * and each signal to wake up a thread that might take it. So in
318 >     * general, pools will be over-signalled.  When a submission is
319 >     * added or another worker adds a task to a queue that has fewer
320 >     * than two tasks, they signal waiting workers (or trigger
321 >     * creation of new ones if fewer than the given parallelism level
322 >     * -- signalWork), and may leave a hint to the unparked worker to
323 >     * help signal others upon wakeup).  These primary signals are
324 >     * buttressed by others (see method helpSignal) whenever other
325 >     * threads scan for work or do not have a task to process.  On
326 >     * most platforms, signalling (unpark) overhead time is noticeably
327 >     * long, and the time between signalling a thread and it actually
328 >     * making progress can be very noticeably long, so it is worth
329 >     * offloading these delays from critical paths as much as
330 >     * possible.
331       *
332       * Trimming workers. To release resources after periods of lack of
333       * use, a worker starting to wait when the pool is quiescent will
# Line 323 | Line 338 | public class ForkJoinPool extends Abstra
338       * periods of non-use.
339       *
340       * Shutdown and Termination. A call to shutdownNow atomically sets
341 <     * a runState bit and then (non-atomically) sets each worker's
342 <     * runState status, cancels all unprocessed tasks, and wakes up
341 >     * a plock bit and then (non-atomically) sets each worker's
342 >     * qlock status, cancels all unprocessed tasks, and wakes up
343       * all waiting workers.  Detecting whether termination should
344       * commence after a non-abrupt shutdown() call requires more work
345       * and bookkeeping. We need consensus about quiescence (i.e., that
# Line 352 | Line 367 | public class ForkJoinPool extends Abstra
367       *      method tryCompensate() may create or re-activate a spare
368       *      thread to compensate for blocked joiners until they unblock.
369       *
370 <     * A third form (implemented in tryRemoveAndExec and
371 <     * tryPollForAndExec) amounts to helping a hypothetical
372 <     * compensator: If we can readily tell that a possible action of a
373 <     * compensator is to steal and execute the task being joined, the
374 <     * joining thread can do so directly, without the need for a
375 <     * compensation thread (although at the expense of larger run-time
376 <     * stacks, but the tradeoff is typically worthwhile).
370 >     * A third form (implemented in tryRemoveAndExec) amounts to
371 >     * helping a hypothetical compensator: If we can readily tell that
372 >     * a possible action of a compensator is to steal and execute the
373 >     * task being joined, the joining thread can do so directly,
374 >     * without the need for a compensation thread (although at the
375 >     * expense of larger run-time stacks, but the tradeoff is
376 >     * typically worthwhile).
377       *
378       * The ManagedBlocker extension API can't use helping so relies
379       * only on compensation in method awaitBlocker.
# Line 380 | Line 395 | public class ForkJoinPool extends Abstra
395       * steals, rather than use per-task bookkeeping.  This sometimes
396       * requires a linear scan of workQueues array to locate stealers,
397       * but often doesn't because stealers leave hints (that may become
398 <     * stale/wrong) of where to locate them.  A stealHint is only a
399 <     * hint because a worker might have had multiple steals and the
400 <     * hint records only one of them (usually the most current).
401 <     * Hinting isolates cost to when it is needed, rather than adding
402 <     * to per-task overhead.  (2) It is "shallow", ignoring nesting
403 <     * and potentially cyclic mutual steals.  (3) It is intentionally
398 >     * stale/wrong) of where to locate them.  It is only a hint
399 >     * because a worker might have had multiple steals and the hint
400 >     * records only one of them (usually the most current).  Hinting
401 >     * isolates cost to when it is needed, rather than adding to
402 >     * per-task overhead.  (2) It is "shallow", ignoring nesting and
403 >     * potentially cyclic mutual steals.  (3) It is intentionally
404       * racy: field currentJoin is updated only while actively joining,
405       * which means that we miss links in the chain during long-lived
406       * tasks, GC stalls etc (which is OK since blocking in such cases
# Line 393 | Line 408 | public class ForkJoinPool extends Abstra
408       * to find work (see MAX_HELP) and fall back to suspending the
409       * worker and if necessary replacing it with another.
410       *
411 +     * Helping actions for CountedCompleters are much simpler: Method
412 +     * helpComplete can take and execute any task with the same root
413 +     * as the task being waited on. However, this still entails some
414 +     * traversal of completer chains, so is less efficient than using
415 +     * CountedCompleters without explicit joins.
416 +     *
417       * It is impossible to keep exactly the target parallelism number
418       * of threads running at any given time.  Determining the
419       * existence of conservatively safe helping targets, the
# Line 414 | Line 435 | public class ForkJoinPool extends Abstra
435       * intractable) game with an opponent that may choose the worst
436       * (for us) active thread to stall at any time.  We take several
437       * precautions to bound losses (and thus bound gains), mainly in
438 <     * methods tryCompensate and awaitJoin: (1) We only try
439 <     * compensation after attempting enough helping steps (measured
440 <     * via counting and timing) that we have already consumed the
441 <     * estimated cost of creating and activating a new thread.  (2) We
442 <     * allow up to 50% of threads to be blocked before initially
443 <     * adding any others, and unless completely saturated, check that
444 <     * some work is available for a new worker before adding. Also, we
445 <     * create up to only 50% more threads until entering a mode that
446 <     * only adds a thread if all others are possibly blocked.  All
447 <     * together, this means that we might be half as fast to react,
448 <     * and create half as many threads as possible in the ideal case,
449 <     * but present vastly fewer anomalies in all other cases compared
450 <     * to both more aggressive and more conservative alternatives.
451 <     *
452 <     * Style notes: There is a lot of representation-level coupling
453 <     * among classes ForkJoinPool, ForkJoinWorkerThread, and
454 <     * ForkJoinTask.  The fields of WorkQueue maintain data structures
455 <     * managed by ForkJoinPool, so are directly accessed.  There is
456 <     * little point trying to reduce this, since any associated future
457 <     * changes in representations will need to be accompanied by
458 <     * algorithmic changes anyway. Several methods intrinsically
459 <     * sprawl because they must accumulate sets of consistent reads of
460 <     * volatiles held in local variables.  Methods signalWork() and
461 <     * scan() are the main bottlenecks, so are especially heavily
438 >     * methods tryCompensate and awaitJoin.
439 >     *
440 >     * Common Pool
441 >     * ===========
442 >     *
443 >     * The static common Pool always exists after static
444 >     * initialization.  Since it (or any other created pool) need
445 >     * never be used, we minimize initial construction overhead and
446 >     * footprint to the setup of about a dozen fields, with no nested
447 >     * allocation. Most bootstrapping occurs within method
448 >     * fullExternalPush during the first submission to the pool.
449 >     *
450 >     * When external threads submit to the common pool, they can
451 >     * perform some subtask processing (see externalHelpJoin and
452 >     * related methods).  We do not need to record whether these
453 >     * submissions are to the common pool -- if not, externalHelpJoin
454 >     * returns quickly (at the most helping to signal some common pool
455 >     * workers). These submitters would otherwise be blocked waiting
456 >     * for completion, so the extra effort (with liberally sprinkled
457 >     * task status checks) in inapplicable cases amounts to an odd
458 >     * form of limited spin-wait before blocking in ForkJoinTask.join.
459 >     *
460 >     * Style notes
461 >     * ===========
462 >     *
463 >     * There is a lot of representation-level coupling among classes
464 >     * ForkJoinPool, ForkJoinWorkerThread, and ForkJoinTask.  The
465 >     * fields of WorkQueue maintain data structures managed by
466 >     * ForkJoinPool, so are directly accessed.  There is little point
467 >     * trying to reduce this, since any associated future changes in
468 >     * representations will need to be accompanied by algorithmic
469 >     * changes anyway. Several methods intrinsically sprawl because
470 >     * they must accumulate sets of consistent reads of volatiles held
471 >     * in local variables.  Methods signalWork() and scan() are the
472 >     * main bottlenecks, so are especially heavily
473       * micro-optimized/mangled.  There are lots of inline assignments
474       * (of form "while ((local = field) != 0)") which are usually the
475       * simplest way to ensure the required read orderings (which are
# Line 445 | Line 477 | public class ForkJoinPool extends Abstra
477       * declarations of these locals at the heads of methods or blocks.
478       * There are several occurrences of the unusual "do {} while
479       * (!cas...)"  which is the simplest way to force an update of a
480 <     * CAS'ed variable. There are also other coding oddities that help
480 >     * CAS'ed variable. There are also other coding oddities (including
481 >     * several unnecessary-looking hoisted null checks) that help
482       * some methods perform reasonably even when interpreted (not
483       * compiled).
484       *
# Line 494 | Line 527 | public class ForkJoinPool extends Abstra
527       * Default ForkJoinWorkerThreadFactory implementation; creates a
528       * new ForkJoinWorkerThread.
529       */
530 <    static class DefaultForkJoinWorkerThreadFactory
530 >    static final class DefaultForkJoinWorkerThreadFactory
531          implements ForkJoinWorkerThreadFactory {
532 <        public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
532 >        public final ForkJoinWorkerThread newThread(ForkJoinPool pool) {
533              return new ForkJoinWorkerThread(pool);
534          }
535      }
536  
537      /**
538 +     * Per-thread records for threads that submit to pools. Currently
539 +     * holds only pseudo-random seed / index that is used to choose
540 +     * submission queues in method externalPush. In the future, this may
541 +     * also incorporate a means to implement different task rejection
542 +     * and resubmission policies.
543 +     *
544 +     * Seeds for submitters and workers/workQueues work in basically
545 +     * the same way but are initialized and updated using slightly
546 +     * different mechanics. Both are initialized using the same
547 +     * approach as in class ThreadLocal, where successive values are
548 +     * unlikely to collide with previous values. Seeds are then
549 +     * randomly modified upon collisions using xorshifts, which
550 +     * requires a non-zero seed.
551 +     */
552 +    static final class Submitter {
553 +        int seed;
554 +        Submitter(int s) { seed = s; }
555 +    }
556 +
557 +    /**
558       * Class for artificial tasks that are used to replace the target
559       * of local joins if they are removed from an interior queue slot
560       * in WorkQueue.tryRemoveAndExec. We don't need the proxy to
561       * actually do anything beyond having a unique identity.
562       */
563      static final class EmptyTask extends ForkJoinTask<Void> {
564 +        private static final long serialVersionUID = -7721805057305804111L;
565          EmptyTask() { status = ForkJoinTask.NORMAL; } // force done
566          public final Void getRawResult() { return null; }
567          public final void setRawResult(Void x) {}
# Line 528 | Line 582 | public class ForkJoinPool extends Abstra
582       *
583       * Field "top" is the index (mod array.length) of the next queue
584       * slot to push to or pop from. It is written only by owner thread
585 <     * for push, or under lock for trySharedPush, and accessed by
586 <     * other threads only after reading (volatile) base.  Both top and
587 <     * base are allowed to wrap around on overflow, but (top - base)
588 <     * (or more commonly -(base - top) to force volatile read of base
589 <     * before top) still estimates size.
585 >     * for push, or under lock for external/shared push, and accessed
586 >     * by other threads only after reading (volatile) base.  Both top
587 >     * and base are allowed to wrap around on overflow, but (top -
588 >     * base) (or more commonly -(base - top) to force volatile read of
589 >     * base before top) still estimates size. The lock ("qlock") is
590 >     * forced to -1 on termination, causing all further lock attempts
591 >     * to fail. (Note: we don't need CAS for termination state because
592 >     * upon pool shutdown, all shared-queues will stop being used
593 >     * anyway.)  Nearly all lock bodies are set up so that exceptions
594 >     * within lock bodies are "impossible" (modulo JVM errors that
595 >     * would cause failure anyway.)
596       *
597       * The array slots are read and written using the emulation of
598       * volatiles/atomics provided by Unsafe. Insertions must in
599       * general use putOrderedObject as a form of releasing store to
600       * ensure that all writes to the task object are ordered before
601 <     * its publication in the queue. (Although we can avoid one case
602 <     * of this when locked in trySharedPush.) All removals entail a
603 <     * CAS to null.  The array is always a power of two. To ensure
604 <     * safety of Unsafe array operations, all accesses perform
545 <     * explicit null checks and implicit bounds checks via
546 <     * power-of-two masking.
601 >     * its publication in the queue.  All removals entail a CAS to
602 >     * null.  The array is always a power of two. To ensure safety of
603 >     * Unsafe array operations, all accesses perform explicit null
604 >     * checks and implicit bounds checks via power-of-two masking.
605       *
606       * In addition to basic queuing support, this class contains
607       * fields described elsewhere to control execution. It turns out
608 <     * to work better memory-layout-wise to include them in this
609 <     * class rather than a separate class.
608 >     * to work better memory-layout-wise to include them in this class
609 >     * rather than a separate class.
610       *
611       * Performance on most platforms is very sensitive to placement of
612       * instances of both WorkQueues and their arrays -- we absolutely
# Line 562 | Line 620 | public class ForkJoinPool extends Abstra
620       * trades off slightly slower average field access for the sake of
621       * avoiding really bad worst-case access. (Until better JVM
622       * support is in place, this padding is dependent on transient
623 <     * properties of JVM field layout rules.)  We also take care in
623 >     * properties of JVM field layout rules.) We also take care in
624       * allocating, sizing and resizing the array. Non-shared queue
625 <     * arrays are initialized (via method growArray) by workers before
626 <     * use. Others are allocated on first use.
625 >     * arrays are initialized by workers before use. Others are
626 >     * allocated on first use.
627       */
628      static final class WorkQueue {
629          /**
# Line 588 | Line 646 | public class ForkJoinPool extends Abstra
646           */
647          static final int MAXIMUM_QUEUE_CAPACITY = 1 << 26; // 64M
648  
649 <        volatile long totalSteals; // cumulative number of steals
649 >        // Heuristic padding to ameliorate unfortunate memory placements
650 >        volatile long pad00, pad01, pad02, pad03, pad04, pad05, pad06;
651 >
652          int seed;                  // for random scanning; initialize nonzero
653          volatile int eventCount;   // encoded inactivation count; < 0 if inactive
654          int nextWait;              // encoded record of next event waiter
655 <        int rescans;               // remaining scans until block
596 <        int nsteals;               // top-level task executions since last idle
597 <        final int mode;            // lifo, fifo, or shared
655 >        int hint;                  // steal or signal hint (index)
656          int poolIndex;             // index of this queue in pool (or 0)
657 <        int stealHint;             // index of most recent known stealer
658 <        volatile int runState;     // 1: locked, -1: terminate; else 0
657 >        final int mode;            // 0: lifo, > 0: fifo, < 0: shared
658 >        int nsteals;               // number of steals
659 >        volatile int qlock;        // 1: locked, -1: terminate; else 0
660          volatile int base;         // index of next slot for poll
661          int top;                   // index of next slot for push
662          ForkJoinTask<?>[] array;   // the elements (initially unallocated)
# Line 606 | Line 665 | public class ForkJoinPool extends Abstra
665          volatile Thread parker;    // == owner during call to park; else null
666          volatile ForkJoinTask<?> currentJoin;  // task being joined in awaitJoin
667          ForkJoinTask<?> currentSteal; // current non-local task being executed
609        // Heuristic padding to ameliorate unfortunate memory placements
610        Object p00, p01, p02, p03, p04, p05, p06, p07;
611        Object p08, p09, p0a, p0b, p0c, p0d, p0e;
668  
669 <        WorkQueue(ForkJoinPool pool, ForkJoinWorkerThread owner, int mode) {
670 <            this.mode = mode;
669 >        volatile Object pad10, pad11, pad12, pad13, pad14, pad15, pad16, pad17;
670 >        volatile Object pad18, pad19, pad1a, pad1b, pad1c, pad1d;
671 >
672 >        WorkQueue(ForkJoinPool pool, ForkJoinWorkerThread owner, int mode,
673 >                  int seed) {
674              this.pool = pool;
675              this.owner = owner;
676 +            this.mode = mode;
677 +            this.seed = seed;
678              // Place indices in the center of array (that is not yet allocated)
679              base = top = INITIAL_QUEUE_CAPACITY >>> 1;
680          }
# Line 626 | Line 687 | public class ForkJoinPool extends Abstra
687              return (n >= 0) ? 0 : -n; // ignore transient negative
688          }
689  
690 <        /**
690 >       /**
691           * Provides a more accurate estimate of whether this queue has
692           * any tasks than does queueSize, by checking whether a
693           * near-empty queue has at least one unclaimed task.
# Line 638 | Line 699 | public class ForkJoinPool extends Abstra
699                      (n == -1 &&
700                       ((a = array) == null ||
701                        (m = a.length - 1) < 0 ||
702 <                      U.getObjectVolatile
703 <                      (a, ((m & (s - 1)) << ASHIFT) + ABASE) == null)));
702 >                      U.getObject
703 >                      (a, (long)((m & (s - 1)) << ASHIFT) + ABASE) == null)));
704          }
705  
706          /**
707 <         * Pushes a task. Call only by owner in unshared queues.
707 >         * Pushes a task. Call only by owner in unshared queues.  (The
708 >         * shared-queue version is embedded in method externalPush.)
709           *
710           * @param task the task. Caller must ensure non-null.
711 <         * @throw RejectedExecutionException if array cannot be resized
711 >         * @throws RejectedExecutionException if array cannot be resized
712           */
713          final void push(ForkJoinTask<?> task) {
714              ForkJoinTask<?>[] a; ForkJoinPool p;
715              int s = top, m, n;
716              if ((a = array) != null) {    // ignore if queue removed
717 <                U.putOrderedObject
718 <                    (a, (((m = a.length - 1) & s) << ASHIFT) + ABASE, task);
717 >                int j = (((m = a.length - 1) & s) << ASHIFT) + ABASE;
718 >                U.putOrderedObject(a, j, task);
719                  if ((n = (top = s + 1) - base) <= 2) {
720                      if ((p = pool) != null)
721 <                        p.signalWork();
721 >                        p.signalWork(this);
722                  }
723                  else if (n >= m)
724 <                    growArray(true);
724 >                    growArray();
725              }
726          }
727  
728 <        /**
729 <         * Pushes a task if lock is free and array is either big
730 <         * enough or can be resized to be big enough.
731 <         *
670 <         * @param task the task. Caller must ensure non-null.
671 <         * @return true if submitted
728 >       /**
729 >         * Initializes or doubles the capacity of array. Call either
730 >         * by owner or with lock held -- it is OK for base, but not
731 >         * top, to move while resizings are in progress.
732           */
733 <        final boolean trySharedPush(ForkJoinTask<?> task) {
734 <            boolean submitted = false;
735 <            if (runState == 0 && U.compareAndSwapInt(this, RUNSTATE, 0, 1)) {
736 <                ForkJoinTask<?>[] a = array;
737 <                int s = top;
738 <                try {
739 <                    if ((a != null && a.length > s + 1 - base) ||
740 <                        (a = growArray(false)) != null) { // must presize
741 <                        int j = (((a.length - 1) & s) << ASHIFT) + ABASE;
742 <                        U.putObject(a, (long)j, task);    // don't need "ordered"
743 <                        top = s + 1;
744 <                        submitted = true;
745 <                    }
746 <                } finally {
747 <                    runState = 0;                         // unlock
748 <                }
733 >        final ForkJoinTask<?>[] growArray() {
734 >            ForkJoinTask<?>[] oldA = array;
735 >            int size = oldA != null ? oldA.length << 1 : INITIAL_QUEUE_CAPACITY;
736 >            if (size > MAXIMUM_QUEUE_CAPACITY)
737 >                throw new RejectedExecutionException("Queue capacity exceeded");
738 >            int oldMask, t, b;
739 >            ForkJoinTask<?>[] a = array = new ForkJoinTask<?>[size];
740 >            if (oldA != null && (oldMask = oldA.length - 1) >= 0 &&
741 >                (t = top) - (b = base) > 0) {
742 >                int mask = size - 1;
743 >                do {
744 >                    ForkJoinTask<?> x;
745 >                    int oldj = ((b & oldMask) << ASHIFT) + ABASE;
746 >                    int j    = ((b &    mask) << ASHIFT) + ABASE;
747 >                    x = (ForkJoinTask<?>)U.getObjectVolatile(oldA, oldj);
748 >                    if (x != null &&
749 >                        U.compareAndSwapObject(oldA, oldj, x, null))
750 >                        U.putObjectVolatile(a, j, x);
751 >                } while (++b != t);
752              }
753 <            return submitted;
753 >            return a;
754          }
755  
756          /**
# Line 710 | Line 773 | public class ForkJoinPool extends Abstra
773              return null;
774          }
775  
713        final ForkJoinTask<?> sharedPop() {
714            ForkJoinTask<?> task = null;
715            if (runState == 0 && U.compareAndSwapInt(this, RUNSTATE, 0, 1)) {
716                try {
717                    ForkJoinTask<?>[] a; int m;
718                    if ((a = array) != null && (m = a.length - 1) >= 0) {
719                        for (int s; (s = top - 1) - base >= 0;) {
720                            long j = ((m & s) << ASHIFT) + ABASE;
721                            ForkJoinTask<?> t =
722                                (ForkJoinTask<?>)U.getObject(a, j);
723                            if (t == null)
724                                break;
725                            if (U.compareAndSwapObject(a, j, t, null)) {
726                                top = s;
727                                task = t;
728                                break;
729                            }
730                        }
731                    }
732                } finally {
733                    runState = 0;
734                }
735            }
736            return task;
737        }
738
739        /**
740         * Version of pop that takes top element only if it
741         * its root is the given CountedCompleter.
742         */
743        final ForkJoinTask<?> popCC(CountedCompleter<?> root) {
744            ForkJoinTask<?>[] a; int m;
745            if (root != null && (a = array) != null && (m = a.length - 1) >= 0) {
746                for (int s; (s = top - 1) - base >= 0;) {
747                    long j = ((m & s) << ASHIFT) + ABASE;
748                    ForkJoinTask<?> t =
749                        (ForkJoinTask<?>)U.getObject(a, j);
750                    if (t == null || !(t instanceof CountedCompleter) ||
751                        ((CountedCompleter<?>)t).getRoot() != root)
752                        break;
753                    if (U.compareAndSwapObject(a, j, t, null)) {
754                        top = s;
755                        return t;
756                    }
757                    if (root.status < 0)
758                        break;
759                }
760            }
761            return null;
762        }
763
764        /**
765         * Shared version of popCC
766         */
767        final ForkJoinTask<?> sharedPopCC(CountedCompleter<?> root) {
768            ForkJoinTask<?> task = null;
769            if (root != null &&
770                runState == 0 && U.compareAndSwapInt(this, RUNSTATE, 0, 1)) {
771                try {
772                    ForkJoinTask<?>[] a; int m;
773                    if ((a = array) != null && (m = a.length - 1) >= 0) {
774                        for (int s; (s = top - 1) - base >= 0;) {
775                            long j = ((m & s) << ASHIFT) + ABASE;
776                            ForkJoinTask<?> t =
777                                (ForkJoinTask<?>)U.getObject(a, j);
778                            if (t == null || !(t instanceof CountedCompleter) ||
779                                ((CountedCompleter<?>)t).getRoot() != root)
780                                break;
781                            if (U.compareAndSwapObject(a, j, t, null)) {
782                                top = s;
783                                task = t;
784                                break;
785                            }
786                            if (root.status < 0)
787                                break;
788                        }
789                    }
790                } finally {
791                    runState = 0;
792                }
793            }
794            return task;
795        }
796
776          /**
777           * Takes a task in FIFO order if b is base of queue and a task
778           * can be claimed without contention. Specialized versions
# Line 831 | Line 810 | public class ForkJoinPool extends Abstra
810                  else if (base == b) {
811                      if (b + 1 == top)
812                          break;
813 <                    Thread.yield(); // wait for lagging update
813 >                    Thread.yield(); // wait for lagging update (very rare)
814                  }
815              }
816              return null;
# Line 858 | Line 837 | public class ForkJoinPool extends Abstra
837  
838          /**
839           * Pops the given task only if it is at the current top.
840 +         * (A shared version is available only via FJP.tryExternalUnpush)
841           */
842          final boolean tryUnpush(ForkJoinTask<?> t) {
843              ForkJoinTask<?>[] a; int s;
# Line 871 | Line 851 | public class ForkJoinPool extends Abstra
851          }
852  
853          /**
874         * Version of tryUnpush for shared queues; called by non-FJ
875         * submitters after prechecking that task probably exists.
876         */
877        final boolean trySharedUnpush(ForkJoinTask<?> t) {
878            boolean success = false;
879            if (runState == 0 && U.compareAndSwapInt(this, RUNSTATE, 0, 1)) {
880                try {
881                    ForkJoinTask<?>[] a; int s;
882                    if ((a = array) != null && (s = top) != base &&
883                        U.compareAndSwapObject
884                        (a, (((a.length - 1) & --s) << ASHIFT) + ABASE, t, null)) {
885                        top = s;
886                        success = true;
887                    }
888                } finally {
889                    runState = 0;                         // unlock
890                }
891            }
892            return success;
893        }
894
895        /**
896         * Polls the given task only if it is at the current base.
897         */
898        final boolean pollFor(ForkJoinTask<?> task) {
899            ForkJoinTask<?>[] a; int b;
900            if ((b = base) - top < 0 && (a = array) != null) {
901                int j = (((a.length - 1) & b) << ASHIFT) + ABASE;
902                if (U.getObjectVolatile(a, j) == task && base == b &&
903                    U.compareAndSwapObject(a, j, task, null)) {
904                    base = b + 1;
905                    return true;
906                }
907            }
908            return false;
909        }
910
911        /**
912         * Initializes or doubles the capacity of array. Call either
913         * by owner or with lock held -- it is OK for base, but not
914         * top, to move while resizings are in progress.
915         *
916         * @param rejectOnFailure if true, throw exception if capacity
917         * exceeded (relayed ultimately to user); else return null.
918         */
919        final ForkJoinTask<?>[] growArray(boolean rejectOnFailure) {
920            ForkJoinTask<?>[] oldA = array;
921            int size = oldA != null ? oldA.length << 1 : INITIAL_QUEUE_CAPACITY;
922            if (size <= MAXIMUM_QUEUE_CAPACITY) {
923                int oldMask, t, b;
924                ForkJoinTask<?>[] a = array = new ForkJoinTask<?>[size];
925                if (oldA != null && (oldMask = oldA.length - 1) >= 0 &&
926                    (t = top) - (b = base) > 0) {
927                    int mask = size - 1;
928                    do {
929                        ForkJoinTask<?> x;
930                        int oldj = ((b & oldMask) << ASHIFT) + ABASE;
931                        int j    = ((b &    mask) << ASHIFT) + ABASE;
932                        x = (ForkJoinTask<?>)U.getObjectVolatile(oldA, oldj);
933                        if (x != null &&
934                            U.compareAndSwapObject(oldA, oldj, x, null))
935                            U.putObjectVolatile(a, j, x);
936                    } while (++b != t);
937                }
938                return a;
939            }
940            else if (!rejectOnFailure)
941                return null;
942            else
943                throw new RejectedExecutionException("Queue capacity exceeded");
944        }
945
946        /**
854           * Removes and cancels all known tasks, ignoring any exceptions.
855           */
856          final void cancelAll() {
# Line 967 | Line 874 | public class ForkJoinPool extends Abstra
874              return seed = r ^= r << 5;
875          }
876  
877 <        // Execution methods
877 >        // Specialized execution methods
878  
879          /**
880           * Pops and runs tasks until empty.
# Line 996 | Line 903 | public class ForkJoinPool extends Abstra
903          }
904  
905          /**
906 <         * If present, removes from queue and executes the given task, or
907 <         * any other cancelled task. Returns (true) immediately on any CAS
906 >         * If present, removes from queue and executes the given task,
907 >         * or any other cancelled task. Returns (true) on any CAS
908           * or consistency check failure so caller can retry.
909           *
910 <         * @return 0 if no progress can be made, else positive
1004 <         * (this unusual convention simplifies use with tryHelpStealer.)
910 >         * @return false if no progress can be made, else true
911           */
912 <        final int tryRemoveAndExec(ForkJoinTask<?> task) {
913 <            int stat = 1;
1008 <            boolean removed = false, empty = true;
912 >        final boolean tryRemoveAndExec(ForkJoinTask<?> task) {
913 >            boolean stat = true, removed = false, empty = true;
914              ForkJoinTask<?>[] a; int m, s, b, n;
915              if ((a = array) != null && (m = a.length - 1) >= 0 &&
916                  (n = (s = top) - (b = base)) > 0) {
# Line 1035 | Line 940 | public class ForkJoinPool extends Abstra
940                      }
941                      if (--n == 0) {
942                          if (!empty && base == b)
943 <                            stat = 0;
943 >                            stat = false;
944                          break;
945                      }
946                  }
# Line 1046 | Line 951 | public class ForkJoinPool extends Abstra
951          }
952  
953          /**
954 +         * Polls for and executes the given task or any other task in
955 +         * its CountedCompleter computation.
956 +         */
957 +        final boolean pollAndExecCC(ForkJoinTask<?> root) {
958 +            ForkJoinTask<?>[] a; int b; Object o;
959 +            outer: while ((b = base) - top < 0 && (a = array) != null) {
960 +                long j = (((a.length - 1) & b) << ASHIFT) + ABASE;
961 +                if ((o = U.getObject(a, j)) == null ||
962 +                    !(o instanceof CountedCompleter))
963 +                    break;
964 +                for (CountedCompleter<?> t = (CountedCompleter<?>)o, r = t;;) {
965 +                    if (r == root) {
966 +                        if (base == b &&
967 +                            U.compareAndSwapObject(a, j, t, null)) {
968 +                            base = b + 1;
969 +                            t.doExec();
970 +                            return true;
971 +                        }
972 +                        else
973 +                            break; // restart
974 +                    }
975 +                    if ((r = r.completer) == null)
976 +                        break outer; // not part of root computation
977 +                }
978 +            }
979 +            return false;
980 +        }
981 +
982 +        /**
983           * Executes a top-level task and any local tasks remaining
984           * after execution.
985           */
986          final void runTask(ForkJoinTask<?> t) {
987              if (t != null) {
988 <                currentSteal = t;
989 <                t.doExec();
990 <                if (top != base) {       // process remaining local tasks
988 >                (currentSteal = t).doExec();
989 >                currentSteal = null;
990 >                ++nsteals;
991 >                if (base - top < 0) {       // process remaining local tasks
992                      if (mode == 0)
993                          popAndExecAll();
994                      else
995                          pollAndExecAll();
996                  }
1062                ++nsteals;
1063                currentSteal = null;
997              }
998          }
999  
# Line 1070 | Line 1003 | public class ForkJoinPool extends Abstra
1003          final void runSubtask(ForkJoinTask<?> t) {
1004              if (t != null) {
1005                  ForkJoinTask<?> ps = currentSteal;
1006 <                currentSteal = t;
1074 <                t.doExec();
1006 >                (currentSteal = t).doExec();
1007                  currentSteal = ps;
1008              }
1009          }
# Line 1088 | Line 1020 | public class ForkJoinPool extends Abstra
1020                      s != Thread.State.TIMED_WAITING);
1021          }
1022  
1091        /**
1092         * If this owned and is not already interrupted, try to
1093         * interrupt and/or unpark, ignoring exceptions.
1094         */
1095        final void interruptOwner() {
1096            Thread wt, p;
1097            if ((wt = owner) != null && !wt.isInterrupted()) {
1098                try {
1099                    wt.interrupt();
1100                } catch (SecurityException ignore) {
1101                }
1102            }
1103            if ((p = parker) != null)
1104                U.unpark(p);
1105        }
1106
1023          // Unsafe mechanics
1024          private static final sun.misc.Unsafe U;
1025 <        private static final long RUNSTATE;
1025 >        private static final long QLOCK;
1026          private static final int ABASE;
1027          private static final int ASHIFT;
1028          static {
1113            int s;
1029              try {
1030                  U = getUnsafe();
1031                  Class<?> k = WorkQueue.class;
1032                  Class<?> ak = ForkJoinTask[].class;
1033 <                RUNSTATE = U.objectFieldOffset
1034 <                    (k.getDeclaredField("runState"));
1033 >                QLOCK = U.objectFieldOffset
1034 >                    (k.getDeclaredField("qlock"));
1035                  ABASE = U.arrayBaseOffset(ak);
1036 <                s = U.arrayIndexScale(ak);
1036 >                int scale = U.arrayIndexScale(ak);
1037 >                if ((scale & (scale - 1)) != 0)
1038 >                    throw new Error("data type scale not a power of two");
1039 >                ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
1040              } catch (Exception e) {
1041                  throw new Error(e);
1042              }
1125            if ((s & (s-1)) != 0)
1126                throw new Error("data type scale not a power of two");
1127            ASHIFT = 31 - Integer.numberOfLeadingZeros(s);
1128        }
1129    }
1130
1131    /**
1132     * Per-thread records for threads that submit to pools. Currently
1133     * holds only pseudo-random seed / index that is used to choose
1134     * submission queues in method doSubmit. In the future, this may
1135     * also incorporate a means to implement different task rejection
1136     * and resubmission policies.
1137     *
1138     * Seeds for submitters and workers/workQueues work in basically
1139     * the same way but are initialized and updated using slightly
1140     * different mechanics. Both are initialized using the same
1141     * approach as in class ThreadLocal, where successive values are
1142     * unlikely to collide with previous values. This is done during
1143     * registration for workers, but requires a separate AtomicInteger
1144     * for submitters. Seeds are then randomly modified upon
1145     * collisions using xorshifts, which requires a non-zero seed.
1146     */
1147    static final class Submitter {
1148        int seed;
1149        Submitter() {
1150            int s = nextSubmitterSeed.getAndAdd(SEED_INCREMENT);
1151            seed = (s == 0) ? 1 : s; // ensure non-zero
1043          }
1044      }
1045  
1155    /** ThreadLocal class for Submitters */
1156    static final class ThreadSubmitter extends ThreadLocal<Submitter> {
1157        public Submitter initialValue() { return new Submitter(); }
1158    }
1159
1046      // static fields (initialized in static initializer below)
1047  
1048      /**
# Line 1166 | Line 1052 | public class ForkJoinPool extends Abstra
1052      public static final ForkJoinWorkerThreadFactory
1053          defaultForkJoinWorkerThreadFactory;
1054  
1169
1170    /** Property prefix for constructing common pool */
1171    private static final String propPrefix =
1172        "java.util.concurrent.ForkJoinPool.common.";
1173
1055      /**
1056 <     * Common (static) pool. Non-null for public use unless a static
1057 <     * construction exception, but internal usages must null-check on
1058 <     * use.
1056 >     * Per-thread submission bookkeeping. Shared across all pools
1057 >     * to reduce ThreadLocal pollution and because random motion
1058 >     * to avoid contention in one pool is likely to hold for others.
1059 >     * Lazily initialized on first submission (but null-checked
1060 >     * in other contexts to avoid unnecessary initialization).
1061       */
1062 <    static final ForkJoinPool commonPool;
1062 >    static final ThreadLocal<Submitter> submitters;
1063  
1064      /**
1065 <     * Common pool parallelism. Must equal commonPool.parallelism.
1065 >     * Permission required for callers of methods that may start or
1066 >     * kill threads.
1067       */
1068 <    static final int commonPoolParallelism;
1068 >    private static final RuntimePermission modifyThreadPermission;
1069  
1070      /**
1071 <     * Generator for assigning sequence numbers as pool names.
1071 >     * Common (static) pool. Non-null for public use unless a static
1072 >     * construction exception, but internal usages null-check on use
1073 >     * to paranoically avoid potential initialization circularities
1074 >     * as well as to simplify generated code.
1075       */
1076 <    private static final AtomicInteger poolNumberGenerator;
1076 >    static final ForkJoinPool common;
1077  
1078      /**
1079 <     * Generator for initial hashes/seeds for submitters. Accessed by
1193 <     * Submitter class constructor.
1079 >     * Common pool parallelism. Must equal common.parallelism.
1080       */
1081 <    static final AtomicInteger nextSubmitterSeed;
1081 >    static final int commonParallelism;
1082  
1083      /**
1084 <     * Permission required for callers of methods that may start or
1199 <     * kill threads.
1084 >     * Sequence number for creating workerNamePrefix.
1085       */
1086 <    private static final RuntimePermission modifyThreadPermission;
1086 >    private static int poolNumberSequence;
1087  
1088      /**
1089 <     * Per-thread submission bookkeeping. Shared across all pools
1090 <     * to reduce ThreadLocal pollution and because random motion
1206 <     * to avoid contention in one pool is likely to hold for others.
1089 >     * Returns the next sequence number. We don't expect this to
1090 >     * ever contend, so use simple builtin sync.
1091       */
1092 <    private static final ThreadSubmitter submitters;
1092 >    private static final synchronized int nextPoolId() {
1093 >        return ++poolNumberSequence;
1094 >    }
1095  
1096      // static constants
1097  
1098      /**
1099 <     * Initial timeout value (in nanoseconds) for the thread triggering
1100 <     * quiescence to park waiting for new work. On timeout, the thread
1101 <     * will instead try to shrink the number of workers.
1099 >     * Initial timeout value (in nanoseconds) for the thread
1100 >     * triggering quiescence to park waiting for new work. On timeout,
1101 >     * the thread will instead try to shrink the number of
1102 >     * workers. The value should be large enough to avoid overly
1103 >     * aggressive shrinkage during most transient stalls (long GCs
1104 >     * etc).
1105       */
1106 <    private static final long IDLE_TIMEOUT      = 1000L * 1000L * 1000L; // 1sec
1106 >    private static final long IDLE_TIMEOUT      = 2000L * 1000L * 1000L; // 2sec
1107  
1108      /**
1109       * Timeout value when there are more threads than parallelism level
1110       */
1111 <    private static final long FAST_IDLE_TIMEOUT =  100L * 1000L * 1000L;
1111 >    private static final long FAST_IDLE_TIMEOUT =  200L * 1000L * 1000L;
1112 >
1113 >    /**
1114 >     * Tolerance for idle timeouts, to cope with timer undershoots
1115 >     */
1116 >    private static final long TIMEOUT_SLOP = 2000000L;
1117  
1118      /**
1119       * The maximum stolen->joining link depth allowed in method
1120 <     * tryHelpStealer.  Must be a power of two. This value also
1227 <     * controls the maximum number of times to try to help join a task
1228 <     * without any apparent progress or change in pool state before
1229 <     * giving up and blocking (see awaitJoin).  Depths for legitimate
1120 >     * tryHelpStealer.  Must be a power of two.  Depths for legitimate
1121       * chains are unbounded, but we use a fixed constant to avoid
1122       * (otherwise unchecked) cycles and to bound staleness of
1123       * traversal parameters at the expense of sometimes blocking when
# Line 1235 | Line 1126 | public class ForkJoinPool extends Abstra
1126      private static final int MAX_HELP = 64;
1127  
1128      /**
1238     * Secondary time-based bound (in nanosecs) for helping attempts
1239     * before trying compensated blocking in awaitJoin. Used in
1240     * conjunction with MAX_HELP to reduce variance due to different
1241     * polling rates associated with different helping options. The
1242     * value should roughly approximate the time required to create
1243     * and/or activate a worker thread.
1244     */
1245    private static final long COMPENSATION_DELAY = 1L << 18; // ~0.25 millisec
1246
1247    /**
1129       * Increment for seed generators. See class ThreadLocal for
1130       * explanation.
1131       */
# Line 1278 | Line 1159 | public class ForkJoinPool extends Abstra
1159       * scan for them to avoid queuing races. Note however that
1160       * eventCount updates lag releases so usage requires care.
1161       *
1162 <     * Field runState is an int packed with:
1162 >     * Field plock is an int packed with:
1163       * SHUTDOWN: true if shutdown is enabled (1 bit)
1164 <     * SEQ:  a sequence number updated upon (de)registering workers (30 bits)
1165 <     * INIT: set true after workQueues array construction (1 bit)
1164 >     * SEQ:  a sequence lock, with PL_LOCK bit set if locked (30 bits)
1165 >     * SIGNAL: set when threads may be waiting on the lock (1 bit)
1166       *
1167       * The sequence number enables simple consistency checks:
1168       * Staleness of read-only operations on the workQueues array can
1169 <     * be checked by comparing runState before vs after the reads.
1169 >     * be checked by comparing plock before vs after the reads.
1170       */
1171  
1172      // bit positions/shifts for fields
# Line 1297 | Line 1178 | public class ForkJoinPool extends Abstra
1178      // bounds
1179      private static final int  SMASK      = 0xffff;  // short bits
1180      private static final int  MAX_CAP    = 0x7fff;  // max #workers - 1
1181 <    private static final int  SQMASK     = 0xfffe;  // even short bits
1181 >    private static final int  EVENMASK   = 0xfffe;  // even short bits
1182 >    private static final int  SQMASK     = 0x007e;  // max 64 (even) slots
1183      private static final int  SHORT_SIGN = 1 << 15;
1184      private static final int  INT_SIGN   = 1 << 31;
1185  
# Line 1322 | Line 1204 | public class ForkJoinPool extends Abstra
1204      private static final int E_MASK      = 0x7fffffff; // no STOP_BIT
1205      private static final int E_SEQ       = 1 << EC_SHIFT;
1206  
1207 <    // runState bits
1207 >    // plock bits
1208      private static final int SHUTDOWN    = 1 << 31;
1209 +    private static final int PL_LOCK     = 2;
1210 +    private static final int PL_SIGNAL   = 1;
1211 +    private static final int PL_SPINS    = 1 << 8;
1212  
1213      // access mode for WorkQueue
1214      static final int LIFO_QUEUE          =  0;
1215      static final int FIFO_QUEUE          =  1;
1216      static final int SHARED_QUEUE        = -1;
1217  
1218 +    // bounds for #steps in scan loop -- must be power 2 minus 1
1219 +    private static final int MIN_SCAN    = 0x1ff;   // cover estimation slop
1220 +    private static final int MAX_SCAN    = 0x1ffff; // 4 * max workers
1221 +
1222      // Instance fields
1223  
1224      /*
1225 <     * Field layout order in this class tends to matter more than one
1226 <     * would like. Runtime layout order is only loosely related to
1225 >     * Field layout of this class tends to matter more than one would
1226 >     * like. Runtime layout order is only loosely related to
1227       * declaration order and may differ across JVMs, but the following
1228       * empirically works OK on current JVMs.
1229       */
1230  
1231 +    // Heuristic padding to ameliorate unfortunate memory placements
1232 +    volatile long pad00, pad01, pad02, pad03, pad04, pad05, pad06;
1233 +
1234      volatile long stealCount;                  // collects worker counts
1235      volatile long ctl;                         // main pool control
1236 <    final int parallelism;                     // parallelism level
1237 <    final int localMode;                       // per-worker scheduling mode
1238 <    volatile int nextWorkerNumber;             // to create worker name string
1347 <    final int submitMask;                      // submit queue index bound
1348 <    int nextSeed;                              // for initializing worker seeds
1349 <    volatile int mainLock;                     // spinlock for array updates
1350 <    volatile int runState;                     // shutdown status and seq
1236 >    volatile int plock;                        // shutdown status and seqLock
1237 >    volatile int indexSeed;                    // worker/submitter index seed
1238 >    final int config;                          // mode and parallelism level
1239      WorkQueue[] workQueues;                    // main registry
1240 <    final ForkJoinWorkerThreadFactory factory; // factory for new workers
1240 >    final ForkJoinWorkerThreadFactory factory;
1241      final Thread.UncaughtExceptionHandler ueh; // per-worker UEH
1242      final String workerNamePrefix;             // to create worker name string
1243  
1244 <    /*
1245 <     * Mechanics for main lock protecting worker array updates.  Uses
1358 <     * the same strategy as ConcurrentHashMap bins -- a spinLock for
1359 <     * normal cases, but falling back to builtin lock when (rarely)
1360 <     * needed.  See internal ConcurrentHashMap documentation for
1361 <     * explanation.
1362 <     */
1363 <
1364 <    static final int LOCK_WAITING = 2; // bit to indicate need for signal
1365 <    static final int MAX_LOCK_SPINS = 1 << 8;
1244 >    volatile Object pad10, pad11, pad12, pad13, pad14, pad15, pad16, pad17;
1245 >    volatile Object pad18, pad19, pad1a, pad1b;
1246  
1247 <    private void tryAwaitMainLock() {
1248 <        int spins = MAX_LOCK_SPINS, r = 0, h;
1249 <        while (((h = mainLock) & 1) != 0) {
1250 <            if (r == 0)
1251 <                r = ThreadLocalRandom.current().nextInt(); // randomize spins
1247 >    /**
1248 >     * Acquires the plock lock to protect worker array and related
1249 >     * updates. This method is called only if an initial CAS on plock
1250 >     * fails. This acts as a spinlock for normal cases, but falls back
1251 >     * to builtin monitor to block when (rarely) needed. This would be
1252 >     * a terrible idea for a highly contended lock, but works fine as
1253 >     * a more conservative alternative to a pure spinlock.
1254 >     */
1255 >    private int acquirePlock() {
1256 >        int spins = PL_SPINS, r = 0, ps, nps;
1257 >        for (;;) {
1258 >            if (((ps = plock) & PL_LOCK) == 0 &&
1259 >                U.compareAndSwapInt(this, PLOCK, ps, nps = ps + PL_LOCK))
1260 >                return nps;
1261 >            else if (r == 0) { // randomize spins if possible
1262 >                Thread t = Thread.currentThread(); WorkQueue w; Submitter z;
1263 >                if ((t instanceof ForkJoinWorkerThread) &&
1264 >                    (w = ((ForkJoinWorkerThread)t).workQueue) != null)
1265 >                    r = w.seed;
1266 >                else if ((z = submitters.get()) != null)
1267 >                    r = z.seed;
1268 >                else
1269 >                    r = 1;
1270 >            }
1271              else if (spins >= 0) {
1272                  r ^= r << 1; r ^= r >>> 3; r ^= r << 10; // xorshift
1273                  if (r >= 0)
1274                      --spins;
1275              }
1276 <            else if (U.compareAndSwapInt(this, MAINLOCK, h, h | LOCK_WAITING)) {
1276 >            else if (U.compareAndSwapInt(this, PLOCK, ps, ps | PL_SIGNAL)) {
1277                  synchronized (this) {
1278 <                    if ((mainLock & LOCK_WAITING) != 0) {
1278 >                    if ((plock & PL_SIGNAL) != 0) {
1279                          try {
1280                              wait();
1281                          } catch (InterruptedException ie) {
1282 <                            Thread.currentThread().interrupt();
1282 >                            try {
1283 >                                Thread.currentThread().interrupt();
1284 >                            } catch (SecurityException ignore) {
1285 >                            }
1286                          }
1287                      }
1288                      else
1289 <                        notifyAll(); // possibly won race vs signaller
1289 >                        notifyAll();
1290                  }
1389                break;
1291              }
1292          }
1293      }
1294  
1394    //  Creating, registering, and deregistering workers
1395
1295      /**
1296 <     * Tries to create and start a worker
1296 >     * Unlocks and signals any thread waiting for plock. Called only
1297 >     * when CAS of seq value for unlock fails.
1298       */
1299 <    private void addWorker() {
1300 <        Throwable ex = null;
1301 <        ForkJoinWorkerThread wt = null;
1402 <        try {
1403 <            if ((wt = factory.newThread(this)) != null) {
1404 <                wt.start();
1405 <                return;
1406 <            }
1407 <        } catch (Throwable e) {
1408 <            ex = e;
1409 <        }
1410 <        deregisterWorker(wt, ex); // adjust counts etc on failure
1299 >    private void releasePlock(int ps) {
1300 >        plock = ps;
1301 >        synchronized (this) { notifyAll(); }
1302      }
1303  
1304      /**
1305 <     * Callback from ForkJoinWorkerThread constructor to assign a
1306 <     * public name. This must be separate from registerWorker because
1416 <     * it is called during the "super" constructor call in
1417 <     * ForkJoinWorkerThread.
1305 >     * Tries to create and start one worker if fewer than target
1306 >     * parallelism level exist. Adjusts counts etc on failure.
1307       */
1308 <    final String nextWorkerName() {
1309 <        int n;
1310 <        do {} while (!U.compareAndSwapInt(this, NEXTWORKERNUMBER,
1311 <                                          n = nextWorkerNumber, ++n));
1312 <        return workerNamePrefix.concat(Integer.toString(n));
1308 >    private void tryAddWorker() {
1309 >        long c; int u;
1310 >        while ((u = (int)((c = ctl) >>> 32)) < 0 &&
1311 >               (u & SHORT_SIGN) != 0 && (int)c == 0) {
1312 >            long nc = (long)(((u + UTC_UNIT) & UTC_MASK) |
1313 >                             ((u + UAC_UNIT) & UAC_MASK)) << 32;
1314 >            if (U.compareAndSwapLong(this, CTL, c, nc)) {
1315 >                ForkJoinWorkerThreadFactory fac;
1316 >                Throwable ex = null;
1317 >                ForkJoinWorkerThread wt = null;
1318 >                try {
1319 >                    if ((fac = factory) != null &&
1320 >                        (wt = fac.newThread(this)) != null) {
1321 >                        wt.start();
1322 >                        break;
1323 >                    }
1324 >                } catch (Throwable e) {
1325 >                    ex = e;
1326 >                }
1327 >                deregisterWorker(wt, ex);
1328 >                break;
1329 >            }
1330 >        }
1331      }
1332  
1333 +    //  Registering and deregistering workers
1334 +
1335      /**
1336 <     * Callback from ForkJoinWorkerThread constructor to establish its
1337 <     * poolIndex and record its WorkQueue. To avoid scanning bias due
1338 <     * to packing entries in front of the workQueues array, we treat
1339 <     * the array as a simple power-of-two hash table using per-thread
1340 <     * seed as hash, expanding as needed.
1341 <     *
1342 <     * @param w the worker's queue
1343 <     */
1344 <    final void registerWorker(WorkQueue w) {
1345 <        while (!U.compareAndSwapInt(this, MAINLOCK, 0, 1))
1346 <            tryAwaitMainLock();
1336 >     * Callback from ForkJoinWorkerThread to establish and record its
1337 >     * WorkQueue. To avoid scanning bias due to packing entries in
1338 >     * front of the workQueues array, we treat the array as a simple
1339 >     * power-of-two hash table using per-thread seed as hash,
1340 >     * expanding as needed.
1341 >     *
1342 >     * @param wt the worker thread
1343 >     * @return the worker's queue
1344 >     */
1345 >    final WorkQueue registerWorker(ForkJoinWorkerThread wt) {
1346 >        Thread.UncaughtExceptionHandler handler; WorkQueue[] ws; int s, ps;
1347 >        wt.setDaemon(true);
1348 >        if ((handler = ueh) != null)
1349 >            wt.setUncaughtExceptionHandler(handler);
1350 >        do {} while (!U.compareAndSwapInt(this, INDEXSEED, s = indexSeed,
1351 >                                          s += SEED_INCREMENT) ||
1352 >                     s == 0); // skip 0
1353 >        WorkQueue w = new WorkQueue(this, wt, config >>> 16, s);
1354 >        if (((ps = plock) & PL_LOCK) != 0 ||
1355 >            !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1356 >            ps = acquirePlock();
1357 >        int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
1358          try {
1359 <            WorkQueue[] ws;
1360 <            if ((ws = workQueues) == null)
1361 <                ws = workQueues = new WorkQueue[submitMask + 1];
1362 <            if (w != null) {
1363 <                int rs, n =  ws.length, m = n - 1;
1364 <                int s = nextSeed += SEED_INCREMENT; // rarely-colliding sequence
1445 <                w.seed = (s == 0) ? 1 : s;          // ensure non-zero seed
1446 <                int r = (s << 1) | 1;               // use odd-numbered indices
1447 <                if (ws[r &= m] != null) {           // collision
1448 <                    int probes = 0;                 // step by approx half size
1449 <                    int step = (n <= 4) ? 2 : ((n >>> 1) & SQMASK) + 2;
1359 >            if ((ws = workQueues) != null) {    // skip if shutting down
1360 >                int n = ws.length, m = n - 1;
1361 >                int r = (s << 1) | 1;           // use odd-numbered indices
1362 >                if (ws[r &= m] != null) {       // collision
1363 >                    int probes = 0;             // step by approx half size
1364 >                    int step = (n <= 4) ? 2 : ((n >>> 1) & EVENMASK) + 2;
1365                      while (ws[r = (r + step) & m] != null) {
1366                          if (++probes >= n) {
1367                              workQueues = ws = Arrays.copyOf(ws, n <<= 1);
# Line 1455 | Line 1370 | public class ForkJoinPool extends Abstra
1370                          }
1371                      }
1372                  }
1373 <                w.eventCount = w.poolIndex = r;     // establish before recording
1374 <                ws[r] = w;                          // also update seq
1460 <                runState = ((rs = runState) & SHUTDOWN) | ((rs + 2) & ~SHUTDOWN);
1373 >                w.eventCount = w.poolIndex = r; // volatile write orders
1374 >                ws[r] = w;
1375              }
1376          } finally {
1377 <            if (!U.compareAndSwapInt(this, MAINLOCK, 1, 0)) {
1378 <                mainLock = 0;
1465 <                synchronized (this) { notifyAll(); };
1466 <            }
1377 >            if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
1378 >                releasePlock(nps);
1379          }
1380 <
1380 >        wt.setName(workerNamePrefix.concat(Integer.toString(w.poolIndex)));
1381 >        return w;
1382      }
1383  
1384      /**
1385       * Final callback from terminating worker, as well as upon failure
1386 <     * to construct or start a worker in addWorker.  Removes record of
1387 <     * worker from array, and adjusts counts. If pool is shutting
1388 <     * down, tries to complete termination.
1386 >     * to construct or start a worker.  Removes record of worker from
1387 >     * array, and adjusts counts. If pool is shutting down, tries to
1388 >     * complete termination.
1389       *
1390 <     * @param wt the worker thread or null if addWorker failed
1390 >     * @param wt the worker thread or null if construction failed
1391       * @param ex the exception causing failure, or null if none
1392       */
1393      final void deregisterWorker(ForkJoinWorkerThread wt, Throwable ex) {
1394          WorkQueue w = null;
1395          if (wt != null && (w = wt.workQueue) != null) {
1396 <            w.runState = -1;                // ensure runState is set
1397 <            long steals = w.totalSteals + w.nsteals, sc;
1396 >            int ps;
1397 >            w.qlock = -1;                // ensure set
1398 >            long ns = w.nsteals, sc;     // collect steal count
1399              do {} while (!U.compareAndSwapLong(this, STEALCOUNT,
1400 <                                               sc = stealCount, sc + steals));
1401 <            int idx = w.poolIndex;
1402 <            while (!U.compareAndSwapInt(this, MAINLOCK, 0, 1))
1403 <                tryAwaitMainLock();
1400 >                                               sc = stealCount, sc + ns));
1401 >            if (((ps = plock) & PL_LOCK) != 0 ||
1402 >                !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1403 >                ps = acquirePlock();
1404 >            int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
1405              try {
1406 +                int idx = w.poolIndex;
1407                  WorkQueue[] ws = workQueues;
1408                  if (ws != null && idx >= 0 && idx < ws.length && ws[idx] == w)
1409                      ws[idx] = null;
1410              } finally {
1411 <                if (!U.compareAndSwapInt(this, MAINLOCK, 1, 0)) {
1412 <                    mainLock = 0;
1497 <                    synchronized (this) { notifyAll(); };
1498 <                }
1411 >                if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
1412 >                    releasePlock(nps);
1413              }
1414          }
1415  
1416 <        long c;                             // adjust ctl counts
1416 >        long c;                          // adjust ctl counts
1417          do {} while (!U.compareAndSwapLong
1418                       (this, CTL, c = ctl, (((c - AC_UNIT) & AC_MASK) |
1419                                             ((c - TC_UNIT) & TC_MASK) |
1420                                             (c & ~(AC_MASK|TC_MASK)))));
1421  
1422 <        if (!tryTerminate(false, false) && w != null) {
1423 <            w.cancelAll();                  // cancel remaining tasks
1424 <            if (w.array != null)            // suppress signal if never ran
1425 <                signalWork();               // wake up or create replacement
1426 <            if (ex == null)                 // help clean refs on way out
1427 <                ForkJoinTask.helpExpungeStaleExceptions();
1422 >        if (!tryTerminate(false, false) && w != null && w.array != null) {
1423 >            w.cancelAll();               // cancel remaining tasks
1424 >            WorkQueue[] ws; WorkQueue v; Thread p; int u, i, e;
1425 >            while ((u = (int)((c = ctl) >>> 32)) < 0 && (e = (int)c) >= 0) {
1426 >                if (e > 0) {             // activate or create replacement
1427 >                    if ((ws = workQueues) == null ||
1428 >                        (i = e & SMASK) >= ws.length ||
1429 >                        (v = ws[i]) == null)
1430 >                        break;
1431 >                    long nc = (((long)(v.nextWait & E_MASK)) |
1432 >                               ((long)(u + UAC_UNIT) << 32));
1433 >                    if (v.eventCount != (e | INT_SIGN))
1434 >                        break;
1435 >                    if (U.compareAndSwapLong(this, CTL, c, nc)) {
1436 >                        v.eventCount = (e + E_SEQ) & E_MASK;
1437 >                        if ((p = v.parker) != null)
1438 >                            U.unpark(p);
1439 >                        break;
1440 >                    }
1441 >                }
1442 >                else {
1443 >                    if ((short)u < 0)
1444 >                        tryAddWorker();
1445 >                    break;
1446 >                }
1447 >            }
1448          }
1449 <
1450 <        if (ex != null)                     // rethrow
1451 <            U.throwException(ex);
1449 >        if (ex == null)                     // help clean refs on way out
1450 >            ForkJoinTask.helpExpungeStaleExceptions();
1451 >        else                                // rethrow
1452 >            ForkJoinTask.rethrow(ex);
1453      }
1454  
1455      // Submissions
# Line 1522 | Line 1457 | public class ForkJoinPool extends Abstra
1457      /**
1458       * Unless shutting down, adds the given task to a submission queue
1459       * at submitter's current queue index (modulo submission
1460 <     * range). If no queue exists at the index, one is created.  If
1461 <     * the queue is busy, another index is randomly chosen. The
1527 <     * submitMask bounds the effective number of queues to the
1528 <     * (nearest power of two for) parallelism level.
1460 >     * range). Only the most common path is directly handled in this
1461 >     * method. All others are relayed to fullExternalPush.
1462       *
1463       * @param task the task. Caller must ensure non-null.
1464       */
1465 <    private void doSubmit(ForkJoinTask<?> task) {
1466 <        Submitter s = submitters.get();
1467 <        for (int r = s.seed, m = submitMask;;) {
1468 <            WorkQueue[] ws; WorkQueue q;
1469 <            int k = r & m & SQMASK;          // use only even indices
1470 <            if (runState < 0)
1471 <                throw new RejectedExecutionException(); // shutting down
1472 <            else if ((ws = workQueues) == null || ws.length <= k) {
1473 <                while (!U.compareAndSwapInt(this, MAINLOCK, 0, 1))
1474 <                    tryAwaitMainLock();
1475 <                try {
1476 <                    if (workQueues == null)
1477 <                        workQueues = new WorkQueue[submitMask + 1];
1478 <                } finally {
1546 <                    if (!U.compareAndSwapInt(this, MAINLOCK, 1, 0)) {
1547 <                        mainLock = 0;
1548 <                        synchronized (this) { notifyAll(); };
1549 <                    }
1550 <                }
1551 <            }
1552 <            else if ((q = ws[k]) == null) {  // create new queue
1553 <                WorkQueue nq = new WorkQueue(this, null, SHARED_QUEUE);
1554 <                while (!U.compareAndSwapInt(this, MAINLOCK, 0, 1))
1555 <                    tryAwaitMainLock();
1556 <                try {
1557 <                    int rs = runState;       // to update seq
1558 <                    if (ws == workQueues && ws[k] == null) {
1559 <                        ws[k] = nq;
1560 <                        runState = ((rs & SHUTDOWN) | ((rs + 2) & ~SHUTDOWN));
1561 <                    }
1562 <                } finally {
1563 <                    if (!U.compareAndSwapInt(this, MAINLOCK, 1, 0)) {
1564 <                        mainLock = 0;
1565 <                        synchronized (this) { notifyAll(); };
1566 <                    }
1567 <                }
1568 <            }
1569 <            else if (q.trySharedPush(task)) {
1570 <                signalWork();
1465 >    final void externalPush(ForkJoinTask<?> task) {
1466 >        WorkQueue[] ws; WorkQueue q; Submitter z; int m; ForkJoinTask<?>[] a;
1467 >        if ((z = submitters.get()) != null && plock > 0 &&
1468 >            (ws = workQueues) != null && (m = (ws.length - 1)) >= 0 &&
1469 >            (q = ws[m & z.seed & SQMASK]) != null &&
1470 >            U.compareAndSwapInt(q, QLOCK, 0, 1)) { // lock
1471 >            int b = q.base, s = q.top, n, an;
1472 >            if ((a = q.array) != null && (an = a.length) > (n = s + 1 - b)) {
1473 >                int j = (((an - 1) & s) << ASHIFT) + ABASE;
1474 >                U.putOrderedObject(a, j, task);
1475 >                q.top = s + 1;                     // push on to deque
1476 >                q.qlock = 0;
1477 >                if (n <= 2)
1478 >                    signalWork(q);
1479                  return;
1480              }
1481 <            else if (m > 1) {                // move to a different index
1574 <                r ^= r << 13;                // same xorshift as WorkQueues
1575 <                r ^= r >>> 17;
1576 <                s.seed = r ^= r << 5;
1577 <            }
1578 <            else
1579 <                Thread.yield();              // yield if no alternatives
1481 >            q.qlock = 0;
1482          }
1483 +        fullExternalPush(task);
1484      }
1485  
1486      /**
1487 <     * Submits the given (non-null) task to the common pool, if possible.
1488 <     */
1489 <    static void submitToCommonPool(ForkJoinTask<?> task) {
1490 <        ForkJoinPool p;
1491 <        if ((p = commonPool) == null)
1492 <            throw new RejectedExecutionException("Common Pool Unavailable");
1493 <        p.doSubmit(task);
1494 <    }
1495 <
1496 <    /**
1497 <     * Returns true if caller is (or may be) submitter to the common
1498 <     * pool, and not all workers are active, and there appear to be
1499 <     * tasks in the associated submission queue.
1500 <     */
1501 <    static boolean canHelpCommonPool() {
1502 <        ForkJoinPool p; WorkQueue[] ws; WorkQueue q;
1503 <        int k = submitters.get().seed & SQMASK;
1504 <        return ((p = commonPool) != null &&
1505 <                (int)(p.ctl >> AC_SHIFT) < 0 &&
1506 <                (ws = p.workQueues) != null &&
1507 <                ws.length > (k &= p.submitMask) &&
1508 <                (q = ws[k]) != null &&
1509 <                q.top - q.base > 0);
1510 <    }
1511 <
1512 <    /**
1513 <     * Returns true if the given task was submitted to common pool
1514 <     * and has not yet commenced execution, and is available for
1515 <     * removal according to execution policies; if so removing the
1516 <     * submission from the pool.
1517 <     *
1518 <     * @param task the task
1519 <     * @return true if successful
1520 <     */
1521 <    static boolean tryUnsubmitFromCommonPool(ForkJoinTask<?> task) {
1522 <        // Peek, looking for task and eligibility before
1523 <        // using trySharedUnpush to actually take it under lock
1524 <        ForkJoinPool p; WorkQueue[] ws; WorkQueue q;
1525 <        ForkJoinTask<?>[] a; int s;
1526 <        int k = submitters.get().seed & SQMASK;
1527 <        return ((p = commonPool) != null &&
1528 <                (int)(p.ctl >> AC_SHIFT) < 0 &&
1529 <                (ws = p.workQueues) != null &&
1530 <                ws.length > (k &= p.submitMask) &&
1531 <                (q = ws[k]) != null &&
1532 <                (a = q.array) != null &&
1533 <                (s = q.top - 1) - q.base >= 0 &&
1534 <                s >= 0 && s < a.length &&
1535 <                a[s] == task &&
1536 <                q.trySharedUnpush(task));
1537 <    }
1538 <
1539 <    /**
1540 <     * Tries to pop a task from common pool with given root
1541 <     */
1542 <    static ForkJoinTask<?> popCCFromCommonPool(CountedCompleter<?> root) {
1543 <        ForkJoinPool p; WorkQueue[] ws; WorkQueue q;
1544 <        ForkJoinTask<?> t;
1545 <        int k = submitters.get().seed & SQMASK;
1546 <        if (root != null &&
1547 <            (p = commonPool) != null &&
1548 <            (int)(p.ctl >> AC_SHIFT) < 0 &&
1549 <            (ws = p.workQueues) != null &&
1550 <            ws.length > (k &= p.submitMask) &&
1551 <            (q = ws[k]) != null && q.top - q.base > 0 &&
1552 <            root.status < 0 &&
1553 <            (t = q.sharedPopCC(root)) != null)
1554 <            return t;
1555 <        return null;
1487 >     * Full version of externalPush. This method is called, among
1488 >     * other times, upon the first submission of the first task to the
1489 >     * pool, so must perform secondary initialization.  It also
1490 >     * detects first submission by an external thread by looking up
1491 >     * its ThreadLocal, and creates a new shared queue if the one at
1492 >     * index if empty or contended. The plock lock body must be
1493 >     * exception-free (so no try/finally) so we optimistically
1494 >     * allocate new queues outside the lock and throw them away if
1495 >     * (very rarely) not needed.
1496 >     *
1497 >     * Secondary initialization occurs when plock is zero, to create
1498 >     * workQueue array and set plock to a valid value.  This lock body
1499 >     * must also be exception-free. Because the plock seq value can
1500 >     * eventually wrap around zero, this method harmlessly fails to
1501 >     * reinitialize if workQueues exists, while still advancing plock.
1502 >     */
1503 >    private void fullExternalPush(ForkJoinTask<?> task) {
1504 >        int r = 0; // random index seed
1505 >        for (Submitter z = submitters.get();;) {
1506 >            WorkQueue[] ws; WorkQueue q; int ps, m, k;
1507 >            if (z == null) {
1508 >                if (U.compareAndSwapInt(this, INDEXSEED, r = indexSeed,
1509 >                                        r += SEED_INCREMENT) && r != 0)
1510 >                    submitters.set(z = new Submitter(r));
1511 >            }
1512 >            else if (r == 0) {                  // move to a different index
1513 >                r = z.seed;
1514 >                r ^= r << 13;                   // same xorshift as WorkQueues
1515 >                r ^= r >>> 17;
1516 >                z.seed = r ^ (r << 5);
1517 >            }
1518 >            else if ((ps = plock) < 0)
1519 >                throw new RejectedExecutionException();
1520 >            else if (ps == 0 || (ws = workQueues) == null ||
1521 >                     (m = ws.length - 1) < 0) { // initialize workQueues
1522 >                int p = config & SMASK;         // find power of two table size
1523 >                int n = (p > 1) ? p - 1 : 1;    // ensure at least 2 slots
1524 >                n |= n >>> 1; n |= n >>> 2;  n |= n >>> 4;
1525 >                n |= n >>> 8; n |= n >>> 16; n = (n + 1) << 1;
1526 >                WorkQueue[] nws = ((ws = workQueues) == null || ws.length == 0 ?
1527 >                                   new WorkQueue[n] : null);
1528 >                if (((ps = plock) & PL_LOCK) != 0 ||
1529 >                    !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1530 >                    ps = acquirePlock();
1531 >                if (((ws = workQueues) == null || ws.length == 0) && nws != null)
1532 >                    workQueues = nws;
1533 >                int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
1534 >                if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
1535 >                    releasePlock(nps);
1536 >            }
1537 >            else if ((q = ws[k = r & m & SQMASK]) != null) {
1538 >                if (q.qlock == 0 && U.compareAndSwapInt(q, QLOCK, 0, 1)) {
1539 >                    ForkJoinTask<?>[] a = q.array;
1540 >                    int s = q.top;
1541 >                    boolean submitted = false;
1542 >                    try {                      // locked version of push
1543 >                        if ((a != null && a.length > s + 1 - q.base) ||
1544 >                            (a = q.growArray()) != null) {   // must presize
1545 >                            int j = (((a.length - 1) & s) << ASHIFT) + ABASE;
1546 >                            U.putOrderedObject(a, j, task);
1547 >                            q.top = s + 1;
1548 >                            submitted = true;
1549 >                        }
1550 >                    } finally {
1551 >                        q.qlock = 0;  // unlock
1552 >                    }
1553 >                    if (submitted) {
1554 >                        signalWork(q);
1555 >                        return;
1556 >                    }
1557 >                }
1558 >                r = 0; // move on failure
1559 >            }
1560 >            else if (((ps = plock) & PL_LOCK) == 0) { // create new queue
1561 >                q = new WorkQueue(this, null, SHARED_QUEUE, r);
1562 >                if (((ps = plock) & PL_LOCK) != 0 ||
1563 >                    !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1564 >                    ps = acquirePlock();
1565 >                if ((ws = workQueues) != null && k < ws.length && ws[k] == null)
1566 >                    ws[k] = q;
1567 >                int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
1568 >                if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
1569 >                    releasePlock(nps);
1570 >            }
1571 >            else
1572 >                r = 0; // try elsewhere while lock held
1573 >        }
1574      }
1575  
1655
1576      // Maintaining ctl counts
1577  
1578      /**
# Line 1664 | Line 1584 | public class ForkJoinPool extends Abstra
1584      }
1585  
1586      /**
1587 <     * Tries to create one or activate one or more workers if too few are active.
1587 >     * Tries to create or activate a worker if too few are active.
1588 >     *
1589 >     * @param q the (non-null) queue holding tasks to be signalled
1590       */
1591 <    final void signalWork() {
1592 <        long c; int u;
1593 <        while ((u = (int)((c = ctl) >>> 32)) < 0) {     // too few active
1594 <            WorkQueue[] ws = workQueues; int e, i; WorkQueue w; Thread p;
1595 <            if ((e = (int)c) > 0) {                     // at least one waiting
1596 <                if (ws != null && (i = e & SMASK) < ws.length &&
1591 >    final void signalWork(WorkQueue q) {
1592 >        int hint = q.poolIndex;
1593 >        long c; int e, u, i, n; WorkQueue[] ws; WorkQueue w; Thread p;
1594 >        while ((u = (int)((c = ctl) >>> 32)) < 0) {
1595 >            if ((e = (int)c) > 0) {
1596 >                if ((ws = workQueues) != null && ws.length > (i = e & SMASK) &&
1597                      (w = ws[i]) != null && w.eventCount == (e | INT_SIGN)) {
1598                      long nc = (((long)(w.nextWait & E_MASK)) |
1599                                 ((long)(u + UAC_UNIT) << 32));
1600                      if (U.compareAndSwapLong(this, CTL, c, nc)) {
1601 +                        w.hint = hint;
1602                          w.eventCount = (e + E_SEQ) & E_MASK;
1603                          if ((p = w.parker) != null)
1604 <                            U.unpark(p);                // activate and release
1604 >                            U.unpark(p);
1605                          break;
1606                      }
1607 +                    if (q.top - q.base <= 0)
1608 +                        break;
1609                  }
1610                  else
1611                      break;
1612              }
1613 <            else if (e == 0 && (u & SHORT_SIGN) != 0) { // too few total
1614 <                long nc = (long)(((u + UTC_UNIT) & UTC_MASK) |
1615 <                                 ((u + UAC_UNIT) & UAC_MASK)) << 32;
1691 <                if (U.compareAndSwapLong(this, CTL, c, nc)) {
1692 <                    addWorker();
1693 <                    break;
1694 <                }
1695 <            }
1696 <            else
1613 >            else {
1614 >                if ((short)u < 0)
1615 >                    tryAddWorker();
1616                  break;
1617 +            }
1618          }
1619      }
1620  
# Line 1704 | Line 1624 | public class ForkJoinPool extends Abstra
1624       * Top-level runloop for workers, called by ForkJoinWorkerThread.run.
1625       */
1626      final void runWorker(WorkQueue w) {
1627 <        w.growArray(false);         // initialize queue array in this thread
1628 <        do { w.runTask(scan(w)); } while (w.runState >= 0);
1627 >        w.growArray(); // allocate queue
1628 >        do { w.runTask(scan(w)); } while (w.qlock >= 0);
1629      }
1630  
1631      /**
# Line 1716 | Line 1636 | public class ForkJoinPool extends Abstra
1636       * contention, or state changes that indicate possible success on
1637       * re-invocation.
1638       *
1639 <     * The scan searches for tasks across a random permutation of
1640 <     * queues (starting at a random index and stepping by a random
1641 <     * relative prime, checking each at least once).  The scan
1642 <     * terminates upon either finding a non-empty queue, or completing
1643 <     * the sweep. If the worker is not inactivated, it takes and
1644 <     * returns a task from this queue.  On failure to find a task, we
1645 <     * take one of the following actions, after which the caller will
1646 <     * retry calling this method unless terminated.
1639 >     * The scan searches for tasks across queues (starting at a random
1640 >     * index, and relying on registerWorker to irregularly scatter
1641 >     * them within array to avoid bias), checking each at least twice.
1642 >     * The scan terminates upon either finding a non-empty queue, or
1643 >     * completing the sweep. If the worker is not inactivated, it
1644 >     * takes and returns a task from this queue. Otherwise, if not
1645 >     * activated, it signals workers (that may include itself) and
1646 >     * returns so caller can retry. Also returns for true if the
1647 >     * worker array may have changed during an empty scan.  On failure
1648 >     * to find a task, we take one of the following actions, after
1649 >     * which the caller will retry calling this method unless
1650 >     * terminated.
1651       *
1652       * * If pool is terminating, terminate the worker.
1653       *
1730     * * If not a complete sweep, try to release a waiting worker.  If
1731     * the scan terminated because the worker is inactivated, then the
1732     * released worker will often be the calling worker, and it can
1733     * succeed obtaining a task on the next call. Or maybe it is
1734     * another worker, but with same net effect. Releasing in other
1735     * cases as well ensures that we have enough workers running.
1736     *
1654       * * If not already enqueued, try to inactivate and enqueue the
1655       * worker on wait queue. Or, if inactivating has caused the pool
1656 <     * to be quiescent, relay to idleAwaitWork to check for
1657 <     * termination and possibly shrink pool.
1656 >     * to be quiescent, relay to idleAwaitWork to possibly shrink
1657 >     * pool.
1658       *
1659 <     * * If already inactive, and the caller has run a task since the
1660 <     * last empty scan, return (to allow rescan) unless others are
1744 <     * also inactivated.  Field WorkQueue.rescans counts down on each
1745 <     * scan to ensure eventual inactivation and blocking.
1659 >     * * If already enqueued and none of the above apply, possibly
1660 >     * park awaiting signal, else lingering to help scan and signal.
1661       *
1662 <     * * If already enqueued and none of the above apply, park
1663 <     * awaiting signal,
1662 >     * * If a non-empty queue discovered or left as a hint,
1663 >     * help wake up other workers before return.
1664       *
1665       * @param w the worker (via its WorkQueue)
1666       * @return a task or null if none found
1667       */
1668      private final ForkJoinTask<?> scan(WorkQueue w) {
1669 <        WorkQueue[] ws;                       // first update random seed
1670 <        int r = w.seed; r ^= r << 13; r ^= r >>> 17; w.seed = r ^= r << 5;
1671 <        int rs = runState, m;                 // volatile read order matters
1672 <        if ((ws = workQueues) != null && (m = ws.length - 1) > 0) {
1673 <            int ec = w.eventCount;            // ec is negative if inactive
1674 <            int step = (r >>> 16) | 1;        // relative prime
1675 <            for (int j = (m + 1) << 2; ; r += step) {
1676 <                WorkQueue q; ForkJoinTask<?> t; ForkJoinTask<?>[] a; int b;
1677 <                if ((q = ws[r & m]) != null && (b = q.base) - q.top < 0 &&
1678 <                    (a = q.array) != null) {  // probably nonempty
1669 >        WorkQueue[] ws; int m;
1670 >        int ps = plock;                          // read plock before ws
1671 >        if (w != null && (ws = workQueues) != null && (m = ws.length - 1) >= 0) {
1672 >            int ec = w.eventCount;               // ec is negative if inactive
1673 >            int r = w.seed; r ^= r << 13; r ^= r >>> 17; w.seed = r ^= r << 5;
1674 >            w.hint = -1;                         // update seed and clear hint
1675 >            int j = ((m + m + 1) | MIN_SCAN) & MAX_SCAN;
1676 >            do {
1677 >                WorkQueue q; ForkJoinTask<?>[] a; int b;
1678 >                if ((q = ws[(r + j) & m]) != null && (b = q.base) - q.top < 0 &&
1679 >                    (a = q.array) != null) {     // probably nonempty
1680                      int i = (((a.length - 1) & b) << ASHIFT) + ABASE;
1681 <                    t = (ForkJoinTask<?>)U.getObjectVolatile(a, i);
1681 >                    ForkJoinTask<?> t = (ForkJoinTask<?>)
1682 >                        U.getObjectVolatile(a, i);
1683                      if (q.base == b && ec >= 0 && t != null &&
1684                          U.compareAndSwapObject(a, i, t, null)) {
1685 <                        if (q.top - (q.base = b + 1) > 0)
1686 <                            signalWork();    // help pushes signal
1687 <                        return t;
1688 <                    }
1689 <                    else if (ec < 0 || j <= m) {
1690 <                        rs = 0;               // mark scan as imcomplete
1691 <                        break;                // caller can retry after release
1692 <                    }
1693 <                }
1694 <                if (--j < 0)
1695 <                    break;
1696 <            }
1697 <
1698 <            long c = ctl; int e = (int)c, a = (int)(c >> AC_SHIFT), nr, ns;
1699 <            if (e < 0)                        // decode ctl on empty scan
1700 <                w.runState = -1;              // pool is terminating
1701 <            else if (rs == 0 || rs != runState) { // incomplete scan
1702 <                WorkQueue v; Thread p;        // try to release a waiter
1703 <                if (e > 0 && a < 0 && w.eventCount == ec &&
1704 <                    (v = ws[e & m]) != null && v.eventCount == (e | INT_SIGN)) {
1705 <                    long nc = ((long)(v.nextWait & E_MASK) |
1706 <                               ((c + AC_UNIT) & (AC_MASK|TC_MASK)));
1707 <                    if (ctl == c && U.compareAndSwapLong(this, CTL, c, nc)) {
1685 >                        if ((q.base = b + 1) - q.top < 0)
1686 >                            signalWork(q);
1687 >                        return t;                // taken
1688 >                    }
1689 >                    else if ((ec < 0 || j < m) && (int)(ctl >> AC_SHIFT) <= 0) {
1690 >                        w.hint = (r + j) & m;    // help signal below
1691 >                        break;                   // cannot take
1692 >                    }
1693 >                }
1694 >            } while (--j >= 0);
1695 >
1696 >            int h, e, ns; long c, sc; WorkQueue q;
1697 >            if ((ns = w.nsteals) != 0) {
1698 >                if (U.compareAndSwapLong(this, STEALCOUNT,
1699 >                                         sc = stealCount, sc + ns))
1700 >                    w.nsteals = 0;               // collect steals and rescan
1701 >            }
1702 >            else if (plock != ps)                // consistency check
1703 >                ;                                // skip
1704 >            else if ((e = (int)(c = ctl)) < 0)
1705 >                w.qlock = -1;                    // pool is terminating
1706 >            else {
1707 >                if ((h = w.hint) < 0) {
1708 >                    if (ec >= 0) {               // try to enqueue/inactivate
1709 >                        long nc = (((long)ec |
1710 >                                    ((c - AC_UNIT) & (AC_MASK|TC_MASK))));
1711 >                        w.nextWait = e;          // link and mark inactive
1712 >                        w.eventCount = ec | INT_SIGN;
1713 >                        if (ctl != c || !U.compareAndSwapLong(this, CTL, c, nc))
1714 >                            w.eventCount = ec;   // unmark on CAS failure
1715 >                        else if ((int)(c >> AC_SHIFT) == 1 - (config & SMASK))
1716 >                            idleAwaitWork(w, nc, c);
1717 >                    }
1718 >                    else if (w.eventCount < 0 && ctl == c) {
1719 >                        Thread wt = Thread.currentThread();
1720 >                        Thread.interrupted();    // clear status
1721 >                        U.putObject(wt, PARKBLOCKER, this);
1722 >                        w.parker = wt;           // emulate LockSupport.park
1723 >                        if (w.eventCount < 0)    // recheck
1724 >                            U.park(false, 0L);   // block
1725 >                        w.parker = null;
1726 >                        U.putObject(wt, PARKBLOCKER, null);
1727 >                    }
1728 >                }
1729 >                if ((h >= 0 || (h = w.hint) >= 0) &&
1730 >                    (ws = workQueues) != null && h < ws.length &&
1731 >                    (q = ws[h]) != null) {      // signal others before retry
1732 >                    WorkQueue v; Thread p; int u, i, s;
1733 >                    for (int n = (config & SMASK) - 1;;) {
1734 >                        int idleCount = (w.eventCount < 0) ? 0 : -1;
1735 >                        if (((s = idleCount - q.base + q.top) <= n &&
1736 >                             (n = s) <= 0) ||
1737 >                            (u = (int)((c = ctl) >>> 32)) >= 0 ||
1738 >                            (e = (int)c) <= 0 || m < (i = e & SMASK) ||
1739 >                            (v = ws[i]) == null)
1740 >                            break;
1741 >                        long nc = (((long)(v.nextWait & E_MASK)) |
1742 >                                   ((long)(u + UAC_UNIT) << 32));
1743 >                        if (v.eventCount != (e | INT_SIGN) ||
1744 >                            !U.compareAndSwapLong(this, CTL, c, nc))
1745 >                            break;
1746 >                        v.hint = h;
1747                          v.eventCount = (e + E_SEQ) & E_MASK;
1748                          if ((p = v.parker) != null)
1749                              U.unpark(p);
1750 +                        if (--n <= 0)
1751 +                            break;
1752                      }
1753                  }
1754              }
1797            else if (ec >= 0) {               // try to enqueue/inactivate
1798                long nc = (long)ec | ((c - AC_UNIT) & (AC_MASK|TC_MASK));
1799                w.nextWait = e;
1800                w.eventCount = ec | INT_SIGN; // mark as inactive
1801                if (ctl != c || !U.compareAndSwapLong(this, CTL, c, nc))
1802                    w.eventCount = ec;        // unmark on CAS failure
1803                else {
1804                    if ((ns = w.nsteals) != 0) {
1805                        w.nsteals = 0;        // set rescans if ran task
1806                        w.rescans = (a > 0) ? 0 : a + parallelism;
1807                        w.totalSteals += ns;
1808                    }
1809                    if (a == 1 - parallelism) // quiescent
1810                        idleAwaitWork(w, nc, c);
1811                }
1812            }
1813            else if (w.eventCount < 0) {      // already queued
1814                int ac = a + parallelism;
1815                if ((nr = w.rescans) > 0)     // continue rescanning
1816                    w.rescans = (ac < nr) ? ac : nr - 1;
1817                else if (((w.seed >>> 16) & ac) == 0) { // randomize park
1818                    Thread.interrupted();     // clear status
1819                    Thread wt = Thread.currentThread();
1820                    U.putObject(wt, PARKBLOCKER, this);
1821                    w.parker = wt;            // emulate LockSupport.park
1822                    if (w.eventCount < 0)     // recheck
1823                        U.park(false, 0L);
1824                    w.parker = null;
1825                    U.putObject(wt, PARKBLOCKER, null);
1826                }
1827            }
1755          }
1756          return null;
1757      }
# Line 1842 | Line 1769 | public class ForkJoinPool extends Abstra
1769       * @param prevCtl the ctl value to restore if thread is terminated
1770       */
1771      private void idleAwaitWork(WorkQueue w, long currentCtl, long prevCtl) {
1772 <        if (w.eventCount < 0 && !tryTerminate(false, false) &&
1773 <            (int)prevCtl != 0 && !hasQueuedSubmissions() && ctl == currentCtl) {
1772 >        if (w != null && w.eventCount < 0 &&
1773 >            !tryTerminate(false, false) && (int)prevCtl != 0 &&
1774 >            ctl == currentCtl) {
1775              int dc = -(short)(currentCtl >>> TC_SHIFT);
1776              long parkTime = dc < 0 ? FAST_IDLE_TIMEOUT: (dc + 1) * IDLE_TIMEOUT;
1777 <            long deadline = System.nanoTime() + parkTime - 100000L; // 1ms slop
1777 >            long deadline = System.nanoTime() + parkTime - TIMEOUT_SLOP;
1778              Thread wt = Thread.currentThread();
1779              while (ctl == currentCtl) {
1780                  Thread.interrupted();  // timed variant of version in scan()
# Line 1861 | Line 1789 | public class ForkJoinPool extends Abstra
1789                  if (deadline - System.nanoTime() <= 0L &&
1790                      U.compareAndSwapLong(this, CTL, currentCtl, prevCtl)) {
1791                      w.eventCount = (w.eventCount + E_SEQ) | E_MASK;
1792 <                    w.runState = -1;   // shrink
1792 >                    w.hint = -1;
1793 >                    w.qlock = -1;   // shrink
1794                      break;
1795                  }
1796              }
# Line 1869 | Line 1798 | public class ForkJoinPool extends Abstra
1798      }
1799  
1800      /**
1801 +     * Scans through queues looking for work while joining a task; if
1802 +     * any present, signals. May return early if more signalling is
1803 +     * detectably unneeded.
1804 +     *
1805 +     * @param task return early if done
1806 +     * @param origin an index to start scan
1807 +     */
1808 +    private void helpSignal(ForkJoinTask<?> task, int origin) {
1809 +        WorkQueue[] ws; WorkQueue w; Thread p; long c; int m, u, e, i, s;
1810 +        if (task != null && task.status >= 0 &&
1811 +            (u = (int)(ctl >>> 32)) < 0 && (u >> UAC_SHIFT) < 0 &&
1812 +            (ws = workQueues) != null && (m = ws.length - 1) >= 0) {
1813 +            outer: for (int k = origin, j = m; j >= 0; --j) {
1814 +                WorkQueue q = ws[k++ & m];
1815 +                for (int n = m;;) { // limit to at most m signals
1816 +                    if (task.status < 0)
1817 +                        break outer;
1818 +                    if (q == null ||
1819 +                        ((s = -q.base + q.top) <= n && (n = s) <= 0))
1820 +                        break;
1821 +                    if ((u = (int)((c = ctl) >>> 32)) >= 0 ||
1822 +                        (e = (int)c) <= 0 || m < (i = e & SMASK) ||
1823 +                        (w = ws[i]) == null)
1824 +                        break outer;
1825 +                    long nc = (((long)(w.nextWait & E_MASK)) |
1826 +                               ((long)(u + UAC_UNIT) << 32));
1827 +                    if (w.eventCount != (e | INT_SIGN))
1828 +                        break outer;
1829 +                    if (U.compareAndSwapLong(this, CTL, c, nc)) {
1830 +                        w.eventCount = (e + E_SEQ) & E_MASK;
1831 +                        if ((p = w.parker) != null)
1832 +                            U.unpark(p);
1833 +                        if (--n <= 0)
1834 +                            break;
1835 +                    }
1836 +                }
1837 +            }
1838 +        }
1839 +    }
1840 +
1841 +    /**
1842       * Tries to locate and execute tasks for a stealer of the given
1843       * task, or in turn one of its stealers, Traces currentSteal ->
1844       * currentJoin links looking for a thread working on a descendant
# Line 1899 | Line 1869 | public class ForkJoinPool extends Abstra
1869                      }
1870                      if ((ws = workQueues) == null || (m = ws.length - 1) <= 0)
1871                          break restart;              // shutting down
1872 <                    if ((v = ws[h = (j.stealHint | 1) & m]) == null ||
1872 >                    if ((v = ws[h = (j.hint | 1) & m]) == null ||
1873                          v.currentSteal != subtask) {
1874                          for (int origin = h;;) {    // find stealer
1875                              if (((h = (h + 2) & m) & 15) == 1 &&
# Line 1907 | Line 1877 | public class ForkJoinPool extends Abstra
1877                                  continue restart;   // occasional staleness check
1878                              if ((v = ws[h]) != null &&
1879                                  v.currentSteal == subtask) {
1880 <                                j.stealHint = h;    // save hint
1880 >                                j.hint = h;        // save hint
1881                                  break;
1882                              }
1883                              if (h == origin)
# Line 1955 | Line 1925 | public class ForkJoinPool extends Abstra
1925      }
1926  
1927      /**
1928 <     * If task is at base of some steal queue, steals and executes it.
1928 >     * Analog of tryHelpStealer for CountedCompleters. Tries to steal
1929 >     * and run tasks within the target's computation.
1930       *
1931 <     * @param joiner the joining worker
1932 <     * @param task the task
1931 >     * @param task the task to join
1932 >     * @param mode if shared, exit upon completing any task
1933 >     * if all workers are active
1934       */
1935 <    private void tryPollForAndExec(WorkQueue joiner, ForkJoinTask<?> task) {
1936 <        WorkQueue[] ws;
1937 <        if ((ws = workQueues) != null) {
1938 <            for (int j = 1; j < ws.length && task.status >= 0; j += 2) {
1939 <                WorkQueue q = ws[j];
1940 <                if (q != null && q.pollFor(task)) {
1941 <                    joiner.runSubtask(task);
1942 <                    break;
1935 >    private int helpComplete(ForkJoinTask<?> task, int mode) {
1936 >        WorkQueue[] ws; WorkQueue q; int m, n, s, u;
1937 >        if (task != null && (ws = workQueues) != null &&
1938 >            (m = ws.length - 1) >= 0) {
1939 >            for (int j = 1, origin = j;;) {
1940 >                if ((s = task.status) < 0)
1941 >                    return s;
1942 >                if ((q = ws[j & m]) != null && q.pollAndExecCC(task)) {
1943 >                    origin = j;
1944 >                    if (mode == SHARED_QUEUE &&
1945 >                        ((u = (int)(ctl >>> 32)) >= 0 || (u >> UAC_SHIFT) >= 0))
1946 >                        break;
1947                  }
1948 +                else if ((j = (j + 2) & m) == origin)
1949 +                    break;
1950              }
1951          }
1952 +        return 0;
1953      }
1954  
1955      /**
1956       * Tries to decrement active count (sometimes implicitly) and
1957       * possibly release or create a compensating worker in preparation
1958       * for blocking. Fails on contention or termination. Otherwise,
1959 <     * adds a new thread if no idle workers are available and either
1960 <     * pool would become completely starved or: (at least half
1982 <     * starved, and fewer than 50% spares exist, and there is at least
1983 <     * one task apparently available). Even though the availability
1984 <     * check requires a full scan, it is worthwhile in reducing false
1985 <     * alarms.
1986 <     *
1987 <     * @param task if non-null, a task being waited for
1988 <     * @param blocker if non-null, a blocker being waited for
1989 <     * @return true if the caller can block, else should recheck and retry
1959 >     * adds a new thread if no idle workers are available and pool
1960 >     * may become starved.
1961       */
1962 <    final boolean tryCompensate(ForkJoinTask<?> task, ManagedBlocker blocker) {
1963 <        int pc = parallelism, e;
1964 <        long c = ctl;
1965 <        WorkQueue[] ws = workQueues;
1966 <        if ((e = (int)c) >= 0 && ws != null) {
1967 <            int u, a, ac, hc;
1968 <            int tc = (short)((u = (int)(c >>> 32)) >>> UTC_SHIFT) + pc;
1969 <            boolean replace = false;
1970 <            if ((a = u >> UAC_SHIFT) <= 0) {
1971 <                if ((ac = a + pc) <= 1)
1972 <                    replace = true;
1973 <                else if ((e > 0 || (task != null &&
1974 <                                    ac <= (hc = pc >>> 1) && tc < pc + hc))) {
2004 <                    WorkQueue w;
2005 <                    for (int j = 0; j < ws.length; ++j) {
2006 <                        if ((w = ws[j]) != null && !w.isEmpty()) {
2007 <                            replace = true;
2008 <                            break;   // in compensation range and tasks available
2009 <                        }
2010 <                    }
1962 >    final boolean tryCompensate() {
1963 >        int pc = config & SMASK, e, i, tc; long c;
1964 >        WorkQueue[] ws; WorkQueue w; Thread p;
1965 >        if ((ws = workQueues) != null && (e = (int)(c = ctl)) >= 0) {
1966 >            if (e != 0 && (i = e & SMASK) < ws.length &&
1967 >                (w = ws[i]) != null && w.eventCount == (e | INT_SIGN)) {
1968 >                long nc = ((long)(w.nextWait & E_MASK) |
1969 >                           (c & (AC_MASK|TC_MASK)));
1970 >                if (U.compareAndSwapLong(this, CTL, c, nc)) {
1971 >                    w.eventCount = (e + E_SEQ) & E_MASK;
1972 >                    if ((p = w.parker) != null)
1973 >                        U.unpark(p);
1974 >                    return true;   // replace with idle worker
1975                  }
1976              }
1977 <            if ((task == null || task.status >= 0) && // recheck need to block
1978 <                (blocker == null || !blocker.isReleasable()) && ctl == c) {
1979 <                if (!replace) {          // no compensation
1980 <                    long nc = ((c - AC_UNIT) & AC_MASK) | (c & ~AC_MASK);
1981 <                    if (U.compareAndSwapLong(this, CTL, c, nc))
1982 <                        return true;
1983 <                }
1984 <                else if (e != 0) {       // release an idle worker
1985 <                    WorkQueue w; Thread p; int i;
1986 <                    if ((i = e & SMASK) < ws.length && (w = ws[i]) != null) {
1987 <                        long nc = ((long)(w.nextWait & E_MASK) |
1988 <                                   (c & (AC_MASK|TC_MASK)));
1989 <                        if (w.eventCount == (e | INT_SIGN) &&
1990 <                            U.compareAndSwapLong(this, CTL, c, nc)) {
1991 <                            w.eventCount = (e + E_SEQ) & E_MASK;
1992 <                            if ((p = w.parker) != null)
2029 <                                U.unpark(p);
1977 >            else if ((tc = (short)(c >>> TC_SHIFT)) >= 0 &&
1978 >                     (int)(c >> AC_SHIFT) + pc > 1) {
1979 >                long nc = ((c - AC_UNIT) & AC_MASK) | (c & ~AC_MASK);
1980 >                if (U.compareAndSwapLong(this, CTL, c, nc))
1981 >                    return true;   // no compensation
1982 >            }
1983 >            else if (tc + pc < MAX_CAP) {
1984 >                long nc = ((c + TC_UNIT) & TC_MASK) | (c & ~TC_MASK);
1985 >                if (U.compareAndSwapLong(this, CTL, c, nc)) {
1986 >                    ForkJoinWorkerThreadFactory fac;
1987 >                    Throwable ex = null;
1988 >                    ForkJoinWorkerThread wt = null;
1989 >                    try {
1990 >                        if ((fac = factory) != null &&
1991 >                            (wt = fac.newThread(this)) != null) {
1992 >                            wt.start();
1993                              return true;
1994                          }
1995 +                    } catch (Throwable rex) {
1996 +                        ex = rex;
1997                      }
1998 <                }
2034 <                else if (tc < MAX_CAP) { // create replacement
2035 <                    long nc = ((c + TC_UNIT) & TC_MASK) | (c & ~TC_MASK);
2036 <                    if (U.compareAndSwapLong(this, CTL, c, nc)) {
2037 <                        addWorker();
2038 <                        return true;
2039 <                    }
1998 >                    deregisterWorker(wt, ex); // clean up and return false
1999                  }
2000              }
2001          }
# Line 2051 | Line 2010 | public class ForkJoinPool extends Abstra
2010       * @return task status on exit
2011       */
2012      final int awaitJoin(WorkQueue joiner, ForkJoinTask<?> task) {
2013 <        int s;
2014 <        if ((s = task.status) >= 0) {
2013 >        int s = 0;
2014 >        if (joiner != null && task != null && (s = task.status) >= 0) {
2015              ForkJoinTask<?> prevJoin = joiner.currentJoin;
2016              joiner.currentJoin = task;
2017 <            long startTime = 0L;
2018 <            for (int k = 0;;) {
2019 <                if ((s = (joiner.isEmpty() ?           // try to help
2020 <                          tryHelpStealer(joiner, task) :
2021 <                          joiner.tryRemoveAndExec(task))) == 0 &&
2017 >            do {} while ((s = task.status) >= 0 && !joiner.isEmpty() &&
2018 >                         joiner.tryRemoveAndExec(task)); // process local tasks
2019 >            if (s >= 0 && (s = task.status) >= 0) {
2020 >                helpSignal(task, joiner.poolIndex);
2021 >                if ((s = task.status) >= 0 &&
2022 >                    (task instanceof CountedCompleter))
2023 >                    s = helpComplete(task, LIFO_QUEUE);
2024 >            }
2025 >            while (s >= 0 && (s = task.status) >= 0) {
2026 >                if ((!joiner.isEmpty() ||           // try helping
2027 >                     (s = tryHelpStealer(joiner, task)) == 0) &&
2028                      (s = task.status) >= 0) {
2029 <                    if (k == 0) {
2030 <                        startTime = System.nanoTime();
2031 <                        tryPollForAndExec(joiner, task); // check uncommon case
2067 <                    }
2068 <                    else if ((k & (MAX_HELP - 1)) == 0 &&
2069 <                             System.nanoTime() - startTime >=
2070 <                             COMPENSATION_DELAY &&
2071 <                             tryCompensate(task, null)) {
2072 <                        if (task.trySetSignal()) {
2029 >                    helpSignal(task, joiner.poolIndex);
2030 >                    if ((s = task.status) >= 0 && tryCompensate()) {
2031 >                        if (task.trySetSignal() && (s = task.status) >= 0) {
2032                              synchronized (task) {
2033                                  if (task.status >= 0) {
2034                                      try {                // see ForkJoinTask
# Line 2086 | Line 2045 | public class ForkJoinPool extends Abstra
2045                                       (this, CTL, c = ctl, c + AC_UNIT));
2046                      }
2047                  }
2089                if (s < 0 || (s = task.status) < 0) {
2090                    joiner.currentJoin = prevJoin;
2091                    break;
2092                }
2093                else if ((k++ & (MAX_HELP - 1)) == MAX_HELP >>> 1)
2094                    Thread.yield();                     // for politeness
2048              }
2049 +            joiner.currentJoin = prevJoin;
2050          }
2051          return s;
2052      }
# Line 2104 | Line 2058 | public class ForkJoinPool extends Abstra
2058       *
2059       * @param joiner the joining worker
2060       * @param task the task
2107     * @return task status on exit
2061       */
2062 <    final int helpJoinOnce(WorkQueue joiner, ForkJoinTask<?> task) {
2062 >    final void helpJoinOnce(WorkQueue joiner, ForkJoinTask<?> task) {
2063          int s;
2064 <        while ((s = task.status) >= 0 &&
2065 <               (joiner.isEmpty() ?
2066 <                tryHelpStealer(joiner, task) :
2067 <                joiner.tryRemoveAndExec(task)) != 0)
2068 <            ;
2069 <        return s;
2064 >        if (joiner != null && task != null && (s = task.status) >= 0) {
2065 >            ForkJoinTask<?> prevJoin = joiner.currentJoin;
2066 >            joiner.currentJoin = task;
2067 >            do {} while ((s = task.status) >= 0 && !joiner.isEmpty() &&
2068 >                         joiner.tryRemoveAndExec(task));
2069 >            if (s >= 0 && (s = task.status) >= 0) {
2070 >                helpSignal(task, joiner.poolIndex);
2071 >                if ((s = task.status) >= 0 &&
2072 >                    (task instanceof CountedCompleter))
2073 >                    s = helpComplete(task, LIFO_QUEUE);
2074 >            }
2075 >            if (s >= 0 && joiner.isEmpty()) {
2076 >                do {} while (task.status >= 0 &&
2077 >                             tryHelpStealer(joiner, task) > 0);
2078 >            }
2079 >            joiner.currentJoin = prevJoin;
2080 >        }
2081      }
2082  
2083      /**
2084       * Returns a (probably) non-empty steal queue, if one is found
2085 <     * during a random, then cyclic scan, else null.  This method must
2086 <     * be retried by caller if, by the time it tries to use the queue,
2087 <     * it is empty.
2088 <     */
2089 <    private WorkQueue findNonEmptyStealQueue(WorkQueue w) {
2090 <        // Similar to loop in scan(), but ignoring submissions
2091 <        int r = w.seed; r ^= r << 13; r ^= r >>> 17; w.seed = r ^= r << 5;
2092 <        int step = (r >>> 16) | 1;
2093 <        for (WorkQueue[] ws;;) {
2094 <            int rs = runState, m;
2095 <            if ((ws = workQueues) == null || (m = ws.length - 1) < 1)
2096 <                return null;
2133 <            for (int j = (m + 1) << 2; ; r += step) {
2134 <                WorkQueue q = ws[((r << 1) | 1) & m];
2135 <                if (q != null && !q.isEmpty())
2136 <                    return q;
2137 <                else if (--j < 0) {
2138 <                    if (runState == rs)
2139 <                        return null;
2140 <                    break;
2085 >     * during a scan, else null.  This method must be retried by
2086 >     * caller if, by the time it tries to use the queue, it is empty.
2087 >     * @param r a (random) seed for scanning
2088 >     */
2089 >    private WorkQueue findNonEmptyStealQueue(int r) {
2090 >        for (;;) {
2091 >            int ps = plock, m; WorkQueue[] ws; WorkQueue q;
2092 >            if ((ws = workQueues) != null && (m = ws.length - 1) >= 0) {
2093 >                for (int j = (m + 1) << 2; j >= 0; --j) {
2094 >                    if ((q = ws[(((r + j) << 1) | 1) & m]) != null &&
2095 >                        q.base - q.top < 0)
2096 >                        return q;
2097                  }
2098              }
2099 +            if (plock == ps)
2100 +                return null;
2101          }
2102      }
2103  
# Line 2151 | Line 2109 | public class ForkJoinPool extends Abstra
2109       */
2110      final void helpQuiescePool(WorkQueue w) {
2111          for (boolean active = true;;) {
2112 <            ForkJoinTask<?> localTask; // exhaust local queue
2113 <            while ((localTask = w.nextLocalTask()) != null)
2114 <                localTask.doExec();
2115 <            WorkQueue q = findNonEmptyStealQueue(w);
2116 <            if (q != null) {
2117 <                ForkJoinTask<?> t; int b;
2112 >            long c; WorkQueue q; ForkJoinTask<?> t; int b;
2113 >            while ((t = w.nextLocalTask()) != null) {
2114 >                if (w.base - w.top < 0)
2115 >                    signalWork(w);
2116 >                t.doExec();
2117 >            }
2118 >            if ((q = findNonEmptyStealQueue(w.nextSeed())) != null) {
2119                  if (!active) {      // re-establish active count
2161                    long c;
2120                      active = true;
2121                      do {} while (!U.compareAndSwapLong
2122                                   (this, CTL, c = ctl, c + AC_UNIT));
2123                  }
2124 <                if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
2124 >                if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
2125 >                    if (q.base - q.top < 0)
2126 >                        signalWork(q);
2127                      w.runSubtask(t);
2168            }
2169            else {
2170                long c;
2171                if (active) {       // decrement active count without queuing
2172                    active = false;
2173                    do {} while (!U.compareAndSwapLong
2174                                 (this, CTL, c = ctl, c -= AC_UNIT));
2175                }
2176                else
2177                    c = ctl;        // re-increment on exit
2178                if ((int)(c >> AC_SHIFT) + parallelism == 0) {
2179                    do {} while (!U.compareAndSwapLong
2180                                 (this, CTL, c = ctl, c + AC_UNIT));
2181                    break;
2128                  }
2129              }
2130 <        }
2131 <    }
2132 <
2133 <    /**
2134 <     * Restricted version of helpQuiescePool for non-FJ callers
2135 <     */
2190 <    static void externalHelpQuiescePool() {
2191 <        ForkJoinPool p; WorkQueue[] ws; WorkQueue q, sq;
2192 <        ForkJoinTask<?>[] a; int b;
2193 <        ForkJoinTask<?> t = null;
2194 <        int k = submitters.get().seed & SQMASK;
2195 <        if ((p = commonPool) != null &&
2196 <            (int)(p.ctl >> AC_SHIFT) < 0 &&
2197 <            (ws = p.workQueues) != null &&
2198 <            ws.length > (k &= p.submitMask) &&
2199 <            (q = ws[k]) != null) {
2200 <            while (q.top - q.base > 0) {
2201 <                if ((t = q.sharedPop()) != null)
2202 <                    break;
2130 >            else if (active) {       // decrement active count without queuing
2131 >                long nc = (c = ctl) - AC_UNIT;
2132 >                if ((int)(nc >> AC_SHIFT) + (config & SMASK) == 0)
2133 >                    return;          // bypass decrement-then-increment
2134 >                if (U.compareAndSwapLong(this, CTL, c, nc))
2135 >                    active = false;
2136              }
2137 <            if (t == null && (sq = p.findNonEmptyStealQueue(q)) != null &&
2138 <                (b = sq.base) - sq.top < 0)
2139 <                t = sq.pollAt(b);
2207 <            if (t != null)
2208 <                t.doExec();
2137 >            else if ((int)((c = ctl) >> AC_SHIFT) + (config & SMASK) == 0 &&
2138 >                     U.compareAndSwapLong(this, CTL, c, c + AC_UNIT))
2139 >                return;
2140          }
2141      }
2142  
# Line 2219 | Line 2150 | public class ForkJoinPool extends Abstra
2150              WorkQueue q; int b;
2151              if ((t = w.nextLocalTask()) != null)
2152                  return t;
2153 <            if ((q = findNonEmptyStealQueue(w)) == null)
2153 >            if ((q = findNonEmptyStealQueue(w.nextSeed())) == null)
2154                  return null;
2155 <            if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
2155 >            if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
2156 >                if (q.base - q.top < 0)
2157 >                    signalWork(q);
2158                  return t;
2159 +            }
2160          }
2161      }
2162  
2163      /**
2164 <     * Returns the approximate (non-atomic) number of idle threads per
2165 <     * active thread to offset steal queue size for method
2166 <     * ForkJoinTask.getSurplusQueuedTaskCount().
2167 <     */
2168 <    final int idlePerActive() {
2169 <        // Approximate at powers of two for small values, saturate past 4
2170 <        int p = parallelism;
2171 <        int a = p + (int)(ctl >> AC_SHIFT);
2172 <        return (a > (p >>>= 1) ? 0 :
2173 <                a > (p >>>= 1) ? 1 :
2174 <                a > (p >>>= 1) ? 2 :
2175 <                a > (p >>>= 1) ? 4 :
2176 <                8);
2177 <    }
2178 <
2179 <    /**
2180 <     * Returns approximate submission queue length for the given caller
2181 <     */
2182 <    static int getEstimatedSubmitterQueueLength() {
2183 <        ForkJoinPool p; WorkQueue[] ws; WorkQueue q;
2184 <        int k = submitters.get().seed & SQMASK;
2185 <        return ((p = commonPool) != null &&
2186 <                p.runState >= 0 &&
2187 <                (ws = p.workQueues) != null &&
2188 <                ws.length > (k &= p.submitMask) &&
2189 <                (q = ws[k]) != null) ?
2190 <            q.queueSize() : 0;
2164 >     * Returns a cheap heuristic guide for task partitioning when
2165 >     * programmers, frameworks, tools, or languages have little or no
2166 >     * idea about task granularity.  In essence by offering this
2167 >     * method, we ask users only about tradeoffs in overhead vs
2168 >     * expected throughput and its variance, rather than how finely to
2169 >     * partition tasks.
2170 >     *
2171 >     * In a steady state strict (tree-structured) computation, each
2172 >     * thread makes available for stealing enough tasks for other
2173 >     * threads to remain active. Inductively, if all threads play by
2174 >     * the same rules, each thread should make available only a
2175 >     * constant number of tasks.
2176 >     *
2177 >     * The minimum useful constant is just 1. But using a value of 1
2178 >     * would require immediate replenishment upon each steal to
2179 >     * maintain enough tasks, which is infeasible.  Further,
2180 >     * partitionings/granularities of offered tasks should minimize
2181 >     * steal rates, which in general means that threads nearer the top
2182 >     * of computation tree should generate more than those nearer the
2183 >     * bottom. In perfect steady state, each thread is at
2184 >     * approximately the same level of computation tree. However,
2185 >     * producing extra tasks amortizes the uncertainty of progress and
2186 >     * diffusion assumptions.
2187 >     *
2188 >     * So, users will want to use values larger (but not much larger)
2189 >     * than 1 to both smooth over transient shortages and hedge
2190 >     * against uneven progress; as traded off against the cost of
2191 >     * extra task overhead. We leave the user to pick a threshold
2192 >     * value to compare with the results of this call to guide
2193 >     * decisions, but recommend values such as 3.
2194 >     *
2195 >     * When all threads are active, it is on average OK to estimate
2196 >     * surplus strictly locally. In steady-state, if one thread is
2197 >     * maintaining say 2 surplus tasks, then so are others. So we can
2198 >     * just use estimated queue length.  However, this strategy alone
2199 >     * leads to serious mis-estimates in some non-steady-state
2200 >     * conditions (ramp-up, ramp-down, other stalls). We can detect
2201 >     * many of these by further considering the number of "idle"
2202 >     * threads, that are known to have zero queued tasks, so
2203 >     * compensate by a factor of (#idle/#active) threads.
2204 >     *
2205 >     * Note: The approximation of #busy workers as #active workers is
2206 >     * not very good under current signalling scheme, and should be
2207 >     * improved.
2208 >     */
2209 >    static int getSurplusQueuedTaskCount() {
2210 >        Thread t; ForkJoinWorkerThread wt; ForkJoinPool pool; WorkQueue q;
2211 >        if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)) {
2212 >            int p = (pool = (wt = (ForkJoinWorkerThread)t).pool).config & SMASK;
2213 >            int n = (q = wt.workQueue).top - q.base;
2214 >            int a = (int)(pool.ctl >> AC_SHIFT) + p;
2215 >            return n - (a > (p >>>= 1) ? 0 :
2216 >                        a > (p >>>= 1) ? 1 :
2217 >                        a > (p >>>= 1) ? 2 :
2218 >                        a > (p >>>= 1) ? 4 :
2219 >                        8);
2220 >        }
2221 >        return 0;
2222      }
2223  
2224      //  Termination
# Line 2273 | Line 2238 | public class ForkJoinPool extends Abstra
2238       * @return true if now terminating or terminated
2239       */
2240      private boolean tryTerminate(boolean now, boolean enable) {
2241 +        int ps;
2242 +        if (this == common)                    // cannot shut down
2243 +            return false;
2244 +        if ((ps = plock) >= 0) {                   // enable by setting plock
2245 +            if (!enable)
2246 +                return false;
2247 +            if ((ps & PL_LOCK) != 0 ||
2248 +                !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
2249 +                ps = acquirePlock();
2250 +            int nps = ((ps + PL_LOCK) & ~SHUTDOWN) | SHUTDOWN;
2251 +            if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
2252 +                releasePlock(nps);
2253 +        }
2254          for (long c;;) {
2255 <            if (((c = ctl) & STOP_BIT) != 0) {      // already terminating
2256 <                if ((short)(c >>> TC_SHIFT) == -parallelism) {
2255 >            if (((c = ctl) & STOP_BIT) != 0) {     // already terminating
2256 >                if ((short)(c >>> TC_SHIFT) == -(config & SMASK)) {
2257                      synchronized (this) {
2258 <                        notifyAll();                // signal when 0 workers
2258 >                        notifyAll();               // signal when 0 workers
2259                      }
2260                  }
2261                  return true;
2262              }
2263 <            if (runState >= 0) {                    // not yet enabled
2264 <                if (!enable)
2265 <                    return false;
2288 <                while (!U.compareAndSwapInt(this, MAINLOCK, 0, 1))
2289 <                    tryAwaitMainLock();
2290 <                try {
2291 <                    runState |= SHUTDOWN;
2292 <                } finally {
2293 <                    if (!U.compareAndSwapInt(this, MAINLOCK, 1, 0)) {
2294 <                        mainLock = 0;
2295 <                        synchronized (this) { notifyAll(); };
2296 <                    }
2297 <                }
2298 <            }
2299 <            if (!now) {                             // check if idle & no tasks
2300 <                if ((int)(c >> AC_SHIFT) != -parallelism ||
2301 <                    hasQueuedSubmissions())
2263 >            if (!now) {                            // check if idle & no tasks
2264 >                WorkQueue[] ws; WorkQueue w;
2265 >                if ((int)(c >> AC_SHIFT) != -(config & SMASK))
2266                      return false;
2267 <                // Check for unqueued inactive workers. One pass suffices.
2268 <                WorkQueue[] ws = workQueues; WorkQueue w;
2269 <                if (ws != null) {
2270 <                    for (int i = 1; i < ws.length; i += 2) {
2271 <                        if ((w = ws[i]) != null && w.eventCount >= 0)
2272 <                            return false;
2267 >                if ((ws = workQueues) != null) {
2268 >                    for (int i = 0; i < ws.length; ++i) {
2269 >                        if ((w = ws[i]) != null) {
2270 >                            if (!w.isEmpty()) {    // signal unprocessed tasks
2271 >                                signalWork(w);
2272 >                                return false;
2273 >                            }
2274 >                            if ((i & 1) != 0 && w.eventCount >= 0)
2275 >                                return false;      // unqueued inactive worker
2276 >                        }
2277                      }
2278                  }
2279              }
2280              if (U.compareAndSwapLong(this, CTL, c, c | STOP_BIT)) {
2281                  for (int pass = 0; pass < 3; ++pass) {
2282 <                    WorkQueue[] ws = workQueues;
2283 <                    if (ws != null) {
2316 <                        WorkQueue w;
2282 >                    WorkQueue[] ws; WorkQueue w; Thread wt;
2283 >                    if ((ws = workQueues) != null) {
2284                          int n = ws.length;
2285                          for (int i = 0; i < n; ++i) {
2286                              if ((w = ws[i]) != null) {
2287 <                                w.runState = -1;
2287 >                                w.qlock = -1;
2288                                  if (pass > 0) {
2289                                      w.cancelAll();
2290 <                                    if (pass > 1)
2291 <                                        w.interruptOwner();
2290 >                                    if (pass > 1 && (wt = w.owner) != null) {
2291 >                                        if (!wt.isInterrupted()) {
2292 >                                            try {
2293 >                                                wt.interrupt();
2294 >                                            } catch (Throwable ignore) {
2295 >                                            }
2296 >                                        }
2297 >                                        U.unpark(wt);
2298 >                                    }
2299                                  }
2300                              }
2301                          }
2302                          // Wake up workers parked on event queue
2303                          int i, e; long cc; Thread p;
2304                          while ((e = (int)(cc = ctl) & E_MASK) != 0 &&
2305 <                               (i = e & SMASK) < n &&
2305 >                               (i = e & SMASK) < n && i >= 0 &&
2306                                 (w = ws[i]) != null) {
2307                              long nc = ((long)(w.nextWait & E_MASK) |
2308                                         ((cc + AC_UNIT) & AC_MASK) |
# Line 2336 | Line 2310 | public class ForkJoinPool extends Abstra
2310                              if (w.eventCount == (e | INT_SIGN) &&
2311                                  U.compareAndSwapLong(this, CTL, cc, nc)) {
2312                                  w.eventCount = (e + E_SEQ) & E_MASK;
2313 <                                w.runState = -1;
2313 >                                w.qlock = -1;
2314                                  if ((p = w.parker) != null)
2315                                      U.unpark(p);
2316                              }
# Line 2347 | Line 2321 | public class ForkJoinPool extends Abstra
2321          }
2322      }
2323  
2324 +    // external operations on common pool
2325 +
2326 +    /**
2327 +     * Returns common pool queue for a thread that has submitted at
2328 +     * least one task.
2329 +     */
2330 +    static WorkQueue commonSubmitterQueue() {
2331 +        ForkJoinPool p; WorkQueue[] ws; int m; Submitter z;
2332 +        return ((z = submitters.get()) != null &&
2333 +                (p = common) != null &&
2334 +                (ws = p.workQueues) != null &&
2335 +                (m = ws.length - 1) >= 0) ?
2336 +            ws[m & z.seed & SQMASK] : null;
2337 +    }
2338 +
2339 +    /**
2340 +     * Tries to pop the given task from submitter's queue in common pool.
2341 +     */
2342 +    static boolean tryExternalUnpush(ForkJoinTask<?> t) {
2343 +        ForkJoinPool p; WorkQueue[] ws; WorkQueue q; Submitter z;
2344 +        ForkJoinTask<?>[] a;  int m, s;
2345 +        if (t != null &&
2346 +            (z = submitters.get()) != null &&
2347 +            (p = common) != null &&
2348 +            (ws = p.workQueues) != null &&
2349 +            (m = ws.length - 1) >= 0 &&
2350 +            (q = ws[m & z.seed & SQMASK]) != null &&
2351 +            (s = q.top) != q.base &&
2352 +            (a = q.array) != null) {
2353 +            long j = (((a.length - 1) & (s - 1)) << ASHIFT) + ABASE;
2354 +            if (U.getObject(a, j) == t &&
2355 +                U.compareAndSwapInt(q, QLOCK, 0, 1)) {
2356 +                if (q.array == a && q.top == s && // recheck
2357 +                    U.compareAndSwapObject(a, j, t, null)) {
2358 +                    q.top = s - 1;
2359 +                    q.qlock = 0;
2360 +                    return true;
2361 +                }
2362 +                q.qlock = 0;
2363 +            }
2364 +        }
2365 +        return false;
2366 +    }
2367 +
2368 +    /**
2369 +     * Tries to pop and run local tasks within the same computation
2370 +     * as the given root. On failure, tries to help complete from
2371 +     * other queues via helpComplete.
2372 +     */
2373 +    private void externalHelpComplete(WorkQueue q, ForkJoinTask<?> root) {
2374 +        ForkJoinTask<?>[] a; int m;
2375 +        if (q != null && (a = q.array) != null && (m = (a.length - 1)) >= 0 &&
2376 +            root != null && root.status >= 0) {
2377 +            for (;;) {
2378 +                int s, u; Object o; CountedCompleter<?> task = null;
2379 +                if ((s = q.top) - q.base > 0) {
2380 +                    long j = ((m & (s - 1)) << ASHIFT) + ABASE;
2381 +                    if ((o = U.getObject(a, j)) != null &&
2382 +                        (o instanceof CountedCompleter)) {
2383 +                        CountedCompleter<?> t = (CountedCompleter<?>)o, r = t;
2384 +                        do {
2385 +                            if (r == root) {
2386 +                                if (U.compareAndSwapInt(q, QLOCK, 0, 1)) {
2387 +                                    if (q.array == a && q.top == s &&
2388 +                                        U.compareAndSwapObject(a, j, t, null)) {
2389 +                                        q.top = s - 1;
2390 +                                        task = t;
2391 +                                    }
2392 +                                    q.qlock = 0;
2393 +                                }
2394 +                                break;
2395 +                            }
2396 +                        } while ((r = r.completer) != null);
2397 +                    }
2398 +                }
2399 +                if (task != null)
2400 +                    task.doExec();
2401 +                if (root.status < 0 ||
2402 +                    (u = (int)(ctl >>> 32)) >= 0 || (u >> UAC_SHIFT) >= 0)
2403 +                    break;
2404 +                if (task == null) {
2405 +                    helpSignal(root, q.poolIndex);
2406 +                    if (root.status >= 0)
2407 +                        helpComplete(root, SHARED_QUEUE);
2408 +                    break;
2409 +                }
2410 +            }
2411 +        }
2412 +    }
2413 +
2414 +    /**
2415 +     * Tries to help execute or signal availability of the given task
2416 +     * from submitter's queue in common pool.
2417 +     */
2418 +    static void externalHelpJoin(ForkJoinTask<?> t) {
2419 +        // Some hard-to-avoid overlap with tryExternalUnpush
2420 +        ForkJoinPool p; WorkQueue[] ws; WorkQueue q, w; Submitter z;
2421 +        ForkJoinTask<?>[] a;  int m, s, n;
2422 +        if (t != null &&
2423 +            (z = submitters.get()) != null &&
2424 +            (p = common) != null &&
2425 +            (ws = p.workQueues) != null &&
2426 +            (m = ws.length - 1) >= 0 &&
2427 +            (q = ws[m & z.seed & SQMASK]) != null &&
2428 +            (a = q.array) != null) {
2429 +            int am = a.length - 1;
2430 +            if ((s = q.top) != q.base) {
2431 +                long j = ((am & (s - 1)) << ASHIFT) + ABASE;
2432 +                if (U.getObject(a, j) == t &&
2433 +                    U.compareAndSwapInt(q, QLOCK, 0, 1)) {
2434 +                    if (q.array == a && q.top == s &&
2435 +                        U.compareAndSwapObject(a, j, t, null)) {
2436 +                        q.top = s - 1;
2437 +                        q.qlock = 0;
2438 +                        t.doExec();
2439 +                    }
2440 +                    else
2441 +                        q.qlock = 0;
2442 +                }
2443 +            }
2444 +            if (t.status >= 0) {
2445 +                if (t instanceof CountedCompleter)
2446 +                    p.externalHelpComplete(q, t);
2447 +                else
2448 +                    p.helpSignal(t, q.poolIndex);
2449 +            }
2450 +        }
2451 +    }
2452 +
2453      // Exported methods
2454  
2455      // Constructors
# Line 2363 | Line 2466 | public class ForkJoinPool extends Abstra
2466       *         java.lang.RuntimePermission}{@code ("modifyThread")}
2467       */
2468      public ForkJoinPool() {
2469 <        this(Runtime.getRuntime().availableProcessors(),
2469 >        this(Math.min(MAX_CAP, Runtime.getRuntime().availableProcessors()),
2470               defaultForkJoinWorkerThreadFactory, null, false);
2471      }
2472  
# Line 2418 | Line 2521 | public class ForkJoinPool extends Abstra
2521              throw new NullPointerException();
2522          if (parallelism <= 0 || parallelism > MAX_CAP)
2523              throw new IllegalArgumentException();
2421        this.parallelism = parallelism;
2524          this.factory = factory;
2525          this.ueh = handler;
2526 <        this.localMode = asyncMode ? FIFO_QUEUE : LIFO_QUEUE;
2526 >        this.config = parallelism | (asyncMode ? (FIFO_QUEUE << 16) : 0);
2527          long np = (long)(-parallelism); // offset ctl counts
2528          this.ctl = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
2529 <        // Use nearest power 2 for workQueues size. See Hackers Delight sec 3.2.
2428 <        int n = parallelism - 1;
2429 <        n |= n >>> 1; n |= n >>> 2; n |= n >>> 4; n |= n >>> 8; n |= n >>> 16;
2430 <        this.submitMask = ((n + 1) << 1) - 1;
2431 <        int pn = poolNumberGenerator.incrementAndGet();
2529 >        int pn = nextPoolId();
2530          StringBuilder sb = new StringBuilder("ForkJoinPool-");
2531          sb.append(Integer.toString(pn));
2532          sb.append("-worker-");
2533          this.workerNamePrefix = sb.toString();
2436        this.runState = 1;              // set init flag
2534      }
2535  
2536      /**
2537       * Constructor for common pool, suitable only for static initialization.
2538       * Basically the same as above, but uses smallest possible initial footprint.
2539       */
2540 <    ForkJoinPool(int parallelism, int submitMask,
2540 >    ForkJoinPool(int parallelism, long ctl,
2541                   ForkJoinWorkerThreadFactory factory,
2542                   Thread.UncaughtExceptionHandler handler) {
2543 +        this.config = parallelism;
2544 +        this.ctl = ctl;
2545          this.factory = factory;
2546          this.ueh = handler;
2448        this.submitMask = submitMask;
2449        this.parallelism = parallelism;
2450        long np = (long)(-parallelism);
2451        this.ctl = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
2452        this.localMode = LIFO_QUEUE;
2547          this.workerNamePrefix = "ForkJoinPool.commonPool-worker-";
2454        this.runState = 1;
2548      }
2549  
2550      /**
2551 <     * Returns the common pool instance.
2551 >     * Returns the common pool instance. This pool is statically
2552 >     * constructed; its run state is unaffected by attempts to {@link
2553 >     * #shutdown} or {@link #shutdownNow}. However this pool and any
2554 >     * ongoing processing are automatically terminated upon program
2555 >     * {@link System#exit}.  Any program that relies on asynchronous
2556 >     * task processing to complete before program termination should
2557 >     * invoke {@code commonPool().}{@link #awaitQuiescence}, before
2558 >     * exit.
2559       *
2560       * @return the common pool instance
2561 +     * @since 1.8
2562       */
2563      public static ForkJoinPool commonPool() {
2564 <        ForkJoinPool p;
2565 <        if ((p = commonPool) == null)
2465 <            throw new Error("Common Pool Unavailable");
2466 <        return p;
2564 >        // assert common != null : "static init error";
2565 >        return common;
2566      }
2567  
2568      // Execution methods
# Line 2487 | Line 2586 | public class ForkJoinPool extends Abstra
2586      public <T> T invoke(ForkJoinTask<T> task) {
2587          if (task == null)
2588              throw new NullPointerException();
2589 <        doSubmit(task);
2589 >        externalPush(task);
2590          return task.join();
2591      }
2592  
# Line 2502 | Line 2601 | public class ForkJoinPool extends Abstra
2601      public void execute(ForkJoinTask<?> task) {
2602          if (task == null)
2603              throw new NullPointerException();
2604 <        doSubmit(task);
2604 >        externalPush(task);
2605      }
2606  
2607      // AbstractExecutorService methods
# Line 2520 | Line 2619 | public class ForkJoinPool extends Abstra
2619              job = (ForkJoinTask<?>) task;
2620          else
2621              job = new ForkJoinTask.AdaptedRunnableAction(task);
2622 <        doSubmit(job);
2622 >        externalPush(job);
2623      }
2624  
2625      /**
# Line 2535 | Line 2634 | public class ForkJoinPool extends Abstra
2634      public <T> ForkJoinTask<T> submit(ForkJoinTask<T> task) {
2635          if (task == null)
2636              throw new NullPointerException();
2637 <        doSubmit(task);
2637 >        externalPush(task);
2638          return task;
2639      }
2640  
# Line 2546 | Line 2645 | public class ForkJoinPool extends Abstra
2645       */
2646      public <T> ForkJoinTask<T> submit(Callable<T> task) {
2647          ForkJoinTask<T> job = new ForkJoinTask.AdaptedCallable<T>(task);
2648 <        doSubmit(job);
2648 >        externalPush(job);
2649          return job;
2650      }
2651  
# Line 2557 | Line 2656 | public class ForkJoinPool extends Abstra
2656       */
2657      public <T> ForkJoinTask<T> submit(Runnable task, T result) {
2658          ForkJoinTask<T> job = new ForkJoinTask.AdaptedRunnable<T>(task, result);
2659 <        doSubmit(job);
2659 >        externalPush(job);
2660          return job;
2661      }
2662  
# Line 2574 | Line 2673 | public class ForkJoinPool extends Abstra
2673              job = (ForkJoinTask<?>) task;
2674          else
2675              job = new ForkJoinTask.AdaptedRunnableAction(task);
2676 <        doSubmit(job);
2676 >        externalPush(job);
2677          return job;
2678      }
2679  
# Line 2586 | Line 2685 | public class ForkJoinPool extends Abstra
2685          // In previous versions of this class, this method constructed
2686          // a task to run ForkJoinTask.invokeAll, but now external
2687          // invocation of multiple tasks is at least as efficient.
2688 <        List<ForkJoinTask<T>> fs = new ArrayList<ForkJoinTask<T>>(tasks.size());
2590 <        // Workaround needed because method wasn't declared with
2591 <        // wildcards in return type but should have been.
2592 <        @SuppressWarnings({"unchecked", "rawtypes"})
2593 <            List<Future<T>> futures = (List<Future<T>>) (List) fs;
2688 >        ArrayList<Future<T>> futures = new ArrayList<Future<T>>(tasks.size());
2689  
2690          boolean done = false;
2691          try {
2692              for (Callable<T> t : tasks) {
2693                  ForkJoinTask<T> f = new ForkJoinTask.AdaptedCallable<T>(t);
2694 <                doSubmit(f);
2695 <                fs.add(f);
2694 >                futures.add(f);
2695 >                externalPush(f);
2696              }
2697 <            for (ForkJoinTask<T> f : fs)
2698 <                f.quietlyJoin();
2697 >            for (int i = 0, size = futures.size(); i < size; i++)
2698 >                ((ForkJoinTask<?>)futures.get(i)).quietlyJoin();
2699              done = true;
2700              return futures;
2701          } finally {
2702              if (!done)
2703 <                for (ForkJoinTask<T> f : fs)
2704 <                    f.cancel(false);
2703 >                for (int i = 0, size = futures.size(); i < size; i++)
2704 >                    futures.get(i).cancel(false);
2705          }
2706      }
2707  
# Line 2635 | Line 2730 | public class ForkJoinPool extends Abstra
2730       * @return the targeted parallelism level of this pool
2731       */
2732      public int getParallelism() {
2733 <        return parallelism;
2733 >        return config & SMASK;
2734      }
2735  
2736      /**
2737       * Returns the targeted parallelism level of the common pool.
2738       *
2739       * @return the targeted parallelism level of the common pool
2740 +     * @since 1.8
2741       */
2742      public static int getCommonPoolParallelism() {
2743 <        return commonPoolParallelism;
2743 >        return commonParallelism;
2744      }
2745  
2746      /**
# Line 2656 | Line 2752 | public class ForkJoinPool extends Abstra
2752       * @return the number of worker threads
2753       */
2754      public int getPoolSize() {
2755 <        return parallelism + (short)(ctl >>> TC_SHIFT);
2755 >        return (config & SMASK) + (short)(ctl >>> TC_SHIFT);
2756      }
2757  
2758      /**
# Line 2666 | Line 2762 | public class ForkJoinPool extends Abstra
2762       * @return {@code true} if this pool uses async mode
2763       */
2764      public boolean getAsyncMode() {
2765 <        return localMode != 0;
2765 >        return (config >>> 16) == FIFO_QUEUE;
2766      }
2767  
2768      /**
# Line 2697 | Line 2793 | public class ForkJoinPool extends Abstra
2793       * @return the number of active threads
2794       */
2795      public int getActiveThreadCount() {
2796 <        int r = parallelism + (int)(ctl >> AC_SHIFT);
2796 >        int r = (config & SMASK) + (int)(ctl >> AC_SHIFT);
2797          return (r <= 0) ? 0 : r; // suppress momentarily negative values
2798      }
2799  
# Line 2713 | Line 2809 | public class ForkJoinPool extends Abstra
2809       * @return {@code true} if all threads are currently idle
2810       */
2811      public boolean isQuiescent() {
2812 <        return (int)(ctl >> AC_SHIFT) + parallelism == 0;
2812 >        return (int)(ctl >> AC_SHIFT) + (config & SMASK) == 0;
2813      }
2814  
2815      /**
# Line 2733 | Line 2829 | public class ForkJoinPool extends Abstra
2829          if ((ws = workQueues) != null) {
2830              for (int i = 1; i < ws.length; i += 2) {
2831                  if ((w = ws[i]) != null)
2832 <                    count += w.totalSteals;
2832 >                    count += w.nsteals;
2833              }
2834          }
2835          return count;
# Line 2869 | Line 2965 | public class ForkJoinPool extends Abstra
2965                          qs += size;
2966                      else {
2967                          qt += size;
2968 <                        st += w.totalSteals;
2968 >                        st += w.nsteals;
2969                          if (w.isApparentlyUnblocked())
2970                              ++rc;
2971                      }
2972                  }
2973              }
2974          }
2975 <        int pc = parallelism;
2975 >        int pc = (config & SMASK);
2976          int tc = pc + (short)(c >>> TC_SHIFT);
2977          int ac = pc + (int)(c >> AC_SHIFT);
2978          if (ac < 0) // ignore transient negative
# Line 2885 | Line 2981 | public class ForkJoinPool extends Abstra
2981          if ((c & STOP_BIT) != 0)
2982              level = (tc == 0) ? "Terminated" : "Terminating";
2983          else
2984 <            level = runState < 0 ? "Shutting down" : "Running";
2984 >            level = plock < 0 ? "Shutting down" : "Running";
2985          return super.toString() +
2986              "[" + level +
2987              ", parallelism = " + pc +
# Line 2902 | Line 2998 | public class ForkJoinPool extends Abstra
2998       * Possibly initiates an orderly shutdown in which previously
2999       * submitted tasks are executed, but no new tasks will be
3000       * accepted. Invocation has no effect on execution state if this
3001 <     * is the {@link #commonPool}, and no additional effect if
3001 >     * is the {@link #commonPool()}, and no additional effect if
3002       * already shut down.  Tasks that are in the process of being
3003       * submitted concurrently during the course of this method may or
3004       * may not be rejected.
# Line 2914 | Line 3010 | public class ForkJoinPool extends Abstra
3010       */
3011      public void shutdown() {
3012          checkPermission();
3013 <        if (this != commonPool)
2918 <            tryTerminate(false, true);
3013 >        tryTerminate(false, true);
3014      }
3015  
3016      /**
3017       * Possibly attempts to cancel and/or stop all tasks, and reject
3018       * all subsequently submitted tasks.  Invocation has no effect on
3019 <     * execution state if this is the {@link #commonPool}, and no
3019 >     * execution state if this is the {@link #commonPool()}, and no
3020       * additional effect if already shut down. Otherwise, tasks that
3021       * are in the process of being submitted or executed concurrently
3022       * during the course of this method may or may not be
# Line 2938 | Line 3033 | public class ForkJoinPool extends Abstra
3033       */
3034      public List<Runnable> shutdownNow() {
3035          checkPermission();
3036 <        if (this != commonPool)
2942 <            tryTerminate(true, true);
3036 >        tryTerminate(true, true);
3037          return Collections.emptyList();
3038      }
3039  
# Line 2951 | Line 3045 | public class ForkJoinPool extends Abstra
3045      public boolean isTerminated() {
3046          long c = ctl;
3047          return ((c & STOP_BIT) != 0L &&
3048 <                (short)(c >>> TC_SHIFT) == -parallelism);
3048 >                (short)(c >>> TC_SHIFT) == -(config & SMASK));
3049      }
3050  
3051      /**
# Line 2959 | Line 3053 | public class ForkJoinPool extends Abstra
3053       * commenced but not yet completed.  This method may be useful for
3054       * debugging. A return of {@code true} reported a sufficient
3055       * period after shutdown may indicate that submitted tasks have
3056 <     * ignored or suppressed interruption, or are waiting for IO,
3056 >     * ignored or suppressed interruption, or are waiting for I/O,
3057       * causing this executor not to properly terminate. (See the
3058       * advisory notes for class {@link ForkJoinTask} stating that
3059       * tasks should not normally entail blocking operations.  But if
# Line 2970 | Line 3064 | public class ForkJoinPool extends Abstra
3064      public boolean isTerminating() {
3065          long c = ctl;
3066          return ((c & STOP_BIT) != 0L &&
3067 <                (short)(c >>> TC_SHIFT) != -parallelism);
3067 >                (short)(c >>> TC_SHIFT) != -(config & SMASK));
3068      }
3069  
3070      /**
# Line 2979 | Line 3073 | public class ForkJoinPool extends Abstra
3073       * @return {@code true} if this pool has been shut down
3074       */
3075      public boolean isShutdown() {
3076 <        return runState < 0;
3076 >        return plock < 0;
3077      }
3078  
3079      /**
3080 <     * Blocks until all tasks have completed execution after a shutdown
3081 <     * request, or the timeout occurs, or the current thread is
3082 <     * interrupted, whichever happens first.
3080 >     * Blocks until all tasks have completed execution after a
3081 >     * shutdown request, or the timeout occurs, or the current thread
3082 >     * is interrupted, whichever happens first. Because the {@link
3083 >     * #commonPool()} never terminates until program shutdown, when
3084 >     * applied to the common pool, this method is equivalent to {@link
3085 >     * #awaitQuiescence} but always returns {@code false}.
3086       *
3087       * @param timeout the maximum time to wait
3088       * @param unit the time unit of the timeout argument
# Line 2995 | Line 3092 | public class ForkJoinPool extends Abstra
3092       */
3093      public boolean awaitTermination(long timeout, TimeUnit unit)
3094          throws InterruptedException {
3095 +        if (Thread.interrupted())
3096 +            throw new InterruptedException();
3097 +        if (this == common) {
3098 +            awaitQuiescence(timeout, unit);
3099 +            return false;
3100 +        }
3101          long nanos = unit.toNanos(timeout);
3102          if (isTerminated())
3103              return true;
# Line 3014 | Line 3117 | public class ForkJoinPool extends Abstra
3117      }
3118  
3119      /**
3120 +     * If called by a ForkJoinTask operating in this pool, equivalent
3121 +     * in effect to {@link ForkJoinTask#helpQuiesce}. Otherwise,
3122 +     * waits and/or attempts to assist performing tasks until this
3123 +     * pool {@link #isQuiescent} or the indicated timeout elapses.
3124 +     *
3125 +     * @param timeout the maximum time to wait
3126 +     * @param unit the time unit of the timeout argument
3127 +     * @return {@code true} if quiescent; {@code false} if the
3128 +     * timeout elapsed.
3129 +     */
3130 +    public boolean awaitQuiescence(long timeout, TimeUnit unit) {
3131 +        long nanos = unit.toNanos(timeout);
3132 +        ForkJoinWorkerThread wt;
3133 +        Thread thread = Thread.currentThread();
3134 +        if ((thread instanceof ForkJoinWorkerThread) &&
3135 +            (wt = (ForkJoinWorkerThread)thread).pool == this) {
3136 +            helpQuiescePool(wt.workQueue);
3137 +            return true;
3138 +        }
3139 +        long startTime = System.nanoTime();
3140 +        WorkQueue[] ws;
3141 +        int r = 0, m;
3142 +        boolean found = true;
3143 +        while (!isQuiescent() && (ws = workQueues) != null &&
3144 +               (m = ws.length - 1) >= 0) {
3145 +            if (!found) {
3146 +                if ((System.nanoTime() - startTime) > nanos)
3147 +                    return false;
3148 +                Thread.yield(); // cannot block
3149 +            }
3150 +            found = false;
3151 +            for (int j = (m + 1) << 2; j >= 0; --j) {
3152 +                ForkJoinTask<?> t; WorkQueue q; int b;
3153 +                if ((q = ws[r++ & m]) != null && (b = q.base) - q.top < 0) {
3154 +                    found = true;
3155 +                    if ((t = q.pollAt(b)) != null) {
3156 +                        if (q.base - q.top < 0)
3157 +                            signalWork(q);
3158 +                        t.doExec();
3159 +                    }
3160 +                    break;
3161 +                }
3162 +            }
3163 +        }
3164 +        return true;
3165 +    }
3166 +
3167 +    /**
3168 +     * Waits and/or attempts to assist performing tasks indefinitely
3169 +     * until the {@link #commonPool()} {@link #isQuiescent}.
3170 +     */
3171 +    static void quiesceCommonPool() {
3172 +        common.awaitQuiescence(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
3173 +    }
3174 +
3175 +    /**
3176       * Interface for extending managed parallelism for tasks running
3177       * in {@link ForkJoinPool}s.
3178       *
# Line 3109 | Line 3268 | public class ForkJoinPool extends Abstra
3268      public static void managedBlock(ManagedBlocker blocker)
3269          throws InterruptedException {
3270          Thread t = Thread.currentThread();
3271 <        ForkJoinPool p = ((t instanceof ForkJoinWorkerThread) ?
3272 <                          ((ForkJoinWorkerThread)t).pool : null);
3273 <        while (!blocker.isReleasable()) {
3274 <            if (p == null || p.tryCompensate(null, blocker)) {
3275 <                try {
3276 <                    do {} while (!blocker.isReleasable() && !blocker.block());
3277 <                } finally {
3278 <                    if (p != null)
3271 >        if (t instanceof ForkJoinWorkerThread) {
3272 >            ForkJoinPool p = ((ForkJoinWorkerThread)t).pool;
3273 >            while (!blocker.isReleasable()) { // variant of helpSignal
3274 >                WorkQueue[] ws; WorkQueue q; int m, u;
3275 >                if ((ws = p.workQueues) != null && (m = ws.length - 1) >= 0) {
3276 >                    for (int i = 0; i <= m; ++i) {
3277 >                        if (blocker.isReleasable())
3278 >                            return;
3279 >                        if ((q = ws[i]) != null && q.base - q.top < 0) {
3280 >                            p.signalWork(q);
3281 >                            if ((u = (int)(p.ctl >>> 32)) >= 0 ||
3282 >                                (u >> UAC_SHIFT) >= 0)
3283 >                                break;
3284 >                        }
3285 >                    }
3286 >                }
3287 >                if (p.tryCompensate()) {
3288 >                    try {
3289 >                        do {} while (!blocker.isReleasable() &&
3290 >                                     !blocker.block());
3291 >                    } finally {
3292                          p.incrementActiveCount();
3293 +                    }
3294 +                    break;
3295                  }
3122                break;
3296              }
3297          }
3298 +        else {
3299 +            do {} while (!blocker.isReleasable() &&
3300 +                         !blocker.block());
3301 +        }
3302      }
3303  
3304      // AbstractExecutorService overrides.  These rely on undocumented
# Line 3142 | Line 3319 | public class ForkJoinPool extends Abstra
3319      private static final long PARKBLOCKER;
3320      private static final int ABASE;
3321      private static final int ASHIFT;
3145    private static final long NEXTWORKERNUMBER;
3322      private static final long STEALCOUNT;
3323 <    private static final long MAINLOCK;
3323 >    private static final long PLOCK;
3324 >    private static final long INDEXSEED;
3325 >    private static final long QLOCK;
3326  
3327      static {
3328 <        poolNumberGenerator = new AtomicInteger();
3151 <        nextSubmitterSeed = new AtomicInteger(0x55555555);
3152 <        modifyThreadPermission = new RuntimePermission("modifyThread");
3153 <        defaultForkJoinWorkerThreadFactory =
3154 <            new DefaultForkJoinWorkerThreadFactory();
3155 <        submitters = new ThreadSubmitter();
3156 <        int s;
3328 >        // initialize field offsets for CAS etc
3329          try {
3330              U = getUnsafe();
3331              Class<?> k = ForkJoinPool.class;
3160            Class<?> ak = ForkJoinTask[].class;
3332              CTL = U.objectFieldOffset
3333                  (k.getDeclaredField("ctl"));
3163            NEXTWORKERNUMBER = U.objectFieldOffset
3164                (k.getDeclaredField("nextWorkerNumber"));
3334              STEALCOUNT = U.objectFieldOffset
3335                  (k.getDeclaredField("stealCount"));
3336 <            MAINLOCK = U.objectFieldOffset
3337 <                (k.getDeclaredField("mainLock"));
3336 >            PLOCK = U.objectFieldOffset
3337 >                (k.getDeclaredField("plock"));
3338 >            INDEXSEED = U.objectFieldOffset
3339 >                (k.getDeclaredField("indexSeed"));
3340              Class<?> tk = Thread.class;
3341              PARKBLOCKER = U.objectFieldOffset
3342                  (tk.getDeclaredField("parkBlocker"));
3343 +            Class<?> wk = WorkQueue.class;
3344 +            QLOCK = U.objectFieldOffset
3345 +                (wk.getDeclaredField("qlock"));
3346 +            Class<?> ak = ForkJoinTask[].class;
3347              ABASE = U.arrayBaseOffset(ak);
3348 <            s = U.arrayIndexScale(ak);
3349 <            ASHIFT = 31 - Integer.numberOfLeadingZeros(s);
3350 <        } catch (Exception e) {
3351 <            throw new Error(e);
3177 <        }
3178 <        if ((s & (s-1)) != 0)
3179 <            throw new Error("data type scale not a power of two");
3180 <        try { // Establish common pool
3181 <            String pp = System.getProperty(propPrefix + "parallelism");
3182 <            String fp = System.getProperty(propPrefix + "threadFactory");
3183 <            String up = System.getProperty(propPrefix + "exceptionHandler");
3184 <            ForkJoinWorkerThreadFactory fac = (fp == null) ?
3185 <                defaultForkJoinWorkerThreadFactory :
3186 <                ((ForkJoinWorkerThreadFactory)ClassLoader.
3187 <                 getSystemClassLoader().loadClass(fp).newInstance());
3188 <            Thread.UncaughtExceptionHandler ueh = (up == null) ? null :
3189 <                ((Thread.UncaughtExceptionHandler)ClassLoader.
3190 <                 getSystemClassLoader().loadClass(up).newInstance());
3191 <            int par;
3192 <            if ((pp == null || (par = Integer.parseInt(pp)) <= 0))
3193 <                par = Runtime.getRuntime().availableProcessors();
3194 <            if (par > MAX_CAP)
3195 <                par = MAX_CAP;
3196 <            commonPoolParallelism = par;
3197 <            int n = par - 1; // precompute submit mask
3198 <            n |= n >>> 1; n |= n >>> 2; n |= n >>> 4;
3199 <            n |= n >>> 8; n |= n >>> 16;
3200 <            int mask = ((n + 1) << 1) - 1;
3201 <            commonPool = new ForkJoinPool(par, mask, fac, ueh);
3348 >            int scale = U.arrayIndexScale(ak);
3349 >            if ((scale & (scale - 1)) != 0)
3350 >                throw new Error("data type scale not a power of two");
3351 >            ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
3352          } catch (Exception e) {
3353              throw new Error(e);
3354          }
3355 +
3356 +        submitters = new ThreadLocal<Submitter>();
3357 +        ForkJoinWorkerThreadFactory fac = defaultForkJoinWorkerThreadFactory =
3358 +            new DefaultForkJoinWorkerThreadFactory();
3359 +        modifyThreadPermission = new RuntimePermission("modifyThread");
3360 +
3361 +        /*
3362 +         * Establish common pool parameters.  For extra caution,
3363 +         * computations to set up common pool state are here; the
3364 +         * constructor just assigns these values to fields.
3365 +         */
3366 +
3367 +        int par = 0;
3368 +        Thread.UncaughtExceptionHandler handler = null;
3369 +        try {  // TBD: limit or report ignored exceptions?
3370 +            String pp = System.getProperty
3371 +                ("java.util.concurrent.ForkJoinPool.common.parallelism");
3372 +            String hp = System.getProperty
3373 +                ("java.util.concurrent.ForkJoinPool.common.exceptionHandler");
3374 +            String fp = System.getProperty
3375 +                ("java.util.concurrent.ForkJoinPool.common.threadFactory");
3376 +            if (fp != null)
3377 +                fac = ((ForkJoinWorkerThreadFactory)ClassLoader.
3378 +                       getSystemClassLoader().loadClass(fp).newInstance());
3379 +            if (hp != null)
3380 +                handler = ((Thread.UncaughtExceptionHandler)ClassLoader.
3381 +                           getSystemClassLoader().loadClass(hp).newInstance());
3382 +            if (pp != null)
3383 +                par = Integer.parseInt(pp);
3384 +        } catch (Exception ignore) {
3385 +        }
3386 +
3387 +        if (par <= 0)
3388 +            par = Runtime.getRuntime().availableProcessors();
3389 +        if (par > MAX_CAP)
3390 +            par = MAX_CAP;
3391 +        commonParallelism = par;
3392 +        long np = (long)(-par); // precompute initial ctl value
3393 +        long ct = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
3394 +
3395 +        common = new ForkJoinPool(par, ct, fac, handler);
3396      }
3397  
3398      /**
# Line 3214 | Line 3405 | public class ForkJoinPool extends Abstra
3405      private static sun.misc.Unsafe getUnsafe() {
3406          try {
3407              return sun.misc.Unsafe.getUnsafe();
3408 <        } catch (SecurityException se) {
3409 <            try {
3410 <                return java.security.AccessController.doPrivileged
3411 <                    (new java.security
3412 <                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
3413 <                        public sun.misc.Unsafe run() throws Exception {
3414 <                            java.lang.reflect.Field f = sun.misc
3415 <                                .Unsafe.class.getDeclaredField("theUnsafe");
3416 <                            f.setAccessible(true);
3417 <                            return (sun.misc.Unsafe) f.get(null);
3418 <                        }});
3419 <            } catch (java.security.PrivilegedActionException e) {
3420 <                throw new RuntimeException("Could not initialize intrinsics",
3421 <                                           e.getCause());
3422 <            }
3408 >        } catch (SecurityException tryReflectionInstead) {}
3409 >        try {
3410 >            return java.security.AccessController.doPrivileged
3411 >            (new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
3412 >                public sun.misc.Unsafe run() throws Exception {
3413 >                    Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class;
3414 >                    for (java.lang.reflect.Field f : k.getDeclaredFields()) {
3415 >                        f.setAccessible(true);
3416 >                        Object x = f.get(null);
3417 >                        if (k.isInstance(x))
3418 >                            return k.cast(x);
3419 >                    }
3420 >                    throw new NoSuchFieldError("the Unsafe");
3421 >                }});
3422 >        } catch (java.security.PrivilegedActionException e) {
3423 >            throw new RuntimeException("Could not initialize intrinsics",
3424 >                                       e.getCause());
3425          }
3426      }
3234
3427   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines