jdk-sandbox: comparison jdk/src/share/classes/java/util/WeakHashMap.java

equal deleted inserted replaced

-:87067e3340d3
+:b7d3500f2516
 /*
-* Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 2013, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
 package java.util;
 import java.lang.ref.WeakReference;
 import java.lang.ref.ReferenceQueue;
+import java.util.function.Consumer;
 /**
 * Hash table based implementation of the <tt>Map</tt> interface, with
 * <em>weak keys</em>.
 }
 public void clear() {
 WeakHashMap.this.clear();
 }
+public Spliterator<K> spliterator() {
+return new KeySpliterator<>(WeakHashMap.this, 0, -1, 0, 0);
+}
 }
 /**
 * Returns a {@link Collection} view of the values contained in this map.
 * The collection is backed by the map, so changes to the map are
 return containsValue(o);
 }
 public void clear() {
 WeakHashMap.this.clear();
+}
+public Spliterator<V> spliterator() {
+return new ValueSpliterator<>(WeakHashMap.this, 0, -1, 0, 0);
 }
 }
 /**
 * Returns a {@link Set} view of the mappings contained in this map.
 }
 public <T> T[] toArray(T[] a) {
 return deepCopy().toArray(a);
 }
-}
+public Spliterator<Map.Entry<K,V>> spliterator() {
+return new EntrySpliterator<>(WeakHashMap.this, 0, -1, 0, 0);
+}
+}
+/**
+* Similar form as other hash Spliterators, but skips dead
+* elements.
+*/
+static class WeakHashMapSpliterator<K,V> {
+final WeakHashMap<K,V> map;
+WeakHashMap.Entry<K,V> current; // current node
+int index;             // current index, modified on advance/split
+int fence;             // -1 until first use; then one past last index
+int est;               // size estimate
+int expectedModCount;  // for comodification checks
+WeakHashMapSpliterator(WeakHashMap<K,V> m, int origin,
+int fence, int est,
+int expectedModCount) {
+this.map = m;
+this.index = origin;
+this.fence = fence;
+this.est = est;
+this.expectedModCount = expectedModCount;
+}
+final int getFence() { // initialize fence and size on first use
+int hi;
+if ((hi = fence) < 0) {
+WeakHashMap<K,V> m = map;
+est = m.size();
+expectedModCount = m.modCount;
+hi = fence = m.table.length;
+}
+return hi;
+}
+public final long estimateSize() {
+getFence(); // force init
+return (long) est;
+}
+}
+static final class KeySpliterator<K,V>
+extends WeakHashMapSpliterator<K,V>
+implements Spliterator<K> {
+KeySpliterator(WeakHashMap<K,V> m, int origin, int fence, int est,
+int expectedModCount) {
+super(m, origin, fence, est, expectedModCount);
+}
+public KeySpliterator<K,V> trySplit() {
+int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
+return (lo >= mid) ? null :
+new KeySpliterator<K,V>(map, lo, index = mid, est >>>= 1,
+expectedModCount);
+}
+public void forEachRemaining(Consumer<? super K> action) {
+int i, hi, mc;
+if (action == null)
+throw new NullPointerException();
+WeakHashMap<K,V> m = map;
+WeakHashMap.Entry<K,V>[] tab = m.table;
+if ((hi = fence) < 0) {
+mc = expectedModCount = m.modCount;
+hi = fence = tab.length;
+}
+else
+mc = expectedModCount;
+if (tab.length >= hi && (i = index) >= 0 && i < hi) {
+index = hi;
+WeakHashMap.Entry<K,V> p = current;
+do {
+if (p == null)
+p = tab[i++];
+else {
+Object x = p.get();
+p = p.next;
+if (x != null) {
+@SuppressWarnings("unchecked") K k =
+(K) WeakHashMap.unmaskNull(x);
+action.accept(k);
+}
+}
+} while (p != null || i < hi);
+}
+if (m.modCount != mc)
+throw new ConcurrentModificationException();
+}
+public boolean tryAdvance(Consumer<? super K> action) {
+int hi;
+if (action == null)
+throw new NullPointerException();
+WeakHashMap.Entry<K,V>[] tab = map.table;
+if (tab.length >= (hi = getFence()) && index >= 0) {
+while (current != null || index < hi) {
+if (current == null)
+current = tab[index++];
+else {
+Object x = current.get();
+current = current.next;
+if (x != null) {
+@SuppressWarnings("unchecked") K k =
+(K) WeakHashMap.unmaskNull(x);
+action.accept(k);
+if (map.modCount != expectedModCount)
+throw new ConcurrentModificationException();
+return true;
+}
+}
+}
+}
+return false;
+}
+public int characteristics() {
+return Spliterator.DISTINCT;
+}
+}
+static final class ValueSpliterator<K,V>
+extends WeakHashMapSpliterator<K,V>
+implements Spliterator<V> {
+ValueSpliterator(WeakHashMap<K,V> m, int origin, int fence, int est,
+int expectedModCount) {
+super(m, origin, fence, est, expectedModCount);
+}
+public ValueSpliterator<K,V> trySplit() {
+int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
+return (lo >= mid) ? null :
+new ValueSpliterator<K,V>(map, lo, index = mid, est >>>= 1,
+expectedModCount);
+}
+public void forEachRemaining(Consumer<? super V> action) {
+int i, hi, mc;
+if (action == null)
+throw new NullPointerException();
+WeakHashMap<K,V> m = map;
+WeakHashMap.Entry<K,V>[] tab = m.table;
+if ((hi = fence) < 0) {
+mc = expectedModCount = m.modCount;
+hi = fence = tab.length;
+}
+else
+mc = expectedModCount;
+if (tab.length >= hi && (i = index) >= 0 && i < hi) {
+index = hi;
+WeakHashMap.Entry<K,V> p = current;
+do {
+if (p == null)
+p = tab[i++];
+else {
+Object x = p.get();
+V v = p.value;
+p = p.next;
+if (x != null)
+action.accept(v);
+}
+} while (p != null || i < hi);
+}
+if (m.modCount != mc)
+throw new ConcurrentModificationException();
+}
+public boolean tryAdvance(Consumer<? super V> action) {
+int hi;
+if (action == null)
+throw new NullPointerException();
+WeakHashMap.Entry<K,V>[] tab = map.table;
+if (tab.length >= (hi = getFence()) && index >= 0) {
+while (current != null || index < hi) {
+if (current == null)
+current = tab[index++];
+else {
+Object x = current.get();
+V v = current.value;
+current = current.next;
+if (x != null) {
+action.accept(v);
+if (map.modCount != expectedModCount)
+throw new ConcurrentModificationException();
+return true;
+}
+}
+}
+}
+return false;
+}
+public int characteristics() {
+return 0;
+}
+}
+static final class EntrySpliterator<K,V>
+extends WeakHashMapSpliterator<K,V>
+implements Spliterator<Map.Entry<K,V>> {
+EntrySpliterator(WeakHashMap<K,V> m, int origin, int fence, int est,
+int expectedModCount) {
+super(m, origin, fence, est, expectedModCount);
+}
+public EntrySpliterator<K,V> trySplit() {
+int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
+return (lo >= mid) ? null :
+new EntrySpliterator<K,V>(map, lo, index = mid, est >>>= 1,
+expectedModCount);
+}
+public void forEachRemaining(Consumer<? super Map.Entry<K, V>> action) {
+int i, hi, mc;
+if (action == null)
+throw new NullPointerException();
+WeakHashMap<K,V> m = map;
+WeakHashMap.Entry<K,V>[] tab = m.table;
+if ((hi = fence) < 0) {
+mc = expectedModCount = m.modCount;
+hi = fence = tab.length;
+}
+else
+mc = expectedModCount;
+if (tab.length >= hi && (i = index) >= 0 && i < hi) {
+index = hi;
+WeakHashMap.Entry<K,V> p = current;
+do {
+if (p == null)
+p = tab[i++];
+else {
+Object x = p.get();
+V v = p.value;
+p = p.next;
+if (x != null) {
+@SuppressWarnings("unchecked") K k =
+(K) WeakHashMap.unmaskNull(x);
+action.accept
+(new AbstractMap.SimpleImmutableEntry<K,V>(k, v));
+}
+}
+} while (p != null || i < hi);
+}
+if (m.modCount != mc)
+throw new ConcurrentModificationException();
+}
+public boolean tryAdvance(Consumer<? super Map.Entry<K,V>> action) {
+int hi;
+if (action == null)
+throw new NullPointerException();
+WeakHashMap.Entry<K,V>[] tab = map.table;
+if (tab.length >= (hi = getFence()) && index >= 0) {
+while (current != null || index < hi) {
+if (current == null)
+current = tab[index++];
+else {
+Object x = current.get();
+V v = current.value;
+current = current.next;
+if (x != null) {
+@SuppressWarnings("unchecked") K k =
+(K) WeakHashMap.unmaskNull(x);
+action.accept
+(new AbstractMap.SimpleImmutableEntry<K,V>(k, v));
+if (map.modCount != expectedModCount)
+throw new ConcurrentModificationException();
+return true;
+}
+}
+}
+}
+return false;
+}
+public int characteristics() {
+return Spliterator.DISTINCT;
+}
+}
 }

changeset 17168	b7d3500f2516
parent 14342	8435a30053c1
child 17939	bd750ec19d82