ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166y/LinkedTransferQueue.java
(Generate patch)

Comparing jsr166/src/jsr166y/LinkedTransferQueue.java (file contents):
Revision 1.49 by jsr166, Thu Oct 22 15:58:44 2009 UTC vs.
Revision 1.64 by jsr166, Mon Nov 2 06:12:02 2009 UTC

# Line 161 | Line 161 | public class LinkedTransferQueue<E> exte
161       * targets.  Even when using very small slack values, this
162       * approach works well for dual queues because it allows all
163       * operations up to the point of matching or appending an item
164 <     * (hence potentially releasing another thread) to be read-only,
165 <     * thus not introducing any further contention. As described
166 <     * below, we implement this by performing slack maintenance
167 <     * retries only after these points.
164 >     * (hence potentially allowing progress by another thread) to be
165 >     * read-only, thus not introducing any further contention. As
166 >     * described below, we implement this by performing slack
167 >     * maintenance retries only after these points.
168       *
169       * As an accompaniment to such techniques, traversal overhead can
170       * be further reduced without increasing contention of head
171 <     * pointer updates.  During traversals, threads may sometimes
172 <     * shortcut the "next" link path from the current "head" node to
173 <     * be closer to the currently known first unmatched node. Again,
174 <     * this may be triggered with using thresholds or randomization.
171 >     * pointer updates: Threads may sometimes shortcut the "next" link
172 >     * path from the current "head" node to be closer to the currently
173 >     * known first unmatched node, and similarly for tail. Again, this
174 >     * may be triggered with using thresholds or randomization.
175       *
176       * These ideas must be further extended to avoid unbounded amounts
177       * of costly-to-reclaim garbage caused by the sequential "next"
# Line 199 | Line 199 | public class LinkedTransferQueue<E> exte
199       * mechanics because an update may leave head at a detached node.
200       * And while direct writes are possible for tail updates, they
201       * increase the risk of long retraversals, and hence long garbage
202 <     * chains which can be much more costly than is worthwhile
202 >     * chains, which can be much more costly than is worthwhile
203       * considering that the cost difference of performing a CAS vs
204       * write is smaller when they are not triggered on each operation
205       * (especially considering that writes and CASes equally require
# Line 207 | Line 207 | public class LinkedTransferQueue<E> exte
207       * more costly than the writes themselves because of contention).
208       *
209       * Removal of interior nodes (due to timed out or interrupted
210 <     * waits, or calls to remove or Iterator.remove) uses a scheme
211 <     * roughly similar to that in Scherer, Lea, and Scott's
212 <     * SynchronousQueue. Given a predecessor, we can unsplice any node
213 <     * except the (actual) tail of the queue. To avoid build-up of
214 <     * cancelled trailing nodes, upon a request to remove a trailing
215 <     * node, it is placed in field "cleanMe" to be unspliced upon the
216 <     * next call to unsplice any other node.  Situations needing such
217 <     * mechanics are not common but do occur in practice; for example
218 <     * when an unbounded series of short timed calls to poll
219 <     * repeatedly time out but never otherwise fall off the list
220 <     * because of an untimed call to take at the front of the
221 <     * queue. (Note that maintaining field cleanMe does not otherwise
222 <     * much impact garbage retention even if never cleared by some
223 <     * other call because the held node will eventually either
224 <     * directly or indirectly lead to a self-link once off the list.)
210 >     * waits, or calls to remove(x) or Iterator.remove) can use a
211 >     * scheme roughly similar to that described in Scherer, Lea, and
212 >     * Scott's SynchronousQueue. Given a predecessor, we can unsplice
213 >     * any node except the (actual) tail of the queue. To avoid
214 >     * build-up of cancelled trailing nodes, upon a request to remove
215 >     * a trailing node, it is placed in field "cleanMe" to be
216 >     * unspliced upon the next call to unsplice any other node.
217 >     * Situations needing such mechanics are not common but do occur
218 >     * in practice; for example when an unbounded series of short
219 >     * timed calls to poll repeatedly time out but never otherwise
220 >     * fall off the list because of an untimed call to take at the
221 >     * front of the queue. Note that maintaining field cleanMe does
222 >     * not otherwise much impact garbage retention even if never
223 >     * cleared by some other call because the held node will
224 >     * eventually either directly or indirectly lead to a self-link
225 >     * once off the list.
226       *
227       * *** Overview of implementation ***
228       *
229 <     * We use a threshold-based approach to updates, with a target
230 <     * slack of two.  The slack value is hard-wired: a path greater
229 >     * We use a threshold-based approach to updates, with a slack
230 >     * threshold of two -- that is, we update head/tail when the
231 >     * current pointer appears to be two or more steps away from the
232 >     * first/last node. The slack value is hard-wired: a path greater
233       * than one is naturally implemented by checking equality of
234       * traversal pointers except when the list has only one element,
235 <     * in which case we keep target slack at one. Avoiding tracking
235 >     * in which case we keep slack threshold at one. Avoiding tracking
236       * explicit counts across method calls slightly simplifies an
237       * already-messy implementation. Using randomization would
238       * probably work better if there were a low-quality dirt-cheap
239       * per-thread one available, but even ThreadLocalRandom is too
240       * heavy for these purposes.
241       *
242 <     * With such a small target slack value, it is rarely worthwhile
243 <     * to augment this with path short-circuiting; i.e., unsplicing
244 <     * nodes between head and the first unmatched node, or similarly
245 <     * for tail, rather than advancing head or tail proper. However,
246 <     * it is used (in awaitMatch) immediately before a waiting thread
247 <     * starts to block, as a final bit of helping at a point when
248 <     * contention with others is extremely unlikely (since if other
249 <     * threads that could release it are operating, then the current
250 <     * thread wouldn't be blocking).
242 >     * With such a small slack threshold value, it is rarely
243 >     * worthwhile to augment this with path short-circuiting; i.e.,
244 >     * unsplicing nodes between head and the first unmatched node, or
245 >     * similarly for tail, rather than advancing head or tail
246 >     * proper. However, it is used (in awaitMatch) immediately before
247 >     * a waiting thread starts to block, as a final bit of helping at
248 >     * a point when contention with others is extremely unlikely
249 >     * (since if other threads that could release it are operating,
250 >     * then the current thread wouldn't be blocking).
251       *
252       * We allow both the head and tail fields to be null before any
253       * nodes are enqueued; initializing upon first append.  This
# Line 260 | Line 263 | public class LinkedTransferQueue<E> exte
263       * of offer, put, poll, take, or transfer (each possibly with
264       * timeout). The relative complexity of using one monolithic
265       * method outweighs the code bulk and maintenance problems of
266 <     * using nine separate methods.
266 >     * using separate methods for each case.
267       *
268       * Operation consists of up to three phases. The first is
269       * implemented within method xfer, the second in tryAppend, and
# Line 285 | Line 288 | public class LinkedTransferQueue<E> exte
288       *
289       * 2. Try to append a new node (method tryAppend)
290       *
291 <     *    Starting at current tail pointer, try to append a new node
292 <     *    to the list (or if head was null, establish the first
293 <     *    node). Nodes can be appended only if their predecessors are
294 <     *    either already matched or are of the same mode. If we detect
295 <     *    otherwise, then a new node with opposite mode must have been
296 <     *    appended during traversal, so must restart at phase 1. The
297 <     *    traversal and update steps are otherwise similar to phase 1:
298 <     *    Retrying upon CAS misses and checking for staleness.  In
299 <     *    particular, if a self-link is encountered, then we can
300 <     *    safely jump to a node on the list by continuing the
301 <     *    traversal at current head.
291 >     *    Starting at current tail pointer, find the actual last node
292 >     *    and try to append a new node (or if head was null, establish
293 >     *    the first node). Nodes can be appended only if their
294 >     *    predecessors are either already matched or are of the same
295 >     *    mode. If we detect otherwise, then a new node with opposite
296 >     *    mode must have been appended during traversal, so we must
297 >     *    restart at phase 1. The traversal and update steps are
298 >     *    otherwise similar to phase 1: Retrying upon CAS misses and
299 >     *    checking for staleness.  In particular, if a self-link is
300 >     *    encountered, then we can safely jump to a node on the list
301 >     *    by continuing the traversal at current head.
302       *
303       *    On successful append, if the call was ASYNC, return.
304       *
305       * 3. Await match or cancellation (method awaitMatch)
306       *
307       *    Wait for another thread to match node; instead cancelling if
308 <     *    current thread was interrupted or the wait timed out. On
308 >     *    the current thread was interrupted or the wait timed out. On
309       *    multiprocessors, we use front-of-queue spinning: If a node
310       *    appears to be the first unmatched node in the queue, it
311       *    spins a bit before blocking. In either case, before blocking
# Line 317 | Line 320 | public class LinkedTransferQueue<E> exte
320       *    to decide to occasionally perform a Thread.yield. While
321       *    yield has underdefined specs, we assume that might it help,
322       *    and will not hurt in limiting impact of spinning on busy
323 <     *    systems.  We also use much smaller (1/4) spins for nodes
324 <     *    that are not known to be front but whose predecessors have
325 <     *    not blocked -- these "chained" spins avoid artifacts of
323 >     *    systems.  We also use smaller (1/2) spins for nodes that are
324 >     *    not known to be front but whose predecessors have not
325 >     *    blocked -- these "chained" spins avoid artifacts of
326       *    front-of-queue rules which otherwise lead to alternating
327       *    nodes spinning vs blocking. Further, front threads that
328       *    represent phase changes (from data to request node or vice
329       *    versa) compared to their predecessors receive additional
330 <     *    spins, reflecting the longer code path lengths necessary to
331 <     *    release them under contention.
330 >     *    chained spins, reflecting longer paths typically required to
331 >     *    unblock threads during phase changes.
332       */
333  
334      /** True if on multiprocessor */
# Line 333 | Line 336 | public class LinkedTransferQueue<E> exte
336          Runtime.getRuntime().availableProcessors() > 1;
337  
338      /**
339 <     * The number of times to spin (with on average one randomly
340 <     * interspersed call to Thread.yield) on multiprocessor before
341 <     * blocking when a node is apparently the first waiter in the
342 <     * queue.  See above for explanation. Must be a power of two. The
343 <     * value is empirically derived -- it works pretty well across a
344 <     * variety of processors, numbers of CPUs, and OSes.
339 >     * The number of times to spin (with randomly interspersed calls
340 >     * to Thread.yield) on multiprocessor before blocking when a node
341 >     * is apparently the first waiter in the queue.  See above for
342 >     * explanation. Must be a power of two. The value is empirically
343 >     * derived -- it works pretty well across a variety of processors,
344 >     * numbers of CPUs, and OSes.
345       */
346      private static final int FRONT_SPINS   = 1 << 7;
347  
348      /**
349       * The number of times to spin before blocking when a node is
350 <     * preceded by another node that is apparently spinning.
350 >     * preceded by another node that is apparently spinning.  Also
351 >     * serves as an increment to FRONT_SPINS on phase changes, and as
352 >     * base average frequency for yielding during spins. Must be a
353 >     * power of two.
354       */
355 <    private static final int CHAINED_SPINS = FRONT_SPINS >>> 2;
355 >    private static final int CHAINED_SPINS = FRONT_SPINS >>> 1;
356  
357      /**
358       * Queue nodes. Uses Object, not E, for items to allow forgetting
# Line 367 | Line 373 | public class LinkedTransferQueue<E> exte
373          }
374  
375          final boolean casItem(Object cmp, Object val) {
376 +            assert cmp == null || cmp.getClass() != Node.class;
377              return UNSAFE.compareAndSwapObject(this, itemOffset, cmp, val);
378          }
379  
# Line 403 | Line 410 | public class LinkedTransferQueue<E> exte
410           */
411          final boolean isMatched() {
412              Object x = item;
413 <            return x == this || (x != null) != isData;
413 >            return (x == this) || ((x == null) == isData);
414 >        }
415 >
416 >        /**
417 >         * Returns true if this is an unmatched request node.
418 >         */
419 >        final boolean isUnmatchedRequest() {
420 >            return !isData && item == null;
421          }
422  
423          /**
# Line 421 | Line 435 | public class LinkedTransferQueue<E> exte
435           * Tries to artificially match a data node -- used by remove.
436           */
437          final boolean tryMatchData() {
438 +            assert isData;
439              Object x = item;
440              if (x != null && x != this && casItem(x, null)) {
441                  LockSupport.unpark(waiter);
# Line 442 | Line 457 | public class LinkedTransferQueue<E> exte
457      }
458  
459      /** head of the queue; null until first enqueue */
460 <    private transient volatile Node head;
460 >    transient volatile Node head;
461  
462      /** predecessor of dangling unspliceable node */
463 <    private transient volatile Node cleanMe; // decl here to reduce contention
463 >    private transient volatile Node cleanMe; // decl here reduces contention
464  
465      /** tail of the queue; null until first append */
466      private transient volatile Node tail;
# Line 464 | Line 479 | public class LinkedTransferQueue<E> exte
479      }
480  
481      /*
482 <     * Possible values for "how" argument in xfer method. Beware that
468 <     * the order of assigned numerical values matters.
482 >     * Possible values for "how" argument in xfer method.
483       */
484      private static final int NOW     = 0; // for untimed poll, tryTransfer
485      private static final int ASYNC   = 1; // for offer, put, add
486      private static final int SYNC    = 2; // for transfer, take
487      private static final int TIMEOUT = 3; // for timed poll, tryTransfer
488  
489 +    @SuppressWarnings("unchecked")
490 +    static <E> E cast(Object item) {
491 +        assert item == null || item.getClass() != Node.class;
492 +        return (E) item;
493 +    }
494 +
495      /**
496       * Implements all queuing methods. See above for explanation.
497       *
# Line 482 | Line 502 | public class LinkedTransferQueue<E> exte
502       * @return an item if matched, else e
503       * @throws NullPointerException if haveData mode but e is null
504       */
505 <    private Object xfer(Object e, boolean haveData, int how, long nanos) {
505 >    private E xfer(E e, boolean haveData, int how, long nanos) {
506          if (haveData && (e == null))
507              throw new NullPointerException();
508          Node s = null;                        // the node to append, if needed
# Line 496 | Line 516 | public class LinkedTransferQueue<E> exte
516                      if (isData == haveData)   // can't match
517                          break;
518                      if (p.casItem(item, e)) { // match
519 <                        Thread w = p.waiter;
520 <                        while (p != h) {      // update head
521 <                            Node n = p.next;  // by 2 unless singleton
522 <                            if (n != null)
523 <                                p = n;
504 <                            if (head == h && casHead(h, p)) {
519 >                        for (Node q = p; q != h;) {
520 >                            Node n = q.next;  // update head by 2
521 >                            if (n != null)    // unless singleton
522 >                                q = n;
523 >                            if (head == h && casHead(h, q)) {
524                                  h.forgetNext();
525                                  break;
526                              }                 // advance and retry
527                              if ((h = head)   == null ||
528 <                                (p = h.next) == null || !p.isMatched())
528 >                                (q = h.next) == null || !q.isMatched())
529                                  break;        // unless slack < 2
530                          }
531 <                        LockSupport.unpark(w);
532 <                        return item;
531 >                        LockSupport.unpark(p.waiter);
532 >                        return this.<E>cast(item);
533                      }
534                  }
535                  Node n = p.next;
536                  p = (p != n) ? n : (h = head); // Use head if p offlist
537              }
538  
539 <            if (how >= ASYNC) {               // No matches available
539 >            if (how != NOW) {                 // No matches available
540                  if (s == null)
541                      s = new Node(e, haveData);
542                  Node pred = tryAppend(s, haveData);
543                  if (pred == null)
544                      continue retry;           // lost race vs opposite mode
545 <                if (how >= SYNC)
546 <                    return awaitMatch(pred, s, e, how, nanos);
545 >                if (how != ASYNC)
546 >                    return awaitMatch(s, pred, e, (how == TIMEOUT), nanos);
547              }
548              return e; // not waiting
549          }
# Line 540 | Line 559 | public class LinkedTransferQueue<E> exte
559       * predecessor
560       */
561      private Node tryAppend(Node s, boolean haveData) {
562 <        for (Node t = tail, p = t;;) { // move p to last node and append
562 >        for (Node t = tail, p = t;;) {        // move p to last node and append
563              Node n, u;                        // temps for reads of next & tail
564              if (p == null && (p = head) == null) {
565                  if (casHead(null, s))
# Line 568 | Line 587 | public class LinkedTransferQueue<E> exte
587      /**
588       * Spins/yields/blocks until node s is matched or caller gives up.
589       *
571     * @param pred the predecessor of s, or s or null if none
590       * @param s the waiting node
591 +     * @param pred the predecessor of s, or s itself if it has no
592 +     * predecessor, or null if unknown (the null case does not occur
593 +     * in any current calls but may in possible future extensions)
594       * @param e the comparison value for checking match
595 <     * @param how either SYNC or TIMEOUT
595 >     * @param timed if true, wait only until timeout elapses
596       * @param nanos timeout value
597       * @return matched item, or e if unmatched on interrupt or timeout
598       */
599 <    private Object awaitMatch(Node pred, Node s, Object e,
600 <                              int how, long nanos) {
580 <        long lastTime = (how == TIMEOUT) ? System.nanoTime() : 0L;
599 >    private E awaitMatch(Node s, Node pred, E e, boolean timed, long nanos) {
600 >        long lastTime = timed ? System.nanoTime() : 0L;
601          Thread w = Thread.currentThread();
602          int spins = -1; // initialized after first item and cancel checks
603          ThreadLocalRandom randomYields = null; // bound if needed
# Line 585 | Line 605 | public class LinkedTransferQueue<E> exte
605          for (;;) {
606              Object item = s.item;
607              if (item != e) {                  // matched
608 +                assert item != s;
609                  s.forgetContents();           // avoid garbage
610 <                return item;
610 >                return this.<E>cast(item);
611              }
612 <            if ((w.isInterrupted() || (how == TIMEOUT && nanos <= 0)) &&
613 <                     s.casItem(e, s)) {       // cancel
612 >            if ((w.isInterrupted() || (timed && nanos <= 0)) &&
613 >                    s.casItem(e, s)) {       // cancel
614                  unsplice(pred, s);
615                  return e;
616              }
# Line 598 | Line 619 | public class LinkedTransferQueue<E> exte
619                  if ((spins = spinsFor(pred, s.isData)) > 0)
620                      randomYields = ThreadLocalRandom.current();
621              }
622 <            else if (spins > 0) {             // spin, occasionally yield
623 <                if (randomYields.nextInt(FRONT_SPINS) == 0)
624 <                    Thread.yield();
625 <                --spins;
622 >            else if (spins > 0) {             // spin
623 >                if (--spins == 0)
624 >                    shortenHeadPath();        // reduce slack before blocking
625 >                else if (randomYields.nextInt(CHAINED_SPINS) == 0)
626 >                    Thread.yield();           // occasionally yield
627              }
628              else if (s.waiter == null) {
629 <                shortenHeadPath();            // reduce slack before blocking
608 <                s.waiter = w;                 // request unpark
629 >                s.waiter = w;                 // request unpark then recheck
630              }
631 <            else if (how == TIMEOUT) {
631 >            else if (timed) {
632                  long now = System.nanoTime();
633                  if ((nanos -= now - lastTime) > 0)
634                      LockSupport.parkNanos(this, nanos);
# Line 615 | Line 636 | public class LinkedTransferQueue<E> exte
636              }
637              else {
638                  LockSupport.park(this);
639 +                s.waiter = null;
640                  spins = -1;                   // spin if front upon wakeup
641              }
642          }
# Line 626 | Line 648 | public class LinkedTransferQueue<E> exte
648       */
649      private static int spinsFor(Node pred, boolean haveData) {
650          if (MP && pred != null) {
651 <            boolean predData = pred.isData;
652 <            if (predData != haveData)         // front and phase change
653 <                return FRONT_SPINS + (FRONT_SPINS >>> 1);
632 <            if (predData != (pred.item != null)) // probably at front
651 >            if (pred.isData != haveData)      // phase change
652 >                return FRONT_SPINS + CHAINED_SPINS;
653 >            if (pred.isMatched())             // probably at front
654                  return FRONT_SPINS;
655              if (pred.waiter == null)          // pred apparently spinning
656                  return CHAINED_SPINS;
# Line 661 | Line 682 | public class LinkedTransferQueue<E> exte
682      /* -------------- Traversal methods -------------- */
683  
684      /**
685 +     * Returns the successor of p, or the head node if p.next has been
686 +     * linked to self, which will only be true if traversing with a
687 +     * stale pointer that is now off the list.
688 +     */
689 +    final Node succ(Node p) {
690 +        Node next = p.next;
691 +        return (p == next) ? head : next;
692 +    }
693 +
694 +    /**
695       * Returns the first unmatched node of the given mode, or null if
696       * none.  Used by methods isEmpty, hasWaitingConsumer.
697       */
698 <    private Node firstOfMode(boolean data) {
699 <        for (Node p = head; p != null; ) {
698 >    private Node firstOfMode(boolean isData) {
699 >        for (Node p = head; p != null; p = succ(p)) {
700              if (!p.isMatched())
701 <                return (p.isData == data) ? p : null;
671 <            Node n = p.next;
672 <            p = (n != p) ? n : head;
701 >                return (p.isData == isData) ? p : null;
702          }
703          return null;
704      }
705  
706      /**
707       * Returns the item in the first unmatched node with isData; or
708 <     * null if none. Used by peek.
708 >     * null if none.  Used by peek.
709       */
710 <    private Object firstDataItem() {
711 <        for (Node p = head; p != null; ) {
683 <            boolean isData = p.isData;
710 >    private E firstDataItem() {
711 >        for (Node p = head; p != null; p = succ(p)) {
712              Object item = p.item;
713 <            if (item != p && (item != null) == isData)
714 <                return isData ? item : null;
715 <            Node n = p.next;
716 <            p = (n != p) ? n : head;
713 >            if (p.isData) {
714 >                if (item != null && item != p)
715 >                    return this.<E>cast(item);
716 >            }
717 >            else if (item == null)
718 >                return null;
719          }
720          return null;
721      }
# Line 716 | Line 746 | public class LinkedTransferQueue<E> exte
746  
747      final class Itr implements Iterator<E> {
748          private Node nextNode;   // next node to return item for
749 <        private Object nextItem; // the corresponding item
749 >        private E nextItem;      // the corresponding item
750          private Node lastRet;    // last returned node, to support remove
751 +        private Node lastPred;   // predecessor to unlink lastRet
752  
753          /**
754           * Moves to next node after prev, or first node if prev null.
755           */
756          private void advance(Node prev) {
757 +            lastPred = lastRet;
758              lastRet = prev;
759 <            Node p;
760 <            if (prev == null || (p = prev.next) == prev)
729 <                p = head;
730 <            while (p != null) {
759 >            for (Node p = (prev == null) ? head : succ(prev);
760 >                 p != null; p = succ(p)) {
761                  Object item = p.item;
762                  if (p.isData) {
763                      if (item != null && item != p) {
764 <                        nextItem = item;
764 >                        nextItem = LinkedTransferQueue.this.<E>cast(item);
765                          nextNode = p;
766                          return;
767                      }
768                  }
769                  else if (item == null)
770                      break;
741                Node n = p.next;
742                p = (n != p) ? n : head;
771              }
772              nextNode = null;
773          }
# Line 755 | Line 783 | public class LinkedTransferQueue<E> exte
783          public final E next() {
784              Node p = nextNode;
785              if (p == null) throw new NoSuchElementException();
786 <            Object e = nextItem;
786 >            E e = nextItem;
787              advance(p);
788 <            return (E) e;
788 >            return e;
789          }
790  
791          public final void remove() {
792              Node p = lastRet;
793              if (p == null) throw new IllegalStateException();
794 <            lastRet = null;
767 <            findAndRemoveNode(p);
794 >            findAndRemoveDataNode(lastPred, p);
795          }
796      }
797  
# Line 798 | Line 825 | public class LinkedTransferQueue<E> exte
825                      break;
826                  }
827                  if (oldpred == pred ||      // Already saved
828 <                    (oldpred == null && casCleanMe(null, pred)))
829 <                    break;                  // Postpone cleaning
828 >                    ((oldpred == null || oldpred.next == s) &&
829 >                     casCleanMe(oldpred, pred))) {
830 >                    break;
831 >                }
832              }
833          }
834      }
# Line 840 | Line 869 | public class LinkedTransferQueue<E> exte
869  
870      /**
871       * Main implementation of Iterator.remove(). Find
872 <     * and unsplice the given node.
872 >     * and unsplice the given data node.
873 >     * @param possiblePred possible predecessor of s
874 >     * @param s the node to remove
875       */
876 <    final void findAndRemoveNode(Node s) {
876 >    final void findAndRemoveDataNode(Node possiblePred, Node s) {
877 >        assert s.isData;
878          if (s.tryMatchData()) {
879 <            Node pred = null;
880 <            Node p = head;
881 <            while (p != null) {
882 <                if (p == s) {
883 <                    unsplice(pred, p);
884 <                    break;
885 <                }
886 <                if (!p.isData && !p.isMatched())
887 <                    break;
888 <                pred = p;
889 <                if ((p = p.next) == pred) { // stale
890 <                    pred = null;
891 <                    p = head;
879 >            if (possiblePred != null && possiblePred.next == s)
880 >                unsplice(possiblePred, s); // was actual predecessor
881 >            else {
882 >                for (Node pred = null, p = head; p != null; ) {
883 >                    if (p == s) {
884 >                        unsplice(pred, p);
885 >                        break;
886 >                    }
887 >                    if (p.isUnmatchedRequest())
888 >                        break;
889 >                    pred = p;
890 >                    if ((p = p.next) == pred) { // stale
891 >                        pred = null;
892 >                        p = head;
893 >                    }
894                  }
895              }
896          }
# Line 867 | Line 901 | public class LinkedTransferQueue<E> exte
901       */
902      private boolean findAndRemove(Object e) {
903          if (e != null) {
904 <            Node pred = null;
871 <            Node p = head;
872 <            while (p != null) {
904 >            for (Node pred = null, p = head; p != null; ) {
905                  Object item = p.item;
906                  if (p.isData) {
907                      if (item != null && item != p && e.equals(item) &&
# Line 881 | Line 913 | public class LinkedTransferQueue<E> exte
913                  else if (item == null)
914                      break;
915                  pred = p;
916 <                if ((p = p.next) == pred) {
916 >                if ((p = p.next) == pred) { // stale
917                      pred = null;
918                      p = head;
919                  }
# Line 1017 | Line 1049 | public class LinkedTransferQueue<E> exte
1049      }
1050  
1051      public E take() throws InterruptedException {
1052 <        Object e = xfer(null, false, SYNC, 0);
1052 >        E e = xfer(null, false, SYNC, 0);
1053          if (e != null)
1054 <            return (E)e;
1054 >            return e;
1055          Thread.interrupted();
1056          throw new InterruptedException();
1057      }
1058  
1059      public E poll(long timeout, TimeUnit unit) throws InterruptedException {
1060 <        Object e = xfer(null, false, TIMEOUT, unit.toNanos(timeout));
1060 >        E e = xfer(null, false, TIMEOUT, unit.toNanos(timeout));
1061          if (e != null || !Thread.interrupted())
1062 <            return (E)e;
1062 >            return e;
1063          throw new InterruptedException();
1064      }
1065  
1066      public E poll() {
1067 <        return (E)xfer(null, false, NOW, 0);
1067 >        return xfer(null, false, NOW, 0);
1068      }
1069  
1070      /**
# Line 1089 | Line 1121 | public class LinkedTransferQueue<E> exte
1121      }
1122  
1123      public E peek() {
1124 <        return (E) firstDataItem();
1124 >        return firstDataItem();
1125      }
1126  
1127      /**
# Line 1185 | Line 1217 | public class LinkedTransferQueue<E> exte
1217          }
1218      }
1219  
1188
1220      // Unsafe mechanics
1221  
1222      private static final sun.misc.Unsafe UNSAFE = getUnsafe();
# Line 1208 | Line 1239 | public class LinkedTransferQueue<E> exte
1239          }
1240      }
1241  
1242 <    private static sun.misc.Unsafe getUnsafe() {
1242 >    /**
1243 >     * Returns a sun.misc.Unsafe.  Suitable for use in a 3rd party package.
1244 >     * Replace with a simple call to Unsafe.getUnsafe when integrating
1245 >     * into a jdk.
1246 >     *
1247 >     * @return a sun.misc.Unsafe
1248 >     */
1249 >    static sun.misc.Unsafe getUnsafe() {
1250          try {
1251              return sun.misc.Unsafe.getUnsafe();
1252          } catch (SecurityException se) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines