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.32 by jsr166, Wed Jul 29 02:19:56 2009 UTC vs.
Revision 1.33 by dl, Thu Jul 30 13:30:19 2009 UTC

#	Line 635 | Line 635 | public class LinkedTransferQueue<E> exte
635		}
636		}
637
638	–
638		public Iterator<E> iterator() {
639		return new Itr();
640		}
#	Line 650 | Line 649 | public class LinkedTransferQueue<E> exte
649		class Itr implements Iterator<E> {
650		Node<E> next;        // node to return next
651		Node<E> pnext;       // predecessor of next
653	–	Node<E> snext;       // successor of next
652		Node<E> curr;        // last returned node, for remove()
653		Node<E> pcurr;       // predecessor of curr, for remove()
654	<	E nextItem;        // Cache of next item, once committed to in next
654	>	E nextItem;          // Cache of next item, once committed to in next
655
656		Itr() {
657	<	findNext();
657	>	advance();
658		}
659
660		/**
661	<	* Ensures next points to next valid node, or null if none.
661	>	* Moves to next valid node and returns item to return for
662	>	* next(), or null if no such.
663		*/
664	<	void findNext() {
664	>	private E advance() {
665	>	pcurr = pnext;
666	>	curr = next;
667	>	E item = nextItem;
668	>
669		for (;;) {
670	<	Node<E> pred = pnext;
671	<	Node<E> q = next;
672	<	if (pred == null || pred == q) {
670	<	pred = traversalHead();
671	<	q = pred.next;
672	<	}
673	<	if (q == null || !q.isData) {
670	>	pnext = next == null ? traversalHead() : next;
671	>	next = pnext.next;
672	>	if (next == pnext) {
673		next = null;
674	<	return;
674	>	continue;  // restart
675		}
676	<	Object x = q.get();
677	<	Node<E> s = q.next;
678	<	if (x != null && q != x && q != s) {
676	>	if (next == null)
677	>	break;
678	>	Object x = next.get();
679	>	if (x != null && x != next) {
680		nextItem = (E) x;
681	<	snext = s;
682	<	pnext = pred;
683	<	next = q;
684	<	return;
681	>	break;
682		}
686	–	pnext = q;
687	–	next = s;
683		}
684	+	return item;
685		}
686
687		public boolean hasNext() {
#	Line 693 | Line 689 | public class LinkedTransferQueue<E> exte
689		}
690
691		public E next() {
692	<	if (next == null) throw new NoSuchElementException();
693	<	pcurr = pnext;
694	<	curr = next;
699	<	pnext = next;
700	<	next = snext;
701	<	E x = nextItem;
702	<	findNext();
703	<	return x;
692	>	if (next == null)
693	>	throw new NoSuchElementException();
694	>	return advance();
695		}
696
697		public void remove() {
#	Line 770 | Line 761 | public class LinkedTransferQueue<E> exte
761		* @return the number of elements in this queue
762		*/
763		public int size() {
764	<	int count = 0;
765	<	Node<E> h = traversalHead();
766	<	for (Node<E> p = h.next; p != null && p.isData; p = p.next) {
767	<	Object x = p.get();
768	<	if (x != null && x != p) {
769	<	if (++count == Integer.MAX_VALUE) // saturated
764	>	for (;;) {
765	>	int count = 0;
766	>	Node<E> pred = traversalHead();
767	>	for (;;) {
768	>	Node<E> q = pred.next;
769	>	if (q == pred) // restart
770		break;
771	+	if (q == null || !q.isData)
772	+	return count;
773	+	Object x = q.get();
774	+	if (x != null && x != q) {
775	+	if (++count == Integer.MAX_VALUE) // saturated
776	+	return count;
777	+	}
778	+	pred = q;
779		}
780		}
782	–	return count;
781		}
782
783		public int getWaitingConsumerCount() {
784	<	int count = 0;
785	<	Node<E> h = traversalHead();
786	<	for (Node<E> p = h.next; p != null && !p.isData; p = p.next) {
787	<	if (p.get() == null) {
788	<	if (++count == Integer.MAX_VALUE)
784	>	// converse of size -- count valid non-data nodes
785	>	for (;;) {
786	>	int count = 0;
787	>	Node<E> pred = traversalHead();
788	>	for (;;) {
789	>	Node<E> q = pred.next;
790	>	if (q == pred) // restart
791		break;
792	+	if (q == null || q.isData)
793	+	return count;
794	+	Object x = q.get();
795	+	if (x == null) {
796	+	if (++count == Integer.MAX_VALUE) // saturated
797	+	return count;
798	+	}
799	+	pred = q;
800		}
801		}
794	–	return count;
795	–	}
796	–
797	–	public int remainingCapacity() {
798	–	return Integer.MAX_VALUE;
802		}
803
804		public boolean remove(Object o) {
#	Line 805 | Line 808 | public class LinkedTransferQueue<E> exte
808		Node<E> pred = traversalHead();
809		for (;;) {
810		Node<E> q = pred.next;
808	–	if (q == null || !q.isData)
809	–	return false;
811		if (q == pred) // restart
812		break;
813	+	if (q == null || !q.isData)
814	+	return false;
815		Object x = q.get();
816		if (x != null && x != q && o.equals(x) &&
817		q.compareAndSet(x, q)) {
#	Line 820 | Line 823 | public class LinkedTransferQueue<E> exte
823		}
824		}
825
826	+	public int remainingCapacity() {
827	+	return Integer.MAX_VALUE;
828	+	}
829	+
830		/**
831		* Save the state to a stream (that is, serialize it).
832		*

Diff Legend

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