--- jsr166/src/jsr166y/Phaser.java 2009/08/19 17:44:45 1.32 +++ jsr166/src/jsr166y/Phaser.java 2010/11/05 23:01:47 1.49 @@ -7,103 +7,121 @@ package jsr166y; import java.util.concurrent.*; - import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.LockSupport; /** - * A reusable synchronization barrier, similar in functionality to a + * A reusable synchronization barrier, similar in functionality to * {@link java.util.concurrent.CyclicBarrier CyclicBarrier} and * {@link java.util.concurrent.CountDownLatch CountDownLatch} * but supporting more flexible usage. * - * * - *
  • Barrier actions, performed by the task triggering a phase - * advance, are arranged by overriding method {@link #onAdvance(int, - * int)}, which also controls termination. Overriding this method is - * similar to, but more flexible than, providing a barrier action to a - * {@code CyclicBarrier}. - * - *
  • Phasers may enter a termination state in which all - * actions immediately return without updating phaser state or waiting - * for advance, and indicating (via a negative phase value) that - * execution is complete. Termination is triggered when an invocation - * of {@code onAdvance} returns {@code true}. When a phaser is - * controlling an action with a fixed number of iterations, it is + *

    Termination. A {@code 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. Termination is triggered when an invocation of {@code + * onAdvance} returns {@code true}. As illustrated below, when + * phasers control actions with a fixed number of iterations, it is * often convenient to override this method to cause termination when * the current phase number reaches a threshold. Method {@link * #forceTermination} is also available to abruptly release waiting * threads and allow them to terminate. * - *

  • Phasers may be tiered to reduce contention. Phasers with large + *

    Tiering. Phasers may be tiered (i.e., arranged + * in tree structures) to reduce contention. Phasers with large * numbers of parties that would otherwise experience heavy - * synchronization contention costs may instead be arranged in trees. - * This will typically greatly increase throughput even though it - * incurs somewhat greater per-operation overhead. - * - *

  • By default, {@code awaitAdvance} continues to wait even if - * the waiting thread is interrupted. And unlike the case in - * {@code CyclicBarrier}, exceptions encountered while tasks wait - * interruptibly or with timeout do not change the state of the - * barrier. If necessary, you can perform any associated recovery - * within handlers of those exceptions, often after invoking - * {@code forceTermination}. - * - *
  • Phasers may be used to coordinate tasks executing in a {@link - * ForkJoinPool}, which will ensure sufficient parallelism to execute - * tasks when others are blocked waiting for a phase to advance. - * - * + * synchronization contention costs may instead be set up so that + * groups of sub-phasers share a common parent. This may greatly + * increase throughput even though it incurs greater per-operation + * overhead. + * + *

    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 + * #getRegisteredParties} parties in total, of which {@link + * #getArrivedParties} have arrived at the current phase ({@link + * #getPhase}). When the remaining ({@link #getUnarrivedParties}) + * parties arrive, the phase advances. The values returned by these + * methods may reflect transient states and so are not in general + * useful for synchronization control. Method {@link #toString} + * returns snapshots of these state queries in a form convenient for + * informal monitoring. * *

    Sample usages: * *

    A {@code Phaser} may be used instead of a {@code CountDownLatch} - * to control a one-shot action serving a variable number of - * parties. The typical idiom is for the method setting this up to - * first register, then start the actions, then deregister, as in: + * to control a one-shot action serving a variable number of parties. + * The typical idiom is for the method setting this up to first + * register, then start the actions, then deregister, as in: * *

     {@code
    - * void runTasks(List list) {
    + * void runTasks(List tasks) {
      *   final Phaser phaser = new Phaser(1); // "1" to register self
      *   // create and start threads
    - *   for (Runnable r : list) {
    + *   for (Runnable task : tasks) {
      *     phaser.register();
      *     new Thread() {
      *       public void run() {
      *         phaser.arriveAndAwaitAdvance(); // await all creation
    - *         r.run();
    + *         task.run();
      *       }
      *     }.start();
      *   }
    @@ -116,45 +134,68 @@ import java.util.concurrent.locks.LockSu
      * for a given number of iterations is to override {@code onAdvance}:
      *
      *  
     {@code
    - * void startTasks(List list, final int iterations) {
    + * void startTasks(List tasks, final int iterations) {
      *   final Phaser phaser = new Phaser() {
    - *     public boolean onAdvance(int phase, int registeredParties) {
    + *     protected boolean onAdvance(int phase, int registeredParties) {
      *       return phase >= iterations || registeredParties == 0;
      *     }
      *   };
      *   phaser.register();
    - *   for (Runnable r : list) {
    + *   for (final Runnable task : tasks) {
      *     phaser.register();
      *     new Thread() {
      *       public void run() {
      *         do {
    - *           r.run();
    + *           task.run();
      *           phaser.arriveAndAwaitAdvance();
    - *         } while(!phaser.isTerminated();
    + *         } while (!phaser.isTerminated());
      *       }
      *     }.start();
      *   }
      *   phaser.arriveAndDeregister(); // deregister self, don't wait
      * }}
    * + * If the main task must later await termination, it + * may re-register and then execute a similar loop: + *
     {@code
    + *   // ...
    + *   phaser.register();
    + *   while (!phaser.isTerminated())
    + *     phaser.arriveAndAwaitAdvance();}
    + * + *

    Related constructions may be used to await particular phase numbers + * in contexts where you are sure that the phase will never wrap around + * {@code Integer.MAX_VALUE}. For example: + * + *

     {@code
    + * void awaitPhase(Phaser phaser, int phase) {
    + *   int p = phaser.register(); // assumes caller not already registered
    + *   while (p < phase) {
    + *     if (phaser.isTerminated())
    + *       // ... deal with unexpected termination
    + *     else
    + *       p = phaser.arriveAndAwaitAdvance();
    + *   }
    + *   phaser.arriveAndDeregister();
    + * }}
    + * + * *

    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 phaser that - * it registers for upon construction: + * it registers with upon construction: + * *

     {@code
    - * void build(Task[] actions, int lo, int hi, Phaser b) {
    - *   int step = (hi - lo) / TASKS_PER_PHASER;
    - *   if (step > 1) {
    - *     int i = lo;
    - *     while (i < hi) {
    - *       int r = Math.min(i + step, hi);
    - *       build(actions, i, r, new Phaser(b));
    - *       i = r;
    + * void build(Task[] actions, 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));
      *     }
      *   } else {
      *     for (int i = lo; i < hi; ++i)
    - *       actions[i] = new Task(b);
    - *       // assumes new Task(b) performs b.register()
    + *       actions[i] = new Task(ph);
    + *       // assumes new Task(ph) performs ph.register()
      *   }
      * }
      * // .. initially called, for n tasks via
    @@ -165,8 +206,6 @@ import java.util.concurrent.locks.LockSu
      * be appropriate for extremely small per-barrier task bodies (thus
      * high rates), or up to hundreds for extremely large ones.
      *
    - * 
    - * *

    Implementation notes: This implementation restricts the * maximum number of parties to 65535. Attempts to register additional * parties result in {@code IllegalStateException}. However, you can and @@ -203,7 +242,6 @@ public class Phaser { */ private volatile long state; - private static final int ushortBits = 16; private static final int ushortMask = 0xffff; private static final int phaseMask = 0x7fffffff; @@ -256,14 +294,16 @@ public class Phaser { /** * Heads of Treiber stacks for waiting threads. To eliminate - * contention while releasing some threads while adding others, we + * contention when releasing some threads while adding others, we * use two of them, alternating across even and odd phases. + * Subphasers share queues with root to speed up releases. */ private final AtomicReference evenQ = new AtomicReference(); private final AtomicReference oddQ = new AtomicReference(); private AtomicReference queueFor(int phase) { - return ((phase & 1) == 0) ? evenQ : oddQ; + Phaser r = root; + return ((phase & 1) == 0) ? r.evenQ : r.oddQ; } /** @@ -278,20 +318,25 @@ public class Phaser { * Recursively resolves state. */ private long reconcileState() { - Phaser p = parent; + Phaser par = parent; long s = state; - if (p != null) { - while (unarrivedOf(s) == 0 && phaseOf(s) != phaseOf(root.state)) { - long parentState = p.getReconciledState(); + if (par != null) { + int phase, rootPhase; + while ((phase = phaseOf(s)) >= 0 && + (rootPhase = phaseOf(root.state)) != phase && + (rootPhase < 0 || unarrivedOf(s) == 0)) { + long parentState = par.getReconciledState(); int parentPhase = phaseOf(parentState); - int phase = phaseOf(s = state); - if (phase != parentPhase) { - long next = trippedStateFor(parentPhase, partiesOf(s)); - if (casState(s, next)) { - releaseWaiters(phase); - s = next; - } + int parties = partiesOf(s); + long next = trippedStateFor(parentPhase, parties); + if (phaseOf(root.state) == rootPhase && + parentPhase != phase && + state == s && casState(s, next)) { + releaseWaiters(phase); + if (parties == 0) // exit if the final deregistration + break; } + s = state; } } return s; @@ -307,7 +352,7 @@ public class Phaser { } /** - * Creates a new phaser with the given numbers of registered + * Creates a new phaser with the given number of registered * unarrived parties, initial phase number 0, and no parent. * * @param parties the number of parties required to trip barrier @@ -339,7 +384,7 @@ public class Phaser { } /** - * Creates a new phaser with the given parent and numbers of + * Creates a new phaser with the given parent and number of * registered unarrived parties. If parent is non-null, this phaser * is registered with the parent and its initial phase number is * the same as that of parent phaser. @@ -365,8 +410,10 @@ public class Phaser { /** * Adds a new unarrived party to this phaser. + * If an ongoing invocation of {@link #onAdvance} is in progress, + * this method waits until its completion before registering. * - * @return the current barrier phase number upon registration + * @return the arrival phase number to which this registration applied * @throws IllegalStateException if attempting to register more * than the maximum supported number of parties */ @@ -376,11 +423,14 @@ 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 waits until its completion before registering. * - * @param parties the number of parties required to trip barrier - * @return the current barrier phase number upon registration + * @param parties the number of additional parties required to trip barrier + * @return the arrival phase number to which this registration applied * @throws IllegalStateException if attempting to register more * than the maximum supported number of parties + * @throws IllegalArgumentException if {@code parties < 0} */ public int bulkRegister(int parties) { if (parties < 0) @@ -394,68 +444,64 @@ public class Phaser { * Shared code for register, bulkRegister */ private int doRegister(int registrations) { + Phaser par = parent; + long s; int phase; - for (;;) { - long s = getReconciledState(); - phase = phaseOf(s); - int unarrived = unarrivedOf(s) + registrations; - int parties = partiesOf(s) + registrations; - if (phase < 0) - break; - if (parties > ushortMask || unarrived > ushortMask) - throw new IllegalStateException(badBounds(parties, unarrived)); - if (phase == phaseOf(root.state) && - casState(s, stateFor(phase, parties, unarrived))) - break; + while ((phase = phaseOf(s = par==null? state:reconcileState())) >= 0) { + int p = partiesOf(s); + int u = unarrivedOf(s); + int unarrived = u + registrations; + int parties = p + registrations; + if (par == null || phase == phaseOf(root.state)) { + if (parties > ushortMask || unarrived > ushortMask) + throw new IllegalStateException(badBounds(parties, + unarrived)); + else if (p != 0 && u == 0) // back off if advancing + Thread.yield(); // not worth actually blocking + else if (casState(s, stateFor(phase, parties, unarrived))) + break; + } } return phase; } /** * Arrives at the barrier, but does not wait for others. (You can - * in turn wait for others via {@link #awaitAdvance}). + * in turn wait for others via {@link #awaitAdvance}). It is an + * unenforced usage error for an unregistered party to invoke this + * method. * - * @return the barrier phase number upon entry to this method, or a - * negative value if terminated + * @return the arrival phase number, or a negative value if terminated * @throws IllegalStateException if not terminated and the number * of unarrived parties would become negative */ public int arrive() { + Phaser par = parent; + long s; int phase; - for (;;) { - long s = state; - phase = phaseOf(s); - if (phase < 0) - break; + while ((phase = phaseOf(s = par==null? state:reconcileState())) >= 0) { int parties = partiesOf(s); int unarrived = unarrivedOf(s) - 1; - if (unarrived > 0) { // Not the last arrival - if (casState(s, s - 1)) // s-1 adds one arrival + if (parties == 0 || unarrived < 0) + throw new IllegalStateException(badBounds(parties, + unarrived)); + else if (unarrived > 0) { // Not the last arrival + if (casState(s, s - 1)) // s-1 adds one arrival break; } - else if (unarrived == 0) { // the last arrival - Phaser par = parent; - if (par == null) { // directly trip - if (casState - (s, - trippedStateFor(onAdvance(phase, parties) ? -1 : - ((phase + 1) & phaseMask), parties))) { - releaseWaiters(phase); - break; - } - } - else { // cascade to parent - if (casState(s, s - 1)) { // zeroes unarrived - par.arrive(); - reconcileState(); - break; - } + else if (par == null) { // directly trip + if (casState(s, trippedStateFor(onAdvance(phase, parties) ? -1 : + ((phase + 1) & phaseMask), + parties))) { + releaseWaiters(phase); + break; } } - else if (phase != phaseOf(root.state)) // or if unreconciled + else if (phaseOf(root.state) == phase && casState(s, s - 1)) { + par.arrive(); // cascade to parent reconcileState(); - else - throw new IllegalStateException(badBounds(parties, unarrived)); + break; + } } return phase; } @@ -466,53 +512,45 @@ public class Phaser { * required to trip the barrier in future phases. If this phaser * has a parent, and deregistration causes this phaser to have * zero parties, this phaser also arrives at and is deregistered - * from its parent. + * from its parent. It is an unenforced usage error for an + * unregistered party to invoke this method. * - * @return the current barrier phase number upon entry to - * this method, or a negative value if terminated + * @return the arrival phase number, or a negative value if terminated * @throws IllegalStateException if not terminated and the number * of registered or unarrived parties would become negative */ public int arriveAndDeregister() { - // similar code to arrive, but too different to merge + // similar to arrive, but too different to merge Phaser par = parent; + long s; int phase; - for (;;) { - long s = state; - phase = phaseOf(s); - if (phase < 0) - break; + while ((phase = phaseOf(s = par==null? state:reconcileState())) >= 0) { int parties = partiesOf(s) - 1; int unarrived = unarrivedOf(s) - 1; - if (parties >= 0) { - if (unarrived > 0 || (unarrived == 0 && par != null)) { - if (casState - (s, - stateFor(phase, parties, unarrived))) { - if (unarrived == 0) { - par.arriveAndDeregister(); - reconcileState(); - } - break; - } - continue; - } - if (unarrived == 0) { - if (casState - (s, - trippedStateFor(onAdvance(phase, parties) ? -1 : - ((phase + 1) & phaseMask), parties))) { - releaseWaiters(phase); - break; - } - continue; - } - if (par != null && phase != phaseOf(root.state)) { - reconcileState(); - continue; + if (parties < 0 || unarrived < 0) + throw new IllegalStateException(badBounds(parties, + unarrived)); + else if (unarrived > 0) { + if (casState(s, stateFor(phase, parties, unarrived))) + break; + } + else if (par == null) { + if (casState(s, trippedStateFor(onAdvance(phase, parties)? -1: + (phase + 1) & phaseMask, + parties))) { + releaseWaiters(phase); + break; } } - throw new IllegalStateException(badBounds(parties, unarrived)); + else if (phaseOf(root.state) == phase && + casState(s, stateFor(phase, parties, 0))) { + if (parties == 0) + par.arriveAndDeregister(); + else + par.arrive(); + reconcileState(); + break; + } } return phase; } @@ -521,11 +559,12 @@ public class Phaser { * Arrives at the barrier and awaits others. Equivalent in effect * to {@code awaitAdvance(arrive())}. If you need to await with * interruption or timeout, you can arrange this with an analogous - * construction using one of the other forms of the awaitAdvance - * method. If instead you need to deregister upon arrival use - * {@code arriveAndDeregister}. + * construction using one of the other forms of the {@code + * awaitAdvance} method. If instead you need to deregister upon + * arrival, use {@link #arriveAndDeregister}. It is an unenforced + * usage error for an unregistered party to invoke this method. * - * @return the phase on entry to this method + * @return the arrival phase number, or a negative number if terminated * @throws IllegalStateException if not terminated and the number * of unarrived parties would become negative */ @@ -537,76 +576,80 @@ public class Phaser { * Awaits the phase of the barrier to advance from the given phase * value, returning immediately if the current phase of the * barrier is not equal to the given phase value or this barrier - * is terminated. + * is terminated. It is an unenforced usage error for an + * unregistered party to invoke this method. * - * @param phase the phase on entry to this method - * @return the phase on exit from this method + * @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 its variants + * @return the next arrival phase number, or a negative value + * if terminated or argument is negative */ public int awaitAdvance(int phase) { if (phase < 0) return phase; - long s = getReconciledState(); - int p = phaseOf(s); + int p = getPhase(); if (p != phase) return p; - if (unarrivedOf(s) == 0 && parent != null) - parent.awaitAdvance(phase); - // Fall here even if parent waited, to reconcile and help release return untimedWait(phase); } /** * Awaits the phase of the barrier to advance from the given phase - * value, throwing {@code InterruptedException} if interrupted while - * waiting, or returning immediately if the current phase of the - * barrier is not equal to the given phase value or this barrier - * is terminated. - * - * @param phase the phase on entry to this method - * @return the phase on exit from this method + * value, throwing {@code InterruptedException} if interrupted + * while waiting, or returning immediately if the current phase of + * the barrier is not equal to the given phase value or this + * barrier is terminated. It is an unenforced usage error for an + * unregistered party to invoke this method. + * + * @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 its variants + * @return the next arrival phase number, or a negative value + * if terminated or argument is negative * @throws InterruptedException if thread interrupted while waiting */ public int awaitAdvanceInterruptibly(int phase) throws InterruptedException { if (phase < 0) return phase; - long s = getReconciledState(); - int p = phaseOf(s); + int p = getPhase(); if (p != phase) return p; - if (unarrivedOf(s) == 0 && parent != null) - parent.awaitAdvanceInterruptibly(phase); return interruptibleWait(phase); } /** * Awaits the phase of the barrier to advance from the given phase - * value or the given timeout to elapse, throwing - * {@code InterruptedException} if interrupted while waiting, or - * returning immediately if the current phase of the barrier is not - * equal to the given phase value or this barrier is terminated. - * - * @param phase the phase on entry to this method + * value or the given timeout to elapse, throwing {@code + * InterruptedException} if interrupted while waiting, or + * returning immediately if the current phase of the barrier is + * not equal to the given phase value or this barrier is + * terminated. It is an unenforced usage error for an + * unregistered party to invoke this method. + * + * @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 its variants * @param timeout how long to wait before giving up, in units of * {@code unit} * @param unit a {@code TimeUnit} determining how to interpret the * {@code timeout} parameter - * @return the phase on exit from this method + * @return the next arrival phase number, or a negative value + * if terminated or argument is negative * @throws InterruptedException if thread interrupted while waiting * @throws TimeoutException if timed out while waiting */ public int awaitAdvanceInterruptibly(int phase, long timeout, TimeUnit unit) throws InterruptedException, TimeoutException { + long nanos = unit.toNanos(timeout); if (phase < 0) return phase; - long s = getReconciledState(); - int p = phaseOf(s); + int p = getPhase(); if (p != phase) return p; - if (unarrivedOf(s) == 0 && parent != null) - parent.awaitAdvanceInterruptibly(phase, timeout, unit); - return timedWait(phase, unit.toNanos(timeout)); + return timedWait(phase, nanos); } /** @@ -617,20 +660,13 @@ public class Phaser { * unexpected exceptions. */ public void forceTermination() { - for (;;) { - long s = getReconciledState(); - int phase = phaseOf(s); - int parties = partiesOf(s); - int unarrived = unarrivedOf(s); - if (phase < 0 || - casState(s, stateFor(-1, parties, unarrived))) { - releaseWaiters(0); - releaseWaiters(1); - if (parent != null) - parent.forceTermination(); - return; - } - } + Phaser r = root; // force at root then reconcile + long s; + while (phaseOf(s = r.state) >= 0) + r.casState(s, stateFor(-1, partiesOf(s), unarrivedOf(s))); + reconcileState(); + releaseWaiters(0); // ensure wakeups on both queues + releaseWaiters(1); } /** @@ -650,17 +686,17 @@ public class Phaser { * @return the number of parties */ public int getRegisteredParties() { - return partiesOf(state); + return partiesOf(getReconciledState()); } /** - * Returns the number of parties that have arrived at the current - * phase of this barrier. + * Returns the number of registered parties that have arrived at + * the current phase of this barrier. * * @return the number of arrived parties */ public int getArrivedParties() { - return arrivedOf(state); + return arrivedOf(getReconciledState()); } /** @@ -670,7 +706,7 @@ public class Phaser { * @return the number of unarrived parties */ public int getUnarrivedParties() { - return unarrivedOf(state); + return unarrivedOf(getReconciledState()); } /** @@ -702,26 +738,28 @@ public class Phaser { } /** - * Overridable method to perform an action upon phase advance, and - * to control termination. This method is invoked whenever the - * barrier is tripped (and thus all other waiting parties are - * dormant). If it returns {@code true}, then, rather than advance - * the phase number, this barrier will be set to a final - * termination state, and subsequent calls to {@link #isTerminated} - * will return true. + * Overridable method to perform an action upon impending phase + * advance, and to control termination. This method is invoked + * upon arrival of the party tripping the barrier (when all other + * waiting parties are dormant). If this method returns {@code + * true}, then, rather than advance the phase number, this barrier + * 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 trip the barrier, in + * which case no advance occurs. + * + *

    The arguments to this method provide the state of the phaser + * prevailing for the current transition. (When called from within + * an implementation of {@code onAdvance} the values returned by + * methods such as {@code getPhase} may or may not reliably + * indicate the state to which this transition applies.) * *

    The default version returns {@code true} when the number of * registered parties is zero. Normally, overrides that arrange * termination for other reasons should also preserve this * property. * - *

    You may override this method to perform an action with side - * effects visible to participating tasks, but it is in general - * only sensible to do so in designs where all parties register - * before any arrive, and all {@link #awaitAdvance} at each phase. - * Otherwise, you cannot ensure lack of interference from other - * parties during the invocation of this method. - * * @param phase the phase number on entering the barrier * @param registeredParties the current number of registered parties * @return {@code true} if this barrier should terminate @@ -762,6 +800,7 @@ public class Phaser { volatile boolean wasInterrupted = false; volatile Thread thread; // nulled to cancel wait QNode next; + QNode(Phaser phaser, int phase, boolean interruptible, boolean timed, long startTime, long nanos) { this.phaser = phaser; @@ -772,12 +811,14 @@ public class Phaser { this.nanos = nanos; thread = Thread.currentThread(); } + public boolean isReleasable() { return (thread == null || phaser.getPhase() != phase || (interruptible && wasInterrupted) || (timed && (nanos - (System.nanoTime() - startTime)) <= 0)); } + public boolean block() { if (Thread.interrupted()) { wasInterrupted = true; @@ -794,6 +835,7 @@ public class Phaser { } return isReleasable(); } + void signal() { Thread t = thread; if (t != null) { @@ -801,16 +843,17 @@ public class Phaser { LockSupport.unpark(t); } } + boolean doWait() { if (thread != null) { try { - ForkJoinPool.managedBlock(this, false); + ForkJoinPool.managedBlock(this); } catch (InterruptedException ie) { + wasInterrupted = true; // can't currently happen } } return wasInterrupted; } - } /** @@ -852,8 +895,8 @@ public class Phaser { node = new QNode(this, phase, false, false, 0, 0); else if (!queued) queued = tryEnqueue(node); - else - interrupted = node.doWait(); + else if (node.doWait()) + interrupted = true; } if (node != null) node.thread = null; @@ -879,8 +922,8 @@ public class Phaser { node = new QNode(this, phase, true, false, 0, 0); else if (!queued) queued = tryEnqueue(node); - else - interrupted = node.doWait(); + else if (node.doWait()) + interrupted = true; } if (node != null) node.thread = null; @@ -911,8 +954,8 @@ public class Phaser { node = new QNode(this, phase, true, true, startTime, nanos); else if (!queued) queued = tryEnqueue(node); - else - interrupted = node.doWait(); + else if (node.doWait()) + interrupted = true; } if (node != null) node.thread = null;