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.18 by dl, Mon Nov 19 18:12:28 2012 UTC vs.
Revision 1.40 by dl, Tue Jan 1 15:10:32 2013 UTC

# Line 51 | Line 51 | import java.util.concurrent.TimeUnit;
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 99 | Line 99 | import java.util.concurrent.TimeUnit;
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 properties} with prefix {@code
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 <<<<<<< ForkJoinPool.java
107 * exceptionHandler} -- the class name of a {@code
108 =======
106   * exceptionHandler} -- the class name of a {@link
107   * java.lang.Thread.UncaughtExceptionHandler
111 >>>>>>> 1.111
108   * Thread.UncaughtExceptionHandler}. Upon any error in establishing
109   * these settings, default parameters are used.
110   *
# Line 320 | Line 316 | public class ForkJoinPool extends Abstra
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 is
320 <     * apparently empty, they signal waiting workers (or trigger
321 <     * creation of new ones if fewer than the given parallelism
322 <     * level).  These primary signals are buttressed by signals
323 <     * whenever other threads scan for work or do not have a task to
324 <     * process (including the case of leaving a hint to unparked
325 <     * threads to help signal others upon wakeup).  On most platforms,
326 <     * signalling (unpark) overhead time is noticeably long, and the
327 <     * time between signalling a thread and it actually making
328 <     * progress can be very noticeably long, so it is worth offloading
329 <     * these delays from critical paths as much as possible.
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 443 | Line 440 | public class ForkJoinPool extends Abstra
440       * Common Pool
441       * ===========
442       *
443 <     * The static commonPool always exists after static
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
# Line 538 | Line 535 | public class ForkJoinPool extends Abstra
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
# Line 603 | 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.)
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 by workers before use. Others are
626 >     * allocated on first use.
627       */
628      static final class WorkQueue {
629          /**
# Line 626 | Line 646 | public class ForkJoinPool extends Abstra
646           */
647          static final int MAXIMUM_QUEUE_CAPACITY = 1 << 26; // 64M
648  
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
# Line 643 | Line 666 | public class ForkJoinPool extends Abstra
666          volatile ForkJoinTask<?> currentJoin;  // task being joined in awaitJoin
667          ForkJoinTask<?> currentSteal; // current non-local task being executed
668  
669 <        // Heuristic padding to ameliorate unfortunate memory placements
670 <        Object p00, p01, p02, p03, p04, p05, p06, p07;
648 <        Object p08, p09, p0a, p0b, p0c;
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) {
652            this.array = new ForkJoinTask<?>[WorkQueue.INITIAL_QUEUE_CAPACITY];
674              this.pool = pool;
675              this.owner = owner;
676              this.mode = mode;
677              this.seed = seed;
678 <            // Place indices in the center of array
678 >            // Place indices in the center of array (that is not yet allocated)
679              base = top = INITIAL_QUEUE_CAPACITY >>> 1;
680          }
681  
682          /**
683 <         * Pushes a task. Call only by owner in unshared queues.
684 <         * Cases needing resizing or rejection are relayed to fullPush
685 <         * (that also handles shared queues).
683 >         * Returns the approximate number of tasks in the queue.
684 >         */
685 >        final int queueSize() {
686 >            int n = base - top;       // non-owner callers must read base first
687 >            return (n >= 0) ? 0 : -n; // ignore transient negative
688 >        }
689 >
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.
694 >         */
695 >        final boolean isEmpty() {
696 >            ForkJoinTask<?>[] a; int m, s;
697 >            int n = base - (s = top);
698 >            return (n >= 0 ||
699 >                    (n == -1 &&
700 >                     ((a = array) == null ||
701 >                      (m = a.length - 1) < 0 ||
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.  (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
# Line 670 | Line 714 | public class ForkJoinPool extends Abstra
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);
719 <                if ((n = (top = s + 1) - base) <= 1) {
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(this, 0);
721 >                        p.signalWork(this);
722                  }
723                  else if (n >= m)
724                      growArray();
725              }
726          }
727  
684        /**
685         * Pushes a task if lock is free and array is either big
686         * enough or can be resized to be big enough.
687         *
688         * @param task the task. Caller must ensure non-null.
689         * @return true if submitted
690         */
691        final boolean trySharedPush(ForkJoinTask<?> task) {
692            boolean submitted = false;
693            if (qlock == 0 && U.compareAndSwapInt(this, QLOCK, 0, 1)) {
694                ForkJoinTask<?>[] a = array;  ForkJoinPool p;
695                int s = top;
696                try {
697                    if ((a != null && a.length > s + 1 - base) ||
698                        (a = growArray()) != null) {   // must presize
699                        int j = (((a.length - 1) & s) << ASHIFT) + ABASE;
700                        U.putOrderedObject(a, j, task);
701                        top = s + 1;
702                        submitted = true;
703                    }
704                } finally {
705                    qlock = 0;                         // unlock
706                }
707                if (submitted && (p = pool) != null)
708                    p.signalWork(this, 0);
709            }
710            return submitted;
711        }
712
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
# Line 859 | Line 874 | public class ForkJoinPool extends Abstra
874              return seed = r ^= r << 5;
875          }
876  
862        /**
863         * Provides a more accurate estimate of size than (top - base)
864         * by ordering reads and checking whether a near-empty queue
865         * has at least one unclaimed task.
866         */
867        final int queueSize() {
868            ForkJoinTask<?>[] a; int k, s, n;
869            return ((n = base - (s = top)) < 0 &&
870                    (n != -1 ||
871                     ((a = array) != null && (k = a.length) > 0 &&
872                      U.getObject
873                      (a, (long)((((k - 1) & (s - 1)) << ASHIFT) + ABASE)) != null))) ?
874                -n : 0;
875        }
876
877          // Specialized execution methods
878  
879          /**
# Line 988 | Line 988 | public class ForkJoinPool extends Abstra
988                  (currentSteal = t).doExec();
989                  currentSteal = null;
990                  ++nsteals;
991 <                if (top != base) {       // process remaining local tasks
991 >                if (base - top < 0) {       // process remaining local tasks
992                      if (mode == 0)
993                          popAndExecAll();
994                      else
# Line 1020 | Line 1020 | public class ForkJoinPool extends Abstra
1020                      s != Thread.State.TIMED_WAITING);
1021          }
1022  
1023        /**
1024         * If this owned and is not already interrupted, try to
1025         * interrupt and/or unpark, ignoring exceptions.
1026         */
1027        final void interruptOwner() {
1028            Thread wt, p;
1029            if ((wt = owner) != null && !wt.isInterrupted()) {
1030                try {
1031                    wt.interrupt();
1032                } catch (SecurityException ignore) {
1033                }
1034            }
1035            if ((p = parker) != null)
1036                U.unpark(p);
1037        }
1038
1023          // Unsafe mechanics
1024          private static final sun.misc.Unsafe U;
1025          private static final long QLOCK;
# Line 1070 | Line 1054 | public class ForkJoinPool extends Abstra
1054          defaultForkJoinWorkerThreadFactory;
1055  
1056      /**
1073     * Per-thread records for threads that submit to pools. Currently
1074     * holds only pseudo-random seed / index that is used to choose
1075     * submission queues in method externalPush. In the future, this may
1076     * also incorporate a means to implement different task rejection
1077     * and resubmission policies.
1078     *
1079     * Seeds for submitters and workers/workQueues work in basically
1080     * the same way but are initialized and updated using slightly
1081     * different mechanics. Both are initialized using the same
1082     * approach as in class ThreadLocal, where successive values are
1083     * unlikely to collide with previous values. Seeds are then
1084     * randomly modified upon collisions using xorshifts, which
1085     * requires a non-zero seed.
1086     */
1087    static final class Submitter {
1088        int seed;
1089        Submitter(int s) { seed = s; }
1090    }
1091
1092    /**
1057       * Per-thread submission bookkeeping. Shared across all pools
1058       * to reduce ThreadLocal pollution and because random motion
1059       * to avoid contention in one pool is likely to hold for others.
# Line 1099 | Line 1063 | public class ForkJoinPool extends Abstra
1063      static final ThreadLocal<Submitter> submitters;
1064  
1065      /**
1066 +     * Permission required for callers of methods that may start or
1067 +     * kill threads.
1068 +     */
1069 +    private static final RuntimePermission modifyThreadPermission;
1070 +
1071 +    /**
1072       * Common (static) pool. Non-null for public use unless a static
1073       * construction exception, but internal usages null-check on use
1074       * to paranoically avoid potential initialization circularities
1075       * as well as to simplify generated code.
1076       */
1077 <    static final ForkJoinPool commonPool;
1077 >    static final ForkJoinPool common;
1078  
1079      /**
1080 <     * Permission required for callers of methods that may start or
1111 <     * kill threads.
1080 >     * Common pool parallelism. Must equal common.parallelism.
1081       */
1082 <    private static final RuntimePermission modifyThreadPermission;
1114 <
1115 <    /**
1116 <     * Common pool parallelism. Must equal commonPool.parallelism.
1117 <     */
1118 <    static final int commonPoolParallelism;
1082 >    static final int commonParallelism;
1083  
1084      /**
1085       * Sequence number for creating workerNamePrefix.
# Line 1123 | Line 1087 | public class ForkJoinPool extends Abstra
1087      private static int poolNumberSequence;
1088  
1089      /**
1090 <     * Return the next sequence number. We don't expect this to
1091 <     * ever contend so use simple builtin sync.
1090 >     * Returns the next sequence number. We don't expect this to
1091 >     * ever contend, so use simple builtin sync.
1092       */
1093      private static final synchronized int nextPoolId() {
1094          return ++poolNumberSequence;
# Line 1148 | Line 1112 | public class ForkJoinPool extends Abstra
1112      private static final long FAST_IDLE_TIMEOUT =  200L * 1000L * 1000L;
1113  
1114      /**
1115 +     * Tolerance for idle timeouts, to cope with timer undershoots
1116 +     */
1117 +    private static final long TIMEOUT_SLOP = 2000000L;
1118 +
1119 +    /**
1120       * The maximum stolen->joining link depth allowed in method
1121       * tryHelpStealer.  Must be a power of two.  Depths for legitimate
1122       * chains are unbounded, but we use a fixed constant to avoid
# Line 1259 | Line 1228 | public class ForkJoinPool extends Abstra
1228       * declaration order and may differ across JVMs, but the following
1229       * empirically works OK on current JVMs.
1230       */
1231 +
1232 +    // Heuristic padding to ameliorate unfortunate memory placements
1233 +    volatile long pad00, pad01, pad02, pad03, pad04, pad05, pad06;
1234 +
1235      volatile long stealCount;                  // collects worker counts
1236      volatile long ctl;                         // main pool control
1237      volatile int plock;                        // shutdown status and seqLock
# Line 1269 | Line 1242 | public class ForkJoinPool extends Abstra
1242      final Thread.UncaughtExceptionHandler ueh; // per-worker UEH
1243      final String workerNamePrefix;             // to create worker name string
1244  
1245 +    volatile Object pad10, pad11, pad12, pad13, pad14, pad15, pad16, pad17;
1246 +    volatile Object pad18, pad19, pad1a, pad1b;
1247 +
1248      /*
1249       * Acquires the plock lock to protect worker array and related
1250       * updates. This method is called only if an initial CAS on plock
1251       * fails. This acts as a spinLock for normal cases, but falls back
1252       * to builtin monitor to block when (rarely) needed. This would be
1253       * a terrible idea for a highly contended lock, but works fine as
1254 <     * a more conservative alternative to a pure spinlock.  See
1279 <     * internal ConcurrentHashMap documentation for further
1280 <     * explanation of nearly the same construction.
1254 >     * a more conservative alternative to a pure spinlock.
1255       */
1256      private int acquirePlock() {
1257          int spins = PL_SPINS, r = 0, ps, nps;
# Line 1329 | Line 1303 | public class ForkJoinPool extends Abstra
1303      }
1304  
1305      /**
1306 <     * Tries to create and start a worker; adjusts counts etc on failure
1306 >     * Tries to create and start one worker if fewer than target
1307 >     * parallelism level exist. Adjusts counts etc on failure.
1308       */
1309 <    private void addWorker() {
1335 <        ForkJoinWorkerThread wt = null;
1336 <        try {
1337 <            (wt = factory.newThread(this)).start();
1338 <        } catch (Throwable ex) {
1339 <            deregisterWorker(wt, ex); // adjust on failure
1340 <        }
1341 <    }
1342 <
1343 <    /**
1344 <     * Performs secondary initialization, called when plock is zero.
1345 <     * Creates workQueue array and sets plock to a valid value.  The
1346 <     * lock body must be exception-free (so no try/finally) so we
1347 <     * optimistically allocate new array outside the lock and throw
1348 <     * away if (very rarely) not needed. (A similar tactic is used in
1349 <     * fullExternalPush.)  Because the plock seq value can eventually
1350 <     * wrap around zero, this method harmlessly fails to reinitialize
1351 <     * if workQueues exists, while still advancing plock.
1352 <     */
1353 <    private void initWorkQueuesArray() {
1354 <        WorkQueue[] ws; int ps;
1355 <        int p = config & SMASK;        // find power of two table size
1356 <        int n = (p > 1) ? p - 1 : 1;   // ensure at least 2 slots
1357 <        n |= n >>> 1; n |= n >>> 2; n |= n >>> 4; n |= n >>> 8; n |= n >>> 16;
1358 <        WorkQueue[] nws = new WorkQueue[(n + 1) << 1];
1359 <        if (((ps = plock) & PL_LOCK) != 0 ||
1360 <            !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1361 <            ps = acquirePlock();
1362 <        if ((ws = workQueues) == null || ws.length == 0)
1363 <            workQueues = nws;
1364 <        int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
1365 <        if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
1366 <            releasePlock(nps);
1309 >    private void tryAddWorker() {
1310          long c; int u;
1311 <        if ((u = (int)((c = ctl) >>> 32)) < 0 && (int)c == 0) {
1311 >        while ((u = (int)((c = ctl) >>> 32)) < 0 &&
1312 >               (u & SHORT_SIGN) != 0 && (int)c == 0) {
1313              long nc = (long)(((u + UTC_UNIT) & UTC_MASK) |
1314                               ((u + UAC_UNIT) & UAC_MASK)) << 32;
1315 <            if (U.compareAndSwapLong(this, CTL, c, nc))
1316 <                addWorker();
1315 >            if (U.compareAndSwapLong(this, CTL, c, nc)) {
1316 >                ForkJoinWorkerThreadFactory fac;
1317 >                Throwable ex = null;
1318 >                ForkJoinWorkerThread wt = null;
1319 >                try {
1320 >                    if ((fac = factory) != null &&
1321 >                        (wt = fac.newThread(this)) != null) {
1322 >                        wt.start();
1323 >                        break;
1324 >                    }
1325 >                } catch (Throwable e) {
1326 >                    ex = e;
1327 >                }
1328 >                deregisterWorker(wt, ex);
1329 >                break;
1330 >            }
1331          }
1374
1332      }
1333  
1334      //  Registering and deregistering workers
# Line 1384 | Line 1341 | public class ForkJoinPool extends Abstra
1341       * expanding as needed.
1342       *
1343       * @param wt the worker thread
1344 +     * @return the worker's queue
1345       */
1346 <    final void registerWorker(ForkJoinWorkerThread wt) {
1347 <        if (wt != null && wt.workQueue == null) {
1348 <            int s, ps;    // generate a rarely colliding candidate index seed
1349 <            do {} while (!U.compareAndSwapInt(this, INDEXSEED, s = indexSeed,
1350 <                                              s += SEED_INCREMENT) ||
1351 <                         s == 0); // skip 0
1352 <            WorkQueue w = new WorkQueue(this, wt, config >>> 16, s);
1353 <            if (((ps = plock) & PL_LOCK) != 0 ||
1354 <                !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1355 <                ps = acquirePlock();
1356 <            int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
1357 <            try {
1358 <                WorkQueue[] ws;
1359 <                if ((ws = workQueues) != null && wt.workQueue == null) {
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);
1368 <                                m = n - 1;
1369 <                                probes = 0;
1370 <                            }
1346 >    final WorkQueue registerWorker(ForkJoinWorkerThread wt) {
1347 >        Thread.UncaughtExceptionHandler handler; WorkQueue[] ws; int s, ps;
1348 >        wt.setDaemon(true);
1349 >        if ((handler = ueh) != null)
1350 >            wt.setUncaughtExceptionHandler(handler);
1351 >        do {} while (!U.compareAndSwapInt(this, INDEXSEED, s = indexSeed,
1352 >                                          s += SEED_INCREMENT) ||
1353 >                     s == 0); // skip 0
1354 >        WorkQueue w = new WorkQueue(this, wt, config >>> 16, s);
1355 >        if (((ps = plock) & PL_LOCK) != 0 ||
1356 >            !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1357 >            ps = acquirePlock();
1358 >        int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
1359 >        try {
1360 >            if ((ws = workQueues) != null) {    // skip if shutting down
1361 >                int n = ws.length, m = n - 1;
1362 >                int r = (s << 1) | 1;           // use odd-numbered indices
1363 >                if (ws[r &= m] != null) {       // collision
1364 >                    int probes = 0;             // step by approx half size
1365 >                    int step = (n <= 4) ? 2 : ((n >>> 1) & EVENMASK) + 2;
1366 >                    while (ws[r = (r + step) & m] != null) {
1367 >                        if (++probes >= n) {
1368 >                            workQueues = ws = Arrays.copyOf(ws, n <<= 1);
1369 >                            m = n - 1;
1370 >                            probes = 0;
1371                          }
1372                      }
1415                    w.eventCount = w.poolIndex = r; // volatile write orders
1416                    wt.workQueue = ws[r] = w;
1373                  }
1374 <            } finally {
1375 <                if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
1420 <                    releasePlock(nps);
1374 >                w.eventCount = w.poolIndex = r; // volatile write orders
1375 >                ws[r] = w;
1376              }
1377 +        } finally {
1378 +            if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
1379 +                releasePlock(nps);
1380          }
1381 +        wt.setName(workerNamePrefix.concat(Integer.toString(w.poolIndex)));
1382 +        return w;
1383      }
1384  
1385      /**
# Line 1454 | Line 1414 | public class ForkJoinPool extends Abstra
1414              }
1415          }
1416  
1417 <        long c;                             // adjust ctl counts
1417 >        long c;                          // adjust ctl counts
1418          do {} while (!U.compareAndSwapLong
1419                       (this, CTL, c = ctl, (((c - AC_UNIT) & AC_MASK) |
1420                                             ((c - TC_UNIT) & TC_MASK) |
1421                                             (c & ~(AC_MASK|TC_MASK)))));
1422  
1423 <        if (!tryTerminate(false, false) && w != null) {
1424 <            w.cancelAll();                  // cancel remaining tasks
1425 <            if (w.array != null)            // suppress signal if never ran
1426 <                helpSignal(null, 0);        // wake up or create replacement
1427 <            if (ex == null)                 // help clean refs on way out
1428 <                ForkJoinTask.helpExpungeStaleExceptions();
1423 >        if (!tryTerminate(false, false) && w != null && w.array != null) {
1424 >            w.cancelAll();               // cancel remaining tasks
1425 >            WorkQueue[] ws; WorkQueue v; Thread p; int u, i, e;
1426 >            while ((u = (int)((c = ctl) >>> 32)) < 0 && (e = (int)c) >= 0) {
1427 >                if (e > 0) {             // activate or create replacement
1428 >                    if ((ws = workQueues) == null ||
1429 >                        (i = e & SMASK) >= ws.length ||
1430 >                        (v = ws[i]) == null)
1431 >                        break;
1432 >                    long nc = (((long)(v.nextWait & E_MASK)) |
1433 >                               ((long)(u + UAC_UNIT) << 32));
1434 >                    if (v.eventCount != (e | INT_SIGN))
1435 >                        break;
1436 >                    if (U.compareAndSwapLong(this, CTL, c, nc)) {
1437 >                        v.eventCount = (e + E_SEQ) & E_MASK;
1438 >                        if ((p = v.parker) != null)
1439 >                            U.unpark(p);
1440 >                        break;
1441 >                    }
1442 >                }
1443 >                else {
1444 >                    if ((short)u < 0)
1445 >                        tryAddWorker();
1446 >                    break;
1447 >                }
1448 >            }
1449          }
1450 <
1451 <        if (ex != null)                     // rethrow
1450 >        if (ex == null)                     // help clean refs on way out
1451 >            ForkJoinTask.helpExpungeStaleExceptions();
1452 >        else                                // rethrow
1453              ForkJoinTask.rethrow(ex);
1454      }
1455  
# Line 1490 | Line 1471 | public class ForkJoinPool extends Abstra
1471              U.compareAndSwapInt(q, QLOCK, 0, 1)) { // lock
1472              int b = q.base, s = q.top, n, an;
1473              if ((a = q.array) != null && (an = a.length) > (n = s + 1 - b)) {
1474 <                U.putObject(a, (long)(((an - 1) & s) << ASHIFT) + ABASE, task);
1474 >                int j = (((an - 1) & s) << ASHIFT) + ABASE;
1475 >                U.putOrderedObject(a, j, task);
1476                  q.top = s + 1;                     // push on to deque
1477                  q.qlock = 0;
1478                  if (n <= 2)
1479 <                    signalWork(q, 0);
1479 >                    signalWork(q);
1480                  return;
1481              }
1482              q.qlock = 0;
# Line 1505 | Line 1487 | public class ForkJoinPool extends Abstra
1487      /**
1488       * Full version of externalPush. This method is called, among
1489       * other times, upon the first submission of the first task to the
1490 <     * pool, so must perform secondary initialization (via
1491 <     * initWorkQueuesArray). It also detects first submission by an
1492 <     * external thread by looking up its ThreadLocal, and creates a
1493 <     * new shared queue if the one at index if empty or contended. The
1494 <     * lock body must be exception-free (so no try/finally) so we
1495 <     * optimistically allocate new queues outside the lock and throw
1496 <     * them away if (very rarely) not needed.
1490 >     * pool, so must perform secondary initialization.  It also
1491 >     * detects first submission by an external thread by looking up
1492 >     * its ThreadLocal, and creates a new shared queue if the one at
1493 >     * index if empty or contended. The plock lock body must be
1494 >     * exception-free (so no try/finally) so we optimistically
1495 >     * allocate new queues outside the lock and throw them away if
1496 >     * (very rarely) not needed.
1497 >     *
1498 >     * Secondary initialization occurs when plock is zero, to create
1499 >     * workQueue array and set plock to a valid value.  This lock body
1500 >     * must also be exception-free. Because the plock seq value can
1501 >     * eventually wrap around zero, this method harmlessly fails to
1502 >     * reinitialize if workQueues exists, while still advancing plock.
1503       */
1504      private void fullExternalPush(ForkJoinTask<?> task) {
1505 <        int r = 0;
1505 >        int r = 0; // random index seed
1506          for (Submitter z = submitters.get();;) {
1507              WorkQueue[] ws; WorkQueue q; int ps, m, k;
1508              if (z == null) {
# Line 1522 | Line 1510 | public class ForkJoinPool extends Abstra
1510                                          r += SEED_INCREMENT) && r != 0)
1511                      submitters.set(z = new Submitter(r));
1512              }
1513 <            else if (r == 0) {               // move to a different index
1513 >            else if (r == 0) {                  // move to a different index
1514                  r = z.seed;
1515 <                r ^= r << 13;                // same xorshift as WorkQueues
1515 >                r ^= r << 13;                   // same xorshift as WorkQueues
1516                  r ^= r >>> 17;
1517                  z.seed = r ^ (r << 5);
1518              }
1519              else if ((ps = plock) < 0)
1520                  throw new RejectedExecutionException();
1521              else if (ps == 0 || (ws = workQueues) == null ||
1522 <                     (m = ws.length - 1) < 0)
1523 <                initWorkQueuesArray();
1522 >                     (m = ws.length - 1) < 0) { // initialize workQueues
1523 >                int p = config & SMASK;         // find power of two table size
1524 >                int n = (p > 1) ? p - 1 : 1;    // ensure at least 2 slots
1525 >                n |= n >>> 1; n |= n >>> 2;  n |= n >>> 4;
1526 >                n |= n >>> 8; n |= n >>> 16; n = (n + 1) << 1;
1527 >                WorkQueue[] nws = ((ws = workQueues) == null || ws.length == 0 ?
1528 >                                   new WorkQueue[n] : null);
1529 >                if (((ps = plock) & PL_LOCK) != 0 ||
1530 >                    !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
1531 >                    ps = acquirePlock();
1532 >                if (((ws = workQueues) == null || ws.length == 0) && nws != null)
1533 >                    workQueues = nws;
1534 >                int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
1535 >                if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
1536 >                    releasePlock(nps);
1537 >            }
1538              else if ((q = ws[k = r & m & SQMASK]) != null) {
1539 <                if (q.trySharedPush(task))
1540 <                    return;
1541 <                else
1542 <                    r = 0; // move on contention
1539 >                if (q.qlock == 0 && U.compareAndSwapInt(q, QLOCK, 0, 1)) {
1540 >                    ForkJoinTask<?>[] a = q.array;
1541 >                    int s = q.top;
1542 >                    boolean submitted = false;
1543 >                    try {                      // locked version of push
1544 >                        if ((a != null && a.length > s + 1 - q.base) ||
1545 >                            (a = q.growArray()) != null) {   // must presize
1546 >                            int j = (((a.length - 1) & s) << ASHIFT) + ABASE;
1547 >                            U.putOrderedObject(a, j, task);
1548 >                            q.top = s + 1;
1549 >                            submitted = true;
1550 >                        }
1551 >                    } finally {
1552 >                        q.qlock = 0;  // unlock
1553 >                    }
1554 >                    if (submitted) {
1555 >                        signalWork(q);
1556 >                        return;
1557 >                    }
1558 >                }
1559 >                r = 0; // move on failure
1560              }
1561              else if (((ps = plock) & PL_LOCK) == 0) { // create new queue
1562                  q = new WorkQueue(this, null, SHARED_QUEUE, r);
# Line 1566 | Line 1585 | public class ForkJoinPool extends Abstra
1585      }
1586  
1587      /**
1588 <     * Tries to create (at most one) or activate (possibly several)
1589 <     * workers if too few are active. On contention failure, continues
1590 <     * until at least one worker is signalled or the given queue is
1572 <     * empty or all workers are active.
1573 <     *
1574 <     * @param q if non-null, the queue holding tasks to be signalled
1575 <     * @param signals the target number of signals (at least one --
1576 <     * if argument is zero also sets signallee hint if parked).
1588 >     * Tries to create or activate a worker if too few are active.
1589 >     *
1590 >     * @param q the (non-null) queue holding tasks to be signalled
1591       */
1592 <    final void signalWork(WorkQueue q, int signals) {
1593 <        long c; int e, u, i, s; WorkQueue[] ws; WorkQueue w; Thread p;
1592 >    final void signalWork(WorkQueue q) {
1593 >        int hint = q.poolIndex;
1594 >        long c; int e, u, i, n; WorkQueue[] ws; WorkQueue w; Thread p;
1595          while ((u = (int)((c = ctl) >>> 32)) < 0) {
1596              if ((e = (int)c) > 0) {
1597                  if ((ws = workQueues) != null && ws.length > (i = e & SMASK) &&
# Line 1584 | Line 1599 | public class ForkJoinPool extends Abstra
1599                      long nc = (((long)(w.nextWait & E_MASK)) |
1600                                 ((long)(u + UAC_UNIT) << 32));
1601                      if (U.compareAndSwapLong(this, CTL, c, nc)) {
1602 +                        w.hint = hint;
1603                          w.eventCount = (e + E_SEQ) & E_MASK;
1604 <                        if ((p = w.parker) != null) {
1589 <                            if (q != null && signals == 0)
1590 <                                w.hint = q.poolIndex;
1604 >                        if ((p = w.parker) != null)
1605                              U.unpark(p);
1606 <                        }
1593 <                        if (--signals <= 0)
1594 <                            break;
1606 >                        break;
1607                      }
1608 <                    if (q != null && (s = q.queueSize()) <= signals &&
1597 <                         (signals = s) <= 0)
1608 >                    if (q.top - q.base <= 0)
1609                          break;
1610                  }
1611                  else
1612                      break;
1613              }
1614 <            else if (e == 0 && (u & SHORT_SIGN) != 0) {
1615 <                long nc = (long)(((u + UTC_UNIT) & UTC_MASK) |
1616 <                                 ((u + UAC_UNIT) & UAC_MASK)) << 32;
1606 <                if (U.compareAndSwapLong(this, CTL, c, nc)) {
1607 <                    addWorker();
1608 <                    break;
1609 <                }
1610 <            }
1611 <            else
1614 >            else {
1615 >                if ((short)u < 0)
1616 >                    tryAddWorker();
1617                  break;
1618 +            }
1619          }
1620      }
1621  
# Line 1619 | Line 1625 | public class ForkJoinPool extends Abstra
1625       * Top-level runloop for workers, called by ForkJoinWorkerThread.run.
1626       */
1627      final void runWorker(WorkQueue w) {
1628 <        if (w != null) // skip on initialization failure
1629 <            do { w.runTask(scan(w)); } while (w.qlock >= 0);
1628 >        w.growArray(); // allocate queue
1629 >        do { w.runTask(scan(w)); } while (w.qlock >= 0);
1630      }
1631  
1632      /**
# Line 1648 | Line 1654 | public class ForkJoinPool extends Abstra
1654       *
1655       * * If not already enqueued, try to inactivate and enqueue the
1656       * worker on wait queue. Or, if inactivating has caused the pool
1657 <     * to be quiescent, relay to idleAwaitWork to check for
1658 <     * termination and possibly shrink pool.
1657 >     * to be quiescent, relay to idleAwaitWork to possibly shrink
1658 >     * pool.
1659       *
1660       * * If already enqueued and none of the above apply, possibly
1661 <     * (with 1/2 probability) park awaiting signal, else lingering to
1662 <     * help scan and signal.
1661 >     * park awaiting signal, else lingering to help scan and signal.
1662 >     *
1663 >     * * If a non-empty queue discovered or left as a hint,
1664 >     * help wake up other workers before return.
1665       *
1666       * @param w the worker (via its WorkQueue)
1667       * @return a task or null if none found
1668       */
1669      private final ForkJoinTask<?> scan(WorkQueue w) {
1670 <        WorkQueue[] ws; int m, hint;
1670 >        WorkQueue[] ws; int m;
1671          int ps = plock;                          // read plock before ws
1672          if (w != null && (ws = workQueues) != null && (m = ws.length - 1) >= 0) {
1673              int ec = w.eventCount;               // ec is negative if inactive
1674              int r = w.seed; r ^= r << 13; r ^= r >>> 17; w.seed = r ^= r << 5;
1675 <            for (int j = ((m + m + 1) | MIN_SCAN) & MAX_SCAN; ; --j) {
1675 >            w.hint = -1;                         // update seed and clear hint
1676 >            int j = ((m + m + 1) | MIN_SCAN) & MAX_SCAN;
1677 >            do {
1678                  WorkQueue q; ForkJoinTask<?>[] a; int b;
1679                  if ((q = ws[(r + j) & m]) != null && (b = q.base) - q.top < 0 &&
1680                      (a = q.array) != null) {     // probably nonempty
# Line 1674 | Line 1684 | public class ForkJoinPool extends Abstra
1684                      if (q.base == b && ec >= 0 && t != null &&
1685                          U.compareAndSwapObject(a, i, t, null)) {
1686                          if ((q.base = b + 1) - q.top < 0)
1687 <                            signalWork(q, 0);
1687 >                            signalWork(q);
1688                          return t;                // taken
1689                      }
1690 <                    else if (ec < 0 || j < m) {  // cannot take or cannot rescan
1691 <                        w.hint = q.poolIndex;    // use hint below
1692 <                        break;                   // let caller retry after signal
1693 <                    }
1694 <                }
1695 <                else if (j < 0) { // end of scan; in loop to simplify code
1696 <                    long c, sc; int e, ns;
1697 <                    if ((ns = w.nsteals) != 0) {
1698 <                        if (U.compareAndSwapLong(this, STEALCOUNT,
1699 <                                                 sc = stealCount, sc + ns))
1700 <                            w.nsteals = 0;       // collect steals
1701 <                    }
1702 <                    else if (plock != ps)        // ws may have changed
1703 <                        break;
1704 <                    else if ((e = (int)(c = ctl)) < 0)
1705 <                        w.qlock = -1;            // pool is terminating
1706 <                    else if (ec >= 0) {          // try to enqueue/inactivate
1707 <                        long nc = ((long)ec |
1708 <                                   ((c - AC_UNIT) & (AC_MASK|TC_MASK)));
1690 >                    else if ((ec < 0 || j < m) && (int)(ctl >> AC_SHIFT) <= 0) {
1691 >                        w.hint = (r + j) & m;    // help signal below
1692 >                        break;                   // cannot take
1693 >                    }
1694 >                }
1695 >            } while (--j >= 0);
1696 >
1697 >            int h, e, ns; long c, sc; WorkQueue q;
1698 >            if ((ns = w.nsteals) != 0) {
1699 >                if (U.compareAndSwapLong(this, STEALCOUNT,
1700 >                                         sc = stealCount, sc + ns))
1701 >                    w.nsteals = 0;               // collect steals and rescan
1702 >            }
1703 >            else if (plock != ps)                // consistency check
1704 >                ;                                // skip
1705 >            else if ((e = (int)(c = ctl)) < 0)
1706 >                w.qlock = -1;                    // pool is terminating
1707 >            else {
1708 >                if ((h = w.hint) < 0) {
1709 >                    if (ec >= 0) {               // try to enqueue/inactivate
1710 >                        long nc = (((long)ec |
1711 >                                    ((c - AC_UNIT) & (AC_MASK|TC_MASK))));
1712                          w.nextWait = e;          // link and mark inactive
1700                        w.hint = -1;             // use hint if set while parked
1713                          w.eventCount = ec | INT_SIGN;
1714 <                        if (ctl != c ||
1715 <                            !U.compareAndSwapLong(this, CTL, c, nc))
1704 <                            w.eventCount = ec;  // unmark on CAS failure
1714 >                        if (ctl != c || !U.compareAndSwapLong(this, CTL, c, nc))
1715 >                            w.eventCount = ec;   // unmark on CAS failure
1716                          else if ((int)(c >> AC_SHIFT) == 1 - (config & SMASK))
1717                              idleAwaitWork(w, nc, c);
1718                      }
1719 <                    else if (w.eventCount < 0) { // block
1719 >                    else if (w.eventCount < 0 && ctl == c) {
1720                          Thread wt = Thread.currentThread();
1721                          Thread.interrupted();    // clear status
1722                          U.putObject(wt, PARKBLOCKER, this);
1723                          w.parker = wt;           // emulate LockSupport.park
1724                          if (w.eventCount < 0)    // recheck
1725 <                            U.park(false, 0L);
1725 >                            U.park(false, 0L);   // block
1726                          w.parker = null;
1727                          U.putObject(wt, PARKBLOCKER, null);
1728                      }
1718                    break;
1729                  }
1730 <            }
1731 <            if ((hint = w.hint) >= 0) {          // help signal
1732 <                WorkQueue[] vs; WorkQueue v; int k;
1733 <                w.hint = -1;                     // suppress resignal
1734 <                if ((vs = workQueues) != null && hint < vs.length &&
1735 <                    (v = vs[hint]) != null && (k = v.base - v.top) < -1)
1736 <                    signalWork(v, 1 - k);
1730 >                if ((h >= 0 || (h = w.hint) >= 0) &&
1731 >                    (ws = workQueues) != null && h < ws.length &&
1732 >                    (q = ws[h]) != null) {      // signal others before retry
1733 >                    WorkQueue v; Thread p; int u, i, s;
1734 >                    for (int n = (config & SMASK) - 1;;) {
1735 >                        int idleCount = (w.eventCount < 0) ? 0 : -1;
1736 >                        if (((s = idleCount - q.base + q.top) <= n &&
1737 >                             (n = s) <= 0) ||
1738 >                            (u = (int)((c = ctl) >>> 32)) >= 0 ||
1739 >                            (e = (int)c) <= 0 || m < (i = e & SMASK) ||
1740 >                            (v = ws[i]) == null)
1741 >                            break;
1742 >                        long nc = (((long)(v.nextWait & E_MASK)) |
1743 >                                   ((long)(u + UAC_UNIT) << 32));
1744 >                        if (v.eventCount != (e | INT_SIGN) ||
1745 >                            !U.compareAndSwapLong(this, CTL, c, nc))
1746 >                            break;
1747 >                        v.hint = h;
1748 >                        v.eventCount = (e + E_SEQ) & E_MASK;
1749 >                        if ((p = v.parker) != null)
1750 >                            U.unpark(p);
1751 >                        if (--n <= 0)
1752 >                            break;
1753 >                    }
1754 >                }
1755              }
1756          }
1757          return null;
# Line 1743 | Line 1771 | public class ForkJoinPool extends Abstra
1771       */
1772      private void idleAwaitWork(WorkQueue w, long currentCtl, long prevCtl) {
1773          if (w != null && w.eventCount < 0 &&
1774 <            !tryTerminate(false, false) && (int)prevCtl != 0) {
1774 >            !tryTerminate(false, false) && (int)prevCtl != 0 &&
1775 >            ctl == currentCtl) {
1776              int dc = -(short)(currentCtl >>> TC_SHIFT);
1777              long parkTime = dc < 0 ? FAST_IDLE_TIMEOUT: (dc + 1) * IDLE_TIMEOUT;
1778 <            long deadline = System.nanoTime() + parkTime - 100000L; // 1ms slop
1778 >            long deadline = System.nanoTime() + parkTime - TIMEOUT_SLOP;
1779              Thread wt = Thread.currentThread();
1780              while (ctl == currentCtl) {
1781                  Thread.interrupted();  // timed variant of version in scan()
# Line 1761 | Line 1790 | public class ForkJoinPool extends Abstra
1790                  if (deadline - System.nanoTime() <= 0L &&
1791                      U.compareAndSwapLong(this, CTL, currentCtl, prevCtl)) {
1792                      w.eventCount = (w.eventCount + E_SEQ) | E_MASK;
1793 +                    w.hint = -1;
1794                      w.qlock = -1;   // shrink
1765                    w.hint = -1;    // suppress helping
1795                      break;
1796                  }
1797              }
# Line 1770 | Line 1799 | public class ForkJoinPool extends Abstra
1799      }
1800  
1801      /**
1802 <     * Scans through queues looking for work (optionally, while
1803 <     * joining a task); if any are present, signals. May return early
1804 <     * if more signalling is detectably unneeded.
1802 >     * Scans through queues looking for work while joining a task; if
1803 >     * any present, signals. May return early if more signalling is
1804 >     * detectably unneeded.
1805       *
1806 <     * @param task if non-null, return early if done
1806 >     * @param task return early if done
1807       * @param origin an index to start scan
1808       */
1809 <    final int helpSignal(ForkJoinTask<?> task, int origin) {
1810 <        WorkQueue[] ws; WorkQueue q; int m, n, s, u;
1811 <        if ((ws = workQueues) != null && (m = ws.length - 1) >= 0) {
1812 <            for (int i = 0; i <= m; ++i) {
1813 <                if (task != null && (s = task.status) < 0)
1814 <                    return s;
1815 <                if ((q = ws[(i + origin) & m]) != null &&
1816 <                    (n = q.queueSize()) > 0) {
1817 <                    signalWork(q, n);
1818 <                    if ((u = (int)(ctl >>> 32)) >= 0 || (u >> UAC_SHIFT) >= 0)
1809 >    private void helpSignal(ForkJoinTask<?> task, int origin) {
1810 >        WorkQueue[] ws; WorkQueue w; Thread p; long c; int m, u, e, i, s;
1811 >        if (task != null && task.status >= 0 &&
1812 >            (u = (int)(ctl >>> 32)) < 0 && (u >> UAC_SHIFT) < 0 &&
1813 >            (ws = workQueues) != null && (m = ws.length - 1) >= 0) {
1814 >            outer: for (int k = origin, j = m; j >= 0; --j) {
1815 >                WorkQueue q = ws[k++ & m];
1816 >                for (int n = m;;) { // limit to at most m signals
1817 >                    if (task.status < 0)
1818 >                        break outer;
1819 >                    if (q == null ||
1820 >                        ((s = -q.base + q.top) <= n && (n = s) <= 0))
1821                          break;
1822 +                    if ((u = (int)((c = ctl) >>> 32)) >= 0 ||
1823 +                        (e = (int)c) <= 0 || m < (i = e & SMASK) ||
1824 +                        (w = ws[i]) == null)
1825 +                        break outer;
1826 +                    long nc = (((long)(w.nextWait & E_MASK)) |
1827 +                               ((long)(u + UAC_UNIT) << 32));
1828 +                    if (w.eventCount != (e | INT_SIGN))
1829 +                        break outer;
1830 +                    if (U.compareAndSwapLong(this, CTL, c, nc)) {
1831 +                        w.eventCount = (e + E_SEQ) & E_MASK;
1832 +                        if ((p = w.parker) != null)
1833 +                            U.unpark(p);
1834 +                        if (--n <= 0)
1835 +                            break;
1836 +                    }
1837                  }
1838              }
1839          }
1794        return 0;
1840      }
1841  
1842      /**
# Line 1940 | Line 1985 | public class ForkJoinPool extends Abstra
1985              else if (tc + pc < MAX_CAP) {
1986                  long nc = ((c + TC_UNIT) & TC_MASK) | (c & ~TC_MASK);
1987                  if (U.compareAndSwapLong(this, CTL, c, nc)) {
1988 <                    addWorker();
1989 <                    return true;
1988 >                    ForkJoinWorkerThreadFactory fac;
1989 >                    Throwable ex = null;
1990 >                    ForkJoinWorkerThread wt = null;
1991 >                    try {
1992 >                        if ((fac = factory) != null &&
1993 >                            (wt = fac.newThread(this)) != null) {
1994 >                            wt.start();
1995 >                            return true;
1996 >                        }
1997 >                    } catch (Throwable rex) {
1998 >                        ex = rex;
1999 >                    }
2000 >                    deregisterWorker(wt, ex); // clean up and return false
2001                  }
2002              }
2003          }
# Line 1960 | Line 2016 | public class ForkJoinPool extends Abstra
2016          if (joiner != null && task != null && (s = task.status) >= 0) {
2017              ForkJoinTask<?> prevJoin = joiner.currentJoin;
2018              joiner.currentJoin = task;
2019 <            do {} while ((s = task.status) >= 0 &&
1964 <                         joiner.queueSize() > 0 &&
2019 >            do {} while ((s = task.status) >= 0 && !joiner.isEmpty() &&
2020                           joiner.tryRemoveAndExec(task)); // process local tasks
2021 <            if (s >= 0 && (s = task.status) >= 0 &&
2022 <                (s = helpSignal(task, joiner.poolIndex)) >= 0 &&
2023 <                (task instanceof CountedCompleter))
2024 <                s = helpComplete(task, LIFO_QUEUE);
2025 <            int k = 0; // to perform pre-block yield for politeness
2021 >            if (s >= 0 && (s = task.status) >= 0) {
2022 >                helpSignal(task, joiner.poolIndex);
2023 >                if ((s = task.status) >= 0 &&
2024 >                    (task instanceof CountedCompleter))
2025 >                    s = helpComplete(task, LIFO_QUEUE);
2026 >            }
2027              while (s >= 0 && (s = task.status) >= 0) {
2028 <                if ((joiner.queueSize() > 0 ||           // try helping
2028 >                if ((!joiner.isEmpty() ||           // try helping
2029                       (s = tryHelpStealer(joiner, task)) == 0) &&
2030                      (s = task.status) >= 0) {
2031 <                    if (k < 3) {
2032 <                        if (++k < 3)
1977 <                            s = helpSignal(task, joiner.poolIndex);
1978 <                        else
1979 <                            Thread.yield();
1980 <                    }
1981 <                    else if (!tryCompensate())
1982 <                        k = 0;
1983 <                    else {
2031 >                    helpSignal(task, joiner.poolIndex);
2032 >                    if ((s = task.status) >= 0 && tryCompensate()) {
2033                          if (task.trySetSignal() && (s = task.status) >= 0) {
2034                              synchronized (task) {
2035                                  if (task.status >= 0) {
# Line 2017 | Line 2066 | public class ForkJoinPool extends Abstra
2066          if (joiner != null && task != null && (s = task.status) >= 0) {
2067              ForkJoinTask<?> prevJoin = joiner.currentJoin;
2068              joiner.currentJoin = task;
2069 <            do {} while ((s = task.status) >= 0 &&
2021 <                         joiner.queueSize() > 0 &&
2069 >            do {} while ((s = task.status) >= 0 && !joiner.isEmpty() &&
2070                           joiner.tryRemoveAndExec(task));
2071 <            if (s >= 0 && (s = task.status) >= 0 &&
2072 <                (s = helpSignal(task, joiner.poolIndex)) >= 0 &&
2073 <                (task instanceof CountedCompleter))
2074 <                s = helpComplete(task, LIFO_QUEUE);
2075 <            if (s >= 0 && joiner.queueSize() == 0) {
2071 >            if (s >= 0 && (s = task.status) >= 0) {
2072 >                helpSignal(task, joiner.poolIndex);
2073 >                if ((s = task.status) >= 0 &&
2074 >                    (task instanceof CountedCompleter))
2075 >                    s = helpComplete(task, LIFO_QUEUE);
2076 >            }
2077 >            if (s >= 0 && joiner.isEmpty()) {
2078                  do {} while (task.status >= 0 &&
2079                               tryHelpStealer(joiner, task) > 0);
2080              }
# Line 2034 | Line 2084 | public class ForkJoinPool extends Abstra
2084  
2085      /**
2086       * Returns a (probably) non-empty steal queue, if one is found
2087 <     * during a random, then cyclic scan, else null.  This method must
2088 <     * be retried by caller if, by the time it tries to use the queue,
2039 <     * it is empty.
2087 >     * during a scan, else null.  This method must be retried by
2088 >     * caller if, by the time it tries to use the queue, it is empty.
2089       * @param r a (random) seed for scanning
2090       */
2091      private WorkQueue findNonEmptyStealQueue(int r) {
2092 <        for (WorkQueue[] ws;;) {
2093 <            int ps = plock, m, n;
2094 <            if ((ws = workQueues) == null || (m = ws.length - 1) < 1)
2095 <                return null;
2096 <            for (int j = (m + 1) << 2; ;) {
2097 <                WorkQueue q = ws[(((r + j) << 1) | 1) & m];
2098 <                if (q != null && (n = q.queueSize()) > 0) {
2050 <                    if (n > 1)
2051 <                        signalWork(q, 0);
2052 <                    return q;
2053 <                }
2054 <                else if (--j < 0) {
2055 <                    if (plock == ps)
2056 <                        return null;
2057 <                    break;
2092 >        for (;;) {
2093 >            int ps = plock, m; WorkQueue[] ws; WorkQueue q;
2094 >            if ((ws = workQueues) != null && (m = ws.length - 1) >= 0) {
2095 >                for (int j = (m + 1) << 2; j >= 0; --j) {
2096 >                    if ((q = ws[(((r + j) << 1) | 1) & m]) != null &&
2097 >                        q.base - q.top < 0)
2098 >                        return q;
2099                  }
2100              }
2101 +            if (plock == ps)
2102 +                return null;
2103          }
2104      }
2105  
# Line 2068 | Line 2111 | public class ForkJoinPool extends Abstra
2111       */
2112      final void helpQuiescePool(WorkQueue w) {
2113          for (boolean active = true;;) {
2114 <            ForkJoinTask<?> localTask; // exhaust local queue
2115 <            while ((localTask = w.nextLocalTask()) != null)
2116 <                localTask.doExec();
2117 <            // Similar to loop in scan(), but ignoring submissions
2118 <            WorkQueue q = findNonEmptyStealQueue(w.nextSeed());
2119 <            if (q != null) {
2120 <                ForkJoinTask<?> t; int b;
2114 >            long c; WorkQueue q; ForkJoinTask<?> t; int b;
2115 >            while ((t = w.nextLocalTask()) != null) {
2116 >                if (w.base - w.top < 0)
2117 >                    signalWork(w);
2118 >                t.doExec();
2119 >            }
2120 >            if ((q = findNonEmptyStealQueue(w.nextSeed())) != null) {
2121                  if (!active) {      // re-establish active count
2079                    long c;
2122                      active = true;
2123                      do {} while (!U.compareAndSwapLong
2124                                   (this, CTL, c = ctl, c + AC_UNIT));
2125                  }
2126 <                if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
2126 >                if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
2127 >                    if (q.base - q.top < 0)
2128 >                        signalWork(q);
2129                      w.runSubtask(t);
2130 +                }
2131              }
2132 <            else {
2133 <                long c;
2134 <                if (active) {       // decrement active count without queuing
2132 >            else if (active) {       // decrement active count without queuing
2133 >                long nc = (c = ctl) - AC_UNIT;
2134 >                if ((int)(nc >> AC_SHIFT) + (config & SMASK) == 0)
2135 >                    return;          // bypass decrement-then-increment
2136 >                if (U.compareAndSwapLong(this, CTL, c, nc))
2137                      active = false;
2091                    do {} while (!U.compareAndSwapLong
2092                                 (this, CTL, c = ctl, c -= AC_UNIT));
2093                }
2094                else
2095                    c = ctl;        // re-increment on exit
2096                if ((int)(c >> AC_SHIFT) + (config & SMASK) == 0) {
2097                    do {} while (!U.compareAndSwapLong
2098                                 (this, CTL, c = ctl, c + AC_UNIT));
2099                    break;
2100                }
2138              }
2139 +            else if ((int)((c = ctl) >> AC_SHIFT) + (config & SMASK) == 0 &&
2140 +                     U.compareAndSwapLong(this, CTL, c, c + AC_UNIT))
2141 +                return;
2142          }
2143      }
2144  
# Line 2114 | Line 2154 | public class ForkJoinPool extends Abstra
2154                  return t;
2155              if ((q = findNonEmptyStealQueue(w.nextSeed())) == null)
2156                  return null;
2157 <            if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
2157 >            if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
2158 >                if (q.base - q.top < 0)
2159 >                    signalWork(q);
2160                  return t;
2161 +            }
2162          }
2163      }
2164  
# Line 2197 | Line 2240 | public class ForkJoinPool extends Abstra
2240       * @return true if now terminating or terminated
2241       */
2242      private boolean tryTerminate(boolean now, boolean enable) {
2243 <        if (this == commonPool)                     // cannot shut down
2243 >        int ps;
2244 >        if (this == common)                    // cannot shut down
2245              return false;
2246 +        if ((ps = plock) >= 0) {                   // enable by setting plock
2247 +            if (!enable)
2248 +                return false;
2249 +            if ((ps & PL_LOCK) != 0 ||
2250 +                !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
2251 +                ps = acquirePlock();
2252 +            int nps = ((ps + PL_LOCK) & ~SHUTDOWN) | SHUTDOWN;
2253 +            if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
2254 +                releasePlock(nps);
2255 +        }
2256          for (long c;;) {
2257 <            if (((c = ctl) & STOP_BIT) != 0) {      // already terminating
2257 >            if (((c = ctl) & STOP_BIT) != 0) {     // already terminating
2258                  if ((short)(c >>> TC_SHIFT) == -(config & SMASK)) {
2259                      synchronized (this) {
2260 <                        notifyAll();                // signal when 0 workers
2260 >                        notifyAll();               // signal when 0 workers
2261                      }
2262                  }
2263                  return true;
2264              }
2265 <            if (plock >= 0) {                       // not yet enabled
2266 <                int ps;
2267 <                if (!enable)
2214 <                    return false;
2215 <                if (((ps = plock) & PL_LOCK) != 0 ||
2216 <                    !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
2217 <                    ps = acquirePlock();
2218 <                int nps = SHUTDOWN;
2219 <                if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
2220 <                    releasePlock(nps);
2221 <            }
2222 <            if (!now) {                             // check if idle & no tasks
2223 <                if ((int)(c >> AC_SHIFT) != -(config & SMASK) ||
2224 <                    hasQueuedSubmissions())
2265 >            if (!now) {                            // check if idle & no tasks
2266 >                WorkQueue[] ws; WorkQueue w;
2267 >                if ((int)(c >> AC_SHIFT) != -(config & SMASK))
2268                      return false;
2269 <                // Check for unqueued inactive workers. One pass suffices.
2270 <                WorkQueue[] ws = workQueues; WorkQueue w;
2271 <                if (ws != null) {
2272 <                    for (int i = 1; i < ws.length; i += 2) {
2273 <                        if ((w = ws[i]) != null && w.eventCount >= 0)
2274 <                            return false;
2269 >                if ((ws = workQueues) != null) {
2270 >                    for (int i = 0; i < ws.length; ++i) {
2271 >                        if ((w = ws[i]) != null) {
2272 >                            if (!w.isEmpty()) {    // signal unprocessed tasks
2273 >                                signalWork(w);
2274 >                                return false;
2275 >                            }
2276 >                            if ((i & 1) != 0 && w.eventCount >= 0)
2277 >                                return false;      // unqueued inactive worker
2278 >                        }
2279                      }
2280                  }
2281              }
2282              if (U.compareAndSwapLong(this, CTL, c, c | STOP_BIT)) {
2283                  for (int pass = 0; pass < 3; ++pass) {
2284 <                    WorkQueue[] ws = workQueues;
2285 <                    if (ws != null) {
2239 <                        WorkQueue w;
2284 >                    WorkQueue[] ws; WorkQueue w; Thread wt;
2285 >                    if ((ws = workQueues) != null) {
2286                          int n = ws.length;
2287                          for (int i = 0; i < n; ++i) {
2288                              if ((w = ws[i]) != null) {
2289                                  w.qlock = -1;
2290                                  if (pass > 0) {
2291                                      w.cancelAll();
2292 <                                    if (pass > 1)
2293 <                                        w.interruptOwner();
2292 >                                    if (pass > 1 && (wt = w.owner) != null) {
2293 >                                        if (!wt.isInterrupted()) {
2294 >                                            try {
2295 >                                                wt.interrupt();
2296 >                                            } catch (Throwable ignore) {
2297 >                                            }
2298 >                                        }
2299 >                                        U.unpark(wt);
2300 >                                    }
2301                                  }
2302                              }
2303                          }
2304                          // Wake up workers parked on event queue
2305                          int i, e; long cc; Thread p;
2306                          while ((e = (int)(cc = ctl) & E_MASK) != 0 &&
2307 <                               (i = e & SMASK) < n &&
2307 >                               (i = e & SMASK) < n && i >= 0 &&
2308                                 (w = ws[i]) != null) {
2309                              long nc = ((long)(w.nextWait & E_MASK) |
2310                                         ((cc + AC_UNIT) & AC_MASK) |
# Line 2279 | Line 2332 | public class ForkJoinPool extends Abstra
2332      static WorkQueue commonSubmitterQueue() {
2333          ForkJoinPool p; WorkQueue[] ws; int m; Submitter z;
2334          return ((z = submitters.get()) != null &&
2335 <                (p = commonPool) != null &&
2335 >                (p = common) != null &&
2336                  (ws = p.workQueues) != null &&
2337                  (m = ws.length - 1) >= 0) ?
2338              ws[m & z.seed & SQMASK] : null;
# Line 2290 | Line 2343 | public class ForkJoinPool extends Abstra
2343       */
2344      static boolean tryExternalUnpush(ForkJoinTask<?> t) {
2345          ForkJoinPool p; WorkQueue[] ws; WorkQueue q; Submitter z;
2346 <        ForkJoinTask<?>[] a;  int m, s; long j;
2347 <        if ((z = submitters.get()) != null &&
2348 <            (p = commonPool) != null &&
2346 >        ForkJoinTask<?>[] a;  int m, s;
2347 >        if (t != null &&
2348 >            (z = submitters.get()) != null &&
2349 >            (p = common) != null &&
2350              (ws = p.workQueues) != null &&
2351              (m = ws.length - 1) >= 0 &&
2352              (q = ws[m & z.seed & SQMASK]) != null &&
2353              (s = q.top) != q.base &&
2354 <            (a = q.array) != null &&
2355 <            U.getObjectVolatile
2356 <            (a, j = (((a.length - 1) & (s - 1)) << ASHIFT) + ABASE) == t &&
2357 <            U.compareAndSwapInt(q, QLOCK, 0, 1)) {
2358 <            if (q.array == a && q.top == s && // recheck
2359 <                U.compareAndSwapObject(a, j, t, null)) {
2360 <                q.top = s - 1;
2354 >            (a = q.array) != null) {
2355 >            long j = (((a.length - 1) & (s - 1)) << ASHIFT) + ABASE;
2356 >            if (U.getObject(a, j) == t &&
2357 >                U.compareAndSwapInt(q, QLOCK, 0, 1)) {
2358 >                if (q.array == a && q.top == s && // recheck
2359 >                    U.compareAndSwapObject(a, j, t, null)) {
2360 >                    q.top = s - 1;
2361 >                    q.qlock = 0;
2362 >                    return true;
2363 >                }
2364                  q.qlock = 0;
2308                return true;
2365              }
2310            q.qlock = 0;
2366          }
2367          return false;
2368      }
# Line 2349 | Line 2404 | public class ForkJoinPool extends Abstra
2404                      (u = (int)(ctl >>> 32)) >= 0 || (u >> UAC_SHIFT) >= 0)
2405                      break;
2406                  if (task == null) {
2407 <                    if (helpSignal(root, q.poolIndex) >= 0)
2407 >                    helpSignal(root, q.poolIndex);
2408 >                    if (root.status >= 0)
2409                          helpComplete(root, SHARED_QUEUE);
2410                      break;
2411                  }
# Line 2364 | Line 2420 | public class ForkJoinPool extends Abstra
2420      static void externalHelpJoin(ForkJoinTask<?> t) {
2421          // Some hard-to-avoid overlap with tryExternalUnpush
2422          ForkJoinPool p; WorkQueue[] ws; WorkQueue q, w; Submitter z;
2423 <        ForkJoinTask<?>[] a;  int m, s, n; long j;
2423 >        ForkJoinTask<?>[] a;  int m, s, n;
2424          if (t != null &&
2425              (z = submitters.get()) != null &&
2426 <            (p = commonPool) != null &&
2426 >            (p = common) != null &&
2427              (ws = p.workQueues) != null &&
2428              (m = ws.length - 1) >= 0 &&
2429              (q = ws[m & z.seed & SQMASK]) != null &&
2430 <            (a = q.array) != null &&
2431 <            t.status >= 0) {
2432 <            if ((s = q.top) != q.base &&
2433 <                U.getObjectVolatile
2434 <                (a, j = (((a.length - 1) & (s - 1)) << ASHIFT) + ABASE) == t &&
2435 <                U.compareAndSwapInt(q, QLOCK, 0, 1)) {
2436 <                if (q.array == a && q.top == s &&
2437 <                    U.compareAndSwapObject(a, j, t, null)) {
2438 <                    q.top = s - 1;
2439 <                    q.qlock = 0;
2440 <                    t.doExec();
2430 >            (a = q.array) != null) {
2431 >            int am = a.length - 1;
2432 >            if ((s = q.top) != q.base) {
2433 >                long j = ((am & (s - 1)) << ASHIFT) + ABASE;
2434 >                if (U.getObject(a, j) == t &&
2435 >                    U.compareAndSwapInt(q, QLOCK, 0, 1)) {
2436 >                    if (q.array == a && q.top == s &&
2437 >                        U.compareAndSwapObject(a, j, t, null)) {
2438 >                        q.top = s - 1;
2439 >                        q.qlock = 0;
2440 >                        t.doExec();
2441 >                    }
2442 >                    else
2443 >                        q.qlock = 0;
2444                  }
2386                else
2387                    q.qlock = 0;
2445              }
2446              if (t.status >= 0) {
2447                  if (t instanceof CountedCompleter)
# Line 2395 | Line 2452 | public class ForkJoinPool extends Abstra
2452          }
2453      }
2454  
2398    /**
2399     * Restricted version of helpQuiescePool for external callers
2400     */
2401    static void externalHelpQuiescePool() {
2402        ForkJoinPool p; ForkJoinTask<?> t; WorkQueue q; int b;
2403        if ((p = commonPool) != null &&
2404            (q = p.findNonEmptyStealQueue(1)) != null &&
2405            (b = q.base) - q.top < 0 &&
2406            (t = q.pollAt(b)) != null)
2407            t.doExec();
2408    }
2409
2455      // Exported methods
2456  
2457      // Constructors
# Line 2480 | Line 2525 | public class ForkJoinPool extends Abstra
2525              throw new IllegalArgumentException();
2526          this.factory = factory;
2527          this.ueh = handler;
2528 <        this.config = parallelism | (asyncMode? (FIFO_QUEUE << 16) : 0);
2528 >        this.config = parallelism | (asyncMode ? (FIFO_QUEUE << 16) : 0);
2529          long np = (long)(-parallelism); // offset ctl counts
2530          this.ctl = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
2531          int pn = nextPoolId();
# Line 2505 | Line 2550 | public class ForkJoinPool extends Abstra
2550      }
2551  
2552      /**
2553 <     * Returns the common pool instance.
2553 >     * Returns the common pool instance. This pool is statically
2554 >     * constructed; its run state is unaffected by attempts to {@link
2555 >     * #shutdown} or {@link #shutdownNow}. However this pool and any
2556 >     * ongoing processing are automatically terminated upon program
2557 >     * {@link System#exit}.  Any program that relies on asynchronous
2558 >     * task processing to complete before program termination should
2559 >     * invoke {@link #quiesceCommonPool}, or the timeout-based {@code
2560 >     * commonPool().}{@link #awaitQuiescence}, before exit.
2561       *
2562       * @return the common pool instance
2563       */
2564      public static ForkJoinPool commonPool() {
2565 <        // assert commonPool != null : "static init error";
2566 <        return commonPool;
2565 >        // assert common != null : "static init error";
2566 >        return common;
2567      }
2568  
2569      // Execution methods
# Line 2692 | Line 2744 | public class ForkJoinPool extends Abstra
2744       * @return the targeted parallelism level of the common pool
2745       */
2746      public static int getCommonPoolParallelism() {
2747 <        return commonPoolParallelism;
2747 >        return commonParallelism;
2748      }
2749  
2750      /**
# Line 2838 | Line 2890 | public class ForkJoinPool extends Abstra
2890          WorkQueue[] ws; WorkQueue w;
2891          if ((ws = workQueues) != null) {
2892              for (int i = 0; i < ws.length; i += 2) {
2893 <                if ((w = ws[i]) != null && w.queueSize() != 0)
2893 >                if ((w = ws[i]) != null && !w.isEmpty())
2894                      return true;
2895              }
2896          }
# Line 3005 | Line 3057 | public class ForkJoinPool extends Abstra
3057       * commenced but not yet completed.  This method may be useful for
3058       * debugging. A return of {@code true} reported a sufficient
3059       * period after shutdown may indicate that submitted tasks have
3060 <     * ignored or suppressed interruption, or are waiting for IO,
3060 >     * ignored or suppressed interruption, or are waiting for I/O,
3061       * causing this executor not to properly terminate. (See the
3062       * advisory notes for class {@link ForkJoinTask} stating that
3063       * tasks should not normally entail blocking operations.  But if
# Line 3031 | Line 3083 | public class ForkJoinPool extends Abstra
3083      /**
3084       * Blocks until all tasks have completed execution after a
3085       * shutdown request, or the timeout occurs, or the current thread
3086 <     * is interrupted, whichever happens first. Note that the {@link
3087 <     * #commonPool()} never terminates until program shutdown so
3088 <     * this method will always time out.
3086 >     * is interrupted, whichever happens first. Because the {@link
3087 >     * #commonPool()} never terminates until program shutdown, when
3088 >     * applied to the common pool, this method is equivalent to {@link
3089 >     * #awaitQuiescence} but always returns {@code false}.
3090       *
3091       * @param timeout the maximum time to wait
3092       * @param unit the time unit of the timeout argument
# Line 3043 | Line 3096 | public class ForkJoinPool extends Abstra
3096       */
3097      public boolean awaitTermination(long timeout, TimeUnit unit)
3098          throws InterruptedException {
3099 +        if (Thread.interrupted())
3100 +            throw new InterruptedException();
3101 +        if (this == common) {
3102 +            awaitQuiescence(timeout, unit);
3103 +            return false;
3104 +        }
3105          long nanos = unit.toNanos(timeout);
3106          if (isTerminated())
3107              return true;
# Line 3062 | Line 3121 | public class ForkJoinPool extends Abstra
3121      }
3122  
3123      /**
3124 +     * If called by a ForkJoinTask operating in this pool, equivalent
3125 +     * in effect to {@link ForkJoinTask#helpQuiesce}. Otherwise,
3126 +     * waits and/or attempts to assist performing tasks until this
3127 +     * pool {@link #isQuiescent} or the indicated timeout elapses.
3128 +     *
3129 +     * @param timeout the maximum time to wait
3130 +     * @param unit the time unit of the timeout argument
3131 +     * @return {@code true} if quiescent; {@code false} if the
3132 +     * timeout elapsed.
3133 +     */
3134 +    public boolean awaitQuiescence(long timeout, TimeUnit unit) {
3135 +        long nanos = unit.toNanos(timeout);
3136 +        ForkJoinWorkerThread wt;
3137 +        Thread thread = Thread.currentThread();
3138 +        if ((thread instanceof ForkJoinWorkerThread) &&
3139 +            (wt = (ForkJoinWorkerThread)thread).pool == this) {
3140 +            helpQuiescePool(wt.workQueue);
3141 +            return true;
3142 +        }
3143 +        long startTime = System.nanoTime();
3144 +        WorkQueue[] ws;
3145 +        int r = 0, m;
3146 +        boolean found = true;
3147 +        while (!isQuiescent() && (ws = workQueues) != null &&
3148 +               (m = ws.length - 1) >= 0) {
3149 +            if (!found) {
3150 +                if ((System.nanoTime() - startTime) > nanos)
3151 +                    return false;
3152 +                Thread.yield(); // cannot block
3153 +            }
3154 +            found = false;
3155 +            for (int j = (m + 1) << 2; j >= 0; --j) {
3156 +                ForkJoinTask<?> t; WorkQueue q; int b;
3157 +                if ((q = ws[r++ & m]) != null && (b = q.base) - q.top < 0) {
3158 +                    found = true;
3159 +                    if ((t = q.pollAt(b)) != null) {
3160 +                        if (q.base - q.top < 0)
3161 +                            signalWork(q);
3162 +                        t.doExec();
3163 +                    }
3164 +                    break;
3165 +                }
3166 +            }
3167 +        }
3168 +        return true;
3169 +    }
3170 +
3171 +    /**
3172 +     * Waits and/or attempts to assist performing tasks indefinitely
3173 +     * until the {@link #commonPool()} {@link #isQuiescent}
3174 +     */
3175 +    public static void quiesceCommonPool() {
3176 +        common.awaitQuiescence(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
3177 +    }
3178 +
3179 +    /**
3180       * Interface for extending managed parallelism for tasks running
3181       * in {@link ForkJoinPool}s.
3182       *
# Line 3160 | Line 3275 | public class ForkJoinPool extends Abstra
3275          if (t instanceof ForkJoinWorkerThread) {
3276              ForkJoinPool p = ((ForkJoinWorkerThread)t).pool;
3277              while (!blocker.isReleasable()) { // variant of helpSignal
3278 <                WorkQueue[] ws; WorkQueue q; int m, n, u;
3278 >                WorkQueue[] ws; WorkQueue q; int m, u;
3279                  if ((ws = p.workQueues) != null && (m = ws.length - 1) >= 0) {
3280                      for (int i = 0; i <= m; ++i) {
3281                          if (blocker.isReleasable())
3282                              return;
3283 <                        if ((q = ws[i]) != null && (n = q.queueSize()) > 0) {
3284 <                            p.signalWork(q, n);
3283 >                        if ((q = ws[i]) != null && q.base - q.top < 0) {
3284 >                            p.signalWork(q);
3285                              if ((u = (int)(p.ctl >>> 32)) >= 0 ||
3286                                  (u >> UAC_SHIFT) >= 0)
3287                                  break;
# Line 3245 | Line 3360 | public class ForkJoinPool extends Abstra
3360          submitters = new ThreadLocal<Submitter>();
3361          ForkJoinWorkerThreadFactory fac = defaultForkJoinWorkerThreadFactory =
3362              new DefaultForkJoinWorkerThreadFactory();
3363 +        modifyThreadPermission = new RuntimePermission("modifyThread");
3364 +
3365          /*
3366           * Establish common pool parameters.  For extra caution,
3367           * computations to set up common pool state are here; the
# Line 3275 | Line 3392 | public class ForkJoinPool extends Abstra
3392              par = Runtime.getRuntime().availableProcessors();
3393          if (par > MAX_CAP)
3394              par = MAX_CAP;
3395 <        commonPoolParallelism = par;
3395 >        commonParallelism = par;
3396          long np = (long)(-par); // precompute initial ctl value
3397          long ct = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
3398  
3399 <        commonPool = new ForkJoinPool(par, ct, fac, handler);
3283 <        modifyThreadPermission = new RuntimePermission("modifyThread");
3399 >        common = new ForkJoinPool(par, ct, fac, handler);
3400      }
3401  
3402      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines