ViewVC Help

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

root/jsr166/jsr166/src/jsr166e/StampedLock.java

Comparing jsr166/src/jsr166e/StampedLock.java (file contents):
Revision 1.34 by jsr166, Mon Jan 28 17:23:04 2013 UTC vs.
Revision 1.35 by jsr166, Mon Jan 28 22:22:08 2013 UTC

#	Line 896 | Line 896 | public class StampedLock implements java
896		* access bits value to RBITS, indicating hold of spinlock,
897		* then updating, then releasing.
898		*
899	<	* @param s, assumed that (s & ABITS) >= RFULL
899	>	* @param s a reader overflow stamp: (s & ABITS) >= RFULL
900		* @return new stamp on success, else zero
901		*/
902		private long tryIncReaderOverflow(long s) {
903	+	// assert (s & ABITS) >= RFULL
904		if ((s & ABITS) == RFULL) {
905		if (U.compareAndSwapLong(this, STATE, s, s | RBITS)) {
906		++readerOverflow;
#	Line 916 | Line 917 | public class StampedLock implements java
917		/**
918		* Tries to decrement readerOverflow.
919		*
920	<	* @param s, assumed that (s & ABITS) >= RFULL
920	>	* @param s a reader overflow stamp: (s & ABITS) >= RFULL
921		* @return new stamp on success, else zero
922		*/
923		private long tryDecReaderOverflow(long s) {
924	+	// assert (s & ABITS) >= RFULL
925		if ((s & ABITS) == RFULL) {
926		if (U.compareAndSwapLong(this, STATE, s, s | RBITS)) {
927		int r; long next;
#	Line 1204 | Line 1206 | public class StampedLock implements java
1206		* internal documentation).
1207		*
1208		* @param node if nonnull, the waiter
1209	<	* @param group, either node or the group node is cowaiting with
1209	>	* @param group either node or the group node is cowaiting with
1210		* @param interrupted if already interrupted
1211		* @return INTERRUPTED if interrupted or Thread.interrupted, else zero
1212		*/

Diff Legend

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