ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/LinkedTransferQueue.java

Comparing jsr166/src/jsr166y/LinkedTransferQueue.java (file contents):
Revision 1.87 by jsr166, Fri Jun 3 14:17:10 2011 UTC vs.
Revision 1.89 by jsr166, Fri Jun 10 18:10:53 2011 UTC

#	Line 302 | Line 302 | public class LinkedTransferQueue<E> exte
302		*    interrupt status and generate a thread-local random number
303		*    to decide to occasionally perform a Thread.yield. While
304		*    yield has underdefined specs, we assume that it might help,
305	<	*    and will not hurt in limiting impact of spinning on busy
305	>	*    and will not hurt, in limiting impact of spinning on busy
306		*    systems.  We also use smaller (1/2) spins for nodes that are
307		*    not known to be front but whose predecessors have not
308		*    blocked -- these "chained" spins avoid artifacts of
#	Line 598 | Line 598 | public class LinkedTransferQueue<E> exte
598		break;        // unless slack < 2
599		}
600		LockSupport.unpark(p.waiter);
601	<	return this.<E>cast(item);
601	>	return LinkedTransferQueue.<E>cast(item);
602		}
603		}
604		Node n = p.next;
#	Line 676 | Line 676 | public class LinkedTransferQueue<E> exte
676		if (item != e) {                  // matched
677		// assert item != s;
678		s.forgetContents();           // avoid garbage
679	<	return this.<E>cast(item);
679	>	return LinkedTransferQueue.<E>cast(item);
680		}
681		if ((w.isInterrupted() || (timed && nanos <= 0)) &&
682		s.casItem(e, s)) {        // cancel
#	Line 757 | Line 757 | public class LinkedTransferQueue<E> exte
757		Object item = p.item;
758		if (p.isData) {
759		if (item != null && item != p)
760	<	return this.<E>cast(item);
760	>	return LinkedTransferQueue.<E>cast(item);
761		}
762		else if (item == null)
763		return null;

Diff Legend

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