--- jsr166/src/jsr166y/Phaser.java 2010/11/29 15:47:19 1.63 +++ jsr166/src/jsr166y/Phaser.java 2010/12/08 15:27:25 1.70 @@ -75,9 +75,10 @@ import java.util.concurrent.locks.LockSu * * *

Termination. A phaser may enter a termination - * state in which all synchronization methods immediately return - * without updating phaser state or waiting for advance, and - * indicating (via a negative phase value) that execution is complete. + * state, that may be checked using method {@link #isTerminated}. Upon + * termination, all synchronization methods immediately return without + * waiting for advance, as indicated by a negative return value. + * Similarly, attempts to register upon termination have no effect. * Termination is triggered when an invocation of {@code onAdvance} * returns {@code true}. The default implementation returns {@code * true} if a deregistration has caused the number of registered @@ -96,6 +97,16 @@ import java.util.concurrent.locks.LockSu * increase throughput even though it incurs greater per-operation * overhead. * + *

In a tree of tiered phasers, registration and deregistration of + * child phasers with their parent are managed automatically. + * Whenever the number of registered parties of a child phaser becomes + * non-zero (as established in the {@link #Phaser(Phaser,int)} + * constructor, {@link #register}, or {@link #bulkRegister}), the + * child phaser is registered with its parent. Whenever the number of + * registered parties becomes zero as the result of an invocation of + * {@link #arriveAndDeregister}, the child phaser is deregistered + * from its parent. + * *

Monitoring. While synchronization methods may be invoked * only by registered parties, the current state of a phaser may be * monitored by any caller. At any given moment there are {@link @@ -183,26 +194,26 @@ import java.util.concurrent.locks.LockSu * }} * * - *

To create a set of tasks using a tree of phasers, - * you could use code of the following form, assuming a - * Task class with a constructor accepting a {@code Phaser} that - * it registers with upon construction: + *

To create a set of {@code n} tasks using a tree of phasers, you + * could use code of the following form, assuming a Task class with a + * constructor accepting a {@code Phaser} that it registers with upon + * construction. After invocation of {@code build(new Task[n], 0, n, + * new Phaser())}, these tasks could then be started, for example by + * submitting to a pool: * *

 {@code
- * void build(Task[] actions, int lo, int hi, Phaser ph) {
+ * void build(Task[] tasks, int lo, int hi, Phaser ph) {
  *   if (hi - lo > TASKS_PER_PHASER) {
  *     for (int i = lo; i < hi; i += TASKS_PER_PHASER) {
  *       int j = Math.min(i + TASKS_PER_PHASER, hi);
- *       build(actions, i, j, new Phaser(ph));
+ *       build(tasks, i, j, new Phaser(ph));
  *     }
  *   } else {
  *     for (int i = lo; i < hi; ++i)
- *       actions[i] = new Task(ph);
+ *       tasks[i] = new Task(ph);
  *       // assumes new Task(ph) performs ph.register()
  *   }
- * }
- * // .. initially called, for n tasks via
- * build(new Task[n], 0, n, new Phaser());}
+ * }} * * The best value of {@code TASKS_PER_PHASER} depends mainly on * expected synchronization rates. A value as low as four may @@ -233,11 +244,24 @@ public class Phaser { * * phase -- the generation of the barrier (bits 32-62) * * terminated -- set if barrier is terminated (bit 63 / sign) * - * However, to efficiently maintain atomicity, these values are - * packed into a single (atomic) long. Termination uses the sign - * bit of 32 bit representation of phase, so phase is set to -1 on - * termination. Good performance relies on keeping state decoding - * and encoding simple, and keeping race windows short. + * Except that a phaser with no registered parties is + * distinguished with the otherwise illegal state of having zero + * parties and one unarrived parties (encoded as EMPTY below). + * + * To efficiently maintain atomicity, these values are packed into + * a single (atomic) long. Good performance relies on keeping + * state decoding and encoding simple, and keeping race windows + * short. + * + * All state updates are performed via CAS except initial + * registration of a sub-phaser (i.e., one with a non-null + * parent). In this (relatively rare) case, we use built-in + * synchronization to lock while first registering with its + * parent. + * + * The phase of a subphaser is allowed to lag that of its + * ancestors until it is actually accessed -- see method + * reconcileState. */ private volatile long state; @@ -245,16 +269,21 @@ public class Phaser { private static final int MAX_PHASE = 0x7fffffff; private static final int PARTIES_SHIFT = 16; private static final int PHASE_SHIFT = 32; + private static final long PHASE_MASK = -1L << PHASE_SHIFT; private static final int UNARRIVED_MASK = 0xffff; // to mask ints private static final long PARTIES_MASK = 0xffff0000L; // to mask longs - private static final long ONE_ARRIVAL = 1L; - private static final long ONE_PARTY = 1L << PARTIES_SHIFT; private static final long TERMINATION_BIT = 1L << 63; + // some special values + private static final int ONE_ARRIVAL = 1; + private static final int ONE_PARTY = 1 << PARTIES_SHIFT; + private static final int EMPTY = 1; + // The following unpacking methods are usually manually inlined private static int unarrivedOf(long s) { - return (int)s & UNARRIVED_MASK; + int counts = (int)s; + return (counts == EMPTY) ? 0 : counts & UNARRIVED_MASK; } private static int partiesOf(long s) { @@ -266,7 +295,9 @@ public class Phaser { } private static int arrivedOf(long s) { - return partiesOf(s) - unarrivedOf(s); + int counts = (int)s; + return (counts == EMPTY) ? 0 : + (counts >>> PARTIES_SHIFT) - (counts & UNARRIVED_MASK); } /** @@ -275,8 +306,7 @@ public class Phaser { private final Phaser parent; /** - * The root of phaser tree. Equals this if not in a tree. Used to - * support faster state push-down. + * The root of phaser tree. Equals this if not in a tree. */ private final Phaser root; @@ -314,44 +344,37 @@ public class Phaser { * Manually tuned to speed up and minimize race windows for the * common case of just decrementing unarrived field. * - * @param adj - adjustment to apply to state -- either - * ONE_ARRIVAL (for arrive) or - * ONE_ARRIVAL|ONE_PARTY (for arriveAndDeregister) + * @param deregister false for arrive, true for arriveAndDeregister */ - private int doArrive(long adj) { + private int doArrive(boolean deregister) { + int adj = deregister ? ONE_ARRIVAL|ONE_PARTY : ONE_ARRIVAL; + final Phaser root = this.root; for (;;) { - long s = state; - int unarrived = (int)s & UNARRIVED_MASK; + long s = (root == this) ? state : reconcileState(); int phase = (int)(s >>> PHASE_SHIFT); + int counts = (int)s; + int unarrived = (counts & UNARRIVED_MASK) - 1; if (phase < 0) return phase; - else if (unarrived == 0) { - if (reconcileState() == s) // recheck + else if (counts == EMPTY || unarrived < 0) { + if (root == this || reconcileState() == s) throw new IllegalStateException(badArrive(s)); } else if (UNSAFE.compareAndSwapLong(this, stateOffset, s, s-=adj)) { - if (unarrived == 1) { - long p = s & PARTIES_MASK; // unshifted parties field - long lu = p >>> PARTIES_SHIFT; - int u = (int)lu; - int nextPhase = (phase + 1) & MAX_PHASE; - long next = ((long)nextPhase << PHASE_SHIFT) | p | lu; - final Phaser parent = this.parent; - if (parent == null) { - if (onAdvance(phase, u)) - next |= TERMINATION_BIT; - UNSAFE.compareAndSwapLong(this, stateOffset, s, next); - releaseWaiters(phase); - } - else { - parent.doArrive((u == 0) ? - ONE_ARRIVAL|ONE_PARTY : ONE_ARRIVAL); - if ((int)(parent.state >>> PHASE_SHIFT) != nextPhase) - reconcileState(); - else if (state == s) - UNSAFE.compareAndSwapLong(this, stateOffset, s, - next); - } + if (unarrived == 0) { + long n = s & PARTIES_MASK; // base of next state + int nextUnarrived = ((int)n) >>> PARTIES_SHIFT; + if (root != this) + return parent.doArrive(nextUnarrived == 0); + if (onAdvance(phase, nextUnarrived)) + n |= TERMINATION_BIT; + else if (nextUnarrived == 0) + n |= EMPTY; + else + n |= nextUnarrived; + n |= ((long)((phase + 1) & MAX_PHASE)) << PHASE_SHIFT; + UNSAFE.compareAndSwapLong(this, stateOffset, s, n); + releaseWaiters(phase); } return phase; } @@ -367,61 +390,76 @@ public class Phaser { private int doRegister(int registrations) { // adjustment to state long adj = ((long)registrations << PARTIES_SHIFT) | registrations; - final Phaser parent = this.parent; + Phaser par = parent; + int phase; for (;;) { - long s = (parent == null) ? state : reconcileState(); - int parties = (int)s >>> PARTIES_SHIFT; - int phase = (int)(s >>> PHASE_SHIFT); - if (phase < 0) - return phase; - else if (registrations > MAX_PARTIES - parties) + long s = state; + int counts = (int)s; + int parties = counts >>> PARTIES_SHIFT; + int unarrived = counts & UNARRIVED_MASK; + if (registrations > MAX_PARTIES - parties) throw new IllegalStateException(badRegister(s)); - else if ((parties == 0 && parent == null) || // first reg of root - ((int)s & UNARRIVED_MASK) != 0) { // not advancing - if (UNSAFE.compareAndSwapLong(this, stateOffset, s, s + adj)) - return phase; - } - else if (parties != 0) // wait for onAdvance - root.internalAwaitAdvance(phase, null); - else { // 1st registration of child - synchronized (this) { // register parent first - if (reconcileState() == s) { // recheck under lock - parent.doRegister(1); // OK if throws IllegalState - for (;;) { // simpler form of outer loop - s = reconcileState(); - phase = (int)(s >>> PHASE_SHIFT); - if (phase < 0 || - UNSAFE.compareAndSwapLong(this, stateOffset, - s, s + adj)) - return phase; - } + else if ((phase = (int)(s >>> PHASE_SHIFT)) < 0) + break; + else if (counts != EMPTY) { // not 1st registration + if (par == null || reconcileState() == s) { + if (unarrived == 0) // wait out advance + root.internalAwaitAdvance(phase, null); + else if (UNSAFE.compareAndSwapLong(this, stateOffset, + s, s + adj)) + break; + } + } + else if (par == null) { // 1st root registration + long next = (((long) phase) << PHASE_SHIFT) | adj; + if (UNSAFE.compareAndSwapLong(this, stateOffset, s, next)) + break; + } + else { + synchronized (this) { // 1st sub registration + if (state == s) { // recheck under lock + par.doRegister(1); + do { // force current phase + phase = (int)(root.state >>> PHASE_SHIFT); + // assert phase < 0 || (int)state == EMPTY; + } while (!UNSAFE.compareAndSwapLong + (this, stateOffset, state, + (((long) phase) << PHASE_SHIFT) | adj)); + break; } } } } + return phase; } /** - * Recursively resolves lagged phase propagation from root if necessary. + * Resolves lagged phase propagation from root if necessary. + * Reconciliation normally occurs when root has advanced but + * subphasers have not yet done so, in which case they must finish + * their own advance by setting unarrived to parties (or if + * parties is zero, resetting to unregistered EMPTY state). + * However, this method may also be called when "floating" + * subphasers with possibly some unarrived parties are merely + * catching up to current phase, in which case counts are + * unaffected. + * + * @return reconciled state */ private long reconcileState() { - Phaser par = parent; + final Phaser root = this.root; long s = state; - if (par != null) { - Phaser rt = root; - int phase, rPhase; - while ((phase = (int)(s >>> PHASE_SHIFT)) >= 0 && - (rPhase = (int)(rt.state >>> PHASE_SHIFT)) != phase) { - if (par != rt && (int)(par.state >>> PHASE_SHIFT) != rPhase) - par.reconcileState(); - else if (rPhase < 0 || ((int)s & UNARRIVED_MASK) == 0) { - long u = s & PARTIES_MASK; // reset unarrived to parties - long next = ((((long) rPhase) << PHASE_SHIFT) | u | - (u >>> PARTIES_SHIFT)); - UNSAFE.compareAndSwapLong(this, stateOffset, s, next); - } + if (root != this) { + int phase, u, p; + // CAS root phase with current parties; possibly trip unarrived + while ((phase = (int)(root.state >>> PHASE_SHIFT)) != + (int)(s >>> PHASE_SHIFT) && + !UNSAFE.compareAndSwapLong + (this, stateOffset, s, + s = ((((long) phase) << PHASE_SHIFT) | (s & PARTIES_MASK) | + ((p = (int)s >>> PARTIES_SHIFT) == 0 ? EMPTY : + (u = (int)s & UNARRIVED_MASK) == 0 ? p : u)))) s = state; - } } return s; } @@ -459,15 +497,9 @@ public class Phaser { /** * Creates a new phaser with the given parent and number of - * registered unarrived parties. Registration and deregistration - * of this child phaser with its parent are managed automatically. - * If the given parent is non-null, whenever this child phaser has - * any registered parties (as established in this constructor, - * {@link #register}, or {@link #bulkRegister}), this child phaser - * is registered with its parent. Whenever the number of - * registered parties becomes zero as the result of an invocation - * of {@link #arriveAndDeregister}, this child phaser is - * deregistered from its parent. + * registered unarrived parties. When the given parent is non-null + * and the given number of parties is greater than zero, this + * child phaser is registered with its parent. * * @param parent the parent phaser * @param parties the number of parties required to advance to the @@ -478,22 +510,25 @@ public class Phaser { public Phaser(Phaser parent, int parties) { if (parties >>> PARTIES_SHIFT != 0) throw new IllegalArgumentException("Illegal number of parties"); - long s = ((long) parties) | (((long) parties) << PARTIES_SHIFT); + int phase = 0; this.parent = parent; if (parent != null) { - Phaser r = parent.root; - this.root = r; - this.evenQ = r.evenQ; - this.oddQ = r.oddQ; + final Phaser root = parent.root; + this.root = root; + this.evenQ = root.evenQ; + this.oddQ = root.oddQ; if (parties != 0) - s |= ((long)(parent.doRegister(1))) << PHASE_SHIFT; + phase = parent.doRegister(1); } else { this.root = this; this.evenQ = new AtomicReference(); this.oddQ = new AtomicReference(); } - this.state = s; + this.state = (parties == 0) ? (long) EMPTY : + ((((long) phase) << PHASE_SHIFT) | + (((long) parties) << PARTIES_SHIFT) | + ((long) parties)); } /** @@ -501,9 +536,13 @@ public class Phaser { * invocation of {@link #onAdvance} is in progress, this method * may await its completion before returning. If this phaser has * a parent, and this phaser previously had no registered parties, - * this phaser is also registered with its parent. - * - * @return the arrival phase number to which this registration applied + * this child phaser is also registered with its parent. If + * this phaser is terminated, the attempt to register has + * no effect, and a negative value is returned. + * + * @return the arrival phase number to which this registration + * applied. If this value is negative, then this phaser has + * terminated, in which case registration has no effect. * @throws IllegalStateException if attempting to register more * than the maximum supported number of parties */ @@ -515,13 +554,17 @@ public class Phaser { * Adds the given number of new unarrived parties to this phaser. * If an ongoing invocation of {@link #onAdvance} is in progress, * this method may await its completion before returning. If this - * phaser has a parent, and the given number of parities is - * greater than zero, and this phaser previously had no registered - * parties, this phaser is also registered with its parent. + * phaser has a parent, and the given number of parties is greater + * than zero, and this phaser previously had no registered + * parties, this child phaser is also registered with its parent. + * If this phaser is terminated, the attempt to register has no + * effect, and a negative value is returned. * * @param parties the number of additional parties required to * advance to the next phase - * @return the arrival phase number to which this registration applied + * @return the arrival phase number to which this registration + * applied. If this value is negative, then this phaser has + * terminated, in which case registration has no effect. * @throws IllegalStateException if attempting to register more * than the maximum supported number of parties * @throws IllegalArgumentException if {@code parties < 0} @@ -547,7 +590,7 @@ public class Phaser { * of unarrived parties would become negative */ public int arrive() { - return doArrive(ONE_ARRIVAL); + return doArrive(false); } /** @@ -567,7 +610,7 @@ public class Phaser { * of registered or unarrived parties would become negative */ public int arriveAndDeregister() { - return doArrive(ONE_ARRIVAL|ONE_PARTY); + return doArrive(true); } /** @@ -583,12 +626,47 @@ public class Phaser { * IllegalStateException} only upon some subsequent operation on * this phaser, if ever. * - * @return the arrival phase number, or a negative number if terminated + * @return the arrival phase number, or the (negative) + * {@linkplain #getPhase() current phase} if terminated * @throws IllegalStateException if not terminated and the number * of unarrived parties would become negative */ public int arriveAndAwaitAdvance() { - return awaitAdvance(doArrive(ONE_ARRIVAL)); + // Specialization of doArrive+awaitAdvance eliminating some reads/paths + final Phaser root = this.root; + for (;;) { + long s = (root == this) ? state : reconcileState(); + int phase = (int)(s >>> PHASE_SHIFT); + int counts = (int)s; + int unarrived = (counts & UNARRIVED_MASK) - 1; + if (phase < 0) + return phase; + else if (counts == EMPTY || unarrived < 0) { + if (reconcileState() == s) + throw new IllegalStateException(badArrive(s)); + } + else if (UNSAFE.compareAndSwapLong(this, stateOffset, s, + s -= ONE_ARRIVAL)) { + if (unarrived != 0) + return root.internalAwaitAdvance(phase, null); + if (root != this) + return parent.arriveAndAwaitAdvance(); + long n = s & PARTIES_MASK; // base of next state + int nextUnarrived = ((int)n) >>> PARTIES_SHIFT; + if (onAdvance(phase, nextUnarrived)) + n |= TERMINATION_BIT; + else if (nextUnarrived == 0) + n |= EMPTY; + else + n |= nextUnarrived; + int nextPhase = (phase + 1) & MAX_PHASE; + n |= (long)nextPhase << PHASE_SHIFT; + if (!UNSAFE.compareAndSwapLong(this, stateOffset, s, n)) + return (int)(state >>> PHASE_SHIFT); // terminated + releaseWaiters(phase); + return nextPhase; + } + } } /** @@ -599,17 +677,18 @@ public class Phaser { * @param phase an arrival phase number, or negative value if * terminated; this argument is normally the value returned by a * previous call to {@code arrive} or {@code arriveAndDeregister}. - * @return the next arrival phase number, or a negative value - * if terminated or argument is negative + * @return the next arrival phase number, or the argument if it is + * negative, or the (negative) {@linkplain #getPhase() current phase} + * if terminated */ public int awaitAdvance(int phase) { - Phaser rt; - int p = (int)(state >>> PHASE_SHIFT); + final Phaser root = this.root; + long s = (root == this) ? state : reconcileState(); + int p = (int)(s >>> PHASE_SHIFT); if (phase < 0) return phase; - if (p == phase && - (p = (int)((rt = root).state >>> PHASE_SHIFT)) == phase) - return rt.internalAwaitAdvance(phase, null); + if (p == phase) + return root.internalAwaitAdvance(phase, null); return p; } @@ -623,20 +702,21 @@ public class Phaser { * @param phase an arrival phase number, or negative value if * terminated; this argument is normally the value returned by a * previous call to {@code arrive} or {@code arriveAndDeregister}. - * @return the next arrival phase number, or a negative value - * if terminated or argument is negative + * @return the next arrival phase number, or the argument if it is + * negative, or the (negative) {@linkplain #getPhase() current phase} + * if terminated * @throws InterruptedException if thread interrupted while waiting */ public int awaitAdvanceInterruptibly(int phase) throws InterruptedException { - Phaser rt; - int p = (int)(state >>> PHASE_SHIFT); + final Phaser root = this.root; + long s = (root == this) ? state : reconcileState(); + int p = (int)(s >>> PHASE_SHIFT); if (phase < 0) return phase; - if (p == phase && - (p = (int)((rt = root).state >>> PHASE_SHIFT)) == phase) { + if (p == phase) { QNode node = new QNode(this, phase, true, false, 0L); - p = rt.internalAwaitAdvance(phase, node); + p = root.internalAwaitAdvance(phase, node); if (node.wasInterrupted) throw new InterruptedException(); } @@ -657,8 +737,9 @@ public class Phaser { * {@code unit} * @param unit a {@code TimeUnit} determining how to interpret the * {@code timeout} parameter - * @return the next arrival phase number, or a negative value - * if terminated or argument is negative + * @return the next arrival phase number, or the argument if it is + * negative, or the (negative) {@linkplain #getPhase() current phase} + * if terminated * @throws InterruptedException if thread interrupted while waiting * @throws TimeoutException if timed out while waiting */ @@ -666,14 +747,14 @@ public class Phaser { long timeout, TimeUnit unit) throws InterruptedException, TimeoutException { long nanos = unit.toNanos(timeout); - Phaser rt; - int p = (int)(state >>> PHASE_SHIFT); + final Phaser root = this.root; + long s = (root == this) ? state : reconcileState(); + int p = (int)(s >>> PHASE_SHIFT); if (phase < 0) return phase; - if (p == phase && - (p = (int)((rt = root).state >>> PHASE_SHIFT)) == phase) { + if (p == phase) { QNode node = new QNode(this, phase, true, true, nanos); - p = rt.internalAwaitAdvance(phase, node); + p = root.internalAwaitAdvance(phase, node); if (node.wasInterrupted) throw new InterruptedException(); else if (p == phase) @@ -684,12 +765,12 @@ public class Phaser { /** * Forces this phaser to enter termination state. Counts of - * arrived and registered parties are unaffected. If this phaser - * is a member of a tiered set of phasers, then all of the phasers - * in the set are terminated. If this phaser is already - * terminated, this method has no effect. This method may be - * useful for coordinating recovery after one or more tasks - * encounter unexpected exceptions. + * registered parties are unaffected. If this phaser is a member + * of a tiered set of phasers, then all of the phasers in the set + * are terminated. If this phaser is already terminated, this + * method has no effect. This method may be useful for + * coordinating recovery after one or more tasks encounter + * unexpected exceptions. */ public void forceTermination() { // Only need to change root state @@ -698,7 +779,8 @@ public class Phaser { while ((s = root.state) >= 0) { if (UNSAFE.compareAndSwapLong(root, stateOffset, s, s | TERMINATION_BIT)) { - releaseWaiters(0); // signal all threads + // signal all threads + releaseWaiters(0); releaseWaiters(1); return; } @@ -729,27 +811,24 @@ public class Phaser { /** * Returns the number of registered parties that have arrived at - * the current phase of this phaser. + * the current phase of this phaser. If this phaser has terminated, + * the returned value is meaningless and arbitrary. * * @return the number of arrived parties */ public int getArrivedParties() { - long s = state; - int u = unarrivedOf(s); // only reconcile if possibly needed - return (u != 0 || parent == null) ? - partiesOf(s) - u : - arrivedOf(reconcileState()); + return arrivedOf(reconcileState()); } /** * Returns the number of registered parties that have not yet - * arrived at the current phase of this phaser. + * arrived at the current phase of this phaser. If this phaser has + * terminated, the returned value is meaningless and arbitrary. * * @return the number of unarrived parties */ public int getUnarrivedParties() { - int u = unarrivedOf(state); - return (u != 0 || parent == null) ? u : unarrivedOf(reconcileState()); + return unarrivedOf(reconcileState()); } /** @@ -785,12 +864,12 @@ public class Phaser { * advance, and to control termination. This method is invoked * upon arrival of the party advancing this phaser (when all other * waiting parties are dormant). If this method returns {@code - * true}, then, rather than advance the phase number, this phaser - * will be set to a final termination state, and subsequent calls - * to {@link #isTerminated} will return true. Any (unchecked) - * Exception or Error thrown by an invocation of this method is - * propagated to the party attempting to advance this phaser, in - * which case no advance occurs. + * true}, this phaser will be set to a final termination state + * upon advance, and subsequent calls to {@link #isTerminated} + * will return true. Any (unchecked) Exception or Error thrown by + * an invocation of this method is propagated to the party + * attempting to advance this phaser, in which case no advance + * occurs. * *

The arguments to this method provide the state of the phaser * prevailing for the current transition. The effects of invoking @@ -854,12 +933,10 @@ public class Phaser { */ private void releaseWaiters(int phase) { QNode q; // first element of queue - int p; // its phase Thread t; // its thread AtomicReference head = (phase & 1) == 0 ? evenQ : oddQ; while ((q = head.get()) != null && - ((p = q.phase) == phase || - (int)(root.state >>> PHASE_SHIFT) != p)) { + q.phase != (int)(root.state >>> PHASE_SHIFT)) { if (head.compareAndSet(q, q.next) && (t = q.thread) != null) { q.thread = null; @@ -868,6 +945,30 @@ public class Phaser { } } + /** + * Variant of releaseWaiters that additionally tries to remove any + * nodes no longer waiting for advance due to timeout or + * interrupt. Currently, nodes are removed only if they are at + * head of queue, which suffices to reduce memory footprint in + * most usages. + * + * @return current phase on exit + */ + private int abortWait(int phase) { + AtomicReference head = (phase & 1) == 0 ? evenQ : oddQ; + for (;;) { + Thread t; + QNode q = head.get(); + int p = (int)(root.state >>> PHASE_SHIFT); + if (q == null || ((t = q.thread) != null && q.phase == p)) + return p; + if (head.compareAndSet(q, q.next) && t != null) { + q.thread = null; + LockSupport.unpark(t); + } + } + } + /** The number of CPUs, for spin control */ private static final int NCPU = Runtime.getRuntime().availableProcessors(); @@ -935,8 +1036,8 @@ public class Phaser { node.thread = null; // avoid need for unpark() if (node.wasInterrupted && !node.interruptible) Thread.currentThread().interrupt(); - if ((p = (int)(state >>> PHASE_SHIFT)) == phase) - return p; // recheck abort + if (p == phase && (p = (int)(state >>> PHASE_SHIFT)) == phase) + return abortWait(phase); // possibly clean up on abort } releaseWaiters(phase); return p; @@ -963,7 +1064,7 @@ public class Phaser { this.interruptible = interruptible; this.nanos = nanos; this.timed = timed; - this.lastTime = timed? System.nanoTime() : 0L; + this.lastTime = timed ? System.nanoTime() : 0L; thread = Thread.currentThread(); }