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

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.88 by dl, Fri Feb 1 16:23:04 2013 UTC vs.
Revision 1.97 by jsr166, Thu Jul 18 18:21:22 2013 UTC

# Line 24 | Line 24
24   */
25  
26   package java.util;
27 import java.util.stream.Stream;
28 import java.util.Spliterator;
29 import java.util.stream.Streams;
27   import java.util.function.Consumer;
28 + import java.util.stream.Stream;
29  
30   /**
31   * An unbounded priority {@linkplain Queue queue} based on a priority heap.
# Line 543 | Line 541 | public class PriorityQueue<E> extends Ab
541                      cursor--;
542                  else {
543                      if (forgetMeNot == null)
544 <                        forgetMeNot = new ArrayDeque<E>();
544 >                        forgetMeNot = new ArrayDeque<>();
545                      forgetMeNot.add(moved);
546                  }
547              } else if (lastRetElt != null) {
# Line 745 | Line 743 | public class PriorityQueue<E> extends Ab
743       *             emitted (int), followed by all of its elements
744       *             (each an {@code Object}) in the proper order.
745       * @param s the stream
746 +     * @throws java.io.IOException if an I/O error occurs
747       */
748      private void writeObject(java.io.ObjectOutputStream s)
749          throws java.io.IOException {
# Line 764 | Line 763 | public class PriorityQueue<E> extends Ab
763       * (that is, deserializes it).
764       *
765       * @param s the stream
766 +     * @throws ClassNotFoundException if the class of a serialized object
767 +     *         could not be found
768 +     * @throws java.io.IOException if an I/O error occurs
769       */
770      private void readObject(java.io.ObjectInputStream s)
771          throws java.io.IOException, ClassNotFoundException {
# Line 784 | Line 786 | public class PriorityQueue<E> extends Ab
786          heapify();
787      }
788  
789 <    // wrapping constructor in method avoids transient javac problems
790 <    final PriorityQueueSpliterator<E> spliterator(int origin, int fence,
789 <                                                  int expectedModCount) {
790 <        return new PriorityQueueSpliterator<E>(this, origin, fence,
791 <                                               expectedModCount);
792 <    }
793 <
794 <    public Stream<E> stream() {
795 <        int flags = Streams.STREAM_IS_SIZED;
796 <        return Streams.stream
797 <            (() -> spliterator(0, size, modCount), flags);
798 <    }
799 <    public Stream<E> parallelStream() {
800 <        int flags = Streams.STREAM_IS_SIZED;
801 <        return Streams.parallelStream
802 <            (() -> spliterator(0, size, modCount), flags);
789 >    public Spliterator<E> spliterator() {
790 >        return new PriorityQueueSpliterator<E>(this, 0, -1, 0);
791      }
792  
793 <    /** Index-based split-by-two Spliterator */
793 >    /**
794 >     * This is very similar to ArrayList Spliterator, except for extra
795 >     * null checks.
796 >     */
797      static final class PriorityQueueSpliterator<E> implements Spliterator<E> {
798          private final PriorityQueue<E> pq;
799 <        private int index;           // current index, modified on advance/split
800 <        private final int fence;     // one past last index
801 <        private final int expectedModCount; // for comodification checks
799 >        private int index;            // current index, modified on advance/split
800 >        private int fence;            // -1 until first use
801 >        private int expectedModCount; // initialized when fence set
802  
803 <        /** Create new spliterator covering the given  range */
803 >        /** Creates new spliterator covering the given range */
804          PriorityQueueSpliterator(PriorityQueue<E> pq, int origin, int fence,
805                               int expectedModCount) {
806 <            this.pq = pq; this.index = origin; this.fence = fence;
806 >            this.pq = pq;
807 >            this.index = origin;
808 >            this.fence = fence;
809              this.expectedModCount = expectedModCount;
810          }
811  
812 <        public PriorityQueueSpliterator<E> trySplit() {
813 <            int lo = index, mid = (lo + fence) >>> 1;
812 >        private int getFence() { // initialize fence to size on first use
813 >            int hi;
814 >            if ((hi = fence) < 0) {
815 >                expectedModCount = pq.modCount;
816 >                hi = fence = pq.size;
817 >            }
818 >            return hi;
819 >        }
820 >
821 >        public Spliterator<E> trySplit() {
822 >            int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
823              return (lo >= mid) ? null :
824                  new PriorityQueueSpliterator<E>(pq, lo, index = mid,
825                                                  expectedModCount);
826          }
827  
828 <        public void forEach(Consumer<? super E> block) {
829 <            Object[] a; int i, hi; // hoist accesses and checks from loop
830 <            if (block == null)
828 >        @SuppressWarnings("unchecked")
829 >        public void forEachRemaining(Consumer<? super E> action) {
830 >            int i, hi, mc; // hoist accesses and checks from loop
831 >            PriorityQueue<E> q; Object[] a;
832 >            if (action == null)
833                  throw new NullPointerException();
834 <            if ((a = pq.queue).length >= (hi = fence) &&
835 <                (i = index) >= 0 && i < hi) {
836 <                index = hi;
837 <                do {
838 <                    @SuppressWarnings("unchecked") E e = (E) a[i];
839 <                    block.accept(e);
840 <                } while (++i < hi);
841 <                if (pq.modCount != expectedModCount)
842 <                    throw new ConcurrentModificationException();
834 >            if ((q = pq) != null && (a = q.queue) != null) {
835 >                if ((hi = fence) < 0) {
836 >                    mc = q.modCount;
837 >                    hi = q.size;
838 >                }
839 >                else
840 >                    mc = expectedModCount;
841 >                if ((i = index) >= 0 && (index = hi) <= a.length) {
842 >                    for (E e;; ++i) {
843 >                        if (i < hi) {
844 >                            if ((e = (E) a[i]) == null) // must be CME
845 >                                break;
846 >                            action.accept(e);
847 >                        }
848 >                        else if (q.modCount != mc)
849 >                            break;
850 >                        else
851 >                            return;
852 >                    }
853 >                }
854              }
855 +            throw new ConcurrentModificationException();
856          }
857  
858 <        public boolean tryAdvance(Consumer<? super E> block) {
859 <            if (index >= 0 && index < fence) {
860 <                @SuppressWarnings("unchecked") E e =
861 <                    (E)pq.queue[index++];
862 <                block.accept(e);
858 >        public boolean tryAdvance(Consumer<? super E> action) {
859 >            int hi = getFence(), lo = index;
860 >            if (lo >= 0 && lo < hi) {
861 >                index = lo + 1;
862 >                @SuppressWarnings("unchecked") E e = (E)pq.queue[lo];
863 >                if (e == null)
864 >                    throw new ConcurrentModificationException();
865 >                action.accept(e);
866                  if (pq.modCount != expectedModCount)
867                      throw new ConcurrentModificationException();
868                  return true;
# Line 851 | Line 870 | public class PriorityQueue<E> extends Ab
870              return false;
871          }
872  
873 <        public long estimateSize() { return (long)(fence - index); }
874 <        public boolean hasExactSize() { return true; }
875 <        public boolean hasExactSplits() { return true; }
873 >        public long estimateSize() {
874 >            return (long) (getFence() - index);
875 >        }
876 >
877 >        public int characteristics() {
878 >            return Spliterator.SIZED | Spliterator.SUBSIZED | Spliterator.NONNULL;
879 >        }
880      }
881   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines