ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/jsr166y/Phaser.java

Comparing jsr166/src/jsr166y/Phaser.java (file contents):
Revision 1.35 by dl, Sun Aug 23 13:37:08 2009 UTC vs.
Revision 1.54 by dl, Sat Nov 13 13:10:04 2010 UTC

#	Line 6 | Line 6
6
7		package jsr166y;
8
9	<	import java.util.concurrent.*;
10	<
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
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	<	* <ul>
21	<	*
22	<	* <li> The number of parties <em>registered</em> to synchronize on a
23	<	* phaser may vary over time.  Tasks may be registered at any time
24	<	* (using methods {@link #register}, {@link #bulkRegister}, or forms
25	<	* of constructors establishing initial numbers of parties), and may
26	<	* optionally be deregistered upon any arrival (using {@link
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
30	<	* registered. (However, you can introduce such bookkeeping by
31	<	* subclassing this class.)
32	<	*
33	<	* <li> Each generation has an associated phase value, starting at
34	<	* zero, and advancing when all parties arrive at the barrier
35	<	* (wrapping around to zero after reaching {@code Integer.MAX_VALUE}).
36	<	*
37	<	* <li> Like a {@code CyclicBarrier}, a phaser may be repeatedly
38	<	* awaited.  Method {@link #arriveAndAwaitAdvance} has effect
39	<	* analogous to {@link java.util.concurrent.CyclicBarrier#await
40	<	* CyclicBarrier.await}.  However, phasers separate two aspects of
41	<	* coordination, which may also be invoked independently:
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> Arriving at a barrier. Methods {@link #arrive} and
48	<	*       {@link #arriveAndDeregister} do not block, but return
49	<	*       an associated <em>arrival phase number</em>;
50	<	*       that is, the phase number of the barrier to which the
51	<	*       arrival applied.
52	<	*
53	<	*   <li> Awaiting others. Method {@link #awaitAdvance} requires an
54	<	*       argument indicating an arrival phase number, and returns
55	<	*       when the barrier advances to a new phase.
56	<	* </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		*
75	+	* </ul>
76		*
77	<	* <li> Barrier actions, performed by the task triggering a phase
78	<	* advance, are arranged by overriding method {@link #onAdvance(int,
79	<	* int)}, which also controls termination. Overriding this method is
80	<	* similar to, but more flexible than, providing a barrier action to a
81	<	* {@code CyclicBarrier}.
82	<	*
83	<	* <li> Phasers may enter a <em>termination</em> state in which all
65	<	* actions immediately return without updating phaser state or waiting
66	<	* for advance, and indicating (via a negative phase value) that
67	<	* execution is complete.  Termination is triggered when an invocation
68	<	* of {@code onAdvance} returns {@code true}.  When a phaser is
69	<	* controlling an action with a fixed number of iterations, it is
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	<	* <li> Phasers may be tiered to reduce contention. Phasers with large
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 arranged in trees.
93	<	* This will typically greatly increase throughput even though it
94	<	* incurs somewhat greater per-operation overhead.
95	<	*
96	<	* <li> By default, {@code awaitAdvance} continues to wait even if
97	<	* the waiting thread is interrupted. And unlike the case in
98	<	* {@code CyclicBarrier}, exceptions encountered while tasks wait
99	<	* interruptibly or with timeout do not change the state of the
100	<	* barrier. If necessary, you can perform any associated recovery
101	<	* within handlers of those exceptions, often after invoking
102	<	* {@code forceTermination}.
103	<	*
104	<	* <li>Phasers may be used to coordinate tasks executing in a {@link
105	<	* ForkJoinPool}, which will ensure sufficient parallelism to execute
106	<	* tasks when others are blocked waiting for a phase to advance.
107	<	*
93	<	* </ul>
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
113	<	* parties. The typical idiom is for the method setting this up to
114	<	* first register, then start the actions, then deregister, as in:
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) {
#	Line 123 | Line 137 | import java.util.concurrent.locks.LockSu
137		*  <pre> {@code
138		* void startTasks(List<Runnable> tasks, final int iterations) {
139		*   final Phaser phaser = new Phaser() {
140	<	*     public boolean onAdvance(int phase, int registeredParties) {
140	>	*     protected boolean onAdvance(int phase, int registeredParties) {
141		*       return phase >= iterations || registeredParties == 0;
142		*     }
143		*   };
144		*   phaser.register();
145	<	*   for (Runnable task : tasks) {
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();
152	>	*         } while (!phaser.isTerminated());
153		*       }
154		*     }.start();
155		*   }
156		*   phaser.arriveAndDeregister(); // deregister self, don't wait
157		* }}</pre>
158		*
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	+	*
183	+	*
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 for upon construction:
187	>	* it registers with upon construction:
188	>	*
189		*  <pre> {@code
190	<	* void build(Task[] actions, int lo, int hi, Phaser b) {
191	<	*   int step = (hi - lo) / TASKS_PER_PHASER;
192	<	*   if (step > 1) {
193	<	*     int i = lo;
194	<	*     while (i < hi) {
155	<	*       int r = Math.min(i + step, hi);
156	<	*       build(actions, i, r, new Phaser(b));
157	<	*       i = r;
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		*   } else {
197		*     for (int i = lo; i < hi; ++i)
198	<	*       actions[i] = new Task(b);
199	<	*       // assumes new Task(b) performs b.register()
198	>	*       actions[i] = new Task(ph);
199	>	*       // assumes new Task(ph) performs ph.register()
200		*   }
201		* }
202		* // .. initially called, for n tasks via
#	Line 170 | Line 207 | import java.util.concurrent.locks.LockSu
207		* be appropriate for extremely small per-barrier task bodies (thus
208		* high rates), or up to hundreds for extremely large ones.
209		*
173	–	* </pre>
174	–	*
210		* <p><b>Implementation notes</b>: This implementation restricts the
211		* maximum number of parties to 65535. Attempts to register additional
212		* parties result in {@code IllegalStateException}. However, you can and
#	Line 192 | Line 227 | public class Phaser {
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)
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 (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.
205	–	*
206	–	* Note: there are some cheats in arrive() that rely on unarrived
207	–	* count being lowest 16 bits.
240		*/
241		private volatile long state;
242
243	<	private static final int ushortBits = 16;
244	<	private static final int ushortMask = 0xffff;
245	<	private static final int phaseMask  = 0x7fffffff;
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	>	// 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) >>> 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
231	–	private static long stateFor(int phase, int parties, int unarrived) {
232	–	return ((((long) phase) << 32) | (((long) parties) << 16) |
233	–	(long) unarrived);
234	–	}
235	–
236	–	private static long trippedStateFor(int phase, int parties) {
237	–	long lp = (long) parties;
238	–	return (((long) phase) << 32) | (lp << 16) | lp;
239	–	}
240	–
241	–	/**
242	–	* Returns message string for bad bounds exceptions.
243	–	*/
244	–	private static String badBounds(int parties, int unarrived) {
245	–	return ("Attempt to set " + unarrived +
246	–	" unarrived of " + parties + " parties");
247	–	}
248	–
271		/**
272		* The parent of this phaser, or null if none
273		*/
#	Line 257 | Line 279 | public class Phaser {
279		*/
280		private final Phaser root;
281
260	–	// Wait queues
261	–
282		/**
283		* Heads of Treiber stacks for waiting threads. To eliminate
284	<	* contention while releasing some threads while adding others, we
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	<	private final AtomicReference<QNode> evenQ = new AtomicReference<QNode>();
289	<	private final AtomicReference<QNode> oddQ  = new AtomicReference<QNode>();
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	<	* Returns current state, first resolving lagged propagation from
297	<	* root if necessary.
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	>	private int doArrive(long adj) {
305	>	for (;;) {
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	>	* Rechecks state and throws bounds exceptions on arrival -- called
343	>	* only if unarrived is apparently zero.
344		*/
345	<	private long getReconciledState() {
346	<	return (parent == null) ? state : reconcileState();
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	<	* Recursively resolves state.
353	>	* Implementation of register, bulkRegister
354	>	*
355	>	* @param registrations number to add to both parties and unarrived fields
356	>	*/
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	>	int phase, parties;
363	>	long s = par == null? state : reconcileState();
364	>	if ((phase = (int)(s >>> PHASE_SHIFT)) < 0)
365	>	return phase;
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	>	* Returns message string for bounds exceptions on registration
378	>	*/
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 p = parent;
390	<	long s = state;
391	<	if (p != null) {
392	<	while (unarrivedOf(s) == 0 && phaseOf(s) != phaseOf(root.state)) {
393	<	long parentState = p.getReconciledState();
394	<	int parentPhase = phaseOf(parentState);
395	<	int phase = phaseOf(s = state);
396	<	if (phase != parentPhase) {
397	<	long next = trippedStateFor(parentPhase, partiesOf(s));
398	<	if (casState(s, next)) {
399	<	releaseWaiters(phase);
400	<	s = next;
401	<	}
402	<	}
389	>	Phaser par = parent;
390	>	if (par == null)
391	>	return state;
392	>	Phaser rt = root;
393	>	for (;;) {
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		}
412		}
302	–	return s;
413		}
414
415		/**
#	Line 308 | Line 418 | public class Phaser {
418		* phaser will need to first register for it.
419		*/
420		public Phaser() {
421	<	this(null);
421	>	this(null, 0);
422		}
423
424		/**
425	<	* Creates a new phaser with the given numbers of registered
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
#	Line 332 | Line 442 | public class Phaser {
442		* @param parent the parent phaser
443		*/
444		public Phaser(Phaser parent) {
445	<	int phase = 0;
336	<	this.parent = parent;
337	<	if (parent != null) {
338	<	this.root = parent.root;
339	<	phase = parent.register();
340	<	}
341	<	else
342	<	this.root = this;
343	<	this.state = trippedStateFor(phase, 0);
445	>	this(parent, 0);
446		}
447
448		/**
449	<	* Creates a new phaser with the given parent and numbers of
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.
#	Line 355 | Line 457 | public class Phaser {
457		* or greater than the maximum number of parties supported
458		*/
459		public Phaser(Phaser parent, int parties) {
460	<	if (parties < 0 || parties > ushortMask)
460	>	if (parties < 0 || parties > MAX_COUNT)
461		throw new IllegalArgumentException("Illegal number of parties");
462	<	int phase = 0;
462	>	int phase;
463		this.parent = parent;
464		if (parent != null) {
465	<	this.root = parent.root;
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
471	>	else {
472		this.root = this;
473	<	this.state = trippedStateFor(phase, parties);
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		* 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
#	Line 381 | Line 493 | public class Phaser {
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 parties required to trip barrier
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		/**
399	–	* Shared code for register, bulkRegister
400	–	*/
401	–	private int doRegister(int registrations) {
402	–	int phase;
403	–	for (;;) {
404	–	long s = getReconciledState();
405	–	phase = phaseOf(s);
406	–	int unarrived = unarrivedOf(s) + registrations;
407	–	int parties = partiesOf(s) + registrations;
408	–	if (phase < 0)
409	–	break;
410	–	if (parties > ushortMask || unarrived > ushortMask)
411	–	throw new IllegalStateException(badBounds(parties, unarrived));
412	–	if (phase == phaseOf(root.state) &&
413	–	casState(s, stateFor(phase, parties, unarrived)))
414	–	break;
415	–	}
416	–	return phase;
417	–	}
418	–
419	–	/**
516		* Arrives at the barrier, but does not wait for others.  (You can
517	<	* in turn wait for others via {@link #awaitAdvance}).
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	<	int phase;
429	<	for (;;) {
430	<	long s = state;
431	<	phase = phaseOf(s);
432	<	if (phase < 0)
433	<	break;
434	<	int parties = partiesOf(s);
435	<	int unarrived = unarrivedOf(s) - 1;
436	<	if (unarrived > 0) {        // Not the last arrival
437	<	if (casState(s, s - 1)) // s-1 adds one arrival
438	<	break;
439	<	}
440	<	else if (unarrived == 0) {  // the last arrival
441	<	Phaser par = parent;
442	<	if (par == null) {      // directly trip
443	<	if (casState
444	<	(s,
445	<	trippedStateFor(onAdvance(phase, parties) ? -1 :
446	<	((phase + 1) & phaseMask), parties))) {
447	<	releaseWaiters(phase);
448	<	break;
449	<	}
450	<	}
451	<	else {                  // cascade to parent
452	<	if (casState(s, s - 1)) { // zeroes unarrived
453	<	par.arrive();
454	<	reconcileState();
455	<	break;
456	<	}
457	<	}
458	<	}
459	<	else if (phase != phaseOf(root.state)) // or if unreconciled
460	<	reconcileState();
461	<	else
462	<	throw new IllegalStateException(badBounds(parties, unarrived));
463	<	}
464	<	return phase;
526	>	return doArrive(ONE_ARRIVAL);
527		}
528
529		/**
#	Line 470 | Line 532 | public class Phaser {
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.
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	<	// similar code to arrive, but too different to merge
481	<	Phaser par = parent;
482	<	int phase;
483	<	for (;;) {
484	<	long s = state;
485	<	phase = phaseOf(s);
486	<	if (phase < 0)
487	<	break;
488	<	int parties = partiesOf(s) - 1;
489	<	int unarrived = unarrivedOf(s) - 1;
490	<	if (parties >= 0) {
491	<	if (unarrived > 0 || (unarrived == 0 && par != null)) {
492	<	if (casState
493	<	(s,
494	<	stateFor(phase, parties, unarrived))) {
495	<	if (unarrived == 0) {
496	<	par.arriveAndDeregister();
497	<	reconcileState();
498	<	}
499	<	break;
500	<	}
501	<	continue;
502	<	}
503	<	if (unarrived == 0) {
504	<	if (casState
505	<	(s,
506	<	trippedStateFor(onAdvance(phase, parties) ? -1 :
507	<	((phase + 1) & phaseMask), parties))) {
508	<	releaseWaiters(phase);
509	<	break;
510	<	}
511	<	continue;
512	<	}
513	<	if (par != null && phase != phaseOf(root.state)) {
514	<	reconcileState();
515	<	continue;
516	<	}
517	<	}
518	<	throw new IllegalStateException(badBounds(parties, unarrived));
519	<	}
520	<	return phase;
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 awaitAdvance
551	<	* method.  If instead you need to deregister upon arrival use
552	<	* {@code arriveAndDeregister}.
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
#	Line 551 | Line 575 | public class Phaser {
575		public int awaitAdvance(int phase) {
576		if (phase < 0)
577		return phase;
578	<	long s = getReconciledState();
555	<	int p = phaseOf(s);
578	>	int p = (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
579		if (p != phase)
580		return p;
581	<	if (unarrivedOf(s) == 0 && parent != null)
559	<	parent.awaitAdvance(phase);
560	<	// Fall here even if parent waited, to reconcile and help release
561	<	return untimedWait(phase);
581	>	return internalAwaitAdvance(phase, null);
582		}
583
584		/**
585		* Awaits the phase of the barrier to advance from the given phase
586	<	* value, throwing {@code InterruptedException} if interrupted while
587	<	* waiting, or returning immediately if the current phase of the
588	<	* barrier is not equal to the given phase value or this barrier
589	<	* is terminated.
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
#	Line 579 | Line 599 | public class Phaser {
599		throws InterruptedException {
600		if (phase < 0)
601		return phase;
602	<	long s = getReconciledState();
583	<	int p = phaseOf(s);
602	>	int p = (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
603		if (p != phase)
604		return p;
605	<	if (unarrivedOf(s) == 0 && parent != null)
606	<	parent.awaitAdvanceInterruptibly(phase);
607	<	return interruptibleWait(phase);
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 p;
611		}
612
613		/**
614		* Awaits the phase of the barrier to advance from the given phase
615	<	* value or the given timeout to elapse, throwing
616	<	* {@code InterruptedException} if interrupted while waiting, or
617	<	* returning immediately if the current phase of the barrier is not
618	<	* equal to the given phase value or this barrier is terminated.
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
#	Line 610 | Line 633 | public class Phaser {
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 s = getReconciledState();
616	<	int p = phaseOf(s);
639	>	int p = (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
640		if (p != phase)
641		return p;
642	<	if (unarrivedOf(s) == 0 && parent != null)
643	<	parent.awaitAdvanceInterruptibly(phase, timeout, unit);
644	<	return timedWait(phase, unit.toNanos(timeout));
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		/**
#	Line 629 | Line 657 | public class Phaser {
657		* unexpected exceptions.
658		*/
659		public void forceTermination() {
660	<	for (;;) {
661	<	long s = getReconciledState();
662	<	int phase = phaseOf(s);
663	<	int parties = partiesOf(s);
664	<	int unarrived = unarrivedOf(s);
665	<	if (phase < 0 ||
666	<	casState(s, stateFor(-1, parties, unarrived))) {
639	<	releaseWaiters(0);
640	<	releaseWaiters(1);
641	<	if (parent != null)
642	<	parent.forceTermination();
643	<	return;
644	<	}
645	<	}
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		/**
#	Line 653 | Line 674 | public class Phaser {
674		* @return the phase number, or a negative value if terminated
675		*/
676		public final int getPhase() {
677	<	return phaseOf(getReconciledState());
677	>	return (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
678		}
679
680		/**
#	Line 662 | Line 683 | public class Phaser {
683		* @return the number of parties
684		*/
685		public int getRegisteredParties() {
686	<	return partiesOf(state);
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);
696	>	return arrivedOf(parent==null? state : reconcileState());
697		}
698
699		/**
#	Line 682 | Line 703 | public class Phaser {
703		* @return the number of unarrived parties
704		*/
705		public int getUnarrivedParties() {
706	<	return unarrivedOf(state);
706	>	return unarrivedOf(parent==null? state : reconcileState());
707		}
708
709		/**
#	Line 710 | Line 731 | public class Phaser {
731		* @return {@code true} if this barrier has been terminated
732		*/
733		public boolean isTerminated() {
734	<	return getPhase() < 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 {@code true}, then, rather than advance
742	<	* the phase number, this barrier will be set to a final
743	<	* termination state, and subsequent calls to {@link #isTerminated}
744	<	* will return true.
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		*
730	–	* <p>You may override this method to perform an action with side
731	–	* effects visible to participating tasks, but it is in general
732	–	* only sensible to do so in designs where all parties register
733	–	* before any arrive, and all {@link #awaitAdvance} at each phase.
734	–	* Otherwise, you cannot ensure lack of interference from other
735	–	* parties during the invocation of this method.
736	–	*
764		* @param phase the phase number on entering the barrier
765		* @param registeredParties the current number of registered parties
766		* @return {@code true} if this barrier should terminate
#	Line 752 | Line 779 | public class Phaser {
779		* @return a string identifying this barrier, as well as its state
780		*/
781		public String toString() {
782	<	long s = getReconciledState();
782	>	return stateToString(reconcileState());
783	>	}
784	>
785	>	/**
786	>	* Implementation of toString and string-based error messages
787	>	*/
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	<	// methods for waiting
795	>	// Waiting mechanics
796	>
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 ((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	>	}
810	>	}
811	>
812	>	/**
813	>	* Tries to enqueue given node in the appropriate wait queue.
814	>	*
815	>	* @return true if successful
816	>	*/
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	>	private static final int NCPU = Runtime.getRuntime().availableProcessors();
828	>
829	>	/**
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 SPINS_PER_ARRIVAL = NCPU < 2? 1 : 1 << 8;
842	>
843	>	/**
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		* Wait nodes for Treiber stack representing wait queue
#	Line 767 | Line 898 | public class Phaser {
898		static final class QNode implements ForkJoinPool.ManagedBlocker {
899		final Phaser phaser;
900		final int phase;
770	–	final long startTime;
771	–	final long nanos;
772	–	final boolean timed;
901		final boolean interruptible;
902	<	volatile boolean wasInterrupted = false;
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		QNode(Phaser phaser, int phase, boolean interruptible,
910	<	boolean timed, long startTime, long nanos) {
910	>	boolean timed, long nanos) {
911		this.phaser = phaser;
912		this.phase = phase;
781	–	this.timed = timed;
913		this.interruptible = interruptible;
783	–	this.startTime = startTime;
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	<	return (thread == null ||
922	<	phaser.getPhase() != phase ||
923	<	(interruptible && wasInterrupted) ||
924	<	(timed && (nanos - (System.nanoTime() - startTime)) <= 0));
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 (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	>	if (t != null)
941	>	return false;
942	>	thread = null;
943	>	}
944	>	return true;
945		}
946	+
947		public boolean block() {
948	<	if (Thread.interrupted()) {
949	<	wasInterrupted = true;
950	<	if (interruptible)
797	<	return true;
798	<	}
799	<	if (!timed)
948	>	if (isReleasable())
949	>	return true;
950	>	else if (!timed)
951		LockSupport.park(this);
952	<	else {
953	<	long waitTime = nanos - (System.nanoTime() - startTime);
803	<	if (waitTime <= 0)
804	<	return true;
805	<	LockSupport.parkNanos(this, waitTime);
806	<	}
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) {
#	Line 813 | Line 961 | public class Phaser {
961		LockSupport.unpark(t);
962		}
963		}
816	–	boolean doWait() {
817	–	if (thread != null) {
818	–	try {
819	–	ForkJoinPool.managedBlock(this, false);
820	–	} catch (InterruptedException ie) {
821	–	}
822	–	}
823	–	return wasInterrupted;
824	–	}
964
965	<	}
966	<
967	<	/**
968	<	* Removes and signals waiting threads from wait queue.
969	<	*/
831	<	private void releaseWaiters(int phase) {
832	<	AtomicReference<QNode> head = queueFor(phase);
833	<	QNode q;
834	<	while ((q = head.get()) != null) {
835	<	if (head.compareAndSet(q, q.next))
836	<	q.signal();
837	<	}
838	<	}
839	<
840	<	/**
841	<	* Tries to enqueue given node in the appropriate wait queue.
842	<	*
843	<	* @return true if successful
844	<	*/
845	<	private boolean tryEnqueue(QNode node) {
846	<	AtomicReference<QNode> head = queueFor(node.phase);
847	<	return head.compareAndSet(node.next = head.get(), node);
848	<	}
849	<
850	<	/**
851	<	* Enqueues node and waits unless aborted or signalled.
852	<	*
853	<	* @return current phase
854	<	*/
855	<	private int untimedWait(int phase) {
856	<	QNode node = null;
857	<	boolean queued = false;
858	<	boolean interrupted = false;
859	<	int p;
860	<	while ((p = getPhase()) == phase) {
861	<	if (Thread.interrupted())
862	<	interrupted = true;
863	<	else if (node == null)
864	<	node = new QNode(this, phase, false, false, 0, 0);
865	<	else if (!queued)
866	<	queued = tryEnqueue(node);
867	<	else
868	<	interrupted = node.doWait();
965	>	void onRelease() { // actions upon return from internalAwaitAdvance
966	>	if (!interruptible && wasInterrupted)
967	>	Thread.currentThread().interrupt();
968	>	if (thread != null)
969	>	thread = null;
970		}
870	–	if (node != null)
871	–	node.thread = null;
872	–	releaseWaiters(phase);
873	–	if (interrupted)
874	–	Thread.currentThread().interrupt();
875	–	return p;
876	–	}
877	–
878	–	/**
879	–	* Interruptible version
880	–	* @return current phase
881	–	*/
882	–	private int interruptibleWait(int phase) throws InterruptedException {
883	–	QNode node = null;
884	–	boolean queued = false;
885	–	boolean interrupted = false;
886	–	int p;
887	–	while ((p = getPhase()) == phase && !interrupted) {
888	–	if (Thread.interrupted())
889	–	interrupted = true;
890	–	else if (node == null)
891	–	node = new QNode(this, phase, true, false, 0, 0);
892	–	else if (!queued)
893	–	queued = tryEnqueue(node);
894	–	else
895	–	interrupted = node.doWait();
896	–	}
897	–	if (node != null)
898	–	node.thread = null;
899	–	if (p != phase || (p = getPhase()) != phase)
900	–	releaseWaiters(phase);
901	–	if (interrupted)
902	–	throw new InterruptedException();
903	–	return p;
904	–	}
971
906	–	/**
907	–	* Timeout version.
908	–	* @return current phase
909	–	*/
910	–	private int timedWait(int phase, long nanos)
911	–	throws InterruptedException, TimeoutException {
912	–	long startTime = System.nanoTime();
913	–	QNode node = null;
914	–	boolean queued = false;
915	–	boolean interrupted = false;
916	–	int p;
917	–	while ((p = getPhase()) == phase && !interrupted) {
918	–	if (Thread.interrupted())
919	–	interrupted = true;
920	–	else if (nanos - (System.nanoTime() - startTime) <= 0)
921	–	break;
922	–	else if (node == null)
923	–	node = new QNode(this, phase, true, true, startTime, nanos);
924	–	else if (!queued)
925	–	queued = tryEnqueue(node);
926	–	else
927	–	interrupted = node.doWait();
928	–	}
929	–	if (node != null)
930	–	node.thread = null;
931	–	if (p != phase || (p = getPhase()) != phase)
932	–	releaseWaiters(phase);
933	–	if (interrupted)
934	–	throw new InterruptedException();
935	–	if (p == phase)
936	–	throw new TimeoutException();
937	–	return p;
972		}
973
974		// Unsafe mechanics
#	Line 943 | Line 977 | public class Phaser {
977		private static final long stateOffset =
978		objectFieldOffset("state", Phaser.class);
979
946	–	private final boolean casState(long cmp, long val) {
947	–	return UNSAFE.compareAndSwapLong(this, stateOffset, cmp, val);
948	–	}
949	–
980		private static long objectFieldOffset(String field, Class<?> klazz) {
981		try {
982		return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field));

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines