--- jsr166/src/jsr166y/Phaser.java 2009/07/27 20:57:44 1.23 +++ jsr166/src/jsr166y/Phaser.java 2009/08/19 15:50:04 1.31 @@ -32,40 +32,40 @@ import java.util.concurrent.locks.LockSu * zero, and advancing when all parties reach the barrier (wrapping * around to zero after reaching {@code Integer.MAX_VALUE}). * - *
  • Like a CyclicBarrier, a Phaser may be repeatedly awaited. - * Method {@code arriveAndAwaitAdvance} has effect analogous to - * {@code CyclicBarrier.await}. However, Phasers separate two - * aspects of coordination, that may also be invoked independently: + *
  • Like a {@code CyclicBarrier}, a phaser may be repeatedly + * awaited. Method {@link #arriveAndAwaitAdvance} has effect + * analogous to {@link java.util.concurrent.CyclicBarrier#await + * CyclicBarrier.await}. However, phasers separate two aspects of + * coordination, which may also be invoked independently: * * * * *
  • Barrier actions, performed by the task triggering a phase - * advance while others may be waiting, are arranged by overriding - * method {@code onAdvance}, that also controls termination. - * Overriding this method may be used to similar but more flexible - * effect as providing a barrier action to a CyclicBarrier. + * 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 by executing the - * overridable {@code onAdvance} method that is invoked each time the - * barrier is about to be tripped. When a Phaser is controlling an - * action 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 {@code forceTermination} is also - * available to abruptly release waiting threads and allow them to - * terminate. + * 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 + * 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 * numbers of parties that would otherwise experience heavy @@ -75,43 +75,41 @@ import java.util.concurrent.locks.LockSu * *
  • By default, {@code awaitAdvance} continues to wait even if * the waiting thread is interrupted. And unlike the case in - * CyclicBarriers, exceptions encountered while tasks wait + * {@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 ensure lack of starvation when used by ForkJoinTasks. + *
  • 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. * * * *

    Sample usages: * - *

    A 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: + *

    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: * *

     {@code
      * void runTasks(List list) {
      *   final Phaser phaser = new Phaser(1); // "1" to register self
    + *   // create and start threads
      *   for (Runnable r : list) {
      *     phaser.register();
      *     new Thread() {
      *       public void run() {
      *         phaser.arriveAndAwaitAdvance(); // await all creation
      *         r.run();
    - *         phaser.arriveAndDeregister();   // signal completion
      *       }
      *     }.start();
      *   }
      *
    - *   doSomethingOnBehalfOfWorkers();
    - *   phaser.arrive(); // allow threads to start
    - *   int p = phaser.arriveAndDeregister(); // deregister self  ...
    - *   p = phaser.awaitAdvance(p); // ... and await arrival
    - *   otherActions(); // do other things while tasks execute
    - *   phaser.awaitAdvance(p); // await final completion
    + *   // allow threads to start and deregister self
    + *   phaser.arriveAndDeregister();
      * }}
    * *

    One way to cause a set of threads to repeatedly perform actions @@ -139,9 +137,9 @@ import java.util.concurrent.locks.LockSu * phaser.arriveAndDeregister(); // deregister self, don't wait * }} * - *

    To create a set of tasks using a tree of Phasers, + *

    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 + * Task class with a constructor accepting a phaser that * it registers for upon construction: *

     {@code
      * void build(Task[] actions, int lo, int hi, Phaser b) {
    @@ -249,7 +247,7 @@ public class Phaser {
         private final Phaser parent;
     
         /**
    -     * The root of Phaser tree. Equals this if not in a tree.  Used to
    +     * The root of phaser tree. Equals this if not in a tree.  Used to
          * support faster state push-down.
          */
         private final Phaser root;
    @@ -300,16 +298,16 @@ public class Phaser {
         }
     
         /**
    -     * Creates a new Phaser without any initially registered parties,
    +     * Creates a new phaser without any initially registered parties,
          * initial phase number 0, and no parent. Any thread using this
    -     * Phaser will need to first register for it.
    +     * phaser will need to first register for it.
          */
         public Phaser() {
             this(null);
         }
     
         /**
    -     * Creates a new Phaser with the given numbers of registered
    +     * Creates a new phaser with the given numbers of registered
          * unarrived parties, initial phase number 0, and no parent.
          *
          * @param parties the number of parties required to trip barrier
    @@ -321,7 +319,7 @@ public class Phaser {
         }
     
         /**
    -     * Creates a new Phaser with the given parent, without any
    +     * Creates a new phaser with the given parent, without any
          * initially registered 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.
    @@ -341,7 +339,7 @@ public class Phaser {
         }
     
         /**
    -     * Creates a new Phaser with the given parent and numbers of
    +     * Creates a new phaser with the given parent and numbers 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.
    @@ -463,11 +461,12 @@ public class Phaser {
         }
     
         /**
    -     * Arrives at the barrier, and deregisters from it, without
    -     * waiting for others. Deregistration reduces number of parties
    +     * Arrives at the barrier and deregisters from it without waiting
    +     * for others. Deregistration reduces the number of parties
          * 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 is also deregistered from its parent.
    +     * zero parties, this phaser also arrives at and is deregistered
    +     * from its parent.
          *
          * @return the current barrier phase number upon entry to
          * this method, or a negative value if terminated
    @@ -520,9 +519,11 @@ public class Phaser {
     
         /**
          * Arrives at the barrier and awaits others. Equivalent in effect
    -     * to {@code awaitAdvance(arrive())}.  If you instead need to
    -     * await with interruption of timeout, and/or deregister upon
    -     * arrival, you can arrange them using analogous constructions.
    +     * 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}.
          *
          * @return the phase on entry to this method
          * @throws IllegalStateException if not terminated and the number
    @@ -533,9 +534,10 @@ public class Phaser {
         }
     
         /**
    -     * Awaits the phase of the barrier to advance from the given
    -     * value, or returns immediately if argument is negative or this
    -     * barrier is terminated.
    +     * 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.
          *
          * @param phase the phase on entry to this method
          * @return the phase on exit from this method
    @@ -554,10 +556,11 @@ public class Phaser {
         }
     
         /**
    -     * Awaits the phase of the barrier to advance from the given
    -     * value, or returns immediately if argument is negative or this
    -     * barrier is terminated, or throws InterruptedException if
    -     * interrupted while waiting.
    +     * Awaits the phase of the barrier to advance from the given phase
    +     * value, throwing 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
    @@ -577,11 +580,17 @@ public class Phaser {
         }
     
         /**
    -     * Awaits the phase of the barrier to advance from the given value
    -     * or the given timeout elapses, or returns immediately if
    -     * argument is negative or this barrier is terminated.
    +     * Awaits the phase of the barrier to advance from the given phase
    +     * value or the given timeout elapses, throwing
    +     * 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
    +     * @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
          * @throws InterruptedException if thread interrupted while waiting
          * @throws TimeoutException if timed out while waiting
    @@ -636,16 +645,6 @@ public class Phaser {
         }
     
         /**
    -     * Returns {@code true} if the current phase number equals the given phase.
    -     *
    -     * @param phase the phase
    -     * @return {@code true} if the current phase number equals the given phase
    -     */
    -    public final boolean hasPhase(int phase) {
    -        return phaseOf(getReconciledState()) == phase;
    -    }
    -
    -    /**
          * Returns the number of parties registered at this barrier.
          *
          * @return the number of parties
    @@ -711,21 +710,17 @@ public class Phaser {
          * termination state, and subsequent calls to {@link #isTerminated}
          * will return true.
          *
    -     * 

    The default version returns {@code true} when the number of + *

    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 + *

    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 {@code awaitAdvance} at each phase. - * Otherwise, you cannot ensure lack of interference. In - * particular, this method may be invoked more than once per - * transition if other parties successfully register while the - * invocation of this method is in progress, thus postponing the - * transition until those parties also arrive, re-triggering this - * method. + * 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