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.126 by jsr166, Sun May 6 23:07:56 2018 UTC vs.
Revision 1.133 by jsr166, Thu Oct 10 16:53:08 2019 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
2 > * Copyright (c) 2003, 2019, 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;
29 > import java.util.function.Predicate;
30 > // OPENJDK import jdk.internal.access.SharedSecrets;
31 > import jdk.internal.util.ArraysSupport;
32  
33   /**
34   * An unbounded priority {@linkplain Queue queue} based on a priority heap.
# Line 74 | Line 76 | import jdk.internal.misc.SharedSecrets;
76   * ({@code peek}, {@code element}, and {@code size}).
77   *
78   * <p>This class is a member of the
79 < * <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework">
79 > * <a href="{@docRoot}/java.base/java/util/package-summary.html#CollectionsFramework">
80   * Java Collections Framework</a>.
81   *
82   * @since 1.5
# Line 85 | Line 87 | import jdk.internal.misc.SharedSecrets;
87   public class PriorityQueue<E> extends AbstractQueue<E>
88      implements java.io.Serializable {
89  
90 +    // OPENJDK @java.io.Serial
91      private static final long serialVersionUID = -7720805057305804111L;
92  
93      private static final int DEFAULT_INITIAL_CAPACITY = 11;
# Line 108 | Line 111 | public class PriorityQueue<E> extends Ab
111       * The comparator, or null if priority queue uses elements'
112       * natural ordering.
113       */
114 +    @SuppressWarnings("serial") // Conditionally serializable
115      private final Comparator<? super E> comparator;
116  
117      /**
# Line 281 | Line 285 | public class PriorityQueue<E> extends Ab
285      }
286  
287      /**
284 –     * The maximum size of array to allocate.
285 –     * Some VMs reserve some header words in an array.
286 –     * Attempts to allocate larger arrays may result in
287 –     * OutOfMemoryError: Requested array size exceeds VM limit
288 –     */
289 –    private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
290 –
291 –    /**
288       * Increases the capacity of the array.
289       *
290       * @param minCapacity the desired minimum capacity
# Line 296 | Line 292 | public class PriorityQueue<E> extends Ab
292      private void grow(int minCapacity) {
293          int oldCapacity = queue.length;
294          // Double size if small; else grow by 50%
295 <        int newCapacity = oldCapacity + ((oldCapacity < 64) ?
296 <                                         (oldCapacity + 2) :
297 <                                         (oldCapacity >> 1));
298 <        // overflow-conscious code
303 <        if (newCapacity - MAX_ARRAY_SIZE > 0)
304 <            newCapacity = hugeCapacity(minCapacity);
295 >        int newCapacity = ArraysSupport.newLength(oldCapacity,
296 >                minCapacity - oldCapacity, /* minimum growth */
297 >                oldCapacity < 64 ? oldCapacity + 2 : oldCapacity >> 1
298 >                                           /* preferred growth */);
299          queue = Arrays.copyOf(queue, newCapacity);
300      }
301  
308 –    private static int hugeCapacity(int minCapacity) {
309 –        if (minCapacity < 0) // overflow
310 –            throw new OutOfMemoryError();
311 –        return (minCapacity > MAX_ARRAY_SIZE) ?
312 –            Integer.MAX_VALUE :
313 –            MAX_ARRAY_SIZE;
314 –    }
315 –
302      /**
303       * Inserts the specified element into this priority queue.
304       *
# Line 623 | Line 609 | public class PriorityQueue<E> extends Ab
609          if (s == i) // removed last element
610              es[i] = null;
611          else {
612 <            E moved = (E) queue[s];
612 >            E moved = (E) es[s];
613              es[s] = null;
614              siftDown(i, moved);
615              if (es[i] == moved) {
# Line 771 | Line 757 | public class PriorityQueue<E> extends Ab
757       *             emitted (int), followed by all of its elements
758       *             (each an {@code Object}) in the proper order.
759       */
760 +    // OPENJDK @java.io.Serial
761      private void writeObject(java.io.ObjectOutputStream s)
762          throws java.io.IOException {
763          // Write out element count, and any hidden stuff
# Line 794 | Line 781 | public class PriorityQueue<E> extends Ab
781       *         could not be found
782       * @throws java.io.IOException if an I/O error occurs
783       */
784 +    // OPENJDK @java.io.Serial
785      private void readObject(java.io.ObjectInputStream s)
786          throws java.io.IOException, ClassNotFoundException {
787          // Read in size, and any hidden stuff
# Line 802 | Line 790 | public class PriorityQueue<E> extends Ab
790          // Read in (and discard) array length
791          s.readInt();
792  
793 <        SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size);
793 >        jsr166.Platform.checkArray(s, Object[].class, size);
794          final Object[] es = queue = new Object[Math.max(size, 1)];
795  
796          // Read in all elements.
# Line 901 | Line 889 | public class PriorityQueue<E> extends Ab
889      }
890  
891      /**
892 +     * @throws NullPointerException {@inheritDoc}
893 +     */
894 +    public boolean removeIf(Predicate<? super E> filter) {
895 +        Objects.requireNonNull(filter);
896 +        return bulkRemove(filter);
897 +    }
898 +
899 +    /**
900 +     * @throws NullPointerException {@inheritDoc}
901 +     */
902 +    public boolean removeAll(Collection<?> c) {
903 +        Objects.requireNonNull(c);
904 +        return bulkRemove(e -> c.contains(e));
905 +    }
906 +
907 +    /**
908 +     * @throws NullPointerException {@inheritDoc}
909 +     */
910 +    public boolean retainAll(Collection<?> c) {
911 +        Objects.requireNonNull(c);
912 +        return bulkRemove(e -> !c.contains(e));
913 +    }
914 +
915 +    // A tiny bit set implementation
916 +
917 +    private static long[] nBits(int n) {
918 +        return new long[((n - 1) >> 6) + 1];
919 +    }
920 +    private static void setBit(long[] bits, int i) {
921 +        bits[i >> 6] |= 1L << i;
922 +    }
923 +    private static boolean isClear(long[] bits, int i) {
924 +        return (bits[i >> 6] & (1L << i)) == 0;
925 +    }
926 +
927 +    /** Implementation of bulk remove methods. */
928 +    private boolean bulkRemove(Predicate<? super E> filter) {
929 +        final int expectedModCount = ++modCount;
930 +        final Object[] es = queue;
931 +        final int end = size;
932 +        int i;
933 +        // Optimize for initial run of survivors
934 +        for (i = 0; i < end && !filter.test((E) es[i]); i++)
935 +            ;
936 +        if (i >= end) {
937 +            if (modCount != expectedModCount)
938 +                throw new ConcurrentModificationException();
939 +            return false;
940 +        }
941 +        // Tolerate predicates that reentrantly access the collection for
942 +        // read (but writers still get CME), so traverse once to find
943 +        // elements to delete, a second pass to physically expunge.
944 +        final int beg = i;
945 +        final long[] deathRow = nBits(end - beg);
946 +        deathRow[0] = 1L;   // set bit 0
947 +        for (i = beg + 1; i < end; i++)
948 +            if (filter.test((E) es[i]))
949 +                setBit(deathRow, i - beg);
950 +        if (modCount != expectedModCount)
951 +            throw new ConcurrentModificationException();
952 +        int w = beg;
953 +        for (i = beg; i < end; i++)
954 +            if (isClear(deathRow, i - beg))
955 +                es[w++] = es[i];
956 +        for (i = size = w; i < end; i++)
957 +            es[i] = null;
958 +        heapify();
959 +        return true;
960 +    }
961 +
962 +    /**
963       * @throws NullPointerException {@inheritDoc}
964       */
965      public void forEach(Consumer<? super E> action) {

Diff Legend

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