ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166y/Phaser.java
(Generate patch)

Comparing jsr166/src/jsr166y/Phaser.java (file contents):
Revision 1.2 by jsr166, Fri Jul 25 18:10:41 2008 UTC vs.
Revision 1.54 by dl, Sat Nov 13 13:10:04 2010 UTC

# Line 5 | Line 5
5   */
6  
7   package jsr166y;
8 < import jsr166y.forkjoin.*;
9 < import java.util.concurrent.*;
10 < import java.util.concurrent.atomic.*;
8 >
9 > import java.util.concurrent.TimeUnit;
10 > import java.util.concurrent.TimeoutException;
11 > import java.util.concurrent.atomic.AtomicReference;
12   import java.util.concurrent.locks.LockSupport;
13  
14   /**
15 < * A reusable synchronization barrier, similar in functionality to a
16 < * {@link java.util.concurrent.CyclicBarrier}, but supporting more
17 < * flexible usage.
15 > * A reusable synchronization barrier, similar in functionality to
16 > * {@link java.util.concurrent.CyclicBarrier CyclicBarrier} and
17 > * {@link java.util.concurrent.CountDownLatch CountDownLatch}
18 > * but supporting more flexible usage.
19 > *
20 > * <p> <b>Registration.</b> Unlike the case for other barriers, the
21 > * number of parties <em>registered</em> to synchronize on a phaser
22 > * may vary over time.  Tasks may be registered at any time (using
23 > * methods {@link #register}, {@link #bulkRegister}, or forms of
24 > * constructors establishing initial numbers of parties), and
25 > * optionally deregistered upon any arrival (using {@link
26 > * #arriveAndDeregister}).  As is the case with most basic
27 > * synchronization constructs, registration and deregistration affect
28 > * only internal counts; they do not establish any further internal
29 > * bookkeeping, so tasks cannot query whether they are registered.
30 > * (However, you can introduce such bookkeeping by subclassing this
31 > * class.)
32 > *
33 > * <p> <b>Synchronization.</b> Like a {@code CyclicBarrier}, a {@code
34 > * Phaser} may be repeatedly awaited.  Method {@link
35 > * #arriveAndAwaitAdvance} has effect analogous to {@link
36 > * java.util.concurrent.CyclicBarrier#await CyclicBarrier.await}. Each
37 > * generation of a {@code Phaser} has an associated phase number. The
38 > * phase number starts at zero, and advances when all parties arrive
39 > * at the barrier, wrapping around to zero after reaching {@code
40 > * Integer.MAX_VALUE}. The use of phase numbers enables independent
41 > * control of actions upon arrival at a barrier and upon awaiting
42 > * others, via two kinds of methods that may be invoked by any
43 > * registered party:
44   *
45   * <ul>
46   *
47 < * <li> The number of parties synchronizing on the barrier may vary
48 < * over time.  A task may register to be a party in a barrier at any
49 < * time, and may deregister upon arriving at the barrier.  As is the
50 < * case with most basic synchronization constructs, registration
51 < * and deregistration affect only internal counts; they do not
52 < * establish any further internal bookkeeping, so tasks cannot query
53 < * whether they are registered.
54 < *
55 < * <li> Each generation has an associated phase value, starting at
56 < * zero, and advancing when all parties reach the barrier (wrapping
57 < * around to zero after reaching <tt>Integer.MAX_VALUE</tt>).
58 < *
59 < * <li> Like a CyclicBarrier, a Phaser may be repeatedly awaited.
60 < * Method <tt>arriveAndAwaitAdvance</tt> has effect analogous to
61 < * <tt>CyclicBarrier.await</tt>.  However, Phasers separate two
62 < * aspects of coordination, that may be invoked independently:
63 < *
64 < * <ul>
47 > *   <li> <b>Arrival.</b> Methods {@link #arrive} and
48 > *       {@link #arriveAndDeregister} record arrival at a
49 > *       barrier. These methods do not block, but return an associated
50 > *       <em>arrival phase number</em>; that is, the phase number of
51 > *       the barrier to which the arrival applied. When the final
52 > *       party for a given phase arrives, an optional barrier action
53 > *       is performed and the phase advances.  Barrier actions,
54 > *       performed by the party triggering a phase advance, are
55 > *       arranged by overriding method {@link #onAdvance(int, int)},
56 > *       which also controls termination. Overriding this method is
57 > *       similar to, but more flexible than, providing a barrier
58 > *       action to a {@code CyclicBarrier}.
59 > *
60 > *   <li> <b>Waiting.</b> Method {@link #awaitAdvance} requires an
61 > *       argument indicating an arrival phase number, and returns when
62 > *       the barrier advances to (or is already at) a different phase.
63 > *       Unlike similar constructions using {@code CyclicBarrier},
64 > *       method {@code awaitAdvance} continues to wait even if the
65 > *       waiting thread is interrupted. Interruptible and timeout
66 > *       versions are also available, but exceptions encountered while
67 > *       tasks wait interruptibly or with timeout do not change the
68 > *       state of the barrier. If necessary, you can perform any
69 > *       associated recovery within handlers of those exceptions,
70 > *       often after invoking {@code forceTermination}.  Phasers may
71 > *       also be used by tasks executing in a {@link ForkJoinPool},
72 > *       which will ensure sufficient parallelism to execute tasks
73 > *       when others are blocked waiting for a phase to advance.
74   *
39 *   <li> Arriving at a barrier. Methods <tt>arrive</tt> and
40 *       <tt>arriveAndDeregister</tt> do not block, but return
41 *       the phase value on entry to the method.
42 *
43 *   <li> Awaiting others. Method <tt>awaitAdvance</tt> requires an
44 *       argument indicating the entry phase, and returns when the
45 *       barrier advances to a new phase.
75   * </ul>
76   *
77 + * <p> <b>Termination.</b> A {@code Phaser} may enter a
78 + * <em>termination</em> state in which all synchronization methods
79 + * immediately return without updating phaser state or waiting for
80 + * advance, and indicating (via a negative phase value) that execution
81 + * is complete.  Termination is triggered when an invocation of {@code
82 + * onAdvance} returns {@code true}.  As illustrated below, when
83 + * phasers control actions with a fixed number of iterations, it is
84 + * often convenient to override this method to cause termination when
85 + * the current phase number reaches a threshold. Method {@link
86 + * #forceTermination} is also available to abruptly release waiting
87 + * threads and allow them to terminate.
88 + *
89 + * <p> <b>Tiering.</b> Phasers may be <em>tiered</em> (i.e., arranged
90 + * in tree structures) to reduce contention. Phasers with large
91 + * numbers of parties that would otherwise experience heavy
92 + * synchronization contention costs may instead be set up so that
93 + * groups of sub-phasers share a common parent.  This may greatly
94 + * increase throughput even though it incurs greater per-operation
95 + * overhead.
96 + *
97 + * <p><b>Monitoring.</b> While synchronization methods may be invoked
98 + * only by registered parties, the current state of a phaser may be
99 + * monitored by any caller.  At any given moment there are {@link
100 + * #getRegisteredParties} parties in total, of which {@link
101 + * #getArrivedParties} have arrived at the current phase ({@link
102 + * #getPhase}).  When the remaining ({@link #getUnarrivedParties})
103 + * parties arrive, the phase advances.  The values returned by these
104 + * methods may reflect transient states and so are not in general
105 + * useful for synchronization control.  Method {@link #toString}
106 + * returns snapshots of these state queries in a form convenient for
107 + * informal monitoring.
108 + *
109 + * <p><b>Sample usages:</b>
110 + *
111 + * <p>A {@code Phaser} may be used instead of a {@code CountDownLatch}
112 + * to control a one-shot action serving a variable number of parties.
113 + * The typical idiom is for the method setting this up to first
114 + * register, then start the actions, then deregister, as in:
115 + *
116 + *  <pre> {@code
117 + * void runTasks(List<Runnable> tasks) {
118 + *   final Phaser phaser = new Phaser(1); // "1" to register self
119 + *   // create and start threads
120 + *   for (Runnable task : tasks) {
121 + *     phaser.register();
122 + *     new Thread() {
123 + *       public void run() {
124 + *         phaser.arriveAndAwaitAdvance(); // await all creation
125 + *         task.run();
126 + *       }
127 + *     }.start();
128 + *   }
129   *
130 < * <li> Barrier actions, performed by the task triggering a phase
131 < * advance while others may be waiting, are arranged by overriding
132 < * method <tt>onAdvance</tt>, that also controls termination.
133 < *
134 < * <li> Phasers may enter a <em>termination</em> state in which all
135 < * await actions immediately return, indicating (via a negative phase
136 < * value) that execution is complete.  Termination is triggered by
137 < * executing the overridable <tt>onAdvance</tt> method that is invoked
138 < * each time the barrier is tripped. When a Phaser is controlling an
139 < * action with a fixed number of iterations, it is often convenient to
140 < * override this method to cause termination when the current phase
141 < * number reaches a threshold.  Method <tt>forceTermination</tt> is
142 < * also available to assist recovery actions upon failure.
143 < *
144 < * <li> Unlike most synchronizers, a Phaser may also be used with
145 < * ForkJoinTasks (as well as plain threads).
146 < *
147 < * <li> By default, <tt>awaitAdvance</tt> continues to wait even if
148 < * the current thread is interrupted. And unlike the case in
149 < * CyclicBarriers, exceptions encountered while tasks wait
150 < * interruptibly or with timeout do not change the state of the
151 < * barrier. If necessary, you can perform any associated recovery
152 < * within handlers of those exceptions.
153 < *
154 < * </ul>
130 > *   // allow threads to start and deregister self
131 > *   phaser.arriveAndDeregister();
132 > * }}</pre>
133 > *
134 > * <p>One way to cause a set of threads to repeatedly perform actions
135 > * for a given number of iterations is to override {@code onAdvance}:
136 > *
137 > *  <pre> {@code
138 > * void startTasks(List<Runnable> tasks, final int iterations) {
139 > *   final Phaser phaser = new Phaser() {
140 > *     protected boolean onAdvance(int phase, int registeredParties) {
141 > *       return phase >= iterations || registeredParties == 0;
142 > *     }
143 > *   };
144 > *   phaser.register();
145 > *   for (final Runnable task : tasks) {
146 > *     phaser.register();
147 > *     new Thread() {
148 > *       public void run() {
149 > *         do {
150 > *           task.run();
151 > *           phaser.arriveAndAwaitAdvance();
152 > *         } while (!phaser.isTerminated());
153 > *       }
154 > *     }.start();
155 > *   }
156 > *   phaser.arriveAndDeregister(); // deregister self, don't wait
157 > * }}</pre>
158   *
159 < * <p><b>Sample usage:</b>
159 > * If the main task must later await termination, it
160 > * may re-register and then execute a similar loop:
161 > *  <pre> {@code
162 > *   // ...
163 > *   phaser.register();
164 > *   while (!phaser.isTerminated())
165 > *     phaser.arriveAndAwaitAdvance();}</pre>
166 > *
167 > * <p>Related constructions may be used to await particular phase numbers
168 > * in contexts where you are sure that the phase will never wrap around
169 > * {@code Integer.MAX_VALUE}. For example:
170 > *
171 > *  <pre> {@code
172 > * void awaitPhase(Phaser phaser, int phase) {
173 > *   int p = phaser.register(); // assumes caller not already registered
174 > *   while (p < phase) {
175 > *     if (phaser.isTerminated())
176 > *       // ... deal with unexpected termination
177 > *     else
178 > *       p = phaser.arriveAndAwaitAdvance();
179 > *   }
180 > *   phaser.arriveAndDeregister();
181 > * }}</pre>
182   *
77 * <p>[todo: non-FJ example]
183   *
184 < * <p> A Phaser may be used to support a style of programming in
185 < * which a task waits for others to complete, without otherwise
186 < * needing to keep track of which tasks it is waiting for. This is
187 < * similar to the "sync" construct in Cilk and "clocks" in X10.
188 < * Special constructions based on such barriers are available using
189 < * the <tt>LinkedAsyncAction</tt> and <tt>CyclicAction</tt> classes,
190 < * but they can be useful in other contexts as well.  For a simple
191 < * (but not very useful) example, here is a variant of Fibonacci:
192 < *
193 < * <pre>
194 < * class BarrierFibonacci extends RecursiveAction {
90 < *   int argument, result;
91 < *   final Phaser parentBarrier;
92 < *   BarrierFibonacci(int n, Phaser parentBarrier) {
93 < *     this.argument = n;
94 < *     this.parentBarrier = parentBarrier;
95 < *     parentBarrier.register();
96 < *   }
97 < *   protected void compute() {
98 < *     int n = argument;
99 < *     if (n &lt;= 1)
100 < *        result = n;
101 < *     else {
102 < *        Phaser childBarrier = new Phaser(1);
103 < *        BarrierFibonacci f1 = new BarrierFibonacci(n - 1, childBarrier);
104 < *        BarrierFibonacci f2 = new BarrierFibonacci(n - 2, childBarrier);
105 < *        f1.fork();
106 < *        f2.fork();
107 < *        childBarrier.arriveAndAwait();
108 < *        result = f1.result + f2.result;
184 > * <p>To create a set of tasks using a tree of phasers,
185 > * you could use code of the following form, assuming a
186 > * Task class with a constructor accepting a phaser that
187 > * it registers with upon construction:
188 > *
189 > *  <pre> {@code
190 > * void build(Task[] actions, int lo, int hi, Phaser ph) {
191 > *   if (hi - lo > TASKS_PER_PHASER) {
192 > *     for (int i = lo; i < hi; i += TASKS_PER_PHASER) {
193 > *       int j = Math.min(i + TASKS_PER_PHASER, hi);
194 > *       build(actions, i, j, new Phaser(ph));
195   *     }
196 < *     parentBarrier.arriveAndDeregister();
196 > *   } else {
197 > *     for (int i = lo; i < hi; ++i)
198 > *       actions[i] = new Task(ph);
199 > *       // assumes new Task(ph) performs ph.register()
200   *   }
201   * }
202 < * </pre>
202 > * // .. initially called, for n tasks via
203 > * build(new Task[n], 0, n, new Phaser());}</pre>
204 > *
205 > * The best value of {@code TASKS_PER_PHASER} depends mainly on
206 > * expected barrier synchronization rates. A value as low as four may
207 > * be appropriate for extremely small per-barrier task bodies (thus
208 > * high rates), or up to hundreds for extremely large ones.
209   *
210   * <p><b>Implementation notes</b>: This implementation restricts the
211 < * maximum number of parties to 65535. Attempts to register
212 < * additional parties result in IllegalStateExceptions.  
211 > * maximum number of parties to 65535. Attempts to register additional
212 > * parties result in {@code IllegalStateException}. However, you can and
213 > * should create tiered phasers to accommodate arbitrarily large sets
214 > * of participants.
215 > *
216 > * @since 1.7
217 > * @author Doug Lea
218   */
219   public class Phaser {
220      /*
221       * This class implements an extension of X10 "clocks".  Thanks to
222 <     * Vijay Saraswat for the idea of applying it to ForkJoinTasks,
223 <     * and to Vivek Sarkar for enhancements to extend functionality.
222 >     * Vijay Saraswat for the idea, and to Vivek Sarkar for
223 >     * enhancements to extend functionality.
224       */
225  
226      /**
227       * Barrier state representation. Conceptually, a barrier contains
228       * four values:
229 <     *
230 <     * * parties -- the number of parties to wait (16 bits)
231 <     * * unarrived -- the number of parties yet to hit barrier (16 bits)
232 <     * * phase -- the generation of the barrier (31 bits)
233 <     * * terminated -- set if barrier is terminated (1 bit)
229 >     *
230 >     * * unarrived -- the number of parties yet to hit barrier (bits  0-15)
231 >     * * parties -- the number of parties to wait              (bits 16-31)
232 >     * * phase -- the generation of the barrier                (bits 32-62)
233 >     * * terminated -- set if barrier is terminated            (bit  63 / sign)
234       *
235       * However, to efficiently maintain atomicity, these values are
236 <     * packed into a single AtomicLong. Termination uses the sign bit
237 <     * of 32 bit representation of phase, so phase is set to -1 on
238 <     * termination.
239 <     */
240 <    private final AtomicLong state;
236 >     * packed into a single (atomic) long. Termination uses the sign
237 >     * bit of 32 bit representation of phase, so phase is set to -1 on
238 >     * termination. Good performance relies on keeping state decoding
239 >     * and encoding simple, and keeping race windows short.
240 >     */
241 >    private volatile long state;
242 >
243 >    private static final int  MAX_COUNT      = 0xffff;
244 >    private static final int  MAX_PHASE      = 0x7fffffff;
245 >    private static final int  PARTIES_SHIFT  = 16;
246 >    private static final int  PHASE_SHIFT    = 32;
247 >    private static final long UNARRIVED_MASK = 0xffffL;
248 >    private static final long PARTIES_MASK   = 0xffff0000L;
249 >    private static final long ONE_ARRIVAL    = 1L;
250 >    private static final long ONE_PARTY      = 1L << PARTIES_SHIFT;
251 >    private static final long TERMINATION_PHASE  = -1L << PHASE_SHIFT;
252  
253 <    /**
143 <     * Head of Treiber stack for waiting nonFJ threads.
144 <     */
145 <    private final AtomicReference<QNode> head = new AtomicReference<QNode>();
146 <
147 <    private static final int ushortBits = 16;
148 <    private static final int ushortMask =  (1 << ushortBits) - 1;
149 <    private static final int phaseMask = 0x7fffffff;
253 >    // The following unpacking methods are usually manually inlined
254  
255      private static int unarrivedOf(long s) {
256 <        return (int)(s & ushortMask);
256 >        return (int) (s & UNARRIVED_MASK);
257      }
258  
259      private static int partiesOf(long s) {
260 <        return (int)(s & (ushortMask << 16)) >>> 16;
260 >        return ((int) (s & PARTIES_MASK)) >>> PARTIES_SHIFT;
261      }
262  
263      private static int phaseOf(long s) {
264 <        return (int)(s >>> 32);
264 >        return (int) (s >>> PHASE_SHIFT);
265      }
266  
267      private static int arrivedOf(long s) {
268          return partiesOf(s) - unarrivedOf(s);
269      }
270  
271 <    private static long stateFor(int phase, int parties, int unarrived) {
272 <        return (((long)phase) << 32) | ((parties << 16) | unarrived);
273 <    }
274 <
171 <    private static IllegalStateException badBounds(int parties, int unarrived) {
172 <        return new IllegalStateException("Attempt to set " + unarrived +
173 <                                         " unarrived of " + parties + " parties");
174 <    }
271 >    /**
272 >     * The parent of this phaser, or null if none
273 >     */
274 >    private final Phaser parent;
275  
276      /**
277 <     * Creates a new Phaser without any initially registered parties,
278 <     * and initial phase number 0.
277 >     * The root of phaser tree. Equals this if not in a tree.  Used to
278 >     * support faster state push-down.
279       */
280 <    public Phaser() {
181 <        state = new AtomicLong(stateFor(0, 0, 0));
182 <    }
280 >    private final Phaser root;
281  
282      /**
283 <     * Creates a new Phaser with the given numbers of registered
284 <     * unarrived parties and initial phase number 0.
285 <     * @param parties the number of parties required to trip barrier.
286 <     * @throws IllegalArgumentException if parties less than zero
189 <     * or greater than the maximum number of parties supported.
283 >     * Heads of Treiber stacks for waiting threads. To eliminate
284 >     * contention when releasing some threads while adding others, we
285 >     * use two of them, alternating across even and odd phases.
286 >     * Subphasers share queues with root to speed up releases.
287       */
288 <    public Phaser(int parties) {
289 <        if (parties < 0 || parties > ushortMask)
290 <            throw new IllegalArgumentException("Illegal number of parties");
291 <        state = new AtomicLong(stateFor(0, parties, parties));
288 >    private final AtomicReference<QNode> evenQ;
289 >    private final AtomicReference<QNode> oddQ;
290 >
291 >    private AtomicReference<QNode> queueFor(int phase) {
292 >        return ((phase & 1) == 0) ? evenQ : oddQ;
293      }
294  
295      /**
296 <     * Adds a new unarrived party to this phaser.
297 <     * @return the current barrier phase number upon registration
298 <     * @throws IllegalStateException if attempting to register more
299 <     * than the maximum supported number of parties.
296 >     * Main implementation for methods arrive and arriveAndDeregister.
297 >     * Manually tuned to speed up and minimize race windows for the
298 >     * common case of just decrementing unarrived field.
299 >     *
300 >     * @param adj - adjustment to apply to state -- either
301 >     * ONE_ARRIVAL (for arrive) or
302 >     * ONE_ARRIVAL|ONE_PARTY (for arriveAndDeregister)
303       */
304 <    public int register() { // increment both parties and unarrived
204 <        final AtomicLong state = this.state;
304 >    private int doArrive(long adj) {
305          for (;;) {
306 <            long s = state.get();
307 <            int phase = phaseOf(s);
308 <            int parties = partiesOf(s) + 1;
309 <            int unarrived = unarrivedOf(s) + 1;
310 <            if (parties > ushortMask || unarrived > ushortMask)
311 <                throw badBounds(parties, unarrived);
312 <            if (state.compareAndSet(s, stateFor(phase, parties, unarrived)))
306 >            long s;
307 >            int phase, unarrived;
308 >            if ((phase = (int)((s = state) >>> PHASE_SHIFT)) < 0)
309 >                return phase;
310 >            else if ((unarrived = (int)(s & UNARRIVED_MASK)) == 0)
311 >                checkBadArrive(s);
312 >            else if (UNSAFE.compareAndSwapLong(this, stateOffset, s, s -= adj)){
313 >                if (unarrived == 1) {
314 >                    Phaser par;
315 >                    long p = s & PARTIES_MASK; // unshifted parties field
316 >                    long lu = p >>> PARTIES_SHIFT;
317 >                    int u = (int)lu;
318 >                    int nextPhase = (phase + 1) & MAX_PHASE;
319 >                    long next = ((long)nextPhase << PHASE_SHIFT) | p | lu;
320 >                    if ((par = parent) == null) {
321 >                        UNSAFE.compareAndSwapLong
322 >                            (this, stateOffset, s, onAdvance(phase, u)?
323 >                             next | TERMINATION_PHASE : next);
324 >                        releaseWaiters(phase);
325 >                    }
326 >                    else {
327 >                        par.doArrive(u == 0?
328 >                                     ONE_ARRIVAL|ONE_PARTY : ONE_ARRIVAL);
329 >                        if ((int)(par.state >>> PHASE_SHIFT) != nextPhase ||
330 >                            ((int)(state >>> PHASE_SHIFT) != nextPhase &&
331 >                             !UNSAFE.compareAndSwapLong(this, stateOffset,
332 >                                                        s, next)))
333 >                            reconcileState();
334 >                    }
335 >                }
336                  return phase;
337 +            }
338          }
339      }
340  
341      /**
342 <     * Arrives at the barrier, but does not wait for others.  (You can
343 <     * in turn wait for others via {@link #awaitAdvance}).
342 >     * Rechecks state and throws bounds exceptions on arrival -- called
343 >     * only if unarrived is apparently zero.
344 >     */
345 >    private void checkBadArrive(long s) {
346 >        if (reconcileState() == s)
347 >            throw new IllegalStateException
348 >                ("Attempted arrival of unregistered party for " +
349 >                 stateToString(s));
350 >    }
351 >
352 >    /**
353 >     * Implementation of register, bulkRegister
354       *
355 <     * @return the current barrier phase number upon entry to
222 <     * this method, or a negative value if terminated;
223 <     * @throws IllegalStateException if the number of unarrived
224 <     * parties would become negative.
355 >     * @param registrations number to add to both parties and unarrived fields
356       */
357 <    public int arrive() { // decrement unarrived. If zero, trip
358 <        final AtomicLong state = this.state;
357 >    private int doRegister(int registrations) {
358 >        long adj = (long)registrations; // adjustment to state
359 >        adj |= adj << PARTIES_SHIFT;
360 >        Phaser par = parent;
361          for (;;) {
362 <            long s = state.get();
363 <            int phase = phaseOf(s);
364 <            int parties = partiesOf(s);
232 <            int unarrived = unarrivedOf(s) - 1;
233 <            if (unarrived < 0)
234 <                throw badBounds(parties, unarrived);
235 <            if (unarrived == 0 && phase >= 0) {
236 <                trip(phase, parties);
362 >            int phase, parties;
363 >            long s = par == null? state : reconcileState();
364 >            if ((phase = (int)(s >>> PHASE_SHIFT)) < 0)
365                  return phase;
366 <            }
367 <            if (state.compareAndSet(s, stateFor(phase, parties, unarrived)))
366 >            if ((parties = ((int)(s & PARTIES_MASK)) >>> PARTIES_SHIFT) != 0 &&
367 >                (s & UNARRIVED_MASK) == 0)
368 >                internalAwaitAdvance(phase, null); // wait for onAdvance
369 >            else if (parties + registrations > MAX_COUNT)
370 >                throw new IllegalStateException(badRegister(s));
371 >            else if (UNSAFE.compareAndSwapLong(this, stateOffset, s, s + adj))
372                  return phase;
373          }
374      }
375  
376      /**
377 <     * Arrives at the barrier, and deregisters from it, without
246 <     * waiting for others.
247 <     *
248 <     * @return the current barrier phase number upon entry to
249 <     * this method, or a negative value if terminated;
250 <     * @throws IllegalStateException if the number of registered or
251 <     * unarrived parties would become negative.
377 >     * Returns message string for bounds exceptions on registration
378       */
379 <    public int arriveAndDeregister() { // Same as arrive, plus decrement parties
380 <        final AtomicLong state = this.state;
379 >    private String badRegister(long s) {
380 >        return "Attempt to register more than " +
381 >            MAX_COUNT + " parties for " + stateToString(s);
382 >    }
383 >
384 >    /**
385 >     * Recursively resolves lagged phase propagation from root if
386 >     * necessary.
387 >     */
388 >    private long reconcileState() {
389 >        Phaser par = parent;
390 >        if (par == null)
391 >            return state;
392 >        Phaser rt = root;
393          for (;;) {
394 <            long s = state.get();
395 <            int phase = phaseOf(s);
396 <            int parties = partiesOf(s) - 1;
397 <            int unarrived = unarrivedOf(s) - 1;
398 <            if (parties < 0 || unarrived < 0)
399 <                throw badBounds(parties, unarrived);
400 <            if (unarrived == 0 && phase >= 0) {
401 <                trip(phase, parties);
402 <                return phase;
394 >            long s, u;
395 >            int phase, rPhase, pPhase;
396 >            if ((phase = (int)((s = state)>>> PHASE_SHIFT)) < 0 ||
397 >                (rPhase = (int)(rt.state >>> PHASE_SHIFT)) == phase)
398 >                return s;
399 >            long pState = par.parent == null? par.state : par.reconcileState();
400 >            if (state == s) {
401 >                if ((rPhase < 0 || (s & UNARRIVED_MASK) == 0) &&
402 >                    ((pPhase = (int)(pState >>> PHASE_SHIFT)) < 0 ||
403 >                     pPhase == ((phase + 1) & MAX_PHASE)))
404 >                    UNSAFE.compareAndSwapLong
405 >                        (this, stateOffset, s,
406 >                         (((long) pPhase) << PHASE_SHIFT) |
407 >                         (u = s & PARTIES_MASK) |
408 >                         (u >>> PARTIES_SHIFT)); // reset unarrived to parties
409 >                else
410 >                    releaseWaiters(phase); // help release others
411              }
266            if (state.compareAndSet(s, stateFor(phase, parties, unarrived)))
267                return phase;
412          }
413      }
414  
415      /**
416 <     * Arrives at the barrier and awaits others. Unlike other arrival
417 <     * methods, this method returns the arrival index of the
418 <     * caller. The caller tripping the barrier returns zero, the
275 <     * previous caller 1, and so on.
276 <     * @return the arrival index
277 <     * @throws IllegalStateException if the number of unarrived
278 <     * parties would become negative.
416 >     * Creates a new phaser without any initially registered parties,
417 >     * initial phase number 0, and no parent. Any thread using this
418 >     * phaser will need to first register for it.
419       */
420 <    public int arriveAndAwaitAdvance() {
421 <        final AtomicLong state = this.state;
422 <        for (;;) {
423 <            long s = state.get();
424 <            int phase = phaseOf(s);
425 <            int parties = partiesOf(s);
426 <            int unarrived = unarrivedOf(s) - 1;
427 <            if (unarrived < 0)
428 <                throw badBounds(parties, unarrived);
429 <            if (unarrived == 0 && phase >= 0) {
430 <                trip(phase, parties);
431 <                return 0;
432 <            }
433 <            if (state.compareAndSet(s, stateFor(phase, parties, unarrived))) {
434 <                awaitAdvance(phase);
435 <                return unarrived;
436 <            }
420 >    public Phaser() {
421 >        this(null, 0);
422 >    }
423 >
424 >    /**
425 >     * Creates a new phaser with the given number of registered
426 >     * unarrived parties, initial phase number 0, and no parent.
427 >     *
428 >     * @param parties the number of parties required to trip barrier
429 >     * @throws IllegalArgumentException if parties less than zero
430 >     * or greater than the maximum number of parties supported
431 >     */
432 >    public Phaser(int parties) {
433 >        this(null, parties);
434 >    }
435 >
436 >    /**
437 >     * Creates a new phaser with the given parent, without any
438 >     * initially registered parties. If parent is non-null this phaser
439 >     * is registered with the parent and its initial phase number is
440 >     * the same as that of parent phaser.
441 >     *
442 >     * @param parent the parent phaser
443 >     */
444 >    public Phaser(Phaser parent) {
445 >        this(parent, 0);
446 >    }
447 >
448 >    /**
449 >     * Creates a new phaser with the given parent and number of
450 >     * registered unarrived parties. If parent is non-null, this phaser
451 >     * is registered with the parent and its initial phase number is
452 >     * the same as that of parent phaser.
453 >     *
454 >     * @param parent the parent phaser
455 >     * @param parties the number of parties required to trip barrier
456 >     * @throws IllegalArgumentException if parties less than zero
457 >     * or greater than the maximum number of parties supported
458 >     */
459 >    public Phaser(Phaser parent, int parties) {
460 >        if (parties < 0 || parties > MAX_COUNT)
461 >            throw new IllegalArgumentException("Illegal number of parties");
462 >        int phase;
463 >        this.parent = parent;
464 >        if (parent != null) {
465 >            Phaser r = parent.root;
466 >            this.root = r;
467 >            this.evenQ = r.evenQ;
468 >            this.oddQ = r.oddQ;
469 >            phase = parent.register();
470 >        }
471 >        else {
472 >            this.root = this;
473 >            this.evenQ = new AtomicReference<QNode>();
474 >            this.oddQ = new AtomicReference<QNode>();
475 >            phase = 0;
476          }
477 +        long p = (long)parties;
478 +        this.state = (((long) phase) << PHASE_SHIFT) | p | (p << PARTIES_SHIFT);
479      }
480  
481      /**
482 <     * Awaits the phase of the barrier to advance from the given
483 <     * value, or returns immediately if this barrier is terminated.
484 <     * @param phase the phase on entry to this method
485 <     * @return the phase on exit from this method
482 >     * Adds a new unarrived party to this phaser.
483 >     * If an ongoing invocation of {@link #onAdvance} is in progress,
484 >     * this method may wait until its completion before registering.
485 >     *
486 >     * @return the arrival phase number to which this registration applied
487 >     * @throws IllegalStateException if attempting to register more
488 >     * than the maximum supported number of parties
489 >     */
490 >    public int register() {
491 >        return doRegister(1);
492 >    }
493 >
494 >    /**
495 >     * Adds the given number of new unarrived parties to this phaser.
496 >     * If an ongoing invocation of {@link #onAdvance} is in progress,
497 >     * this method may wait until its completion before registering.
498 >     *
499 >     * @param parties the number of additional parties required to trip barrier
500 >     * @return the arrival phase number to which this registration applied
501 >     * @throws IllegalStateException if attempting to register more
502 >     * than the maximum supported number of parties
503 >     * @throws IllegalArgumentException if {@code parties < 0}
504 >     */
505 >    public int bulkRegister(int parties) {
506 >        if (parties < 0)
507 >            throw new IllegalArgumentException();
508 >        if (parties > MAX_COUNT)
509 >            throw new IllegalStateException(badRegister(state));
510 >        if (parties == 0)
511 >            return getPhase();
512 >        return doRegister(parties);
513 >    }
514 >
515 >    /**
516 >     * Arrives at the barrier, but does not wait for others.  (You can
517 >     * in turn wait for others via {@link #awaitAdvance}).  It is an
518 >     * unenforced usage error for an unregistered party to invoke this
519 >     * method.
520 >     *
521 >     * @return the arrival phase number, or a negative value if terminated
522 >     * @throws IllegalStateException if not terminated and the number
523 >     * of unarrived parties would become negative
524 >     */
525 >    public int arrive() {
526 >        return doArrive(ONE_ARRIVAL);
527 >    }
528 >
529 >    /**
530 >     * Arrives at the barrier and deregisters from it without waiting
531 >     * for others. Deregistration reduces the number of parties
532 >     * required to trip the barrier in future phases.  If this phaser
533 >     * has a parent, and deregistration causes this phaser to have
534 >     * zero parties, this phaser also arrives at and is deregistered
535 >     * from its parent.  It is an unenforced usage error for an
536 >     * unregistered party to invoke this method.
537 >     *
538 >     * @return the arrival phase number, or a negative value if terminated
539 >     * @throws IllegalStateException if not terminated and the number
540 >     * of registered or unarrived parties would become negative
541 >     */
542 >    public int arriveAndDeregister() {
543 >        return doArrive(ONE_ARRIVAL|ONE_PARTY);
544 >    }
545 >
546 >    /**
547 >     * Arrives at the barrier and awaits others. Equivalent in effect
548 >     * to {@code awaitAdvance(arrive())}.  If you need to await with
549 >     * interruption or timeout, you can arrange this with an analogous
550 >     * construction using one of the other forms of the {@code
551 >     * awaitAdvance} method.  If instead you need to deregister upon
552 >     * arrival, use {@link #arriveAndDeregister}. It is an unenforced
553 >     * usage error for an unregistered party to invoke this method.
554 >     *
555 >     * @return the arrival phase number, or a negative number if terminated
556 >     * @throws IllegalStateException if not terminated and the number
557 >     * of unarrived parties would become negative
558 >     */
559 >    public int arriveAndAwaitAdvance() {
560 >        return awaitAdvance(arrive());
561 >    }
562 >
563 >    /**
564 >     * Awaits the phase of the barrier to advance from the given phase
565 >     * value, returning immediately if the current phase of the
566 >     * barrier is not equal to the given phase value or this barrier
567 >     * is terminated.
568 >     *
569 >     * @param phase an arrival phase number, or negative value if
570 >     * terminated; this argument is normally the value returned by a
571 >     * previous call to {@code arrive} or its variants
572 >     * @return the next arrival phase number, or a negative value
573 >     * if terminated or argument is negative
574       */
575      public int awaitAdvance(int phase) {
576          if (phase < 0)
577              return phase;
578 <        Thread current = Thread.currentThread();
579 <        if (current instanceof ForkJoinWorkerThread)
580 <            return helpingWait(phase);
581 <        if (untimedWait(current, phase, false))
313 <            current.interrupt();
314 <        return phaseOf(state.get());
578 >        int p = (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
579 >        if (p != phase)
580 >            return p;
581 >        return internalAwaitAdvance(phase, null);
582      }
583  
584      /**
585 <     * Awaits the phase of the barrier to advance from the given
586 <     * value, or returns immediately if this barrier is terminated, or
587 <     * throws InterruptedException if interrupted while waiting.
588 <     * @param phase the phase on entry to this method
589 <     * @return the phase on exit from this method
585 >     * Awaits the phase of the barrier to advance from the given phase
586 >     * value, throwing {@code InterruptedException} if interrupted
587 >     * while waiting, or returning immediately if the current phase of
588 >     * the barrier is not equal to the given phase value or this
589 >     * barrier is terminated.
590 >     *
591 >     * @param phase an arrival phase number, or negative value if
592 >     * terminated; this argument is normally the value returned by a
593 >     * previous call to {@code arrive} or its variants
594 >     * @return the next arrival phase number, or a negative value
595 >     * if terminated or argument is negative
596       * @throws InterruptedException if thread interrupted while waiting
597       */
598 <    public int awaitAdvanceInterruptibly(int phase) throws InterruptedException {
598 >    public int awaitAdvanceInterruptibly(int phase)
599 >        throws InterruptedException {
600          if (phase < 0)
601              return phase;
602 <        Thread current = Thread.currentThread();
603 <        if (current instanceof ForkJoinWorkerThread)
604 <            return helpingWait(phase);
605 <        else if (Thread.interrupted() || untimedWait(current, phase, true))
602 >        int p = (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
603 >        if (p != phase)
604 >            return p;
605 >        QNode node = new QNode(this, phase, true, false, 0L);
606 >        p = internalAwaitAdvance(phase, node);
607 >        if (node.wasInterrupted)
608              throw new InterruptedException();
609          else
610 <            return phaseOf(state.get());
610 >            return p;
611      }
612  
613      /**
614 <     * Awaits the phase of the barrier to advance from the given value
615 <     * or the given timeout elapses, or returns immediately if this
616 <     * barrier is terminated.
617 <     * @param phase the phase on entry to this method
618 <     * @return the phase on exit from this method
614 >     * Awaits the phase of the barrier to advance from the given phase
615 >     * value or the given timeout to elapse, throwing {@code
616 >     * InterruptedException} if interrupted while waiting, or
617 >     * returning immediately if the current phase of the barrier is
618 >     * not equal to the given phase value or this barrier is
619 >     * terminated.
620 >     *
621 >     * @param phase an arrival phase number, or negative value if
622 >     * terminated; this argument is normally the value returned by a
623 >     * previous call to {@code arrive} or its variants
624 >     * @param timeout how long to wait before giving up, in units of
625 >     *        {@code unit}
626 >     * @param unit a {@code TimeUnit} determining how to interpret the
627 >     *        {@code timeout} parameter
628 >     * @return the next arrival phase number, or a negative value
629 >     * if terminated or argument is negative
630       * @throws InterruptedException if thread interrupted while waiting
631       * @throws TimeoutException if timed out while waiting
632       */
633 <    public int awaitAdvanceInterruptibly(int phase, long timeout, TimeUnit unit)
633 >    public int awaitAdvanceInterruptibly(int phase,
634 >                                         long timeout, TimeUnit unit)
635          throws InterruptedException, TimeoutException {
636 +        long nanos = unit.toNanos(timeout);
637          if (phase < 0)
638              return phase;
639 <        long nanos = unit.toNanos(timeout);
640 <        Thread current = Thread.currentThread();
641 <        if (current instanceof ForkJoinWorkerThread)
642 <            return timedHelpingWait(phase, nanos);
643 <        timedWait(current, phase, nanos);
644 <        return phaseOf(state.get());
639 >        int p = (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
640 >        if (p != phase)
641 >            return p;
642 >        QNode node = new QNode(this, phase, true, true, nanos);
643 >        p = internalAwaitAdvance(phase, node);
644 >        if (node.wasInterrupted)
645 >            throw new InterruptedException();
646 >        else if (p == phase)
647 >            throw new TimeoutException();
648 >        else
649 >            return p;
650      }
651  
652      /**
653       * Forces this barrier to enter termination state. Counts of
654 <     * arrived and registered parties are unaffected. This method may
655 <     * be useful for coordinating recovery after one or more tasks
656 <     * encounter unexpected exceptions.
654 >     * arrived and registered parties are unaffected. If this phaser
655 >     * has a parent, it too is terminated. This method may be useful
656 >     * for coordinating recovery after one or more tasks encounter
657 >     * unexpected exceptions.
658       */
659      public void forceTermination() {
660 <        final AtomicLong state = this.state;
661 <        for (;;) {
662 <            long s = state.get();
663 <            int phase = phaseOf(s);
664 <            int parties = partiesOf(s);
665 <            int unarrived = unarrivedOf(s);
666 <            if (phase < 0 ||
372 <                state.compareAndSet(s, stateFor(-1, parties, unarrived))) {
373 <                if (head.get() != null)
374 <                    releaseWaiters(-1);
375 <                return;
376 <            }
377 <        }
378 <    }
379 <
380 <    /**
381 <     * Resets the barrier with the given numbers of registered unarrived
382 <     * parties and phase number 0. This method allows repeated reuse
383 <     * of this barrier, but only if it is somehow known not to be in
384 <     * use for other purposes.
385 <     * @param parties the number of parties required to trip barrier.
386 <     * @throws IllegalArgumentException if parties less than zero
387 <     * or greater than the maximum number of parties supported.
388 <     */
389 <    public void reset(int parties) {
390 <        if (parties < 0 || parties > ushortMask)
391 <            throw new IllegalArgumentException("Illegal number of parties");
392 <        state.set(stateFor(0, parties, parties));
393 <        if (head.get() != null)
394 <            releaseWaiters(0);
660 >        Phaser r = root;    // force at root then reconcile
661 >        long s;
662 >        while ((s = r.state) >= 0)
663 >            UNSAFE.compareAndSwapLong(r, stateOffset, s, s | TERMINATION_PHASE);
664 >        reconcileState();
665 >        releaseWaiters(0); // signal all threads
666 >        releaseWaiters(1);
667      }
668  
669      /**
670       * Returns the current phase number. The maximum phase number is
671 <     * <tt>Integer.MAX_VALUE</tt>, after which it restarts at
671 >     * {@code Integer.MAX_VALUE}, after which it restarts at
672       * zero. Upon termination, the phase number is negative.
673 +     *
674       * @return the phase number, or a negative value if terminated
675       */
676 <    public int getPhase() {
677 <        return phaseOf(state.get());
676 >    public final int getPhase() {
677 >        return (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
678      }
679  
680      /**
681       * Returns the number of parties registered at this barrier.
682 +     *
683       * @return the number of parties
684       */
685      public int getRegisteredParties() {
686 <        return partiesOf(state.get());
686 >        return partiesOf(parent==null? state : reconcileState());
687      }
688  
689      /**
690 <     * Returns the number of parties that have arrived at the current
691 <     * phase of this barrier.
690 >     * Returns the number of registered parties that have arrived at
691 >     * the current phase of this barrier.
692 >     *
693       * @return the number of arrived parties
694       */
695      public int getArrivedParties() {
696 <        return arrivedOf(state.get());
696 >        return arrivedOf(parent==null? state : reconcileState());
697      }
698  
699      /**
700       * Returns the number of registered parties that have not yet
701       * arrived at the current phase of this barrier.
702 +     *
703       * @return the number of unarrived parties
704       */
705      public int getUnarrivedParties() {
706 <        return unarrivedOf(state.get());
706 >        return unarrivedOf(parent==null? state : reconcileState());
707 >    }
708 >
709 >    /**
710 >     * Returns the parent of this phaser, or {@code null} if none.
711 >     *
712 >     * @return the parent of this phaser, or {@code null} if none
713 >     */
714 >    public Phaser getParent() {
715 >        return parent;
716 >    }
717 >
718 >    /**
719 >     * Returns the root ancestor of this phaser, which is the same as
720 >     * this phaser if it has no parent.
721 >     *
722 >     * @return the root ancestor of this phaser
723 >     */
724 >    public Phaser getRoot() {
725 >        return root;
726      }
727  
728      /**
729 <     * Returns true if this barrier has been terminated.
730 <     * @return true if this barrier has been terminated
729 >     * Returns {@code true} if this barrier has been terminated.
730 >     *
731 >     * @return {@code true} if this barrier has been terminated
732       */
733      public boolean isTerminated() {
734 <        return phaseOf(state.get()) < 0;
734 >        return (parent == null? state : reconcileState()) < 0;
735      }
736  
737      /**
738 <     * Overridable method to perform an action upon phase advance, and
739 <     * to control termination. This method is invoked whenever the
740 <     * barrier is tripped (and thus all other waiting parties are
741 <     * dormant). If it returns true, then, rather than advance the
742 <     * phase number, this barrier will be set to a final termination
743 <     * state, and subsequent calls to <tt>isTerminated</tt> will
744 <     * return true.
745 <     *
746 <     * <p> The default version returns true when the number of
738 >     * Overridable method to perform an action upon impending phase
739 >     * advance, and to control termination. This method is invoked
740 >     * upon arrival of the party tripping the barrier (when all other
741 >     * waiting parties are dormant).  If this method returns {@code
742 >     * true}, then, rather than advance the phase number, this barrier
743 >     * will be set to a final termination state, and subsequent calls
744 >     * to {@link #isTerminated} will return true. Any (unchecked)
745 >     * Exception or Error thrown by an invocation of this method is
746 >     * propagated to the party attempting to trip the barrier, in
747 >     * which case no advance occurs.
748 >     *
749 >     * <p>The arguments to this method provide the state of the phaser
750 >     * prevailing for the current transition.  The effects of invoking
751 >     * arrival, registration, and waiting methods on this Phaser from
752 >     * within {@code onAdvance} are unspecified and should not be
753 >     * relied on.
754 >     *
755 >     * <p>If this Phaser is a member of a tiered set of Phasers, then
756 >     * {@code onAdvance} is invoked only for its root Phaser on each
757 >     * advance.
758 >     *
759 >     * <p>The default version returns {@code true} when the number of
760       * registered parties is zero. Normally, overrides that arrange
761       * termination for other reasons should also preserve this
762       * property.
763       *
764       * @param phase the phase number on entering the barrier
765 <     * @param registeredParties the current number of registered
766 <     * parties.
458 <     * @return true if this barrier should terminate
765 >     * @param registeredParties the current number of registered parties
766 >     * @return {@code true} if this barrier should terminate
767       */
768      protected boolean onAdvance(int phase, int registeredParties) {
769          return registeredParties <= 0;
770      }
771  
772      /**
773 <     * Returns a string identifying this barrier, as well as its
773 >     * Returns a string identifying this phaser, as well as its
774       * state.  The state, in brackets, includes the String {@code
775 <     * "phase ="} followed by the phase number, {@code "parties ="}
775 >     * "phase = "} followed by the phase number, {@code "parties = "}
776       * followed by the number of registered parties, and {@code
777 <     * "arrived ="} followed by the number of arrived parties
777 >     * "arrived = "} followed by the number of arrived parties.
778       *
779       * @return a string identifying this barrier, as well as its state
780       */
781      public String toString() {
782 <        long s = state.get();
475 <        return super.toString() + "[phase = " + phaseOf(s) + " parties = " + partiesOf(s) + " arrived = " + arrivedOf(s) + "]";
782 >        return stateToString(reconcileState());
783      }
784  
478    // methods for tripping and waiting
479
785      /**
786 <     * Advance the current phase (or terminate)
786 >     * Implementation of toString and string-based error messages
787       */
788 <    private void trip(int phase, int parties) {
789 <        int next = onAdvance(phase, parties)? -1 : ((phase + 1) & phaseMask);
790 <        state.set(stateFor(next, parties, parties));
791 <        if (head.get() != null)
792 <            releaseWaiters(next);
788 >    private String stateToString(long s) {
789 >        return super.toString() +
790 >            "[phase = " + phaseOf(s) +
791 >            " parties = " + partiesOf(s) +
792 >            " arrived = " + arrivedOf(s) + "]";
793      }
794  
795 <    private int helpingWait(int phase) {
491 <        final AtomicLong state = this.state;
492 <        int p;
493 <        while ((p = phaseOf(state.get())) == phase) {
494 <            ForkJoinTask<?> t = ForkJoinWorkerThread.pollTask();
495 <            if (t != null) {
496 <                if ((p = phaseOf(state.get())) == phase)
497 <                    t.exec();
498 <                else {   // push task and exit if barrier advanced
499 <                    t.fork();
500 <                    break;
501 <                }
502 <            }
503 <        }
504 <        return p;
505 <    }
795 >    // Waiting mechanics
796  
797 <    private int timedHelpingWait(int phase, long nanos) throws TimeoutException {
798 <        final AtomicLong state = this.state;
799 <        long lastTime = System.nanoTime();
797 >    /**
798 >     * Removes and signals threads from queue for phase
799 >     */
800 >    private void releaseWaiters(int phase) {
801 >        AtomicReference<QNode> head = queueFor(phase);
802 >        QNode q;
803          int p;
804 <        while ((p = phaseOf(state.get())) == phase) {
805 <            long now = System.nanoTime();
806 <            nanos -= now - lastTime;
807 <            lastTime = now;
808 <            if (nanos <= 0) {
516 <                if ((p = phaseOf(state.get())) == phase)
517 <                    throw new TimeoutException();
518 <                else
519 <                    break;
520 <            }
521 <            ForkJoinTask<?> t = ForkJoinWorkerThread.pollTask();
522 <            if (t != null) {
523 <                if ((p = phaseOf(state.get())) == phase)
524 <                    t.exec();
525 <                else {   // push task and exit if barrier advanced
526 <                    t.fork();
527 <                    break;
528 <                }
529 <            }
804 >        while ((q = head.get()) != null &&
805 >               ((p = q.phase) == phase ||
806 >                (int)(root.state >>> PHASE_SHIFT) != p)) {
807 >            if (head.compareAndSet(q, q.next))
808 >                q.signal();
809          }
531        return p;
810      }
811  
812      /**
813 <     * Wait nodes for Treiber stack representing wait queue for non-FJ
814 <     * tasks. The waiting scheme is an adaptation of the one used in
815 <     * forkjoin.PoolBarrier.
813 >     * Tries to enqueue given node in the appropriate wait queue.
814 >     *
815 >     * @return true if successful
816       */
817 <    static final class QNode {
818 <        QNode next;
819 <        volatile Thread thread; // nulled to cancel wait
820 <        final int phase;
821 <        QNode(Thread t, int c) {
822 <            thread = t;
823 <            phase = c;
546 <        }
547 <    }
548 <
549 <    private void releaseWaiters(int currentPhase) {
550 <        final AtomicReference<QNode> head = this.head;
551 <        QNode p;
552 <        while ((p = head.get()) != null && p.phase != currentPhase) {
553 <            if (head.compareAndSet(p, null)) {
554 <                do {
555 <                    Thread t = p.thread;
556 <                    if (t != null) {
557 <                        p.thread = null;
558 <                        LockSupport.unpark(t);
559 <                    }
560 <                } while ((p = p.next) != null);
561 <            }
562 <        }
817 >    private boolean tryEnqueue(int phase, QNode node) {
818 >        releaseWaiters(phase-1); // ensure old queue clean
819 >        AtomicReference<QNode> head = queueFor(phase);
820 >        QNode q = head.get();
821 >        return ((q == null || q.phase == phase) &&
822 >                (int)(root.state >>> PHASE_SHIFT) == phase &&
823 >                head.compareAndSet(node.next = q, node));
824      }
825  
826      /** The number of CPUs, for spin control */
827 <    static final int NCPUS = Runtime.getRuntime().availableProcessors();
827 >    private static final int NCPU = Runtime.getRuntime().availableProcessors();
828  
829      /**
830 <     * The number of times to spin before blocking in timed waits.
831 <     * The value is empirically derived.
830 >     * The number of times to spin before blocking while waiting for
831 >     * advance, per arrival while waiting. On multiprocessors, fully
832 >     * blocking and waking up a large number of threads all at once is
833 >     * usually a very slow process, so we use rechargeable spins to
834 >     * avoid it when threads regularly arrive: When a thread in
835 >     * internalAwaitAdvance notices another arrival before blocking,
836 >     * and there appear to be enough CPUs available, it spins
837 >     * SPINS_PER_ARRIVAL more times before continuing to try to
838 >     * block. The value trades off good-citizenship vs big unnecessary
839 >     * slowdowns.
840       */
841 <    static final int maxTimedSpins = (NCPUS < 2)? 0 : 32;
841 >    static final int SPINS_PER_ARRIVAL = NCPU < 2? 1 : 1 << 8;
842  
843      /**
844 <     * The number of times to spin before blocking in untimed waits.
845 <     * This is greater than timed value because untimed waits spin
846 <     * faster since they don't need to check times on each spin.
847 <     */
848 <    static final int maxUntimedSpins = maxTimedSpins * 32;
844 >     * Possibly blocks and waits for phase to advance unless aborted.
845 >     *
846 >     * @param phase current phase
847 >     * @param node if non-null, the wait node to track interrupt and timeout;
848 >     * if null, denotes noninterruptible wait
849 >     * @return current phase
850 >     */
851 >    private int internalAwaitAdvance(int phase, QNode node) {
852 >        Phaser current = this;       // to eventually wait at root if tiered
853 >        boolean queued = false;      // true when node is enqueued
854 >        int lastUnarrived = -1;      // to increase spins upon change
855 >        int spins = SPINS_PER_ARRIVAL;
856 >        for (;;) {
857 >            int p, unarrived;
858 >            Phaser par;
859 >            long s = current.state;
860 >            if ((p = (int)(s >>> PHASE_SHIFT)) != phase) {
861 >                if (node != null)
862 >                    node.onRelease();
863 >                releaseWaiters(phase);
864 >                return p;
865 >            }
866 >            else if ((unarrived = (int)(s & UNARRIVED_MASK)) != lastUnarrived) {
867 >                if ((lastUnarrived = unarrived) < NCPU)
868 >                    spins += SPINS_PER_ARRIVAL;
869 >            }
870 >            else if (unarrived == 0 && (par = current.parent) != null) {
871 >                current = par;       // if all arrived, use parent
872 >                par = par.parent;
873 >                lastUnarrived = -1;
874 >            }
875 >            else if (spins > 0)
876 >                --spins;
877 >            else if (node == null)   // must be noninterruptible
878 >                node = new QNode(this, phase, false, false, 0L);
879 >            else if (node.isReleasable()) {
880 >                if ((int)(reconcileState() >>> PHASE_SHIFT) == phase)
881 >                    return phase;    // aborted
882 >            }
883 >            else if (!queued)
884 >                queued = tryEnqueue(phase, node);
885 >            else {
886 >                try {
887 >                    ForkJoinPool.managedBlock(node);
888 >                } catch (InterruptedException ie) {
889 >                    node.wasInterrupted = true;
890 >                }
891 >            }
892 >        }
893 >    }
894  
895      /**
896 <     * The number of nanoseconds for which it is faster to spin
583 <     * rather than to use timed park. A rough estimate suffices.
896 >     * Wait nodes for Treiber stack representing wait queue
897       */
898 <    static final long spinForTimeoutThreshold = 1000L;
898 >    static final class QNode implements ForkJoinPool.ManagedBlocker {
899 >        final Phaser phaser;
900 >        final int phase;
901 >        final boolean interruptible;
902 >        final boolean timed;
903 >        boolean wasInterrupted;
904 >        long nanos;
905 >        long lastTime;
906 >        volatile Thread thread; // nulled to cancel wait
907 >        QNode next;
908  
909 <    /**
910 <     * Enqueues node and waits unless aborted or signalled.
911 <     */
912 <    private boolean untimedWait(Thread thread, int currentPhase,
913 <                               boolean abortOnInterrupt) {
914 <        final AtomicReference<QNode> head = this.head;
915 <        final AtomicLong state = this.state;
916 <        boolean wasInterrupted = false;
917 <        QNode node = null;
918 <        boolean queued = false;
919 <        int spins = maxUntimedSpins;
920 <        while (phaseOf(state.get()) == currentPhase) {
921 <            QNode h;
922 <            if (node != null && queued) {
923 <                if (node.thread != null) {
924 <                    LockSupport.park();
925 <                    if (Thread.interrupted()) {
909 >        QNode(Phaser phaser, int phase, boolean interruptible,
910 >              boolean timed, long nanos) {
911 >            this.phaser = phaser;
912 >            this.phase = phase;
913 >            this.interruptible = interruptible;
914 >            this.nanos = nanos;
915 >            this.timed = timed;
916 >            this.lastTime = timed? System.nanoTime() : 0L;
917 >            thread = Thread.currentThread();
918 >        }
919 >
920 >        public boolean isReleasable() {
921 >            Thread t = thread;
922 >            if (t != null) {
923 >                if (phaser.getPhase() != phase)
924 >                    t = null;
925 >                else {
926 >                    if (Thread.interrupted())
927                          wasInterrupted = true;
928 <                        if (abortOnInterrupt)
929 <                            break;
930 <                    }
931 <                }
932 <            }
933 <            else if ((h = head.get()) != null && h.phase != currentPhase) {
934 <                if (phaseOf(state.get()) == currentPhase) { // must recheck
612 <                    if (head.compareAndSet(h, h.next)) {
613 <                        Thread t = h.thread; // help clear out old waiters
614 <                        if (t != null) {
615 <                            h.thread = null;
616 <                            LockSupport.unpark(t);
928 >                    if (interruptible && wasInterrupted)
929 >                        t = null;
930 >                    else if (timed) {
931 >                        if (nanos > 0) {
932 >                            long now = System.nanoTime();
933 >                            nanos -= now - lastTime;
934 >                            lastTime = now;
935                          }
936 +                        if (nanos <= 0)
937 +                            t = null;
938                      }
939                  }
940 <                else
941 <                    break;
940 >                if (t != null)
941 >                    return false;
942 >                thread = null;
943              }
944 <            else if (node != null)
945 <                queued = head.compareAndSet(node.next = h, node);
946 <            else if (spins <= 0)
947 <                node = new QNode(thread, currentPhase);
948 <            else
949 <                --spins;
944 >            return true;
945 >        }
946 >
947 >        public boolean block() {
948 >            if (isReleasable())
949 >                return true;
950 >            else if (!timed)
951 >                LockSupport.park(this);
952 >            else if (nanos > 0)
953 >                LockSupport.parkNanos(this, nanos);
954 >            return isReleasable();
955 >        }
956 >
957 >        void signal() {
958 >            Thread t = thread;
959 >            if (t != null) {
960 >                thread = null;
961 >                LockSupport.unpark(t);
962 >            }
963 >        }
964 >
965 >        void onRelease() { // actions upon return from internalAwaitAdvance
966 >            if (!interruptible && wasInterrupted)
967 >                Thread.currentThread().interrupt();
968 >            if (thread != null)
969 >                thread = null;
970 >        }
971 >
972 >    }
973 >
974 >    // Unsafe mechanics
975 >
976 >    private static final sun.misc.Unsafe UNSAFE = getUnsafe();
977 >    private static final long stateOffset =
978 >        objectFieldOffset("state", Phaser.class);
979 >
980 >    private static long objectFieldOffset(String field, Class<?> klazz) {
981 >        try {
982 >            return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field));
983 >        } catch (NoSuchFieldException e) {
984 >            // Convert Exception to corresponding Error
985 >            NoSuchFieldError error = new NoSuchFieldError(field);
986 >            error.initCause(e);
987 >            throw error;
988          }
630        if (node != null)
631            node.thread = null;
632        return wasInterrupted;
989      }
990  
991      /**
992 <     * Messier timeout version
992 >     * Returns a sun.misc.Unsafe.  Suitable for use in a 3rd party package.
993 >     * Replace with a simple call to Unsafe.getUnsafe when integrating
994 >     * into a jdk.
995 >     *
996 >     * @return a sun.misc.Unsafe
997       */
998 <    private void timedWait(Thread thread, int currentPhase, long nanos)
999 <        throws InterruptedException, TimeoutException {
1000 <        final AtomicReference<QNode> head = this.head;
1001 <        final AtomicLong state = this.state;
1002 <        long lastTime = System.nanoTime();
1003 <        QNode node = null;
1004 <        boolean queued = false;
1005 <        int spins = maxTimedSpins;
1006 <        while (phaseOf(state.get()) == currentPhase) {
1007 <            QNode h;
1008 <            long now = System.nanoTime();
1009 <            nanos -= now - lastTime;
1010 <            lastTime = now;
1011 <            if (nanos <= 0) {
1012 <                if (node != null)
1013 <                    node.thread = null;
1014 <                if (phaseOf(state.get()) == currentPhase)
655 <                    throw new TimeoutException();
656 <                else
657 <                    break;
998 >    private static sun.misc.Unsafe getUnsafe() {
999 >        try {
1000 >            return sun.misc.Unsafe.getUnsafe();
1001 >        } catch (SecurityException se) {
1002 >            try {
1003 >                return java.security.AccessController.doPrivileged
1004 >                    (new java.security
1005 >                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
1006 >                        public sun.misc.Unsafe run() throws Exception {
1007 >                            java.lang.reflect.Field f = sun.misc
1008 >                                .Unsafe.class.getDeclaredField("theUnsafe");
1009 >                            f.setAccessible(true);
1010 >                            return (sun.misc.Unsafe) f.get(null);
1011 >                        }});
1012 >            } catch (java.security.PrivilegedActionException e) {
1013 >                throw new RuntimeException("Could not initialize intrinsics",
1014 >                                           e.getCause());
1015              }
659            else if (node != null && queued) {
660                if (node.thread != null &&
661                    nanos > spinForTimeoutThreshold) {
662                    //                LockSupport.parkNanos(this, nanos);
663                    LockSupport.parkNanos(nanos);
664                    if (Thread.interrupted()) {
665                        node.thread = null;
666                        throw new InterruptedException();
667                    }
668                }
669            }
670            else if ((h = head.get()) != null && h.phase != currentPhase) {
671                if (phaseOf(state.get()) == currentPhase) { // must recheck
672                    if (head.compareAndSet(h, h.next)) {
673                        Thread t = h.thread; // help clear out old waiters
674                        if (t != null) {
675                            h.thread = null;
676                            LockSupport.unpark(t);
677                        }
678                    }
679                }
680                else
681                    break;
682            }
683            else if (node != null)
684                queued = head.compareAndSet(node.next = h, node);
685            else if (spins <= 0)
686                node = new QNode(thread, currentPhase);
687            else
688                --spins;
1016          }
690        if (node != null)
691            node.thread = null;
1017      }
693
1018   }
695

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines