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.110 by jsr166, Wed Aug 24 21:46:18 2016 UTC vs.
Revision 1.122 by jsr166, Sun May 6 02:08:36 2018 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
2 > * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4   *
5   * This code is free software; you can redistribute it and/or modify it
# Line 26 | Line 26
26   package java.util;
27  
28   import java.util.function.Consumer;
29 + import jdk.internal.misc.SharedSecrets;
30  
31   /**
32   * An unbounded priority {@linkplain Queue queue} based on a priority heap.
# Line 54 | Line 55 | import java.util.function.Consumer;
55   * <p>This class and its iterator implement all of the
56   * <em>optional</em> methods of the {@link Collection} and {@link
57   * Iterator} interfaces.  The Iterator provided in method {@link
58 < * #iterator()} is <em>not</em> guaranteed to traverse the elements of
58 > * #iterator()} and the Spliterator provided in method {@link #spliterator()}
59 > * are <em>not</em> guaranteed to traverse the elements of
60   * the priority queue in any particular order. If you need ordered
61   * traversal, consider using {@code Arrays.sort(pq.toArray())}.
62   *
# Line 72 | Line 74 | import java.util.function.Consumer;
74   * ({@code peek}, {@code element}, and {@code size}).
75   *
76   * <p>This class is a member of the
77 < * <a href="{@docRoot}/../technotes/guides/collections/index.html">
77 > * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework">
78   * Java Collections Framework</a>.
79   *
80   * @since 1.5
# Line 521 | Line 523 | public class PriorityQueue<E> extends Ab
523           */
524          private int expectedModCount = modCount;
525  
526 +        Itr() {}                        // prevent access constructor creation
527 +
528          public boolean hasNext() {
529              return cursor < size ||
530                  (forgetMeNot != null && !forgetMeNot.isEmpty());
# Line 630 | Line 634 | public class PriorityQueue<E> extends Ab
634       * promoting x up the tree until it is greater than or equal to
635       * its parent, or is the root.
636       *
637 <     * To simplify and speed up coercions and comparisons. the
637 >     * To simplify and speed up coercions and comparisons, the
638       * Comparable and Comparator versions are separated into different
639       * methods that are otherwise identical. (Similarly for siftDown.)
640       *
# Line 726 | Line 730 | public class PriorityQueue<E> extends Ab
730      /**
731       * Establishes the heap invariant (described above) in the entire tree,
732       * assuming nothing about the order of the elements prior to the call.
733 +     * This classic algorithm due to Floyd (1964) is known to be O(size).
734       */
735      @SuppressWarnings("unchecked")
736      private void heapify() {
737 <        for (int i = (size >>> 1) - 1; i >= 0; i--)
738 <            siftDown(i, (E) queue[i]);
737 >        final Object[] es = queue;
738 >        int i = (size >>> 1) - 1;
739 >        if (comparator == null)
740 >            for (; i >= 0; i--)
741 >                siftDownComparable(i, (E) es[i]);
742 >        else
743 >            for (; i >= 0; i--)
744 >                siftDownUsingComparator(i, (E) es[i]);
745      }
746  
747      /**
# Line 785 | Line 796 | public class PriorityQueue<E> extends Ab
796          // Read in (and discard) array length
797          s.readInt();
798  
799 +        SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size);
800          queue = new Object[size];
801  
802          // Read in all elements.
# Line 799 | Line 811 | public class PriorityQueue<E> extends Ab
811      /**
812       * Creates a <em><a href="Spliterator.html#binding">late-binding</a></em>
813       * and <em>fail-fast</em> {@link Spliterator} over the elements in this
814 <     * queue.
814 >     * queue. The spliterator does not traverse elements in any particular order
815 >     * (the {@link Spliterator#ORDERED ORDERED} characteristic is not reported).
816       *
817       * <p>The {@code Spliterator} reports {@link Spliterator#SIZED},
818       * {@link Spliterator#SUBSIZED}, and {@link Spliterator#NONNULL}.
# Line 810 | Line 823 | public class PriorityQueue<E> extends Ab
823       * @since 1.8
824       */
825      public final Spliterator<E> spliterator() {
826 <        return new PriorityQueueSpliterator<>(this, 0, -1, 0);
826 >        return new PriorityQueueSpliterator(0, -1, 0);
827      }
828  
829 <    static final class PriorityQueueSpliterator<E> implements Spliterator<E> {
817 <        /*
818 <         * This is very similar to ArrayList Spliterator, except for
819 <         * extra null checks.
820 <         */
821 <        private final PriorityQueue<E> pq;
829 >    final class PriorityQueueSpliterator implements Spliterator<E> {
830          private int index;            // current index, modified on advance/split
831          private int fence;            // -1 until first use
832          private int expectedModCount; // initialized when fence set
833  
834          /** Creates new spliterator covering the given range. */
835 <        PriorityQueueSpliterator(PriorityQueue<E> pq, int origin, int fence,
828 <                                 int expectedModCount) {
829 <            this.pq = pq;
835 >        PriorityQueueSpliterator(int origin, int fence, int expectedModCount) {
836              this.index = origin;
837              this.fence = fence;
838              this.expectedModCount = expectedModCount;
# Line 835 | Line 841 | public class PriorityQueue<E> extends Ab
841          private int getFence() { // initialize fence to size on first use
842              int hi;
843              if ((hi = fence) < 0) {
844 <                expectedModCount = pq.modCount;
845 <                hi = fence = pq.size;
844 >                expectedModCount = modCount;
845 >                hi = fence = size;
846              }
847              return hi;
848          }
849  
850 <        public PriorityQueueSpliterator<E> trySplit() {
850 >        public PriorityQueueSpliterator trySplit() {
851              int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
852              return (lo >= mid) ? null :
853 <                new PriorityQueueSpliterator<>(pq, lo, index = mid,
848 <                                               expectedModCount);
853 >                new PriorityQueueSpliterator(lo, index = mid, expectedModCount);
854          }
855  
856          @SuppressWarnings("unchecked")
857          public void forEachRemaining(Consumer<? super E> action) {
853            int i, hi, mc; // hoist accesses and checks from loop
854            PriorityQueue<E> q; Object[] a;
858              if (action == null)
859                  throw new NullPointerException();
860 <            if ((q = pq) != null && (a = q.queue) != null) {
861 <                if ((hi = fence) < 0) {
862 <                    mc = q.modCount;
863 <                    hi = q.size;
864 <                }
865 <                else
866 <                    mc = expectedModCount;
864 <                if ((i = index) >= 0 && (index = hi) <= a.length) {
865 <                    for (E e;; ++i) {
866 <                        if (i < hi) {
867 <                            if ((e = (E) a[i]) == null) // must be CME
868 <                                break;
869 <                            action.accept(e);
870 <                        }
871 <                        else if (q.modCount != mc)
872 <                            break;
873 <                        else
874 <                            return;
875 <                    }
876 <                }
860 >            if (fence < 0) { fence = size; expectedModCount = modCount; }
861 >            final Object[] a = queue;
862 >            int i, hi; E e;
863 >            for (i = index, index = hi = fence; i < hi; i++) {
864 >                if ((e = (E) a[i]) == null)
865 >                    break;      // must be CME
866 >                action.accept(e);
867              }
868 <            throw new ConcurrentModificationException();
868 >            if (modCount != expectedModCount)
869 >                throw new ConcurrentModificationException();
870          }
871  
872 +        @SuppressWarnings("unchecked")
873          public boolean tryAdvance(Consumer<? super E> action) {
874              if (action == null)
875                  throw new NullPointerException();
876 <            int hi = getFence(), lo = index;
877 <            if (lo >= 0 && lo < hi) {
878 <                index = lo + 1;
879 <                @SuppressWarnings("unchecked") E e = (E)pq.queue[lo];
880 <                if (e == null)
876 >            if (fence < 0) { fence = size; expectedModCount = modCount; }
877 >            int i;
878 >            if ((i = index) < fence) {
879 >                index = i + 1;
880 >                E e;
881 >                if ((e = (E) queue[i]) == null
882 >                    || modCount != expectedModCount)
883                      throw new ConcurrentModificationException();
884                  action.accept(e);
891                if (pq.modCount != expectedModCount)
892                    throw new ConcurrentModificationException();
885                  return true;
886              }
887              return false;
888          }
889  
890          public long estimateSize() {
891 <            return (long) (getFence() - index);
891 >            return getFence() - index;
892          }
893  
894          public int characteristics() {
895              return Spliterator.SIZED | Spliterator.SUBSIZED | Spliterator.NONNULL;
896          }
897      }
898 +
899 +    /**
900 +     * @throws NullPointerException {@inheritDoc}
901 +     */
902 +    @SuppressWarnings("unchecked")
903 +    public void forEach(Consumer<? super E> action) {
904 +        Objects.requireNonNull(action);
905 +        final int expectedModCount = modCount;
906 +        final Object[] es = queue;
907 +        for (int i = 0, n = size; i < n; i++)
908 +            action.accept((E) es[i]);
909 +        if (expectedModCount != modCount)
910 +            throw new ConcurrentModificationException();
911 +    }
912   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines