1 |
|
/* |
2 |
< |
* Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved. |
2 |
> |
* Copyright (c) 1994, 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 |
25 |
|
|
26 |
|
package java.util; |
27 |
|
|
28 |
+ |
import java.io.IOException; |
29 |
+ |
import java.io.ObjectInputStream; |
30 |
+ |
import java.io.StreamCorruptedException; |
31 |
|
import java.util.function.Consumer; |
32 |
|
import java.util.function.Predicate; |
33 |
|
import java.util.function.UnaryOperator; |
73 |
|
* |
74 |
|
* <p>As of the Java 2 platform v1.2, this class was retrofitted to |
75 |
|
* implement the {@link List} interface, making it a member of the |
76 |
< |
* <a href="{@docRoot}/../technotes/guides/collections/index.html"> |
76 |
> |
* <a href="{@docRoot}/java.base/java/util/package-summary.html#CollectionsFramework"> |
77 |
|
* Java Collections Framework</a>. Unlike the new collection |
78 |
|
* implementations, {@code Vector} is synchronized. If a thread-safe |
79 |
|
* implementation is not needed, it is recommended to use {@link |
309 |
|
modCount++; |
310 |
|
if (newSize > elementData.length) |
311 |
|
grow(newSize); |
312 |
< |
for (int i = newSize; i < elementCount; i++) |
313 |
< |
elementData[i] = null; |
312 |
> |
final Object[] es = elementData; |
313 |
> |
for (int to = elementCount, i = newSize; i < to; i++) |
314 |
> |
es[i] = null; |
315 |
|
elementCount = newSize; |
316 |
|
} |
317 |
|
|
589 |
|
modCount++; |
590 |
|
elementCount--; |
591 |
|
elementData[elementCount] = null; /* to let gc do its work */ |
592 |
+ |
// checkInvariants(); |
593 |
|
} |
594 |
|
|
595 |
|
/** |
680 |
|
* method (which is part of the {@link List} interface). |
681 |
|
*/ |
682 |
|
public synchronized void removeAllElements() { |
683 |
< |
// Let gc do its work |
684 |
< |
for (int i = 0; i < elementCount; i++) |
685 |
< |
elementData[i] = null; |
681 |
< |
|
683 |
> |
final Object[] es = elementData; |
684 |
> |
for (int to = elementCount, i = elementCount = 0; i < to; i++) |
685 |
> |
es[i] = null; |
686 |
|
modCount++; |
683 |
– |
elementCount = 0; |
687 |
|
} |
688 |
|
|
689 |
|
/** |
813 |
|
elementData = grow(); |
814 |
|
elementData[s] = e; |
815 |
|
elementCount = s + 1; |
816 |
+ |
// checkInvariants(); |
817 |
|
} |
818 |
|
|
819 |
|
/** |
882 |
|
numMoved); |
883 |
|
elementData[--elementCount] = null; // Let gc do its work |
884 |
|
|
885 |
+ |
// checkInvariants(); |
886 |
|
return oldValue; |
887 |
|
} |
888 |
|
|
938 |
|
elementData = grow(s + numNew); |
939 |
|
System.arraycopy(a, 0, elementData, s, numNew); |
940 |
|
elementCount = s + numNew; |
941 |
+ |
// checkInvariants(); |
942 |
|
return true; |
943 |
|
} |
944 |
|
} |
989 |
|
return bulkRemove(e -> !c.contains(e)); |
990 |
|
} |
991 |
|
|
992 |
+ |
/** |
993 |
+ |
* @throws NullPointerException {@inheritDoc} |
994 |
+ |
*/ |
995 |
|
@Override |
996 |
|
public boolean removeIf(Predicate<? super E> filter) { |
997 |
|
Objects.requireNonNull(filter); |
1014 |
|
int expectedModCount = modCount; |
1015 |
|
final Object[] es = elementData; |
1016 |
|
final int end = elementCount; |
1008 |
– |
final boolean modified; |
1017 |
|
int i; |
1018 |
|
// Optimize for initial run of survivors |
1019 |
|
for (i = 0; i < end && !filter.test(elementAt(es, i)); i++) |
1021 |
|
// Tolerate predicates that reentrantly access the collection for |
1022 |
|
// read (but writers still get CME), so traverse once to find |
1023 |
|
// elements to delete, a second pass to physically expunge. |
1024 |
< |
if (modified = (i < end)) { |
1017 |
< |
expectedModCount++; |
1018 |
< |
modCount++; |
1024 |
> |
if (i < end) { |
1025 |
|
final int beg = i; |
1026 |
|
final long[] deathRow = nBits(end - beg); |
1027 |
|
deathRow[0] = 1L; // set bit 0 |
1028 |
|
for (i = beg + 1; i < end; i++) |
1029 |
|
if (filter.test(elementAt(es, i))) |
1030 |
|
setBit(deathRow, i - beg); |
1031 |
+ |
if (modCount != expectedModCount) |
1032 |
+ |
throw new ConcurrentModificationException(); |
1033 |
+ |
modCount++; |
1034 |
|
int w = beg; |
1035 |
|
for (i = beg; i < end; i++) |
1036 |
|
if (isClear(deathRow, i - beg)) |
1037 |
|
es[w++] = es[i]; |
1038 |
< |
Arrays.fill(es, elementCount = w, end, null); |
1038 |
> |
for (i = elementCount = w; i < end; i++) |
1039 |
> |
es[i] = null; |
1040 |
> |
// checkInvariants(); |
1041 |
> |
return true; |
1042 |
> |
} else { |
1043 |
> |
if (modCount != expectedModCount) |
1044 |
> |
throw new ConcurrentModificationException(); |
1045 |
> |
// checkInvariants(); |
1046 |
> |
return false; |
1047 |
|
} |
1031 |
– |
if (modCount != expectedModCount) |
1032 |
– |
throw new ConcurrentModificationException(); |
1033 |
– |
return modified; |
1048 |
|
} |
1049 |
|
|
1050 |
|
/** |
1085 |
|
numMoved); |
1086 |
|
System.arraycopy(a, 0, elementData, index, numNew); |
1087 |
|
elementCount = s + numNew; |
1088 |
+ |
// checkInvariants(); |
1089 |
|
return true; |
1090 |
|
} |
1091 |
|
|
1167 |
|
* (If {@code toIndex==fromIndex}, this operation has no effect.) |
1168 |
|
*/ |
1169 |
|
protected synchronized void removeRange(int fromIndex, int toIndex) { |
1155 |
– |
int numMoved = elementCount - toIndex; |
1156 |
– |
System.arraycopy(elementData, toIndex, elementData, fromIndex, |
1157 |
– |
numMoved); |
1158 |
– |
|
1159 |
– |
// Let gc do its work |
1170 |
|
modCount++; |
1171 |
< |
int newElementCount = elementCount - (toIndex-fromIndex); |
1172 |
< |
while (elementCount != newElementCount) |
1173 |
< |
elementData[--elementCount] = null; |
1171 |
> |
shiftTailOverGap(elementData, fromIndex, toIndex); |
1172 |
> |
// checkInvariants(); |
1173 |
> |
} |
1174 |
> |
|
1175 |
> |
/** Erases the gap from lo to hi, by sliding down following elements. */ |
1176 |
> |
private void shiftTailOverGap(Object[] es, int lo, int hi) { |
1177 |
> |
System.arraycopy(es, hi, es, lo, elementCount - hi); |
1178 |
> |
for (int to = elementCount, i = (elementCount -= hi - lo); i < to; i++) |
1179 |
> |
es[i] = null; |
1180 |
> |
} |
1181 |
> |
|
1182 |
> |
/** |
1183 |
> |
* Loads a {@code Vector} instance from a stream |
1184 |
> |
* (that is, deserializes it). |
1185 |
> |
* This method performs checks to ensure the consistency |
1186 |
> |
* of the fields. |
1187 |
> |
* |
1188 |
> |
* @param in the stream |
1189 |
> |
* @throws java.io.IOException if an I/O error occurs |
1190 |
> |
* @throws ClassNotFoundException if the stream contains data |
1191 |
> |
* of a non-existing class |
1192 |
> |
*/ |
1193 |
> |
private void readObject(ObjectInputStream in) |
1194 |
> |
throws IOException, ClassNotFoundException { |
1195 |
> |
ObjectInputStream.GetField gfields = in.readFields(); |
1196 |
> |
int count = gfields.get("elementCount", 0); |
1197 |
> |
Object[] data = (Object[])gfields.get("elementData", null); |
1198 |
> |
if (count < 0 || data == null || count > data.length) { |
1199 |
> |
throw new StreamCorruptedException("Inconsistent vector internals"); |
1200 |
> |
} |
1201 |
> |
elementCount = count; |
1202 |
> |
elementData = data.clone(); |
1203 |
|
} |
1204 |
|
|
1205 |
|
/** |
1206 |
< |
* Save the state of the {@code Vector} instance to a stream (that |
1207 |
< |
* is, serialize it). |
1206 |
> |
* Saves the state of the {@code Vector} instance to a stream |
1207 |
> |
* (that is, serializes it). |
1208 |
|
* This method performs synchronization to ensure the consistency |
1209 |
|
* of the serialized data. |
1210 |
+ |
* |
1211 |
+ |
* @param s the stream |
1212 |
+ |
* @throws java.io.IOException if an I/O error occurs |
1213 |
|
*/ |
1214 |
|
private void writeObject(java.io.ObjectOutputStream s) |
1215 |
|
throws java.io.IOException { |
1382 |
|
} |
1383 |
|
} |
1384 |
|
|
1385 |
+ |
/** |
1386 |
+ |
* @throws NullPointerException {@inheritDoc} |
1387 |
+ |
*/ |
1388 |
|
@Override |
1389 |
|
public synchronized void forEach(Consumer<? super E> action) { |
1390 |
|
Objects.requireNonNull(action); |
1395 |
|
action.accept(elementAt(es, i)); |
1396 |
|
if (modCount != expectedModCount) |
1397 |
|
throw new ConcurrentModificationException(); |
1398 |
+ |
// checkInvariants(); |
1399 |
|
} |
1400 |
|
|
1401 |
+ |
/** |
1402 |
+ |
* @throws NullPointerException {@inheritDoc} |
1403 |
+ |
*/ |
1404 |
|
@Override |
1405 |
|
public synchronized void replaceAll(UnaryOperator<E> operator) { |
1406 |
|
Objects.requireNonNull(operator); |
1411 |
|
es[i] = operator.apply(elementAt(es, i)); |
1412 |
|
if (modCount != expectedModCount) |
1413 |
|
throw new ConcurrentModificationException(); |
1414 |
< |
modCount++; |
1414 |
> |
// checkInvariants(); |
1415 |
|
} |
1416 |
|
|
1417 |
|
@SuppressWarnings("unchecked") |
1419 |
|
public synchronized void sort(Comparator<? super E> c) { |
1420 |
|
final int expectedModCount = modCount; |
1421 |
|
Arrays.sort((E[]) elementData, 0, elementCount, c); |
1422 |
< |
if (modCount != expectedModCount) { |
1422 |
> |
if (modCount != expectedModCount) |
1423 |
|
throw new ConcurrentModificationException(); |
1375 |
– |
} |
1424 |
|
modCount++; |
1425 |
+ |
// checkInvariants(); |
1426 |
|
} |
1427 |
|
|
1428 |
|
/** |
1440 |
|
*/ |
1441 |
|
@Override |
1442 |
|
public Spliterator<E> spliterator() { |
1443 |
< |
return new VectorSpliterator<>(this, null, 0, -1, 0); |
1443 |
> |
return new VectorSpliterator(null, 0, -1, 0); |
1444 |
|
} |
1445 |
|
|
1446 |
|
/** Similar to ArrayList Spliterator */ |
1447 |
< |
static final class VectorSpliterator<E> implements Spliterator<E> { |
1399 |
< |
private final Vector<E> list; |
1447 |
> |
final class VectorSpliterator implements Spliterator<E> { |
1448 |
|
private Object[] array; |
1449 |
|
private int index; // current index, modified on advance/split |
1450 |
|
private int fence; // -1 until used; then one past last index |
1451 |
|
private int expectedModCount; // initialized when fence set |
1452 |
|
|
1453 |
< |
/** Create new spliterator covering the given range */ |
1454 |
< |
VectorSpliterator(Vector<E> list, Object[] array, int origin, int fence, |
1453 |
> |
/** Creates new spliterator covering the given range. */ |
1454 |
> |
VectorSpliterator(Object[] array, int origin, int fence, |
1455 |
|
int expectedModCount) { |
1408 |
– |
this.list = list; |
1456 |
|
this.array = array; |
1457 |
|
this.index = origin; |
1458 |
|
this.fence = fence; |
1462 |
|
private int getFence() { // initialize on first use |
1463 |
|
int hi; |
1464 |
|
if ((hi = fence) < 0) { |
1465 |
< |
synchronized (list) { |
1466 |
< |
array = list.elementData; |
1467 |
< |
expectedModCount = list.modCount; |
1468 |
< |
hi = fence = list.elementCount; |
1465 |
> |
synchronized (Vector.this) { |
1466 |
> |
array = elementData; |
1467 |
> |
expectedModCount = modCount; |
1468 |
> |
hi = fence = elementCount; |
1469 |
|
} |
1470 |
|
} |
1471 |
|
return hi; |
1474 |
|
public Spliterator<E> trySplit() { |
1475 |
|
int hi = getFence(), lo = index, mid = (lo + hi) >>> 1; |
1476 |
|
return (lo >= mid) ? null : |
1477 |
< |
new VectorSpliterator<>(list, array, lo, index = mid, |
1431 |
< |
expectedModCount); |
1477 |
> |
new VectorSpliterator(array, lo, index = mid, expectedModCount); |
1478 |
|
} |
1479 |
|
|
1480 |
|
@SuppressWarnings("unchecked") |
1481 |
|
public boolean tryAdvance(Consumer<? super E> action) { |
1482 |
+ |
Objects.requireNonNull(action); |
1483 |
|
int i; |
1437 |
– |
if (action == null) |
1438 |
– |
throw new NullPointerException(); |
1484 |
|
if (getFence() > (i = index)) { |
1485 |
|
index = i + 1; |
1486 |
|
action.accept((E)array[i]); |
1487 |
< |
if (list.modCount != expectedModCount) |
1487 |
> |
if (modCount != expectedModCount) |
1488 |
|
throw new ConcurrentModificationException(); |
1489 |
|
return true; |
1490 |
|
} |
1493 |
|
|
1494 |
|
@SuppressWarnings("unchecked") |
1495 |
|
public void forEachRemaining(Consumer<? super E> action) { |
1496 |
< |
int i, hi; // hoist accesses and checks from loop |
1497 |
< |
Vector<E> lst; Object[] a; |
1498 |
< |
if (action == null) |
1499 |
< |
throw new NullPointerException(); |
1500 |
< |
if ((lst = list) != null) { |
1501 |
< |
if ((hi = fence) < 0) { |
1502 |
< |
synchronized (lst) { |
1503 |
< |
expectedModCount = lst.modCount; |
1459 |
< |
a = array = lst.elementData; |
1460 |
< |
hi = fence = lst.elementCount; |
1461 |
< |
} |
1462 |
< |
} |
1463 |
< |
else |
1464 |
< |
a = array; |
1465 |
< |
if (a != null && (i = index) >= 0 && (index = hi) <= a.length) { |
1466 |
< |
while (i < hi) |
1467 |
< |
action.accept((E) a[i++]); |
1468 |
< |
if (lst.modCount == expectedModCount) |
1469 |
< |
return; |
1470 |
< |
} |
1471 |
< |
} |
1472 |
< |
throw new ConcurrentModificationException(); |
1496 |
> |
Objects.requireNonNull(action); |
1497 |
> |
final int hi = getFence(); |
1498 |
> |
final Object[] a = array; |
1499 |
> |
int i; |
1500 |
> |
for (i = index, index = hi; i < hi; i++) |
1501 |
> |
action.accept((E) a[i]); |
1502 |
> |
if (modCount != expectedModCount) |
1503 |
> |
throw new ConcurrentModificationException(); |
1504 |
|
} |
1505 |
|
|
1506 |
|
public long estimateSize() { |
1511 |
|
return Spliterator.ORDERED | Spliterator.SIZED | Spliterator.SUBSIZED; |
1512 |
|
} |
1513 |
|
} |
1514 |
+ |
|
1515 |
+ |
void checkInvariants() { |
1516 |
+ |
// assert elementCount >= 0; |
1517 |
+ |
// assert elementCount == elementData.length || elementData[elementCount] == null; |
1518 |
+ |
} |
1519 |
|
} |