ViewVC Help

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

root/jsr166/jsr166/src/main/java/util/concurrent/Phaser.java

Comparing jsr166/src/main/java/util/concurrent/Phaser.java (file contents):
Revision 1.21 by dl, Sat Nov 13 13:07:42 2010 UTC vs.
Revision 1.22 by jsr166, Sun Nov 14 20:44:11 2010 UTC

#	Line 374 | Line 374 | public class Phaser {
374		}
375
376		/**
377	<	* Returns message string for bounds exceptions on registration
377	>	* Returns message string for out of bounds exceptions on registration.
378		*/
379		private String badRegister(long s) {
380		return "Attempt to register more than " +
#	Line 382 | Line 382 | public class Phaser {
382		}
383
384		/**
385	<	* Recursively resolves lagged phase propagation from root if
386	<	* necessary.
385	>	* Recursively resolves lagged phase propagation from root if necessary.
386		*/
387		private long reconcileState() {
388		Phaser par = parent;
#	Line 838 | Line 837 | public class Phaser {
837		* block. The value trades off good-citizenship vs big unnecessary
838		* slowdowns.
839		*/
840	<	static final int SPINS_PER_ARRIVAL = NCPU < 2? 1 : 1 << 8;
840	>	static final int SPINS_PER_ARRIVAL = (NCPU < 2) ? 1 : 1 << 8;
841
842		/**
843		* Possibly blocks and waits for phase to advance unless aborted.
844		*
845		* @param phase current phase
846	<	* @param node if nonnull, the wait node to track interrupt and timeout;
846	>	* @param node if non-null, the wait node to track interrupt and timeout;
847		* if null, denotes noninterruptible wait
848		* @return current phase
849		*/

Diff Legend

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