ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/PriorityQueue.java

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.130 by jsr166, Sun Nov 11 16:27:28 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 28 | Line 28 | package java.util;
28		import java.util.function.Consumer;
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 86 | Line 87 | import java.util.function.Predicate;
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 109 | 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 282 | Line 285 | public class PriorityQueue<E> extends Ab
285		}
286
287		/**
285	–	* The maximum size of array to allocate.
286	–	* Some VMs reserve some header words in an array.
287	–	* Attempts to allocate larger arrays may result in
288	–	* OutOfMemoryError: Requested array size exceeds VM limit
289	–	*/
290	–	private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
291	–
292	–	/**
288		* Increases the capacity of the array.
289		*
290		* @param minCapacity the desired minimum capacity
#	Line 297 | 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
304	<	if (newCapacity - MAX_ARRAY_SIZE > 0)
305	<	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
309	–	private static int hugeCapacity(int minCapacity) {
310	–	if (minCapacity < 0) // overflow
311	–	throw new OutOfMemoryError();
312	–	return (minCapacity > MAX_ARRAY_SIZE) ?
313	–	Integer.MAX_VALUE :
314	–	MAX_ARRAY_SIZE;
315	–	}
316	–
302		/**
303		* Inserts the specified element into this priority queue.
304		*
#	Line 772 | 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 795 | 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

Diff Legend

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