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.53 by jsr166, Sat Nov 13 05:59:25 2010 UTC vs.
Revision 1.69 by jsr166, Sat Dec 4 22:00:05 2010 UTC

#	Line 34 | Line 34 | import java.util.concurrent.locks.LockSu
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
37	>	* generation of a phaser has an associated phase number. The phase
38	>	* number starts at zero, and advances when all parties arrive at the
39	>	* phaser, 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
41	>	* control of actions upon arrival at a phaser 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> <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}.
48	>	*       {@link #arriveAndDeregister} record arrival.  These methods
49	>	*       do not block, but return an associated <em>arrival phase
50	>	*       number</em>; that is, the phase number of the phaser to which
51	>	*       the arrival applied. When the final party for a given phase
52	>	*       arrives, an optional action is performed and the phase
53	>	*       advances.  These actions are performed by the party
54	>	*       triggering a phase advance, and are arranged by overriding
55	>	*       method {@link #onAdvance(int, int)}, which also controls
56	>	*       termination. Overriding this method is similar to, but more
57	>	*       flexible than, providing a barrier action to a {@code
58	>	*       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.
62	>	*       the phaser 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
68	>	*       state of the phaser. 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},
#	Line 74 | Line 74 | import java.util.concurrent.locks.LockSu
74		*
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
77	>	* <p> <b>Termination.</b> A phaser may enter a <em>termination</em>
78	>	* state, that may be checked using method {@link #isTerminated}. Upon
79	>	* termination, all synchronization methods immediately return without
80	>	* waiting for advance, as indicated by a negative return value.
81	>	* Similarly, attempts to register upon termination have no effect.
82	>	* Termination is triggered when an invocation of {@code onAdvance}
83	>	* returns {@code true}. The default implementation returns {@code
84	>	* true} if a deregistration has caused the number of registered
85	>	* parties to become zero.  As illustrated below, when phasers control
86	>	* actions with a fixed number of iterations, it is often convenient
87	>	* to override this method to cause termination when the current phase
88	>	* number reaches a threshold. Method {@link #forceTermination} is
89	>	* also available to abruptly release waiting threads and allow them
90	>	* to terminate.
91	>	*
92	>	* <p> <b>Tiering.</b> Phasers may be <em>tiered</em> (i.e.,
93	>	* constructed in tree structures) to reduce contention. Phasers with
94	>	* large numbers of parties that would otherwise experience heavy
95		* synchronization contention costs may instead be set up so that
96		* groups of sub-phasers share a common parent.  This may greatly
97		* increase throughput even though it incurs greater per-operation
98		* overhead.
99		*
100	+	* <p>In a tree of tiered phasers, registration and deregistration of
101	+	* child phasers with their parent are managed automatically.
102	+	* Whenever the number of registered parties of a child phaser becomes
103	+	* non-zero (as established in the {@link #Phaser(Phaser,int)}
104	+	* constructor, {@link #register}, or {@link #bulkRegister}), the
105	+	* child phaser is registered with its parent.  Whenever the number of
106	+	* registered parties becomes zero as the result of an invocation of
107	+	* {@link #arriveAndDeregister}, the child phaser is deregistered
108	+	* from its parent.
109	+	*
110		* <p><b>Monitoring.</b> While synchronization methods may be invoked
111		* only by registered parties, the current state of a phaser may be
112		* monitored by any caller.  At any given moment there are {@link
#	Line 181 | Line 194 | import java.util.concurrent.locks.LockSu
194		* }}</pre>
195		*
196		*
197	<	* <p>To create a set of tasks using a tree of phasers,
198	<	* you could use code of the following form, assuming a
199	<	* Task class with a constructor accepting a phaser that
200	<	* it registers with upon construction:
197	>	* <p>To create a set of {@code n} tasks using a tree of phasers, you
198	>	* could use code of the following form, assuming a Task class with a
199	>	* constructor accepting a {@code Phaser} that it registers with upon
200	>	* construction. After invocation of {@code build(new Task[n], 0, n,
201	>	* new Phaser())}, these tasks could then be started, for example by
202	>	* submitting to a pool:
203		*
204		*  <pre> {@code
205	<	* void build(Task[] actions, int lo, int hi, Phaser ph) {
205	>	* void build(Task[] tasks, int lo, int hi, Phaser ph) {
206		*   if (hi - lo > TASKS_PER_PHASER) {
207		*     for (int i = lo; i < hi; i += TASKS_PER_PHASER) {
208		*       int j = Math.min(i + TASKS_PER_PHASER, hi);
209	<	*       build(actions, i, j, new Phaser(ph));
209	>	*       build(tasks, i, j, new Phaser(ph));
210		*     }
211		*   } else {
212		*     for (int i = lo; i < hi; ++i)
213	<	*       actions[i] = new Task(ph);
213	>	*       tasks[i] = new Task(ph);
214		*       // assumes new Task(ph) performs ph.register()
215		*   }
216	<	* }
202	<	* // .. initially called, for n tasks via
203	<	* build(new Task[n], 0, n, new Phaser());}</pre>
216	>	* }}</pre>
217		*
218		* The best value of {@code TASKS_PER_PHASER} depends mainly on
219	<	* expected barrier synchronization rates. A value as low as four may
220	<	* be appropriate for extremely small per-barrier task bodies (thus
219	>	* expected synchronization rates. A value as low as four may
220	>	* be appropriate for extremely small per-phase task bodies (thus
221		* high rates), or up to hundreds for extremely large ones.
222		*
223		* <p><b>Implementation notes</b>: This implementation restricts the
#	Line 224 | Line 237 | public class Phaser {
237		*/
238
239		/**
240	<	* Barrier state representation. Conceptually, a barrier contains
228	<	* four values:
240	>	* Primary state representation, holding four fields:
241		*
242		* * unarrived -- the number of parties yet to hit barrier (bits  0-15)
243		* * parties -- the number of parties to wait              (bits 16-31)
244		* * phase -- the generation of the barrier                (bits 32-62)
245		* * terminated -- set if barrier is terminated            (bit  63 / sign)
246		*
247	<	* However, to efficiently maintain atomicity, these values are
248	<	* packed into a single (atomic) long. Termination uses the sign
249	<	* bit of 32 bit representation of phase, so phase is set to -1 on
250	<	* termination. Good performance relies on keeping state decoding
251	<	* and encoding simple, and keeping race windows short.
247	>	* Except that a phaser with no registered parties is
248	>	* distinguished with the otherwise illegal state of having zero
249	>	* parties and one unarrived parties (encoded as EMPTY below).
250	>	*
251	>	* To efficiently maintain atomicity, these values are packed into
252	>	* a single (atomic) long. Good performance relies on keeping
253	>	* state decoding and encoding simple, and keeping race windows
254	>	* short.
255	>	*
256	>	* All state updates are performed via CAS except initial
257	>	* registration of a sub-phaser (i.e., one with a non-null
258	>	* parent).  In this (relatively rare) case, we use built-in
259	>	* synchronization to lock while first registering with its
260	>	* parent.
261	>	*
262	>	* The phase of a subphaser is allowed to lag that of its
263	>	* ancestors until it is actually accessed.  Method reconcileState
264	>	* is usually attempted only only when the number of unarrived
265	>	* parties appears to be zero, which indicates a potential lag in
266	>	* updating phase after the root advanced.
267		*/
268		private volatile long state;
269
270	<	private static final int  MAX_COUNT      = 0xffff;
271	<	private static final int  MAX_PHASE      = 0x7fffffff;
272	<	private static final int  PARTIES_SHIFT  = 16;
273	<	private static final int  PHASE_SHIFT    = 32;
274	<	private static final long UNARRIVED_MASK = 0xffffL;
275	<	private static final long PARTIES_MASK   = 0xffff0000L;
276	<	private static final long ONE_ARRIVAL    = 1L;
277	<	private static final long ONE_PARTY      = 1L << PARTIES_SHIFT;
278	<	private static final long TERMINATION_PHASE  = -1L << PHASE_SHIFT;
270	>	private static final int  MAX_PARTIES     = 0xffff;
271	>	private static final int  MAX_PHASE       = 0x7fffffff;
272	>	private static final int  PARTIES_SHIFT   = 16;
273	>	private static final int  PHASE_SHIFT     = 32;
274	>	private static final int  UNARRIVED_MASK  = 0xffff;      // to mask ints
275	>	private static final long PARTIES_MASK    = 0xffff0000L; // to mask longs
276	>	private static final long TERMINATION_BIT = 1L << 63;
277	>
278	>	// some special values
279	>	private static final int  ONE_ARRIVAL     = 1;
280	>	private static final int  ONE_PARTY       = 1 << PARTIES_SHIFT;
281	>	private static final int  EMPTY           = 1;
282
283		// The following unpacking methods are usually manually inlined
284
285		private static int unarrivedOf(long s) {
286	<	return (int) (s & UNARRIVED_MASK);
286	>	int counts = (int)s;
287	>	return (counts == EMPTY) ? 0 : counts & UNARRIVED_MASK;
288		}
289
290		private static int partiesOf(long s) {
291	<	return ((int) (s & PARTIES_MASK)) >>> PARTIES_SHIFT;
291	>	return (int)s >>> PARTIES_SHIFT;
292		}
293
294		private static int phaseOf(long s) {
#	Line 265 | Line 296 | public class Phaser {
296		}
297
298		private static int arrivedOf(long s) {
299	<	return partiesOf(s) - unarrivedOf(s);
299	>	int counts = (int)s;
300	>	return (counts == EMPTY) ? 0 :
301	>	(counts >>> PARTIES_SHIFT) - (counts & UNARRIVED_MASK);
302		}
303
304		/**
#	Line 274 | Line 307 | public class Phaser {
307		private final Phaser parent;
308
309		/**
310	<	* The root of phaser tree. Equals this if not in a tree.  Used to
278	<	* support faster state push-down.
310	>	* The root of phaser tree. Equals this if not in a tree.
311		*/
312		private final Phaser root;
313
#	Line 293 | Line 325 | public class Phaser {
325		}
326
327		/**
328	+	* Returns message string for bounds exceptions on arrival.
329	+	*/
330	+	private String badArrive(long s) {
331	+	return "Attempted arrival of unregistered party for " +
332	+	stateToString(s);
333	+	}
334	+
335	+	/**
336	+	* Returns message string for bounds exceptions on registration.
337	+	*/
338	+	private String badRegister(long s) {
339	+	return "Attempt to register more than " +
340	+	MAX_PARTIES + " parties for " + stateToString(s);
341	+	}
342	+
343	+	/**
344		* Main implementation for methods arrive and arriveAndDeregister.
345		* Manually tuned to speed up and minimize race windows for the
346		* common case of just decrementing unarrived field.
347		*
348	<	* @param adj - adjustment to apply to state -- either
301	<	* ONE_ARRIVAL (for arrive) or
302	<	* ONE_ARRIVAL|ONE_PARTY (for arriveAndDeregister)
348	>	* @param deregister false for arrive, true for arriveAndDeregister
349		*/
350	<	private int doArrive(long adj) {
351	<	long s;
352	<	int phase, unarrived;
353	<	while ((phase = (int)((s = state) >>> PHASE_SHIFT)) >= 0) {
354	<	if ((unarrived = (int)(s & UNARRIVED_MASK)) != 0) {
355	<	if (UNSAFE.compareAndSwapLong(this, stateOffset, s, s -= adj)) {
356	<	if (unarrived == 1) {
357	<	Phaser par;
358	<	long p = s & PARTIES_MASK; // unshifted parties field
359	<	long lu = p >>> PARTIES_SHIFT;
360	<	int u = (int)lu;
361	<	int nextPhase = (phase + 1) & MAX_PHASE;
362	<	long next = ((long)nextPhase << PHASE_SHIFT) | p | lu;
363	<	if ((par = parent) == null) {
364	<	UNSAFE.compareAndSwapLong
365	<	(this, stateOffset, s, onAdvance(phase, u)?
366	<	next | TERMINATION_PHASE : next);
367	<	releaseWaiters(phase);
368	<	}
369	<	else {
370	<	par.doArrive(u == 0?
371	<	ONE_ARRIVAL|ONE_PARTY : ONE_ARRIVAL);
372	<	if ((int)(par.state >>> PHASE_SHIFT) != nextPhase ||
373	<	((int)(state >>> PHASE_SHIFT) != nextPhase &&
374	<	!UNSAFE.compareAndSwapLong(this, stateOffset,
375	<	s, next)))
376	<	reconcileState();
377	<	}
378	<	}
333	<	break;
350	>	private int doArrive(boolean deregister) {
351	>	int adj = deregister ? ONE_ARRIVAL|ONE_PARTY : ONE_ARRIVAL;
352	>	final Phaser root = this.root;
353	>	for (;;) {
354	>	long s = (root == this) ? state : reconcileState();
355	>	int phase = (int)(s >>> PHASE_SHIFT);
356	>	int counts = (int)s;
357	>	int unarrived = (counts & UNARRIVED_MASK) - 1;
358	>	if (phase < 0)
359	>	return phase;
360	>	else if (counts == EMPTY || unarrived < 0) {
361	>	if (root == this || reconcileState() == s)
362	>	throw new IllegalStateException(badArrive(s));
363	>	}
364	>	else if (UNSAFE.compareAndSwapLong(this, stateOffset, s, s-=adj)) {
365	>	if (unarrived == 0) {
366	>	long n = s & PARTIES_MASK;  // base of next state
367	>	int nextUnarrived = ((int)n) >>> PARTIES_SHIFT;
368	>	if (root != this)
369	>	return parent.doArrive(nextUnarrived == 0);
370	>	if (onAdvance(phase, nextUnarrived))
371	>	n |= TERMINATION_BIT;
372	>	else if (nextUnarrived == 0)
373	>	n |= EMPTY;
374	>	else
375	>	n |= nextUnarrived;
376	>	n |= ((long)((phase + 1) & MAX_PHASE)) << PHASE_SHIFT;
377	>	UNSAFE.compareAndSwapLong(this, stateOffset, s, n);
378	>	releaseWaiters(phase);
379		}
380	+	return phase;
381		}
336	–	else if (state == s && reconcileState() == s) // recheck
337	–	throw new IllegalStateException(badArrive());
382		}
339	–	return phase;
340	–	}
341	–
342	–	/**
343	–	* Returns message string for bounds exceptions on arrival.
344	–	* Declared out of-line from doArrive to reduce string op bulk.
345	–	*/
346	–	private String badArrive() {
347	–	return ("Attempted arrival of unregistered party for " +
348	–	this.toString());
383		}
384
385		/**
386		* Implementation of register, bulkRegister
387		*
388	<	* @param registrations number to add to both parties and unarrived fields
388	>	* @param registrations number to add to both parties and
389	>	* unarrived fields. Must be greater than zero.
390		*/
391		private int doRegister(int registrations) {
392	<	long adj = (long)registrations; // adjustment to state
393	<	adj |= adj << PARTIES_SHIFT;
392	>	// adjustment to state
393	>	long adj = ((long)registrations << PARTIES_SHIFT) | registrations;
394		Phaser par = parent;
360	–	long s;
395		int phase;
396	<	while ((phase = (int)((s = (par == null? state : reconcileState()))
397	<	>>> PHASE_SHIFT)) >= 0) {
398	<	int parties = ((int)(s & PARTIES_MASK)) >>> PARTIES_SHIFT;
399	<	if (parties != 0 && (s & UNARRIVED_MASK) == 0)
400	<	internalAwaitAdvance(phase, null); // wait for onAdvance
401	<	else if (parties + registrations > MAX_COUNT)
402	<	throw new IllegalStateException(badRegister());
403	<	else if (UNSAFE.compareAndSwapLong(this, stateOffset, s, s + adj))
396	>	for (;;) {
397	>	long s = state;
398	>	int counts = (int)s;
399	>	int parties = counts >>> PARTIES_SHIFT;
400	>	int unarrived = counts & UNARRIVED_MASK;
401	>	if (registrations > MAX_PARTIES - parties)
402	>	throw new IllegalStateException(badRegister(s));
403	>	else if ((phase = (int)(s >>> PHASE_SHIFT)) < 0)
404		break;
405	+	else if (counts != EMPTY) {             // not 1st registration
406	+	if (par == null || reconcileState() == s) {
407	+	if (unarrived == 0)             // wait out advance
408	+	root.internalAwaitAdvance(phase, null);
409	+	else if (UNSAFE.compareAndSwapLong(this, stateOffset,
410	+	s, s + adj))
411	+	break;
412	+	}
413	+	}
414	+	else if (par == null) {                 // 1st root registration
415	+	long next = (((long) phase) << PHASE_SHIFT) | adj;
416	+	if (UNSAFE.compareAndSwapLong(this, stateOffset, s, next))
417	+	break;
418	+	}
419	+	else {
420	+	synchronized (this) {               // 1st sub registration
421	+	if (state == s) {               // recheck under lock
422	+	par.doRegister(1);
423	+	do {                        // force current phase
424	+	phase = (int)(root.state >>> PHASE_SHIFT);
425	+	// assert phase < 0 || (int)state == EMPTY;
426	+	} while (!UNSAFE.compareAndSwapLong
427	+	(this, stateOffset, state,
428	+	(((long) phase) << PHASE_SHIFT) | adj));
429	+	break;
430	+	}
431	+	}
432	+	}
433		}
434		return phase;
435		}
436
437		/**
438	<	* Returns message string for bounds exceptions on registration
377	<	*/
378	<	private String badRegister() {
379	<	return ("Attempt to register more than " + MAX_COUNT + " parties for "+
380	<	this.toString());
381	<	}
382	<
383	<	/**
384	<	* Recursively resolves lagged phase propagation from root if
385	<	* necessary.
438	>	* Resolves lagged phase propagation from root if necessary.
439		*/
440		private long reconcileState() {
388	–	Phaser par = parent;
389	–	if (par == null)
390	–	return state;
441		Phaser rt = root;
442	<	long s;
443	<	int phase, rPhase;
444	<	while ((phase = (int)((s = state) >>> PHASE_SHIFT)) >= 0 &&
445	<	(rPhase = (int)(rt.state >>> PHASE_SHIFT)) != phase) {
446	<	if (rPhase < 0 || (s & UNARRIVED_MASK) == 0) {
447	<	long ps = par.parent == null? par.state : par.reconcileState();
448	<	int pPhase = (int)(ps >>> PHASE_SHIFT);
449	<	if (pPhase < 0 || pPhase == ((phase + 1) & MAX_PHASE)) {
450	<	if (state != s)
451	<	continue;
452	<	long p = s & PARTIES_MASK;
453	<	long next = ((((long) pPhase) << PHASE_SHIFT) |
454	<	(p >>> PARTIES_SHIFT) | p);
455	<	if (UNSAFE.compareAndSwapLong(this, stateOffset, s, next))
406	<	return next;
442	>	long s = state;
443	>	if (rt != this) {
444	>	int phase;
445	>	while ((phase = (int)(rt.state >>> PHASE_SHIFT)) !=
446	>	(int)(s >>> PHASE_SHIFT)) {
447	>	// assert phase < 0 || unarrivedOf(s) == 0
448	>	long t;                             // to reread s
449	>	long p = s & PARTIES_MASK;          // unshifted parties field
450	>	long n = (((long) phase) << PHASE_SHIFT) | p;
451	>	if (phase >= 0) {
452	>	if (p == 0L)
453	>	n |= EMPTY;                 // reset to empty
454	>	else
455	>	n |= p >>> PARTIES_SHIFT;   // set unarr to parties
456		}
457	+	if ((t = state) == s &&
458	+	UNSAFE.compareAndSwapLong(this, stateOffset, s, s = n))
459	+	break;
460	+	s = t;
461		}
409	–	if (state == s)
410	–	releaseWaiters(phase); // help release others
462		}
463		return s;
464		}
465
466		/**
467	<	* Creates a new phaser without any initially registered parties,
468	<	* initial phase number 0, and no parent. Any thread using this
467	>	* Creates a new phaser with no initially registered parties, no
468	>	* parent, and initial phase number 0. Any thread using this
469		* phaser will need to first register for it.
470		*/
471		public Phaser() {
#	Line 423 | Line 474 | public class Phaser {
474
475		/**
476		* Creates a new phaser with the given number of registered
477	<	* unarrived parties, initial phase number 0, and no parent.
477	>	* unarrived parties, no parent, and initial phase number 0.
478		*
479	<	* @param parties the number of parties required to trip barrier
479	>	* @param parties the number of parties required to advance to the
480	>	* next phase
481		* @throws IllegalArgumentException if parties less than zero
482		* or greater than the maximum number of parties supported
483		*/
#	Line 434 | Line 486 | public class Phaser {
486		}
487
488		/**
489	<	* 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.
489	>	* Equivalent to {@link #Phaser(Phaser, int) Phaser(parent, 0)}.
490		*
491		* @param parent the parent phaser
492		*/
#	Line 447 | Line 496 | public class Phaser {
496
497		/**
498		* Creates a new phaser with the given parent and number of
499	<	* registered unarrived parties. If parent is non-null, this phaser
500	<	* is registered with the parent and its initial phase number is
501	<	* the same as that of parent phaser.
499	>	* registered unarrived parties.  When the given parent is non-null
500	>	* and the given number of parties is greater than zero, this
501	>	* child phaser is registered with its parent.
502		*
503		* @param parent the parent phaser
504	<	* @param parties the number of parties required to trip barrier
504	>	* @param parties the number of parties required to advance to the
505	>	* next phase
506		* @throws IllegalArgumentException if parties less than zero
507		* or greater than the maximum number of parties supported
508		*/
509		public Phaser(Phaser parent, int parties) {
510	<	if (parties < 0 || parties > MAX_COUNT)
510	>	if (parties >>> PARTIES_SHIFT != 0)
511		throw new IllegalArgumentException("Illegal number of parties");
512	<	int phase;
512	>	int phase = 0;
513		this.parent = parent;
514		if (parent != null) {
515	<	Phaser r = parent.root;
516	<	this.root = r;
517	<	this.evenQ = r.evenQ;
518	<	this.oddQ = r.oddQ;
519	<	phase = parent.register();
515	>	final Phaser root = parent.root;
516	>	this.root = root;
517	>	this.evenQ = root.evenQ;
518	>	this.oddQ = root.oddQ;
519	>	if (parties != 0)
520	>	phase = parent.doRegister(1);
521		}
522		else {
523		this.root = this;
524		this.evenQ = new AtomicReference<QNode>();
525		this.oddQ = new AtomicReference<QNode>();
475	–	phase = 0;
526		}
527	<	long p = (long)parties;
528	<	this.state = (((long) phase) << PHASE_SHIFT) | p | (p << PARTIES_SHIFT);
527	>	this.state = (parties == 0) ? (long) EMPTY :
528	>	((((long) phase) << PHASE_SHIFT) |
529	>	(((long) parties) << PARTIES_SHIFT) |
530	>	((long) parties));
531		}
532
533		/**
534	<	* Adds a new unarrived party to this phaser.
535	<	* If an ongoing invocation of {@link #onAdvance} is in progress,
536	<	* this method may wait until its completion before registering.
537	<	*
538	<	* @return the arrival phase number to which this registration applied
534	>	* Adds a new unarrived party to this phaser.  If an ongoing
535	>	* invocation of {@link #onAdvance} is in progress, this method
536	>	* may await its completion before returning.  If this phaser has
537	>	* a parent, and this phaser previously had no registered parties,
538	>	* this child phaser is also registered with its parent. If
539	>	* this phaser is terminated, the attempt to register has
540	>	* no effect, and a negative value is returned.
541	>	*
542	>	* @return the arrival phase number to which this registration
543	>	* applied.  If this value is negative, then this phaser has
544	>	* terminated, in which case registration has no effect.
545		* @throws IllegalStateException if attempting to register more
546		* than the maximum supported number of parties
547		*/
#	Line 494 | Line 552 | public class Phaser {
552		/**
553		* Adds the given number of new unarrived parties to this phaser.
554		* If an ongoing invocation of {@link #onAdvance} is in progress,
555	<	* this method may wait until its completion before registering.
556	<	*
557	<	* @param parties the number of additional parties required to trip barrier
558	<	* @return the arrival phase number to which this registration applied
555	>	* this method may await its completion before returning.  If this
556	>	* phaser has a parent, and the given number of parties is greater
557	>	* than zero, and this phaser previously had no registered
558	>	* parties, this child phaser is also registered with its parent.
559	>	* If this phaser is terminated, the attempt to register has no
560	>	* effect, and a negative value is returned.
561	>	*
562	>	* @param parties the number of additional parties required to
563	>	* advance to the next phase
564	>	* @return the arrival phase number to which this registration
565	>	* applied.  If this value is negative, then this phaser has
566	>	* terminated, in which case registration has no effect.
567		* @throws IllegalStateException if attempting to register more
568		* than the maximum supported number of parties
569		* @throws IllegalArgumentException if {@code parties < 0}
#	Line 505 | Line 571 | public class Phaser {
571		public int bulkRegister(int parties) {
572		if (parties < 0)
573		throw new IllegalArgumentException();
508	–	if (parties > MAX_COUNT)
509	–	throw new IllegalStateException(badRegister());
574		if (parties == 0)
575		return getPhase();
576		return doRegister(parties);
577		}
578
579		/**
580	<	* Arrives at the barrier, but does not wait for others.  (You can
581	<	* in turn wait for others via {@link #awaitAdvance}).  It is an
582	<	* unenforced usage error for an unregistered party to invoke this
583	<	* method.
580	>	* Arrives at this phaser, without waiting for others to arrive.
581	>	*
582	>	* <p>It is a usage error for an unregistered party to invoke this
583	>	* method.  However, this error may result in an {@code
584	>	* IllegalStateException} only upon some subsequent operation on
585	>	* this phaser, if ever.
586		*
587		* @return the arrival phase number, or a negative value if terminated
588		* @throws IllegalStateException if not terminated and the number
589		* of unarrived parties would become negative
590		*/
591		public int arrive() {
592	<	return doArrive(ONE_ARRIVAL);
592	>	return doArrive(false);
593		}
594
595		/**
596	<	* Arrives at the barrier and deregisters from it without waiting
597	<	* for others. Deregistration reduces the number of parties
598	<	* required to trip the barrier in future phases.  If this phaser
596	>	* Arrives at this phaser and deregisters from it without waiting
597	>	* for others to arrive. Deregistration reduces the number of
598	>	* parties required to advance in future phases.  If this phaser
599		* has a parent, and deregistration causes this phaser to have
600	<	* zero parties, this phaser also arrives at and is deregistered
601	<	* from its parent.  It is an unenforced usage error for an
602	<	* unregistered party to invoke this method.
600	>	* zero parties, this phaser is also deregistered from its parent.
601	>	*
602	>	* <p>It is a usage error for an unregistered party to invoke this
603	>	* method.  However, this error may result in an {@code
604	>	* IllegalStateException} only upon some subsequent operation on
605	>	* this phaser, if ever.
606		*
607		* @return the arrival phase number, or a negative value if terminated
608		* @throws IllegalStateException if not terminated and the number
609		* of registered or unarrived parties would become negative
610		*/
611		public int arriveAndDeregister() {
612	<	return doArrive(ONE_ARRIVAL|ONE_PARTY);
612	>	return doArrive(true);
613		}
614
615		/**
616	<	* Arrives at the barrier and awaits others. Equivalent in effect
616	>	* Arrives at this phaser and awaits others. Equivalent in effect
617		* to {@code awaitAdvance(arrive())}.  If you need to await with
618		* interruption or timeout, you can arrange this with an analogous
619		* construction using one of the other forms of the {@code
620		* awaitAdvance} method.  If instead you need to deregister upon
621	<	* arrival, use {@link #arriveAndDeregister}. It is an unenforced
553	<	* usage error for an unregistered party to invoke this method.
621	>	* arrival, use {@code awaitAdvance(arriveAndDeregister())}.
622		*
623	<	* @return the arrival phase number, or a negative number if terminated
623	>	* <p>It is a usage error for an unregistered party to invoke this
624	>	* method.  However, this error may result in an {@code
625	>	* IllegalStateException} only upon some subsequent operation on
626	>	* this phaser, if ever.
627	>	*
628	>	* @return the arrival phase number, or the (negative)
629	>	* {@linkplain #getPhase() current phase} if terminated
630		* @throws IllegalStateException if not terminated and the number
631		* of unarrived parties would become negative
632		*/
633		public int arriveAndAwaitAdvance() {
634	<	return awaitAdvance(arrive());
634	>	// Specialization of doArrive+awaitAdvance eliminating some reads/paths
635	>	final Phaser root = this.root;
636	>	for (;;) {
637	>	long s = (root == this) ? state : reconcileState();
638	>	int phase = (int)(s >>> PHASE_SHIFT);
639	>	int counts = (int)s;
640	>	int unarrived = (counts & UNARRIVED_MASK) - 1;
641	>	if (phase < 0)
642	>	return phase;
643	>	else if (counts == EMPTY || unarrived < 0) {
644	>	if (reconcileState() == s)
645	>	throw new IllegalStateException(badArrive(s));
646	>	}
647	>	else if (UNSAFE.compareAndSwapLong(this, stateOffset, s,
648	>	s -= ONE_ARRIVAL)) {
649	>	if (unarrived != 0)
650	>	return root.internalAwaitAdvance(phase, null);
651	>	if (root != this)
652	>	return parent.arriveAndAwaitAdvance();
653	>	long n = s & PARTIES_MASK;  // base of next state
654	>	int nextUnarrived = ((int)n) >>> PARTIES_SHIFT;
655	>	if (onAdvance(phase, nextUnarrived))
656	>	n |= TERMINATION_BIT;
657	>	else if (nextUnarrived == 0)
658	>	n |= EMPTY;
659	>	else
660	>	n |= nextUnarrived;
661	>	int nextPhase = (phase + 1) & MAX_PHASE;
662	>	n |= (long)nextPhase << PHASE_SHIFT;
663	>	if (!UNSAFE.compareAndSwapLong(this, stateOffset, s, n))
664	>	return (int)(state >>> PHASE_SHIFT); // terminated
665	>	releaseWaiters(phase);
666	>	return nextPhase;
667	>	}
668	>	}
669		}
670
671		/**
672	<	* Awaits the phase of the barrier to advance from the given phase
673	<	* value, returning immediately if the current phase of the
674	<	* barrier is not equal to the given phase value or this barrier
567	<	* is terminated.
672	>	* Awaits the phase of this phaser to advance from the given phase
673	>	* value, returning immediately if the current phase is not equal
674	>	* to the given phase value or this phaser is terminated.
675		*
676		* @param phase an arrival phase number, or negative value if
677		* terminated; this argument is normally the value returned by a
678	<	* previous call to {@code arrive} or its variants
679	<	* @return the next arrival phase number, or a negative value
680	<	* if terminated or argument is negative
678	>	* previous call to {@code arrive} or {@code arriveAndDeregister}.
679	>	* @return the next arrival phase number, or the argument if it is
680	>	* negative, or the (negative) {@linkplain #getPhase() current phase}
681	>	* if terminated
682		*/
683		public int awaitAdvance(int phase) {
684	+	final Phaser root = this.root;
685	+	long s = (root == this) ? state : reconcileState();
686	+	int p = (int)(s >>> PHASE_SHIFT);
687		if (phase < 0)
688		return phase;
689	<	int p = (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
690	<	if (p != phase)
691	<	return p;
581	<	return internalAwaitAdvance(phase, null);
689	>	if (p == phase)
690	>	return root.internalAwaitAdvance(phase, null);
691	>	return p;
692		}
693
694		/**
695	<	* Awaits the phase of the barrier to advance from the given phase
695	>	* Awaits the phase of this phaser to advance from the given phase
696		* value, throwing {@code InterruptedException} if interrupted
697	<	* while waiting, or returning immediately if the current phase of
698	<	* the barrier is not equal to the given phase value or this
699	<	* barrier is terminated.
697	>	* while waiting, or returning immediately if the current phase is
698	>	* not equal to the given phase value or this phaser is
699	>	* terminated.
700		*
701		* @param phase an arrival phase number, or negative value if
702		* terminated; this argument is normally the value returned by a
703	<	* previous call to {@code arrive} or its variants
704	<	* @return the next arrival phase number, or a negative value
705	<	* if terminated or argument is negative
703	>	* previous call to {@code arrive} or {@code arriveAndDeregister}.
704	>	* @return the next arrival phase number, or the argument if it is
705	>	* negative, or the (negative) {@linkplain #getPhase() current phase}
706	>	* if terminated
707		* @throws InterruptedException if thread interrupted while waiting
708		*/
709		public int awaitAdvanceInterruptibly(int phase)
710		throws InterruptedException {
711	+	final Phaser root = this.root;
712	+	long s = (root == this) ? state : reconcileState();
713	+	int p = (int)(s >>> PHASE_SHIFT);
714		if (phase < 0)
715		return phase;
716	<	int p = (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
717	<	if (p != phase)
718	<	return p;
719	<	QNode node = new QNode(this, phase, true, false, 0L);
720	<	p = internalAwaitAdvance(phase, node);
721	<	if (node.wasInterrupted)
722	<	throw new InterruptedException();
609	<	else
610	<	return p;
716	>	if (p == phase) {
717	>	QNode node = new QNode(this, phase, true, false, 0L);
718	>	p = root.internalAwaitAdvance(phase, node);
719	>	if (node.wasInterrupted)
720	>	throw new InterruptedException();
721	>	}
722	>	return p;
723		}
724
725		/**
726	<	* Awaits the phase of the barrier to advance from the given phase
726	>	* Awaits the phase of this phaser to advance from the given phase
727		* value or the given timeout to elapse, throwing {@code
728		* InterruptedException} if interrupted while waiting, or
729	<	* returning immediately if the current phase of the barrier is
730	<	* not equal to the given phase value or this barrier is
619	<	* terminated.
729	>	* returning immediately if the current phase is not equal to the
730	>	* given phase value or this phaser is terminated.
731		*
732		* @param phase an arrival phase number, or negative value if
733		* terminated; this argument is normally the value returned by a
734	<	* previous call to {@code arrive} or its variants
734	>	* previous call to {@code arrive} or {@code arriveAndDeregister}.
735		* @param timeout how long to wait before giving up, in units of
736		*        {@code unit}
737		* @param unit a {@code TimeUnit} determining how to interpret the
738		*        {@code timeout} parameter
739	<	* @return the next arrival phase number, or a negative value
740	<	* if terminated or argument is negative
739	>	* @return the next arrival phase number, or the argument if it is
740	>	* negative, or the (negative) {@linkplain #getPhase() current phase}
741	>	* if terminated
742		* @throws InterruptedException if thread interrupted while waiting
743		* @throws TimeoutException if timed out while waiting
744		*/
#	Line 634 | Line 746 | public class Phaser {
746		long timeout, TimeUnit unit)
747		throws InterruptedException, TimeoutException {
748		long nanos = unit.toNanos(timeout);
749	+	final Phaser root = this.root;
750	+	long s = (root == this) ? state : reconcileState();
751	+	int p = (int)(s >>> PHASE_SHIFT);
752		if (phase < 0)
753		return phase;
754	<	int p = (int)((parent==null? state : reconcileState()) >>> PHASE_SHIFT);
755	<	if (p != phase)
756	<	return p;
757	<	QNode node = new QNode(this, phase, true, true, nanos);
758	<	p = internalAwaitAdvance(phase, node);
759	<	if (node.wasInterrupted)
760	<	throw new InterruptedException();
761	<	else if (p == phase)
762	<	throw new TimeoutException();
648	<	else
649	<	return p;
754	>	if (p == phase) {
755	>	QNode node = new QNode(this, phase, true, true, nanos);
756	>	p = root.internalAwaitAdvance(phase, node);
757	>	if (node.wasInterrupted)
758	>	throw new InterruptedException();
759	>	else if (p == phase)
760	>	throw new TimeoutException();
761	>	}
762	>	return p;
763		}
764
765		/**
766	<	* Forces this barrier to enter termination state. Counts of
767	<	* arrived and registered parties are unaffected. If this phaser
768	<	* has a parent, it too is terminated. This method may be useful
769	<	* for coordinating recovery after one or more tasks encounter
766	>	* Forces this phaser to enter termination state.  Counts of
767	>	* registered parties are unaffected.  If this phaser is a member
768	>	* of a tiered set of phasers, then all of the phasers in the set
769	>	* are terminated.  If this phaser is already terminated, this
770	>	* method has no effect.  This method may be useful for
771	>	* coordinating recovery after one or more tasks encounter
772		* unexpected exceptions.
773		*/
774		public void forceTermination() {
775	<	Phaser r = root;    // force at root then reconcile
775	>	// Only need to change root state
776	>	final Phaser root = this.root;
777		long s;
778	<	while ((s = r.state) >= 0)
779	<	UNSAFE.compareAndSwapLong(r, stateOffset, s, s | TERMINATION_PHASE);
780	<	reconcileState();
781	<	releaseWaiters(0); // signal all threads
782	<	releaseWaiters(1);
778	>	while ((s = root.state) >= 0) {
779	>	long next = (s & ~((long)UNARRIVED_MASK)) | TERMINATION_BIT;
780	>	if (UNSAFE.compareAndSwapLong(root, stateOffset, s, next)) {
781	>	// signal all threads
782	>	releaseWaiters(0);
783	>	releaseWaiters(1);
784	>	return;
785	>	}
786	>	}
787		}
788
789		/**
790		* Returns the current phase number. The maximum phase number is
791		* {@code Integer.MAX_VALUE}, after which it restarts at
792	<	* zero. Upon termination, the phase number is negative.
792	>	* zero. Upon termination, the phase number is negative,
793	>	* in which case the prevailing phase prior to termination
794	>	* may be obtained via {@code getPhase() + Integer.MIN_VALUE}.
795		*
796		* @return the phase number, or a negative value if terminated
797		*/
798		public final int getPhase() {
799	<	return (int)((parent == null? state : reconcileState()) >>> PHASE_SHIFT);
799	>	return (int)(root.state >>> PHASE_SHIFT);
800		}
801
802		/**
803	<	* Returns the number of parties registered at this barrier.
803	>	* Returns the number of parties registered at this phaser.
804		*
805		* @return the number of parties
806		*/
807		public int getRegisteredParties() {
808	<	return partiesOf(parent == null? state : reconcileState());
808	>	return partiesOf(state);
809		}
810
811		/**
812		* Returns the number of registered parties that have arrived at
813	<	* the current phase of this barrier.
813	>	* the current phase of this phaser.
814		*
815		* @return the number of arrived parties
816		*/
817		public int getArrivedParties() {
818	<	return arrivedOf(parent == null? state : reconcileState());
818	>	return arrivedOf(reconcileState());
819		}
820
821		/**
822		* Returns the number of registered parties that have not yet
823	<	* arrived at the current phase of this barrier.
823	>	* arrived at the current phase of this phaser.
824		*
825		* @return the number of unarrived parties
826		*/
827		public int getUnarrivedParties() {
828	<	return unarrivedOf(parent == null? state : reconcileState());
828	>	return unarrivedOf(reconcileState());
829		}
830
831		/**
#	Line 726 | Line 848 | public class Phaser {
848		}
849
850		/**
851	<	* Returns {@code true} if this barrier has been terminated.
851	>	* Returns {@code true} if this phaser has been terminated.
852		*
853	<	* @return {@code true} if this barrier has been terminated
853	>	* @return {@code true} if this phaser has been terminated
854		*/
855		public boolean isTerminated() {
856	<	return (parent == null? state : reconcileState()) < 0;
856	>	return root.state < 0L;
857		}
858
859		/**
860		* Overridable method to perform an action upon impending phase
861		* advance, and to control termination. This method is invoked
862	<	* upon arrival of the party tripping the barrier (when all other
862	>	* upon arrival of the party advancing this phaser (when all other
863		* waiting parties are dormant).  If this method returns {@code
864	<	* true}, then, rather than advance the phase number, this barrier
865	<	* will be set to a final termination state, and subsequent calls
866	<	* to {@link #isTerminated} will return true. Any (unchecked)
867	<	* Exception or Error thrown by an invocation of this method is
868	<	* propagated to the party attempting to trip the barrier, in
869	<	* which case no advance occurs.
864	>	* true}, this phaser will be set to a final termination state
865	>	* upon advance, and subsequent calls to {@link #isTerminated}
866	>	* will return true. Any (unchecked) Exception or Error thrown by
867	>	* an invocation of this method is propagated to the party
868	>	* attempting to advance this phaser, in which case no advance
869	>	* occurs.
870		*
871		* <p>The arguments to this method provide the state of the phaser
872		* prevailing for the current transition.  The effects of invoking
873	<	* arrival, registration, and waiting methods on this Phaser from
873	>	* arrival, registration, and waiting methods on this phaser from
874		* within {@code onAdvance} are unspecified and should not be
875		* relied on.
876		*
877	<	* <p>If this Phaser is a member of a tiered set of Phasers, then
878	<	* {@code onAdvance} is invoked only for its root Phaser on each
877	>	* <p>If this phaser is a member of a tiered set of phasers, then
878	>	* {@code onAdvance} is invoked only for its root phaser on each
879		* advance.
880		*
881	<	* <p>The default version returns {@code true} when the number of
882	<	* registered parties is zero. Normally, overrides that arrange
883	<	* termination for other reasons should also preserve this
884	<	* property.
881	>	* <p>To support the most common use cases, the default
882	>	* implementation of this method returns {@code true} when the
883	>	* number of registered parties has become zero as the result of a
884	>	* party invoking {@code arriveAndDeregister}.  You can disable
885	>	* this behavior, thus enabling continuation upon future
886	>	* registrations, by overriding this method to always return
887	>	* {@code false}:
888	>	*
889	>	* <pre> {@code
890	>	* Phaser phaser = new Phaser() {
891	>	*   protected boolean onAdvance(int phase, int parties) { return false; }
892	>	* }}</pre>
893		*
894	<	* @param phase the phase number on entering the barrier
894	>	* @param phase the current phase number on entry to this method,
895	>	* before this phaser is advanced
896		* @param registeredParties the current number of registered parties
897	<	* @return {@code true} if this barrier should terminate
897	>	* @return {@code true} if this phaser should terminate
898		*/
899		protected boolean onAdvance(int phase, int registeredParties) {
900	<	return registeredParties <= 0;
900	>	return registeredParties == 0;
901		}
902
903		/**
#	Line 776 | Line 907 | public class Phaser {
907		* followed by the number of registered parties, and {@code
908		* "arrived = "} followed by the number of arrived parties.
909		*
910	<	* @return a string identifying this barrier, as well as its state
910	>	* @return a string identifying this phaser, as well as its state
911		*/
912		public String toString() {
913	<	long s = reconcileState();
913	>	return stateToString(reconcileState());
914	>	}
915	>
916	>	/**
917	>	* Implementation of toString and string-based error messages
918	>	*/
919	>	private String stateToString(long s) {
920		return super.toString() +
921		"[phase = " + phaseOf(s) +
922		" parties = " + partiesOf(s) +
923		" arrived = " + arrivedOf(s) + "]";
924		}
925
926	+	// Waiting mechanics
927	+
928		/**
929	<	* Removes and signals threads from queue for phase
929	>	* Removes and signals threads from queue for phase.
930		*/
931		private void releaseWaiters(int phase) {
932	<	AtomicReference<QNode> head = queueFor(phase);
933	<	QNode q;
934	<	int p;
932	>	QNode q;   // first element of queue
933	>	Thread t;  // its thread
934	>	AtomicReference<QNode> head = (phase & 1) == 0 ? evenQ : oddQ;
935		while ((q = head.get()) != null &&
936	<	((p = q.phase) == phase ||
937	<	(int)(root.state >>> PHASE_SHIFT) != p)) {
938	<	if (head.compareAndSet(q, q.next))
939	<	q.signal();
936	>	q.phase != (int)(root.state >>> PHASE_SHIFT)) {
937	>	if (head.compareAndSet(q, q.next) &&
938	>	(t = q.thread) != null) {
939	>	q.thread = null;
940	>	LockSupport.unpark(t);
941	>	}
942		}
943		}
944
945		/**
946	<	* Tries to enqueue given node in the appropriate wait queue.
947	<	*
948	<	* @return true if successful
949	<	*/
950	<	private boolean tryEnqueue(int phase, QNode node) {
951	<	releaseWaiters(phase-1); // ensure old queue clean
952	<	AtomicReference<QNode> head = queueFor(phase);
953	<	QNode q = head.get();
954	<	return ((q == null || q.phase == phase) &&
955	<	(int)(root.state >>> PHASE_SHIFT) == phase &&
956	<	head.compareAndSet(node.next = q, node));
946	>	* Variant of releaseWaiters that additionally tries to remove any
947	>	* nodes no longer waiting for advance due to timeout or
948	>	* interrupt. Currently, nodes are removed only if they are at
949	>	* head of queue, which suffices to reduce memory footprint in
950	>	* most usages.
951	>	*
952	>	* @return current phase on exit
953	>	*/
954	>	private int abortWait(int phase) {
955	>	AtomicReference<QNode> head = (phase & 1) == 0 ? evenQ : oddQ;
956	>	for (;;) {
957	>	Thread t;
958	>	QNode q = head.get();
959	>	int p = (int)(root.state >>> PHASE_SHIFT);
960	>	if (q == null || ((t = q.thread) != null && q.phase == p))
961	>	return p;
962	>	if (head.compareAndSet(q, q.next) && t != null) {
963	>	q.thread = null;
964	>	LockSupport.unpark(t);
965	>	}
966	>	}
967		}
968
969		/** The number of CPUs, for spin control */
#	Line 826 | Line 977 | public class Phaser {
977		* avoid it when threads regularly arrive: When a thread in
978		* internalAwaitAdvance notices another arrival before blocking,
979		* and there appear to be enough CPUs available, it spins
980	<	* SPINS_PER_ARRIVAL more times before continuing to try to
981	<	* block. The value trades off good-citizenship vs big unnecessary
831	<	* slowdowns.
980	>	* SPINS_PER_ARRIVAL more times before blocking. The value trades
981	>	* off good-citizenship vs big unnecessary slowdowns.
982		*/
983	<	static final int SPINS_PER_ARRIVAL = NCPU < 2? 1 : 1 << 8;
983	>	static final int SPINS_PER_ARRIVAL = (NCPU < 2) ? 1 : 1 << 8;
984
985		/**
986		* Possibly blocks and waits for phase to advance unless aborted.
987	+	* Call only from root node.
988		*
989		* @param phase current phase
990		* @param node if non-null, the wait node to track interrupt and timeout;
#	Line 841 | Line 992 | public class Phaser {
992		* @return current phase
993		*/
994		private int internalAwaitAdvance(int phase, QNode node) {
995	<	Phaser current = this;       // to eventually wait at root if tiered
996	<	Phaser par = parent;
997	<	boolean queued = false;
995	>	releaseWaiters(phase-1);          // ensure old queue clean
996	>	boolean queued = false;           // true when node is enqueued
997	>	int lastUnarrived = 0;            // to increase spins upon change
998		int spins = SPINS_PER_ARRIVAL;
848	–	int lastUnarrived = -1;      // to increase spins upon change
999		long s;
1000		int p;
1001	<	while ((p = (int)((s = current.state) >>> PHASE_SHIFT)) == phase) {
1002	<	int unarrived = (int)(s & UNARRIVED_MASK);
1003	<	if (unarrived != lastUnarrived) {
1004	<	if ((lastUnarrived = unarrived) < NCPU)
1001	>	while ((p = (int)((s = state) >>> PHASE_SHIFT)) == phase) {
1002	>	if (node == null) {           // spinning in noninterruptible mode
1003	>	int unarrived = (int)s & UNARRIVED_MASK;
1004	>	if (unarrived != lastUnarrived &&
1005	>	(lastUnarrived = unarrived) < NCPU)
1006		spins += SPINS_PER_ARRIVAL;
1007	+	boolean interrupted = Thread.interrupted();
1008	+	if (interrupted || --spins < 0) { // need node to record intr
1009	+	node = new QNode(this, phase, false, false, 0L);
1010	+	node.wasInterrupted = interrupted;
1011	+	}
1012		}
1013	<	else if (unarrived == 0 && par != null) {
858	<	current = par;       // if all arrived, use parent
859	<	par = par.parent;
860	<	}
861	<	else if (spins > 0)
862	<	--spins;
863	<	else if (node == null)
864	<	node = new QNode(this, phase, false, false, 0L);
865	<	else if (node.isReleasable())
1013	>	else if (node.isReleasable()) // done or aborted
1014		break;
1015	<	else if (!queued)
1016	<	queued = tryEnqueue(phase, node);
1015	>	else if (!queued) {           // push onto queue
1016	>	AtomicReference<QNode> head = (phase & 1) == 0 ? evenQ : oddQ;
1017	>	QNode q = node.next = head.get();
1018	>	if ((q == null || q.phase == phase) &&
1019	>	(int)(state >>> PHASE_SHIFT) == phase) // avoid stale enq
1020	>	queued = head.compareAndSet(q, node);
1021	>	}
1022		else {
1023		try {
1024		ForkJoinPool.managedBlock(node);
#	Line 874 | Line 1027 | public class Phaser {
1027		}
1028		}
1029		}
1030	+
1031		if (node != null) {
1032		if (node.thread != null)
1033	<	node.thread = null;
1034	<	if (!node.interruptible && node.wasInterrupted)
1033	>	node.thread = null;       // avoid need for unpark()
1034	>	if (node.wasInterrupted && !node.interruptible)
1035		Thread.currentThread().interrupt();
1036	+	if (p == phase && (p = (int)(state >>> PHASE_SHIFT)) == phase)
1037	+	return abortWait(phase); // possibly clean up on abort
1038		}
1039	<	if (p == phase)
884	<	p = (int)(reconcileState() >>> PHASE_SHIFT);
885	<	if (p != phase)
886	<	releaseWaiters(phase);
1039	>	releaseWaiters(phase);
1040		return p;
1041		}
1042
#	Line 908 | Line 1061 | public class Phaser {
1061		this.interruptible = interruptible;
1062		this.nanos = nanos;
1063		this.timed = timed;
1064	<	this.lastTime = timed? System.nanoTime() : 0L;
1064	>	this.lastTime = timed ? System.nanoTime() : 0L;
1065		thread = Thread.currentThread();
1066		}
1067
1068		public boolean isReleasable() {
1069	<	Thread t = thread;
1070	<	if (t != null) {
1071	<	if (phaser.getPhase() != phase)
1072	<	t = null;
1073	<	else {
1074	<	if (Thread.interrupted())
1075	<	wasInterrupted = true;
1076	<	if (interruptible && wasInterrupted)
1077	<	t = null;
925	<	else if (timed) {
926	<	if (nanos > 0) {
927	<	long now = System.nanoTime();
928	<	nanos -= now - lastTime;
929	<	lastTime = now;
930	<	}
931	<	if (nanos <= 0)
932	<	t = null;
933	<	}
934	<	}
935	<	if (t != null)
936	<	return false;
1069	>	if (thread == null)
1070	>	return true;
1071	>	if (phaser.getPhase() != phase) {
1072	>	thread = null;
1073	>	return true;
1074	>	}
1075	>	if (Thread.interrupted())
1076	>	wasInterrupted = true;
1077	>	if (wasInterrupted && interruptible) {
1078		thread = null;
1079	+	return true;
1080	+	}
1081	+	if (timed) {
1082	+	if (nanos > 0L) {
1083	+	long now = System.nanoTime();
1084	+	nanos -= now - lastTime;
1085	+	lastTime = now;
1086	+	}
1087	+	if (nanos <= 0L) {
1088	+	thread = null;
1089	+	return true;
1090	+	}
1091		}
1092	<	return true;
1092	>	return false;
1093		}
1094
1095		public boolean block() {
#	Line 948 | Line 1101 | public class Phaser {
1101		LockSupport.parkNanos(this, nanos);
1102		return isReleasable();
1103		}
951	–
952	–	void signal() {
953	–	Thread t = thread;
954	–	if (t != null) {
955	–	thread = null;
956	–	LockSupport.unpark(t);
957	–	}
958	–	}
1104		}
1105
1106		// Unsafe mechanics

Diff Legend

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