--- jsr166/src/jsr166y/Phaser.java 2009/07/22 01:36:51 1.16 +++ jsr166/src/jsr166y/Phaser.java 2009/08/02 17:02:06 1.25 @@ -7,10 +7,9 @@ package jsr166y; import java.util.concurrent.*; -import java.util.concurrent.atomic.*; + +import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.LockSupport; -import sun.misc.Unsafe; -import java.lang.reflect.*; /** * A reusable synchronization barrier, similar in functionality to a @@ -33,18 +32,19 @@ import java.lang.reflect.*; * 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, that may also be invoked independently: * * @@ -52,19 +52,19 @@ import java.lang.reflect.*; * *
  • 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. + * method {@link #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. + * effect as 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 + * 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 + * number reaches a threshold. Method {@link #forceTermination} is also * available to abruptly release waiting threads and allow them to * terminate. * @@ -76,7 +76,7 @@ import java.lang.reflect.*; * *
  • 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 @@ -88,10 +88,10 @@ import java.lang.reflect.*; * *

    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) {
    @@ -140,9 +140,9 @@ import java.lang.reflect.*;
      *   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) {
    @@ -211,15 +211,15 @@ public class Phaser {
         private static final int phaseMask  = 0x7fffffff;
     
         private static int unarrivedOf(long s) {
    -        return (int)(s & ushortMask);
    +        return (int) (s & ushortMask);
         }
     
         private static int partiesOf(long s) {
    -        return ((int)s) >>> 16;
    +        return ((int) s) >>> 16;
         }
     
         private static int phaseOf(long s) {
    -        return (int)(s >>> 32);
    +        return (int) (s >>> 32);
         }
     
         private static int arrivedOf(long s) {
    @@ -227,13 +227,13 @@ public class Phaser {
         }
     
         private static long stateFor(int phase, int parties, int unarrived) {
    -        return ((((long)phase) << 32) | (((long)parties) << 16) |
    -                (long)unarrived);
    +        return ((((long) phase) << 32) | (((long) parties) << 16) |
    +                (long) unarrived);
         }
     
         private static long trippedStateFor(int phase, int parties) {
    -        long lp = (long)parties;
    -        return (((long)phase) << 32) | (lp << 16) | lp;
    +        long lp = (long) parties;
    +        return (((long) phase) << 32) | (lp << 16) | lp;
         }
     
         /**
    @@ -250,7 +250,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;
    @@ -266,7 +266,7 @@ public class Phaser {
         private final AtomicReference oddQ  = new AtomicReference();
     
         private AtomicReference queueFor(int phase) {
    -        return (phase & 1) == 0? evenQ : oddQ;
    +        return ((phase & 1) == 0) ? evenQ : oddQ;
         }
     
         /**
    @@ -274,7 +274,7 @@ public class Phaser {
          * root if necessary.
          */
         private long getReconciledState() {
    -        return parent == null? state : reconcileState();
    +        return (parent == null) ? state : reconcileState();
         }
     
         /**
    @@ -301,16 +301,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
    @@ -322,7 +322,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.
    @@ -342,7 +342,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.
    @@ -441,7 +441,7 @@ public class Phaser {
                     if (par == null) {      // directly trip
                         if (casState
                             (s,
    -                         trippedStateFor(onAdvance(phase, parties)? -1 :
    +                         trippedStateFor(onAdvance(phase, parties) ? -1 :
                                              ((phase + 1) & phaseMask), parties))) {
                             releaseWaiters(phase);
                             break;
    @@ -502,7 +502,7 @@ public class Phaser {
                     if (unarrived == 0) {
                         if (casState
                             (s,
    -                         trippedStateFor(onAdvance(phase, parties)? -1 :
    +                         trippedStateFor(onAdvance(phase, parties) ? -1 :
                                              ((phase + 1) & phaseMask), parties))) {
                             releaseWaiters(phase);
                             break;
    @@ -587,7 +587,8 @@ public class Phaser {
          * @throws InterruptedException if thread interrupted while waiting
          * @throws TimeoutException if timed out while waiting
          */
    -    public int awaitAdvanceInterruptibly(int phase, long timeout, TimeUnit unit)
    +    public int awaitAdvanceInterruptibly(int phase,
    +                                         long timeout, TimeUnit unit)
             throws InterruptedException, TimeoutException {
             if (phase < 0)
                 return phase;
    @@ -675,9 +676,9 @@ public class Phaser {
         }
     
         /**
    -     * Returns the parent of this phaser, or null if none.
    +     * Returns the parent of this phaser, or {@code null} if none.
          *
    -     * @return the parent of this phaser, or null if none
    +     * @return the parent of this phaser, or {@code null} if none
          */
         public Phaser getParent() {
             return parent;
    @@ -706,20 +707,20 @@ 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 true, then, rather than advance the
    -     * phase number, this barrier will be set to a final termination
    -     * state, and subsequent calls to {@code isTerminated} will
    -     * return true.
    +     * 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.
          *
    -     * 

    The default version returns 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. + * before any arrive, and all {@link #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 @@ -930,49 +931,52 @@ public class Phaser { return p; } - // Temporary Unsafe mechanics for preliminary release - private static Unsafe getUnsafe() throws Throwable { - try { - return Unsafe.getUnsafe(); - } catch (SecurityException se) { - try { - return java.security.AccessController.doPrivileged - (new java.security.PrivilegedExceptionAction() { - public Unsafe run() throws Exception { - return getUnsafePrivileged(); - }}); - } catch (java.security.PrivilegedActionException e) { - throw e.getCause(); - } - } - } + // Unsafe mechanics - private static Unsafe getUnsafePrivileged() - throws NoSuchFieldException, IllegalAccessException { - Field f = Unsafe.class.getDeclaredField("theUnsafe"); - f.setAccessible(true); - return (Unsafe) f.get(null); - } + private static final sun.misc.Unsafe UNSAFE = getUnsafe(); + private static final long stateOffset = + objectFieldOffset("state", Phaser.class); - private static long fieldOffset(String fieldName) - throws NoSuchFieldException { - return UNSAFE.objectFieldOffset - (Phaser.class.getDeclaredField(fieldName)); + private final boolean casState(long cmp, long val) { + return UNSAFE.compareAndSwapLong(this, stateOffset, cmp, val); } - static final Unsafe UNSAFE; - static final long stateOffset; - - static { + private static long objectFieldOffset(String field, Class klazz) { try { - UNSAFE = getUnsafe(); - stateOffset = fieldOffset("state"); - } catch (Throwable e) { - throw new RuntimeException("Could not initialize intrinsics", e); + return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field)); + } catch (NoSuchFieldException e) { + // Convert Exception to corresponding Error + NoSuchFieldError error = new NoSuchFieldError(field); + error.initCause(e); + throw error; } } - final boolean casState(long cmp, long val) { - return UNSAFE.compareAndSwapLong(this, stateOffset, cmp, val); + /** + * Returns a sun.misc.Unsafe. Suitable for use in a 3rd party package. + * Replace with a simple call to Unsafe.getUnsafe when integrating + * into a jdk. + * + * @return a sun.misc.Unsafe + */ + private static sun.misc.Unsafe getUnsafe() { + try { + return sun.misc.Unsafe.getUnsafe(); + } catch (SecurityException se) { + try { + return java.security.AccessController.doPrivileged + (new java.security + .PrivilegedExceptionAction() { + public sun.misc.Unsafe run() throws Exception { + java.lang.reflect.Field f = sun.misc + .Unsafe.class.getDeclaredField("theUnsafe"); + f.setAccessible(true); + return (sun.misc.Unsafe) f.get(null); + }}); + } catch (java.security.PrivilegedActionException e) { + throw new RuntimeException("Could not initialize intrinsics", + e.getCause()); + } + } } }