--- jsr166/src/main/java/util/Vector.java 2016/11/13 19:58:47 1.34
+++ jsr166/src/main/java/util/Vector.java 2019/08/30 18:05:39 1.56
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,15 @@
package java.util;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.StreamCorruptedException;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
+import jdk.internal.util.ArraysSupport;
+
/**
* The {@code Vector} class implements a growable array of
* objects. Like an array, it contains components that can be
@@ -70,7 +75,7 @@ import java.util.function.UnaryOperator;
*
*
As of the Java 2 platform v1.2, this class was retrofitted to
* implement the {@link List} interface, making it a member of the
- *
+ *
* Java Collections Framework. Unlike the new collection
* implementations, {@code Vector} is synchronized. If a thread-safe
* implementation is not needed, it is recommended to use {@link
@@ -119,6 +124,7 @@ public class Vector
protected int capacityIncrement;
/** use serialVersionUID from JDK 1.0.2 for interoperability */
+ // OPENJDK @java.io.Serial
private static final long serialVersionUID = -2767605614048989439L;
/**
@@ -239,14 +245,6 @@ public class Vector
}
/**
- * The maximum size of array to allocate (unless necessary).
- * Some VMs reserve some header words in an array.
- * Attempts to allocate larger arrays may result in
- * OutOfMemoryError: Requested array size exceeds VM limit
- */
- private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
-
- /**
* Increases the capacity to ensure that it can hold at least the
* number of elements specified by the minimum capacity argument.
*
@@ -254,8 +252,12 @@ public class Vector
* @throws OutOfMemoryError if minCapacity is less than zero
*/
private Object[] grow(int minCapacity) {
- return elementData = Arrays.copyOf(elementData,
- newCapacity(minCapacity));
+ int oldCapacity = elementData.length;
+ int newCapacity = ArraysSupport.newLength(oldCapacity,
+ minCapacity - oldCapacity, /* minimum growth */
+ capacityIncrement > 0 ? capacityIncrement : oldCapacity
+ /* preferred growth */);
+ return elementData = Arrays.copyOf(elementData, newCapacity);
}
private Object[] grow() {
@@ -263,37 +265,6 @@ public class Vector
}
/**
- * Returns a capacity at least as large as the given minimum capacity.
- * Will not return a capacity greater than MAX_ARRAY_SIZE unless
- * the given minimum capacity is greater than MAX_ARRAY_SIZE.
- *
- * @param minCapacity the desired minimum capacity
- * @throws OutOfMemoryError if minCapacity is less than zero
- */
- private int newCapacity(int minCapacity) {
- // overflow-conscious code
- int oldCapacity = elementData.length;
- int newCapacity = oldCapacity + ((capacityIncrement > 0) ?
- capacityIncrement : oldCapacity);
- if (newCapacity - minCapacity <= 0) {
- if (minCapacity < 0) // overflow
- throw new OutOfMemoryError();
- return minCapacity;
- }
- return (newCapacity - MAX_ARRAY_SIZE <= 0)
- ? newCapacity
- : hugeCapacity(minCapacity);
- }
-
- private static int hugeCapacity(int minCapacity) {
- if (minCapacity < 0) // overflow
- throw new OutOfMemoryError();
- return (minCapacity > MAX_ARRAY_SIZE) ?
- Integer.MAX_VALUE :
- MAX_ARRAY_SIZE;
- }
-
- /**
* Sets the size of this vector. If the new size is greater than the
* current size, new {@code null} items are added to the end of
* the vector. If the new size is less than the current size, all
@@ -306,8 +277,9 @@ public class Vector
modCount++;
if (newSize > elementData.length)
grow(newSize);
- for (int i = newSize; i < elementCount; i++)
- elementData[i] = null;
+ final Object[] es = elementData;
+ for (int to = elementCount, i = newSize; i < to; i++)
+ es[i] = null;
elementCount = newSize;
}
@@ -585,6 +557,7 @@ public class Vector
modCount++;
elementCount--;
elementData[elementCount] = null; /* to let gc do its work */
+ // checkInvariants();
}
/**
@@ -675,12 +648,10 @@ public class Vector
* method (which is part of the {@link List} interface).
*/
public synchronized void removeAllElements() {
- // Let gc do its work
- for (int i = 0; i < elementCount; i++)
- elementData[i] = null;
-
+ final Object[] es = elementData;
+ for (int to = elementCount, i = elementCount = 0; i < to; i++)
+ es[i] = null;
modCount++;
- elementCount = 0;
}
/**
@@ -810,6 +781,7 @@ public class Vector
elementData = grow();
elementData[s] = e;
elementCount = s + 1;
+ // checkInvariants();
}
/**
@@ -878,6 +850,7 @@ public class Vector
numMoved);
elementData[--elementCount] = null; // Let gc do its work
+ // checkInvariants();
return oldValue;
}
@@ -933,6 +906,7 @@ public class Vector
elementData = grow(s + numNew);
System.arraycopy(a, 0, elementData, s, numNew);
elementCount = s + numNew;
+ // checkInvariants();
return true;
}
}
@@ -983,6 +957,9 @@ public class Vector
return bulkRemove(e -> !c.contains(e));
}
+ /**
+ * @throws NullPointerException {@inheritDoc}
+ */
@Override
public boolean removeIf(Predicate super E> filter) {
Objects.requireNonNull(filter);
@@ -1005,7 +982,6 @@ public class Vector
int expectedModCount = modCount;
final Object[] es = elementData;
final int end = elementCount;
- final boolean modified;
int i;
// Optimize for initial run of survivors
for (i = 0; i < end && !filter.test(elementAt(es, i)); i++)
@@ -1013,24 +989,30 @@ public class Vector
// Tolerate predicates that reentrantly access the collection for
// read (but writers still get CME), so traverse once to find
// elements to delete, a second pass to physically expunge.
- if (modified = (i < end)) {
- expectedModCount++;
- modCount++;
+ if (i < end) {
final int beg = i;
final long[] deathRow = nBits(end - beg);
deathRow[0] = 1L; // set bit 0
for (i = beg + 1; i < end; i++)
if (filter.test(elementAt(es, i)))
setBit(deathRow, i - beg);
+ if (modCount != expectedModCount)
+ throw new ConcurrentModificationException();
+ modCount++;
int w = beg;
for (i = beg; i < end; i++)
if (isClear(deathRow, i - beg))
es[w++] = es[i];
- Arrays.fill(es, elementCount = w, end, null);
+ for (i = elementCount = w; i < end; i++)
+ es[i] = null;
+ // checkInvariants();
+ return true;
+ } else {
+ if (modCount != expectedModCount)
+ throw new ConcurrentModificationException();
+ // checkInvariants();
+ return false;
}
- if (modCount != expectedModCount)
- throw new ConcurrentModificationException();
- return modified;
}
/**
@@ -1071,6 +1053,7 @@ public class Vector
numMoved);
System.arraycopy(a, 0, elementData, index, numNew);
elementCount = s + numNew;
+ // checkInvariants();
return true;
}
@@ -1152,23 +1135,52 @@ public class Vector
* (If {@code toIndex==fromIndex}, this operation has no effect.)
*/
protected synchronized void removeRange(int fromIndex, int toIndex) {
- int numMoved = elementCount - toIndex;
- System.arraycopy(elementData, toIndex, elementData, fromIndex,
- numMoved);
-
- // Let gc do its work
modCount++;
- int newElementCount = elementCount - (toIndex-fromIndex);
- while (elementCount != newElementCount)
- elementData[--elementCount] = null;
+ shiftTailOverGap(elementData, fromIndex, toIndex);
+ // checkInvariants();
+ }
+
+ /** Erases the gap from lo to hi, by sliding down following elements. */
+ private void shiftTailOverGap(Object[] es, int lo, int hi) {
+ System.arraycopy(es, hi, es, lo, elementCount - hi);
+ for (int to = elementCount, i = (elementCount -= hi - lo); i < to; i++)
+ es[i] = null;
}
/**
- * Save the state of the {@code Vector} instance to a stream (that
- * is, serialize it).
+ * Loads a {@code Vector} instance from a stream
+ * (that is, deserializes it).
+ * This method performs checks to ensure the consistency
+ * of the fields.
+ *
+ * @param in the stream
+ * @throws java.io.IOException if an I/O error occurs
+ * @throws ClassNotFoundException if the stream contains data
+ * of a non-existing class
+ */
+ // OPENJDK @java.io.Serial
+ private void readObject(ObjectInputStream in)
+ throws IOException, ClassNotFoundException {
+ ObjectInputStream.GetField gfields = in.readFields();
+ int count = gfields.get("elementCount", 0);
+ Object[] data = (Object[])gfields.get("elementData", null);
+ if (count < 0 || data == null || count > data.length) {
+ throw new StreamCorruptedException("Inconsistent vector internals");
+ }
+ elementCount = count;
+ elementData = data.clone();
+ }
+
+ /**
+ * Saves the state of the {@code Vector} instance to a stream
+ * (that is, serializes it).
* This method performs synchronization to ensure the consistency
* of the serialized data.
+ *
+ * @param s the stream
+ * @throws java.io.IOException if an I/O error occurs
*/
+ // OPENJDK @java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
final java.io.ObjectOutputStream.PutField fields = s.putFields();
@@ -1340,6 +1352,9 @@ public class Vector
}
}
+ /**
+ * @throws NullPointerException {@inheritDoc}
+ */
@Override
public synchronized void forEach(Consumer super E> action) {
Objects.requireNonNull(action);
@@ -1350,8 +1365,12 @@ public class Vector
action.accept(elementAt(es, i));
if (modCount != expectedModCount)
throw new ConcurrentModificationException();
+ // checkInvariants();
}
+ /**
+ * @throws NullPointerException {@inheritDoc}
+ */
@Override
public synchronized void replaceAll(UnaryOperator operator) {
Objects.requireNonNull(operator);
@@ -1362,7 +1381,9 @@ public class Vector
es[i] = operator.apply(elementAt(es, i));
if (modCount != expectedModCount)
throw new ConcurrentModificationException();
+ // TODO(8203662): remove increment of modCount from ...
modCount++;
+ // checkInvariants();
}
@SuppressWarnings("unchecked")
@@ -1370,10 +1391,10 @@ public class Vector
public synchronized void sort(Comparator super E> c) {
final int expectedModCount = modCount;
Arrays.sort((E[]) elementData, 0, elementCount, c);
- if (modCount != expectedModCount) {
+ if (modCount != expectedModCount)
throw new ConcurrentModificationException();
- }
modCount++;
+ // checkInvariants();
}
/**
@@ -1391,21 +1412,19 @@ public class Vector
*/
@Override
public Spliterator spliterator() {
- return new VectorSpliterator<>(this, null, 0, -1, 0);
+ return new VectorSpliterator(null, 0, -1, 0);
}
/** Similar to ArrayList Spliterator */
- static final class VectorSpliterator implements Spliterator {
- private final Vector list;
+ final class VectorSpliterator implements Spliterator {
private Object[] array;
private int index; // current index, modified on advance/split
private int fence; // -1 until used; then one past last index
private int expectedModCount; // initialized when fence set
- /** Create new spliterator covering the given range */
- VectorSpliterator(Vector list, Object[] array, int origin, int fence,
+ /** Creates new spliterator covering the given range. */
+ VectorSpliterator(Object[] array, int origin, int fence,
int expectedModCount) {
- this.list = list;
this.array = array;
this.index = origin;
this.fence = fence;
@@ -1415,10 +1434,10 @@ public class Vector
private int getFence() { // initialize on first use
int hi;
if ((hi = fence) < 0) {
- synchronized (list) {
- array = list.elementData;
- expectedModCount = list.modCount;
- hi = fence = list.elementCount;
+ synchronized (Vector.this) {
+ array = elementData;
+ expectedModCount = modCount;
+ hi = fence = elementCount;
}
}
return hi;
@@ -1427,19 +1446,17 @@ public class Vector
public Spliterator trySplit() {
int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
return (lo >= mid) ? null :
- new VectorSpliterator<>(list, array, lo, index = mid,
- expectedModCount);
+ new VectorSpliterator(array, lo, index = mid, expectedModCount);
}
@SuppressWarnings("unchecked")
public boolean tryAdvance(Consumer super E> action) {
+ Objects.requireNonNull(action);
int i;
- if (action == null)
- throw new NullPointerException();
if (getFence() > (i = index)) {
index = i + 1;
action.accept((E)array[i]);
- if (list.modCount != expectedModCount)
+ if (modCount != expectedModCount)
throw new ConcurrentModificationException();
return true;
}
@@ -1448,28 +1465,14 @@ public class Vector
@SuppressWarnings("unchecked")
public void forEachRemaining(Consumer super E> action) {
- int i, hi; // hoist accesses and checks from loop
- Vector lst; Object[] a;
- if (action == null)
- throw new NullPointerException();
- if ((lst = list) != null) {
- if ((hi = fence) < 0) {
- synchronized (lst) {
- expectedModCount = lst.modCount;
- a = array = lst.elementData;
- hi = fence = lst.elementCount;
- }
- }
- else
- a = array;
- if (a != null && (i = index) >= 0 && (index = hi) <= a.length) {
- while (i < hi)
- action.accept((E) a[i++]);
- if (lst.modCount == expectedModCount)
- return;
- }
- }
- throw new ConcurrentModificationException();
+ Objects.requireNonNull(action);
+ final int hi = getFence();
+ final Object[] a = array;
+ int i;
+ for (i = index, index = hi; i < hi; i++)
+ action.accept((E) a[i]);
+ if (modCount != expectedModCount)
+ throw new ConcurrentModificationException();
}
public long estimateSize() {
@@ -1480,4 +1483,9 @@ public class Vector
return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED;
}
}
+
+ void checkInvariants() {
+ // assert elementCount >= 0;
+ // assert elementCount == elementData.length || elementData[elementCount] == null;
+ }
}