ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/jsr166e/ConcurrentHashMapV8.java
(Generate patch)

Comparing jsr166/src/jsr166e/ConcurrentHashMapV8.java (file contents):
Revision 1.74 by jsr166, Tue Oct 30 16:54:26 2012 UTC vs.
Revision 1.116 by dl, Wed Sep 11 14:53:38 2013 UTC

# Line 6 | Line 6
6  
7   package jsr166e;
8  
9 < import java.util.Comparator;
9 > import jsr166e.ForkJoinPool;
10 >
11 > import java.io.ObjectStreamField;
12 > import java.io.Serializable;
13 > import java.lang.reflect.ParameterizedType;
14 > import java.lang.reflect.Type;
15 > import java.util.AbstractMap;
16   import java.util.Arrays;
11 import java.util.Map;
12 import java.util.Set;
17   import java.util.Collection;
18 < import java.util.AbstractMap;
19 < import java.util.AbstractSet;
20 < import java.util.AbstractCollection;
17 < import java.util.Hashtable;
18 > import java.util.Comparator;
19 > import java.util.ConcurrentModificationException;
20 > import java.util.Enumeration;
21   import java.util.HashMap;
22 + import java.util.Hashtable;
23   import java.util.Iterator;
24 < import java.util.Enumeration;
21 < import java.util.ConcurrentModificationException;
24 > import java.util.Map;
25   import java.util.NoSuchElementException;
26 + import java.util.Set;
27   import java.util.concurrent.ConcurrentMap;
24 import java.util.concurrent.ThreadLocalRandom;
25 import java.util.concurrent.locks.LockSupport;
26 import java.util.concurrent.locks.AbstractQueuedSynchronizer;
28   import java.util.concurrent.atomic.AtomicReference;
29 <
30 < import java.io.Serializable;
29 > import java.util.concurrent.atomic.AtomicInteger;
30 > import java.util.concurrent.locks.LockSupport;
31 > import java.util.concurrent.locks.ReentrantLock;
32  
33   /**
34   * A hash table supporting full concurrency of retrievals and
# Line 40 | Line 42 | import java.io.Serializable;
42   * interoperable with {@code Hashtable} in programs that rely on its
43   * thread safety but not on its synchronization details.
44   *
45 < * <p> Retrieval operations (including {@code get}) generally do not
45 > * <p>Retrieval operations (including {@code get}) generally do not
46   * block, so may overlap with update operations (including {@code put}
47   * and {@code remove}). Retrievals reflect the results of the most
48   * recently <em>completed</em> update operations holding upon their
# Line 61 | Line 63 | import java.io.Serializable;
63   * that may be adequate for monitoring or estimation purposes, but not
64   * for program control.
65   *
66 < * <p> The table is dynamically expanded when there are too many
66 > * <p>The table is dynamically expanded when there are too many
67   * collisions (i.e., keys that have distinct hash codes but fall into
68   * the same slot modulo the table size), with the expected average
69   * effect of maintaining roughly two bins per mapping (corresponding
# Line 80 | Line 82 | import java.io.Serializable;
82   * expected {@code concurrencyLevel} as an additional hint for
83   * internal sizing.  Note that using many keys with exactly the same
84   * {@code hashCode()} is a sure way to slow down performance of any
85 < * hash table.
85 > * hash table. To ameliorate impact, when keys are {@link Comparable},
86 > * this class may use comparison order among keys to help break ties.
87   *
88 < * <p> A {@link Set} projection of a ConcurrentHashMapV8 may be created
88 > * <p>A {@link Set} projection of a ConcurrentHashMapV8 may be created
89   * (using {@link #newKeySet()} or {@link #newKeySet(int)}), or viewed
90   * (using {@link #keySet(Object)} when only keys are of interest, and the
91   * mapped values are (perhaps transiently) not used or all take the
92   * same mapping value.
93   *
91 * <p> A ConcurrentHashMapV8 can be used as scalable frequency map (a
92 * form of histogram or multiset) by using {@link LongAdder} values
93 * and initializing via {@link #computeIfAbsent}. For example, to add
94 * a count to a {@code ConcurrentHashMapV8<String,LongAdder> freqs}, you
95 * can use {@code freqs.computeIfAbsent(k -> new
96 * LongAdder()).increment();}
97 *
94   * <p>This class and its views and iterators implement all of the
95   * <em>optional</em> methods of the {@link Map} and {@link Iterator}
96   * interfaces.
97   *
98 < * <p> Like {@link Hashtable} but unlike {@link HashMap}, this class
98 > * <p>Like {@link Hashtable} but unlike {@link HashMap}, this class
99   * does <em>not</em> allow {@code null} to be used as a key or value.
100   *
101 < * <p>ConcurrentHashMapV8s support parallel operations using the {@link
102 < * ForkJoinPool#commonPool}. (Tasks that may be used in other contexts
103 < * are available in class {@link ForkJoinTasks}). These operations are
104 < * designed to be safely, and often sensibly, applied even with maps
105 < * that are being concurrently updated by other threads; for example,
106 < * when computing a snapshot summary of the values in a shared
107 < * registry.  There are three kinds of operation, each with four
108 < * forms, accepting functions with Keys, Values, Entries, and (Key,
109 < * Value) arguments and/or return values. Because the elements of a
110 < * ConcurrentHashMapV8 are not ordered in any particular way, and may be
111 < * processed in different orders in different parallel executions, the
112 < * correctness of supplied functions should not depend on any
113 < * ordering, or on any other objects or values that may transiently
114 < * change while computation is in progress; and except for forEach
115 < * actions, should ideally be side-effect-free.
101 > * <p>ConcurrentHashMapV8s support a set of sequential and parallel bulk
102 > * operations that are designed
103 > * to be safely, and often sensibly, applied even with maps that are
104 > * being concurrently updated by other threads; for example, when
105 > * computing a snapshot summary of the values in a shared registry.
106 > * There are three kinds of operation, each with four forms, accepting
107 > * functions with Keys, Values, Entries, and (Key, Value) arguments
108 > * and/or return values. Because the elements of a ConcurrentHashMapV8
109 > * are not ordered in any particular way, and may be processed in
110 > * different orders in different parallel executions, the correctness
111 > * of supplied functions should not depend on any ordering, or on any
112 > * other objects or values that may transiently change while
113 > * computation is in progress; and except for forEach actions, should
114 > * ideally be side-effect-free. Bulk operations on {@link java.util.Map.Entry}
115 > * objects do not support method {@code setValue}.
116   *
117   * <ul>
118   * <li> forEach: Perform a given action on each element.
# Line 143 | Line 139 | import java.io.Serializable;
139   * <li> Reductions to scalar doubles, longs, and ints, using a
140   * given basis value.</li>
141   *
146 * </li>
142   * </ul>
143 + * </li>
144   * </ul>
145   *
146 + * <p>These bulk operations accept a {@code parallelismThreshold}
147 + * argument. Methods proceed sequentially if the current map size is
148 + * estimated to be less than the given threshold. Using a value of
149 + * {@code Long.MAX_VALUE} suppresses all parallelism.  Using a value
150 + * of {@code 1} results in maximal parallelism by partitioning into
151 + * enough subtasks to fully utilize the {@link
152 + * ForkJoinPool#commonPool()} that is used for all parallel
153 + * computations. Normally, you would initially choose one of these
154 + * extreme values, and then measure performance of using in-between
155 + * values that trade off overhead versus throughput.
156 + *
157   * <p>The concurrency properties of bulk operations follow
158   * from those of ConcurrentHashMapV8: Any non-null result returned
159   * from {@code get(key)} and related access methods bears a
# Line 182 | Line 189 | import java.io.Serializable;
189   * arguments can be supplied using {@code new
190   * AbstractMap.SimpleEntry(k,v)}.
191   *
192 < * <p> Bulk operations may complete abruptly, throwing an
192 > * <p>Bulk operations may complete abruptly, throwing an
193   * exception encountered in the application of a supplied
194   * function. Bear in mind when handling such exceptions that other
195   * concurrently executing functions could also have thrown
196   * exceptions, or would have done so if the first exception had
197   * not occurred.
198   *
199 < * <p>Parallel speedups for bulk operations compared to sequential
200 < * processing are common but not guaranteed.  Operations involving
201 < * brief functions on small maps may execute more slowly than
202 < * sequential loops if the underlying work to parallelize the
203 < * computation is more expensive than the computation itself.
204 < * Similarly, parallelization may not lead to much actual parallelism
205 < * if all processors are busy performing unrelated tasks.
199 > * <p>Speedups for parallel compared to sequential forms are common
200 > * but not guaranteed.  Parallel operations involving brief functions
201 > * on small maps may execute more slowly than sequential forms if the
202 > * underlying work to parallelize the computation is more expensive
203 > * than the computation itself.  Similarly, parallelization may not
204 > * lead to much actual parallelism if all processors are busy
205 > * performing unrelated tasks.
206   *
207 < * <p> All arguments to all task methods must be non-null.
207 > * <p>All arguments to all task methods must be non-null.
208   *
209   * <p><em>jsr166e note: During transition, this class
210   * uses nested functional interfaces with different names but the
211 < * same forms as those expected for JDK8.<em>
211 > * same forms as those expected for JDK8.</em>
212   *
213   * <p>This class is a member of the
214   * <a href="{@docRoot}/../technotes/guides/collections/index.html">
# Line 212 | Line 219 | import java.io.Serializable;
219   * @param <K> the type of keys maintained by this map
220   * @param <V> the type of mapped values
221   */
222 < public class ConcurrentHashMapV8<K, V>
223 <    implements ConcurrentMap<K, V>, Serializable {
222 > public class ConcurrentHashMapV8<K,V> extends AbstractMap<K,V>
223 >    implements ConcurrentMap<K,V>, Serializable {
224      private static final long serialVersionUID = 7249069246763182397L;
225  
226      /**
227 <     * A partitionable iterator. A Spliterator can be traversed
228 <     * directly, but can also be partitioned (before traversal) by
229 <     * creating another Spliterator that covers a non-overlapping
223 <     * portion of the elements, and so may be amenable to parallel
224 <     * execution.
225 <     *
226 <     * <p> This interface exports a subset of expected JDK8
227 <     * functionality.
228 <     *
229 <     * <p>Sample usage: Here is one (of the several) ways to compute
230 <     * the sum of the values held in a map using the ForkJoin
231 <     * framework. As illustrated here, Spliterators are well suited to
232 <     * designs in which a task repeatedly splits off half its work
233 <     * into forked subtasks until small enough to process directly,
234 <     * and then joins these subtasks. Variants of this style can also
235 <     * be used in completion-based designs.
236 <     *
237 <     * <pre>
238 <     * {@code ConcurrentHashMapV8<String, Long> m = ...
239 <     * // split as if have 8 * parallelism, for load balance
240 <     * int n = m.size();
241 <     * int p = aForkJoinPool.getParallelism() * 8;
242 <     * int split = (n < p)? n : p;
243 <     * long sum = aForkJoinPool.invoke(new SumValues(m.valueSpliterator(), split, null));
244 <     * // ...
245 <     * static class SumValues extends RecursiveTask<Long> {
246 <     *   final Spliterator<Long> s;
247 <     *   final int split;             // split while > 1
248 <     *   final SumValues nextJoin;    // records forked subtasks to join
249 <     *   SumValues(Spliterator<Long> s, int depth, SumValues nextJoin) {
250 <     *     this.s = s; this.depth = depth; this.nextJoin = nextJoin;
251 <     *   }
252 <     *   public Long compute() {
253 <     *     long sum = 0;
254 <     *     SumValues subtasks = null; // fork subtasks
255 <     *     for (int s = split >>> 1; s > 0; s >>>= 1)
256 <     *       (subtasks = new SumValues(s.split(), s, subtasks)).fork();
257 <     *     while (s.hasNext())        // directly process remaining elements
258 <     *       sum += s.next();
259 <     *     for (SumValues t = subtasks; t != null; t = t.nextJoin)
260 <     *       sum += t.join();         // collect subtask results
261 <     *     return sum;
262 <     *   }
263 <     * }
264 <     * }</pre>
227 >     * An object for traversing and partitioning elements of a source.
228 >     * This interface provides a subset of the functionality of JDK8
229 >     * java.util.Spliterator.
230       */
231 <    public static interface Spliterator<T> extends Iterator<T> {
231 >    public static interface ConcurrentHashMapSpliterator<T> {
232          /**
233 <         * Returns a Spliterator covering approximately half of the
234 <         * elements, guaranteed not to overlap with those subsequently
235 <         * returned by this Spliterator.  After invoking this method,
236 <         * the current Spliterator will <em>not</em> produce any of
272 <         * the elements of the returned Spliterator, but the two
273 <         * Spliterators together will produce all of the elements that
274 <         * would have been produced by this Spliterator had this
275 <         * method not been called. The exact number of elements
276 <         * produced by the returned Spliterator is not guaranteed, and
277 <         * may be zero (i.e., with {@code hasNext()} reporting {@code
278 <         * false}) if this Spliterator cannot be further split.
279 <         *
280 <         * @return a Spliterator covering approximately half of the
281 <         * elements
282 <         * @throws IllegalStateException if this Spliterator has
283 <         * already commenced traversing elements
233 >         * If possible, returns a new spliterator covering
234 >         * approximately one half of the elements, which will not be
235 >         * covered by this spliterator. Returns null if cannot be
236 >         * split.
237           */
238 <        Spliterator<T> split();
286 <    }
287 <
288 <    /**
289 <     * A view of a ConcurrentHashMapV8 as a {@link Set} of keys, in
290 <     * which additions may optionally be enabled by mapping to a
291 <     * common value.  This class cannot be directly instantiated. See
292 <     * {@link #keySet}, {@link #keySet(Object)}, {@link #newKeySet()},
293 <     * {@link #newKeySet(int)}.
294 <     *
295 <     * <p>The view's {@code iterator} is a "weakly consistent" iterator
296 <     * that will never throw {@link ConcurrentModificationException},
297 <     * and guarantees to traverse elements as they existed upon
298 <     * construction of the iterator, and may (but is not guaranteed to)
299 <     * reflect any modifications subsequent to construction.
300 <     */
301 <    public static class KeySetView<K,V> extends CHMView<K,V> implements Set<K>, java.io.Serializable {
302 <        private static final long serialVersionUID = 7249069246763182397L;
303 <        private final V value;
304 <        KeySetView(ConcurrentHashMapV8<K, V> map, V value) {  // non-public
305 <            super(map);
306 <            this.value = value;
307 <        }
308 <
238 >        ConcurrentHashMapSpliterator<T> trySplit();
239          /**
240 <         * Returns the map backing this view.
241 <         *
312 <         * @return the map backing this view
240 >         * Returns an estimate of the number of elements covered by
241 >         * this Spliterator.
242           */
243 <        public ConcurrentHashMapV8<K,V> getMap() { return map; }
243 >        long estimateSize();
244  
245 <        /**
246 <         * Returns the default mapped value for additions,
247 <         * or {@code null} if additions are not supported.
248 <         *
249 <         * @return the default mapped value for additions, or {@code null}
321 <         * if not supported.
322 <         */
323 <        public V getMappedValue() { return value; }
245 >        /** Applies the action to each untraversed element */
246 >        void forEachRemaining(Action<? super T> action);
247 >        /** If an element remains, applies the action and returns true. */
248 >        boolean tryAdvance(Action<? super T> action);
249 >    }
250  
251 <        // implement Set API
251 >    // Sams
252 >    /** Interface describing a void action of one argument */
253 >    public interface Action<A> { void apply(A a); }
254 >    /** Interface describing a void action of two arguments */
255 >    public interface BiAction<A,B> { void apply(A a, B b); }
256 >    /** Interface describing a function of one argument */
257 >    public interface Fun<A,T> { T apply(A a); }
258 >    /** Interface describing a function of two arguments */
259 >    public interface BiFun<A,B,T> { T apply(A a, B b); }
260 >    /** Interface describing a function mapping its argument to a double */
261 >    public interface ObjectToDouble<A> { double apply(A a); }
262 >    /** Interface describing a function mapping its argument to a long */
263 >    public interface ObjectToLong<A> { long apply(A a); }
264 >    /** Interface describing a function mapping its argument to an int */
265 >    public interface ObjectToInt<A> {int apply(A a); }
266 >    /** Interface describing a function mapping two arguments to a double */
267 >    public interface ObjectByObjectToDouble<A,B> { double apply(A a, B b); }
268 >    /** Interface describing a function mapping two arguments to a long */
269 >    public interface ObjectByObjectToLong<A,B> { long apply(A a, B b); }
270 >    /** Interface describing a function mapping two arguments to an int */
271 >    public interface ObjectByObjectToInt<A,B> {int apply(A a, B b); }
272 >    /** Interface describing a function mapping two doubles to a double */
273 >    public interface DoubleByDoubleToDouble { double apply(double a, double b); }
274 >    /** Interface describing a function mapping two longs to a long */
275 >    public interface LongByLongToLong { long apply(long a, long b); }
276 >    /** Interface describing a function mapping two ints to an int */
277 >    public interface IntByIntToInt { int apply(int a, int b); }
278  
327        public boolean contains(Object o) { return map.containsKey(o); }
328        public boolean remove(Object o)   { return map.remove(o) != null; }
329        public Iterator<K> iterator()     { return new KeyIterator<K,V>(map); }
330        public boolean add(K e) {
331            V v;
332            if ((v = value) == null)
333                throw new UnsupportedOperationException();
334            if (e == null)
335                throw new NullPointerException();
336            return map.internalPutIfAbsent(e, v) == null;
337        }
338        public boolean addAll(Collection<? extends K> c) {
339            boolean added = false;
340            V v;
341            if ((v = value) == null)
342                throw new UnsupportedOperationException();
343            for (K e : c) {
344                if (e == null)
345                    throw new NullPointerException();
346                if (map.internalPutIfAbsent(e, v) == null)
347                    added = true;
348            }
349            return added;
350        }
351        public boolean equals(Object o) {
352            Set<?> c;
353            return ((o instanceof Set) &&
354                    ((c = (Set<?>)o) == this ||
355                     (containsAll(c) && c.containsAll(this))));
356        }
357    }
279  
280      /*
281       * Overview:
# Line 366 | Line 287 | public class ConcurrentHashMapV8<K, V>
287       * the same or better than java.util.HashMap, and to support high
288       * initial insertion rates on an empty table by many threads.
289       *
290 <     * Each key-value mapping is held in a Node.  Because Node fields
291 <     * can contain special values, they are defined using plain Object
292 <     * types. Similarly in turn, all internal methods that use them
293 <     * work off Object types. And similarly, so do the internal
294 <     * methods of auxiliary iterator and view classes.  All public
295 <     * generic typed methods relay in/out of these internal methods,
296 <     * supplying null-checks and casts as needed. This also allows
297 <     * many of the public methods to be factored into a smaller number
298 <     * of internal methods (although sadly not so for the five
299 <     * variants of put-related operations). The validation-based
300 <     * approach explained below leads to a lot of code sprawl because
301 <     * retry-control precludes factoring into smaller methods.
290 >     * This map usually acts as a binned (bucketed) hash table.  Each
291 >     * key-value mapping is held in a Node.  Most nodes are instances
292 >     * of the basic Node class with hash, key, value, and next
293 >     * fields. However, various subclasses exist: TreeNodes are
294 >     * arranged in balanced trees, not lists.  TreeBins hold the roots
295 >     * of sets of TreeNodes. ForwardingNodes are placed at the heads
296 >     * of bins during resizing. ReservationNodes are used as
297 >     * placeholders while establishing values in computeIfAbsent and
298 >     * related methods.  The types TreeBin, ForwardingNode, and
299 >     * ReservationNode do not hold normal user keys, values, or
300 >     * hashes, and are readily distinguishable during search etc
301 >     * because they have negative hash fields and null key and value
302 >     * fields. (These special nodes are either uncommon or transient,
303 >     * so the impact of carrying around some unused fields is
304 >     * insignificant.)
305       *
306       * The table is lazily initialized to a power-of-two size upon the
307       * first insertion.  Each bin in the table normally contains a
# Line 385 | Line 309 | public class ConcurrentHashMapV8<K, V>
309       * Table accesses require volatile/atomic reads, writes, and
310       * CASes.  Because there is no other way to arrange this without
311       * adding further indirections, we use intrinsics
312 <     * (sun.misc.Unsafe) operations.  The lists of nodes within bins
313 <     * are always accurately traversable under volatile reads, so long
314 <     * as lookups check hash code and non-nullness of value before
315 <     * checking key equality.
316 <     *
317 <     * We use the top two bits of Node hash fields for control
394 <     * purposes -- they are available anyway because of addressing
395 <     * constraints.  As explained further below, these top bits are
396 <     * used as follows:
397 <     *  00 - Normal
398 <     *  01 - Locked
399 <     *  11 - Locked and may have a thread waiting for lock
400 <     *  10 - Node is a forwarding node
401 <     *
402 <     * The lower 30 bits of each Node's hash field contain a
403 <     * transformation of the key's hash code, except for forwarding
404 <     * nodes, for which the lower bits are zero (and so always have
405 <     * hash field == MOVED).
312 >     * (sun.misc.Unsafe) operations.
313 >     *
314 >     * We use the top (sign) bit of Node hash fields for control
315 >     * purposes -- it is available anyway because of addressing
316 >     * constraints.  Nodes with negative hash fields are specially
317 >     * handled or ignored in map methods.
318       *
319       * Insertion (via put or its variants) of the first node in an
320       * empty bin is performed by just CASing it to the bin.  This is
# Line 411 | Line 323 | public class ConcurrentHashMapV8<K, V>
323       * delete, and replace) require locks.  We do not want to waste
324       * the space required to associate a distinct lock object with
325       * each bin, so instead use the first node of a bin list itself as
326 <     * a lock. Blocking support for these locks relies on the builtin
327 <     * "synchronized" monitors.  However, we also need a tryLock
416 <     * construction, so we overlay these by using bits of the Node
417 <     * hash field for lock control (see above), and so normally use
418 <     * builtin monitors only for blocking and signalling using
419 <     * wait/notifyAll constructions. See Node.tryAwaitLock.
326 >     * a lock. Locking support for these locks relies on builtin
327 >     * "synchronized" monitors.
328       *
329       * Using the first node of a list as a lock does not by itself
330       * suffice though: When a node is locked, any update must first
331       * validate that it is still the first node after locking it, and
332       * retry if not. Because new nodes are always appended to lists,
333       * once a node is first in a bin, it remains first until deleted
334 <     * or the bin becomes invalidated (upon resizing).  However,
427 <     * operations that only conditionally update may inspect nodes
428 <     * until the point of update. This is a converse of sorts to the
429 <     * lazy locking technique described by Herlihy & Shavit.
334 >     * or the bin becomes invalidated (upon resizing).
335       *
336       * The main disadvantage of per-bin locks is that other update
337       * operations on other nodes in a bin list protected by the same
# Line 459 | Line 364 | public class ConcurrentHashMapV8<K, V>
364       * sometimes deviate significantly from uniform randomness.  This
365       * includes the case when N > (1<<30), so some keys MUST collide.
366       * Similarly for dumb or hostile usages in which multiple keys are
367 <     * designed to have identical hash codes. Also, although we guard
368 <     * against the worst effects of this (see method spread), sets of
369 <     * hashes may differ only in bits that do not impact their bin
370 <     * index for a given power-of-two mask.  So we use a secondary
371 <     * strategy that applies when the number of nodes in a bin exceeds
372 <     * a threshold, and at least one of the keys implements
468 <     * Comparable.  These TreeBins use a balanced tree to hold nodes
469 <     * (a specialized form of red-black trees), bounding search time
470 <     * to O(log N).  Each search step in a TreeBin is around twice as
367 >     * designed to have identical hash codes or ones that differs only
368 >     * in masked-out high bits. So we use a secondary strategy that
369 >     * applies when the number of nodes in a bin exceeds a
370 >     * threshold. These TreeBins use a balanced tree to hold nodes (a
371 >     * specialized form of red-black trees), bounding search time to
372 >     * O(log N).  Each search step in a TreeBin is at least twice as
373       * slow as in a regular list, but given that N cannot exceed
374       * (1<<64) (before running out of addresses) this bounds search
375       * steps, lock hold times, etc, to reasonable constants (roughly
# Line 478 | Line 380 | public class ConcurrentHashMapV8<K, V>
380       * iterators in the same way.
381       *
382       * The table is resized when occupancy exceeds a percentage
383 <     * threshold (nominally, 0.75, but see below).  Only a single
384 <     * thread performs the resize (using field "sizeCtl", to arrange
385 <     * exclusion), but the table otherwise remains usable for reads
386 <     * and updates. Resizing proceeds by transferring bins, one by
387 <     * one, from the table to the next table.  Because we are using
383 >     * threshold (nominally, 0.75, but see below).  Any thread
384 >     * noticing an overfull bin may assist in resizing after the
385 >     * initiating thread allocates and sets up the replacement array.
386 >     * However, rather than stalling, these other threads may proceed
387 >     * with insertions etc.  The use of TreeBins shields us from the
388 >     * worst case effects of overfilling while resizes are in
389 >     * progress.  Resizing proceeds by transferring bins, one by one,
390 >     * from the table to the next table. However, threads claim small
391 >     * blocks of indices to transfer (via field transferIndex) before
392 >     * doing so, reducing contention.  Because we are using
393       * power-of-two expansion, the elements from each bin must either
394       * stay at same index, or move with a power of two offset. We
395       * eliminate unnecessary node creation by catching cases where old
# Line 496 | Line 403 | public class ConcurrentHashMapV8<K, V>
403       * its key. On encountering a forwarding node, access and update
404       * operations restart, using the new table.
405       *
406 <     * Each bin transfer requires its bin lock. However, unlike other
407 <     * cases, a transfer can skip a bin if it fails to acquire its
408 <     * lock, and revisit it later (unless it is a TreeBin). Method
409 <     * rebuild maintains a buffer of TRANSFER_BUFFER_SIZE bins that
410 <     * have been skipped because of failure to acquire a lock, and
411 <     * blocks only if none are available (i.e., only very rarely).
412 <     * The transfer operation must also ensure that all accessible
413 <     * bins in both the old and new table are usable by any traversal.
414 <     * When there are no lock acquisition failures, this is arranged
415 <     * simply by proceeding from the last bin (table.length - 1) up
416 <     * towards the first.  Upon seeing a forwarding node, traversals
417 <     * (see class Iter) arrange to move to the new table
418 <     * without revisiting nodes.  However, when any node is skipped
419 <     * during a transfer, all earlier table bins may have become
420 <     * visible, so are initialized with a reverse-forwarding node back
421 <     * to the old table until the new ones are established. (This
422 <     * sometimes requires transiently locking a forwarding node, which
423 <     * is possible under the above encoding.) These more expensive
424 <     * mechanics trigger only when necessary.
406 >     * Each bin transfer requires its bin lock, which can stall
407 >     * waiting for locks while resizing. However, because other
408 >     * threads can join in and help resize rather than contend for
409 >     * locks, average aggregate waits become shorter as resizing
410 >     * progresses.  The transfer operation must also ensure that all
411 >     * accessible bins in both the old and new table are usable by any
412 >     * traversal.  This is arranged in part by proceeding from the
413 >     * last bin (table.length - 1) up towards the first.  Upon seeing
414 >     * a forwarding node, traversals (see class Traverser) arrange to
415 >     * move to the new table without revisiting nodes.  To ensure that
416 >     * no intervening nodes are skipped even when moved out of order,
417 >     * a stack (see class TableStack) is created on first encounter of
418 >     * a forwarding node during a traversal, to maintain its place if
419 >     * later processing the current table. The need for these
420 >     * save/restore mechanics is relatively rare, but when one
421 >     * forwarding node is encountered, typically many more will be.
422 >     * So Traversers use a simple caching scheme to avoid creating so
423 >     * many new TableStack nodes. (Thanks to Peter Levart for
424 >     * suggesting use of a stack here.)
425       *
426       * The traversal scheme also applies to partial traversals of
427       * ranges of bins (via an alternate Traverser constructor)
# Line 529 | Line 436 | public class ConcurrentHashMapV8<K, V>
436       * These cases attempt to override the initial capacity settings,
437       * but harmlessly fail to take effect in cases of races.
438       *
439 <     * The element count is maintained using a LongAdder, which avoids
440 <     * contention on updates but can encounter cache thrashing if read
441 <     * too frequently during concurrent access. To avoid reading so
442 <     * often, resizing is attempted either when a bin lock is
443 <     * contended, or upon adding to a bin already holding two or more
444 <     * nodes (checked before adding in the xIfAbsent methods, after
445 <     * adding in others). Under uniform hash distributions, the
446 <     * probability of this occurring at threshold is around 13%,
447 <     * meaning that only about 1 in 8 puts check threshold (and after
448 <     * resizing, many fewer do so). But this approximation has high
449 <     * variance for small table sizes, so we check on any collision
450 <     * for sizes <= 64. The bulk putAll operation further reduces
451 <     * contention by only committing count updates upon these size
452 <     * checks.
439 >     * The element count is maintained using a specialization of
440 >     * LongAdder. We need to incorporate a specialization rather than
441 >     * just use a LongAdder in order to access implicit
442 >     * contention-sensing that leads to creation of multiple
443 >     * CounterCells.  The counter mechanics avoid contention on
444 >     * updates but can encounter cache thrashing if read too
445 >     * frequently during concurrent access. To avoid reading so often,
446 >     * resizing under contention is attempted only upon adding to a
447 >     * bin already holding two or more nodes. Under uniform hash
448 >     * distributions, the probability of this occurring at threshold
449 >     * is around 13%, meaning that only about 1 in 8 puts check
450 >     * threshold (and after resizing, many fewer do so).
451 >     *
452 >     * TreeBins use a special form of comparison for search and
453 >     * related operations (which is the main reason we cannot use
454 >     * existing collections such as TreeMaps). TreeBins contain
455 >     * Comparable elements, but may contain others, as well as
456 >     * elements that are Comparable but not necessarily Comparable for
457 >     * the same T, so we cannot invoke compareTo among them. To handle
458 >     * this, the tree is ordered primarily by hash value, then by
459 >     * Comparable.compareTo order if applicable.  On lookup at a node,
460 >     * if elements are not comparable or compare as 0 then both left
461 >     * and right children may need to be searched in the case of tied
462 >     * hash values. (This corresponds to the full list search that
463 >     * would be necessary if all elements were non-Comparable and had
464 >     * tied hashes.) On insertion, to keep a total ordering (or as
465 >     * close as is required here) across rebalancings, we compare
466 >     * classes and identityHashCodes as tie-breakers. The red-black
467 >     * balancing code is updated from pre-jdk-collections
468 >     * (http://gee.cs.oswego.edu/dl/classes/collections/RBCell.java)
469 >     * based in turn on Cormen, Leiserson, and Rivest "Introduction to
470 >     * Algorithms" (CLR).
471 >     *
472 >     * TreeBins also require an additional locking mechanism.  While
473 >     * list traversal is always possible by readers even during
474 >     * updates, tree traversal is not, mainly because of tree-rotations
475 >     * that may change the root node and/or its linkages.  TreeBins
476 >     * include a simple read-write lock mechanism parasitic on the
477 >     * main bin-synchronization strategy: Structural adjustments
478 >     * associated with an insertion or removal are already bin-locked
479 >     * (and so cannot conflict with other writers) but must wait for
480 >     * ongoing readers to finish. Since there can be only one such
481 >     * waiter, we use a simple scheme using a single "waiter" field to
482 >     * block writers.  However, readers need never block.  If the root
483 >     * lock is held, they proceed along the slow traversal path (via
484 >     * next-pointers) until the lock becomes available or the list is
485 >     * exhausted, whichever comes first. These cases are not fast, but
486 >     * maximize aggregate expected throughput.
487       *
488       * Maintaining API and serialization compatibility with previous
489       * versions of this class introduces several oddities. Mainly: We
# Line 552 | Line 493 | public class ConcurrentHashMapV8<K, V>
493       * time that we can guarantee to honor it.) We also declare an
494       * unused "Segment" class that is instantiated in minimal form
495       * only when serializing.
496 +     *
497 +     * Also, solely for compatibility with previous versions of this
498 +     * class, it extends AbstractMap, even though all of its methods
499 +     * are overridden, so it is just useless baggage.
500 +     *
501 +     * This file is organized to make things a little easier to follow
502 +     * while reading than they might otherwise: First the main static
503 +     * declarations and utilities, then fields, then main public
504 +     * methods (with a few factorings of multiple public methods into
505 +     * internal ones), then sizing methods, trees, traversers, and
506 +     * bulk operations.
507       */
508  
509      /* ---------------- Constants -------------- */
# Line 593 | Line 545 | public class ConcurrentHashMapV8<K, V>
545      private static final float LOAD_FACTOR = 0.75f;
546  
547      /**
596     * The buffer size for skipped bins during transfers. The
597     * value is arbitrary but should be large enough to avoid
598     * most locking stalls during resizes.
599     */
600    private static final int TRANSFER_BUFFER_SIZE = 32;
601
602    /**
548       * The bin count threshold for using a tree rather than list for a
549 <     * bin.  The value reflects the approximate break-even point for
550 <     * using tree-based operations.
549 >     * bin.  Bins are converted to trees when adding an element to a
550 >     * bin with at least this many nodes. The value must be greater
551 >     * than 2, and should be at least 8 to mesh with assumptions in
552 >     * tree removal about conversion back to plain bins upon
553 >     * shrinkage.
554       */
555 <    private static final int TREE_THRESHOLD = 8;
608 <
609 <    /*
610 <     * Encodings for special uses of Node hash fields. See above for
611 <     * explanation.
612 <     */
613 <    static final int MOVED     = 0x80000000; // hash field for forwarding nodes
614 <    static final int LOCKED    = 0x40000000; // set/tested only as a bit
615 <    static final int WAITING   = 0xc0000000; // both bits set/tested together
616 <    static final int HASH_BITS = 0x3fffffff; // usable bits of normal node hash
617 <
618 <    /* ---------------- Fields -------------- */
555 >    static final int TREEIFY_THRESHOLD = 8;
556  
557      /**
558 <     * The array of bins. Lazily initialized upon first insertion.
559 <     * Size is always a power of two. Accessed directly by iterators.
558 >     * The bin count threshold for untreeifying a (split) bin during a
559 >     * resize operation. Should be less than TREEIFY_THRESHOLD, and at
560 >     * most 6 to mesh with shrinkage detection under removal.
561       */
562 <    transient volatile Node[] table;
562 >    static final int UNTREEIFY_THRESHOLD = 6;
563  
564      /**
565 <     * The counter maintaining number of elements.
565 >     * The smallest table capacity for which bins may be treeified.
566 >     * (Otherwise the table is resized if too many nodes in a bin.)
567 >     * The value should be at least 4 * TREEIFY_THRESHOLD to avoid
568 >     * conflicts between resizing and treeification thresholds.
569       */
570 <    private transient final LongAdder counter;
570 >    static final int MIN_TREEIFY_CAPACITY = 64;
571  
572      /**
573 <     * Table initialization and resizing control.  When negative, the
574 <     * table is being initialized or resized. Otherwise, when table is
575 <     * null, holds the initial table size to use upon creation, or 0
576 <     * for default. After initialization, holds the next element count
577 <     * value upon which to resize the table.
573 >     * Minimum number of rebinnings per transfer step. Ranges are
574 >     * subdivided to allow multiple resizer threads.  This value
575 >     * serves as a lower bound to avoid resizers encountering
576 >     * excessive memory contention.  The value should be at least
577 >     * DEFAULT_CAPACITY.
578       */
579 <    private transient volatile int sizeCtl;
639 <
640 <    // views
641 <    private transient KeySetView<K,V> keySet;
642 <    private transient Values<K,V> values;
643 <    private transient EntrySet<K,V> entrySet;
644 <
645 <    /** For serialization compatibility. Null unless serialized; see below */
646 <    private Segment<K,V>[] segments;
647 <
648 <    /* ---------------- Table element access -------------- */
579 >    private static final int MIN_TRANSFER_STRIDE = 16;
580  
581      /*
582 <     * Volatile access methods are used for table elements as well as
652 <     * elements of in-progress next table while resizing.  Uses are
653 <     * null checked by callers, and implicitly bounds-checked, relying
654 <     * on the invariants that tab arrays have non-zero size, and all
655 <     * indices are masked with (tab.length - 1) which is never
656 <     * negative and always less than length. Note that, to be correct
657 <     * wrt arbitrary concurrency errors by users, bounds checks must
658 <     * operate on local variables, which accounts for some odd-looking
659 <     * inline assignments below.
582 >     * Encodings for Node hash fields. See above for explanation.
583       */
584 <
585 <    static final Node tabAt(Node[] tab, int i) { // used by Iter
586 <        return (Node)UNSAFE.getObjectVolatile(tab, ((long)i<<ASHIFT)+ABASE);
587 <    }
588 <
589 <    private static final boolean casTabAt(Node[] tab, int i, Node c, Node v) {
590 <        return UNSAFE.compareAndSwapObject(tab, ((long)i<<ASHIFT)+ABASE, c, v);
591 <    }
592 <
593 <    private static final void setTabAt(Node[] tab, int i, Node v) {
594 <        UNSAFE.putObjectVolatile(tab, ((long)i<<ASHIFT)+ABASE, v);
595 <    }
584 >    static final int MOVED     = -1; // hash for forwarding nodes
585 >    static final int TREEBIN   = -2; // hash for roots of trees
586 >    static final int RESERVED  = -3; // hash for transient reservations
587 >    static final int HASH_BITS = 0x7fffffff; // usable bits of normal node hash
588 >
589 >    /** Number of CPUS, to place bounds on some sizings */
590 >    static final int NCPU = Runtime.getRuntime().availableProcessors();
591 >
592 >    /** For serialization compatibility. */
593 >    private static final ObjectStreamField[] serialPersistentFields = {
594 >        new ObjectStreamField("segments", Segment[].class),
595 >        new ObjectStreamField("segmentMask", Integer.TYPE),
596 >        new ObjectStreamField("segmentShift", Integer.TYPE)
597 >    };
598  
599      /* ---------------- Nodes -------------- */
600  
601      /**
602 <     * Key-value entry. Note that this is never exported out as a
603 <     * user-visible Map.Entry (see MapEntry below). Nodes with a hash
604 <     * field of MOVED are special, and do not contain user keys or
605 <     * values.  Otherwise, keys are never null, and null val fields
606 <     * indicate that a node is in the process of being deleted or
607 <     * created. For purposes of read-only access, a key may be read
608 <     * before a val, but can only be used after checking val to be
609 <     * non-null.
610 <     */
611 <    static class Node {
612 <        volatile int hash;
613 <        final Object key;
689 <        volatile Object val;
690 <        volatile Node next;
602 >     * Key-value entry.  This class is never exported out as a
603 >     * user-mutable Map.Entry (i.e., one supporting setValue; see
604 >     * MapEntry below), but can be used for read-only traversals used
605 >     * in bulk tasks.  Subclasses of Node with a negative hash field
606 >     * are special, and contain null keys and values (but are never
607 >     * exported).  Otherwise, keys and vals are never null.
608 >     */
609 >    static class Node<K,V> implements Map.Entry<K,V> {
610 >        final int hash;
611 >        final K key;
612 >        volatile V val;
613 >        volatile Node<K,V> next;
614  
615 <        Node(int hash, Object key, Object val, Node next) {
615 >        Node(int hash, K key, V val, Node<K,V> next) {
616              this.hash = hash;
617              this.key = key;
618              this.val = val;
619              this.next = next;
620          }
621  
622 <        /** CompareAndSet the hash field */
623 <        final boolean casHash(int cmp, int val) {
624 <            return UNSAFE.compareAndSwapInt(this, hashOffset, cmp, val);
625 <        }
626 <
627 <        /** The number of spins before blocking for a lock */
705 <        static final int MAX_SPINS =
706 <            Runtime.getRuntime().availableProcessors() > 1 ? 64 : 1;
707 <
708 <        /**
709 <         * Spins a while if LOCKED bit set and this node is the first
710 <         * of its bin, and then sets WAITING bits on hash field and
711 <         * blocks (once) if they are still set.  It is OK for this
712 <         * method to return even if lock is not available upon exit,
713 <         * which enables these simple single-wait mechanics.
714 <         *
715 <         * The corresponding signalling operation is performed within
716 <         * callers: Upon detecting that WAITING has been set when
717 <         * unlocking lock (via a failed CAS from non-waiting LOCKED
718 <         * state), unlockers acquire the sync lock and perform a
719 <         * notifyAll.
720 <         *
721 <         * The initial sanity check on tab and bounds is not currently
722 <         * necessary in the only usages of this method, but enables
723 <         * use in other future contexts.
724 <         */
725 <        final void tryAwaitLock(Node[] tab, int i) {
726 <            if (tab != null && i >= 0 && i < tab.length) { // sanity check
727 <                int r = ThreadLocalRandom.current().nextInt(); // randomize spins
728 <                int spins = MAX_SPINS, h;
729 <                while (tabAt(tab, i) == this && ((h = hash) & LOCKED) != 0) {
730 <                    if (spins >= 0) {
731 <                        r ^= r << 1; r ^= r >>> 3; r ^= r << 10; // xorshift
732 <                        if (r >= 0 && --spins == 0)
733 <                            Thread.yield();  // yield before block
734 <                    }
735 <                    else if (casHash(h, h | WAITING)) {
736 <                        synchronized (this) {
737 <                            if (tabAt(tab, i) == this &&
738 <                                (hash & WAITING) == WAITING) {
739 <                                try {
740 <                                    wait();
741 <                                } catch (InterruptedException ie) {
742 <                                    Thread.currentThread().interrupt();
743 <                                }
744 <                            }
745 <                            else
746 <                                notifyAll(); // possibly won race vs signaller
747 <                        }
748 <                        break;
749 <                    }
750 <                }
751 <            }
752 <        }
753 <
754 <        // Unsafe mechanics for casHash
755 <        private static final sun.misc.Unsafe UNSAFE;
756 <        private static final long hashOffset;
757 <
758 <        static {
759 <            try {
760 <                UNSAFE = getUnsafe();
761 <                Class<?> k = Node.class;
762 <                hashOffset = UNSAFE.objectFieldOffset
763 <                    (k.getDeclaredField("hash"));
764 <            } catch (Exception e) {
765 <                throw new Error(e);
766 <            }
767 <        }
768 <    }
769 <
770 <    /* ---------------- TreeBins -------------- */
771 <
772 <    /**
773 <     * Nodes for use in TreeBins
774 <     */
775 <    static final class TreeNode extends Node {
776 <        TreeNode parent;  // red-black tree links
777 <        TreeNode left;
778 <        TreeNode right;
779 <        TreeNode prev;    // needed to unlink next upon deletion
780 <        boolean red;
781 <
782 <        TreeNode(int hash, Object key, Object val, Node next, TreeNode parent) {
783 <            super(hash, key, val, next);
784 <            this.parent = parent;
785 <        }
786 <    }
787 <
788 <    /**
789 <     * A specialized form of red-black tree for use in bins
790 <     * whose size exceeds a threshold.
791 <     *
792 <     * TreeBins use a special form of comparison for search and
793 <     * related operations (which is the main reason we cannot use
794 <     * existing collections such as TreeMaps). TreeBins contain
795 <     * Comparable elements, but may contain others, as well as
796 <     * elements that are Comparable but not necessarily Comparable<T>
797 <     * for the same T, so we cannot invoke compareTo among them. To
798 <     * handle this, the tree is ordered primarily by hash value, then
799 <     * by getClass().getName() order, and then by Comparator order
800 <     * among elements of the same class.  On lookup at a node, if
801 <     * elements are not comparable or compare as 0, both left and
802 <     * right children may need to be searched in the case of tied hash
803 <     * values. (This corresponds to the full list search that would be
804 <     * necessary if all elements were non-Comparable and had tied
805 <     * hashes.)  The red-black balancing code is updated from
806 <     * pre-jdk-collections
807 <     * (http://gee.cs.oswego.edu/dl/classes/collections/RBCell.java)
808 <     * based in turn on Cormen, Leiserson, and Rivest "Introduction to
809 <     * Algorithms" (CLR).
810 <     *
811 <     * TreeBins also maintain a separate locking discipline than
812 <     * regular bins. Because they are forwarded via special MOVED
813 <     * nodes at bin heads (which can never change once established),
814 <     * we cannot use those nodes as locks. Instead, TreeBin
815 <     * extends AbstractQueuedSynchronizer to support a simple form of
816 <     * read-write lock. For update operations and table validation,
817 <     * the exclusive form of lock behaves in the same way as bin-head
818 <     * locks. However, lookups use shared read-lock mechanics to allow
819 <     * multiple readers in the absence of writers.  Additionally,
820 <     * these lookups do not ever block: While the lock is not
821 <     * available, they proceed along the slow traversal path (via
822 <     * next-pointers) until the lock becomes available or the list is
823 <     * exhausted, whichever comes first. (These cases are not fast,
824 <     * but maximize aggregate expected throughput.)  The AQS mechanics
825 <     * for doing this are straightforward.  The lock state is held as
826 <     * AQS getState().  Read counts are negative; the write count (1)
827 <     * is positive.  There are no signalling preferences among readers
828 <     * and writers. Since we don't need to export full Lock API, we
829 <     * just override the minimal AQS methods and use them directly.
830 <     */
831 <    static final class TreeBin extends AbstractQueuedSynchronizer {
832 <        private static final long serialVersionUID = 2249069246763182397L;
833 <        transient TreeNode root;  // root of tree
834 <        transient TreeNode first; // head of next-pointer list
835 <
836 <        /* AQS overrides */
837 <        public final boolean isHeldExclusively() { return getState() > 0; }
838 <        public final boolean tryAcquire(int ignore) {
839 <            if (compareAndSetState(0, 1)) {
840 <                setExclusiveOwnerThread(Thread.currentThread());
841 <                return true;
842 <            }
843 <            return false;
844 <        }
845 <        public final boolean tryRelease(int ignore) {
846 <            setExclusiveOwnerThread(null);
847 <            setState(0);
848 <            return true;
849 <        }
850 <        public final int tryAcquireShared(int ignore) {
851 <            for (int c;;) {
852 <                if ((c = getState()) > 0)
853 <                    return -1;
854 <                if (compareAndSetState(c, c -1))
855 <                    return 1;
856 <            }
857 <        }
858 <        public final boolean tryReleaseShared(int ignore) {
859 <            int c;
860 <            do {} while (!compareAndSetState(c = getState(), c + 1));
861 <            return c == -1;
862 <        }
863 <
864 <        /** From CLR */
865 <        private void rotateLeft(TreeNode p) {
866 <            if (p != null) {
867 <                TreeNode r = p.right, pp, rl;
868 <                if ((rl = p.right = r.left) != null)
869 <                    rl.parent = p;
870 <                if ((pp = r.parent = p.parent) == null)
871 <                    root = r;
872 <                else if (pp.left == p)
873 <                    pp.left = r;
874 <                else
875 <                    pp.right = r;
876 <                r.left = p;
877 <                p.parent = r;
878 <            }
879 <        }
880 <
881 <        /** From CLR */
882 <        private void rotateRight(TreeNode p) {
883 <            if (p != null) {
884 <                TreeNode l = p.left, pp, lr;
885 <                if ((lr = p.left = l.right) != null)
886 <                    lr.parent = p;
887 <                if ((pp = l.parent = p.parent) == null)
888 <                    root = l;
889 <                else if (pp.right == p)
890 <                    pp.right = l;
891 <                else
892 <                    pp.left = l;
893 <                l.right = p;
894 <                p.parent = l;
895 <            }
896 <        }
897 <
898 <        /**
899 <         * Returns the TreeNode (or null if not found) for the given key
900 <         * starting at given root.
901 <         */
902 <        @SuppressWarnings("unchecked") final TreeNode getTreeNode
903 <            (int h, Object k, TreeNode p) {
904 <            Class<?> c = k.getClass();
905 <            while (p != null) {
906 <                int dir, ph;  Object pk; Class<?> pc;
907 <                if ((ph = p.hash) == h) {
908 <                    if ((pk = p.key) == k || k.equals(pk))
909 <                        return p;
910 <                    if (c != (pc = pk.getClass()) ||
911 <                        !(k instanceof Comparable) ||
912 <                        (dir = ((Comparable)k).compareTo((Comparable)pk)) == 0) {
913 <                        dir = (c == pc) ? 0 : c.getName().compareTo(pc.getName());
914 <                        TreeNode r = null, s = null, pl, pr;
915 <                        if (dir >= 0) {
916 <                            if ((pl = p.left) != null && h <= pl.hash)
917 <                                s = pl;
918 <                        }
919 <                        else if ((pr = p.right) != null && h >= pr.hash)
920 <                            s = pr;
921 <                        if (s != null && (r = getTreeNode(h, k, s)) != null)
922 <                            return r;
923 <                    }
924 <                }
925 <                else
926 <                    dir = (h < ph) ? -1 : 1;
927 <                p = (dir > 0) ? p.right : p.left;
928 <            }
929 <            return null;
622 >        public final K getKey()       { return key; }
623 >        public final V getValue()     { return val; }
624 >        public final int hashCode()   { return key.hashCode() ^ val.hashCode(); }
625 >        public final String toString(){ return key + "=" + val; }
626 >        public final V setValue(V value) {
627 >            throw new UnsupportedOperationException();
628          }
629  
630 <        /**
631 <         * Wrapper for getTreeNode used by CHM.get. Tries to obtain
632 <         * read-lock to call getTreeNode, but during failure to get
633 <         * lock, searches along next links.
634 <         */
635 <        final Object getValue(int h, Object k) {
636 <            Node r = null;
939 <            int c = getState(); // Must read lock state first
940 <            for (Node e = first; e != null; e = e.next) {
941 <                if (c <= 0 && compareAndSetState(c, c - 1)) {
942 <                    try {
943 <                        r = getTreeNode(h, k, root);
944 <                    } finally {
945 <                        releaseShared(0);
946 <                    }
947 <                    break;
948 <                }
949 <                else if ((e.hash & HASH_BITS) == h && k.equals(e.key)) {
950 <                    r = e;
951 <                    break;
952 <                }
953 <                else
954 <                    c = getState();
955 <            }
956 <            return r == null ? null : r.val;
630 >        public final boolean equals(Object o) {
631 >            Object k, v, u; Map.Entry<?,?> e;
632 >            return ((o instanceof Map.Entry) &&
633 >                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
634 >                    (v = e.getValue()) != null &&
635 >                    (k == key || k.equals(key)) &&
636 >                    (v == (u = val) || v.equals(u)));
637          }
638  
639          /**
640 <         * Finds or adds a node.
961 <         * @return null if added
640 >         * Virtualized support for map.get(); overridden in subclasses.
641           */
642 <        @SuppressWarnings("unchecked") final TreeNode putTreeNode
643 <            (int h, Object k, Object v) {
644 <            Class<?> c = k.getClass();
645 <            TreeNode pp = root, p = null;
646 <            int dir = 0;
647 <            while (pp != null) { // find existing node or leaf to insert at
648 <                int ph;  Object pk; Class<?> pc;
649 <                p = pp;
650 <                if ((ph = p.hash) == h) {
972 <                    if ((pk = p.key) == k || k.equals(pk))
973 <                        return p;
974 <                    if (c != (pc = pk.getClass()) ||
975 <                        !(k instanceof Comparable) ||
976 <                        (dir = ((Comparable)k).compareTo((Comparable)pk)) == 0) {
977 <                        dir = (c == pc) ? 0 : c.getName().compareTo(pc.getName());
978 <                        TreeNode r = null, s = null, pl, pr;
979 <                        if (dir >= 0) {
980 <                            if ((pl = p.left) != null && h <= pl.hash)
981 <                                s = pl;
982 <                        }
983 <                        else if ((pr = p.right) != null && h >= pr.hash)
984 <                            s = pr;
985 <                        if (s != null && (r = getTreeNode(h, k, s)) != null)
986 <                            return r;
987 <                    }
988 <                }
989 <                else
990 <                    dir = (h < ph) ? -1 : 1;
991 <                pp = (dir > 0) ? p.right : p.left;
992 <            }
993 <
994 <            TreeNode f = first;
995 <            TreeNode x = first = new TreeNode(h, k, v, f, p);
996 <            if (p == null)
997 <                root = x;
998 <            else { // attach and rebalance; adapted from CLR
999 <                TreeNode xp, xpp;
1000 <                if (f != null)
1001 <                    f.prev = x;
1002 <                if (dir <= 0)
1003 <                    p.left = x;
1004 <                else
1005 <                    p.right = x;
1006 <                x.red = true;
1007 <                while (x != null && (xp = x.parent) != null && xp.red &&
1008 <                       (xpp = xp.parent) != null) {
1009 <                    TreeNode xppl = xpp.left;
1010 <                    if (xp == xppl) {
1011 <                        TreeNode y = xpp.right;
1012 <                        if (y != null && y.red) {
1013 <                            y.red = false;
1014 <                            xp.red = false;
1015 <                            xpp.red = true;
1016 <                            x = xpp;
1017 <                        }
1018 <                        else {
1019 <                            if (x == xp.right) {
1020 <                                rotateLeft(x = xp);
1021 <                                xpp = (xp = x.parent) == null ? null : xp.parent;
1022 <                            }
1023 <                            if (xp != null) {
1024 <                                xp.red = false;
1025 <                                if (xpp != null) {
1026 <                                    xpp.red = true;
1027 <                                    rotateRight(xpp);
1028 <                                }
1029 <                            }
1030 <                        }
1031 <                    }
1032 <                    else {
1033 <                        TreeNode y = xppl;
1034 <                        if (y != null && y.red) {
1035 <                            y.red = false;
1036 <                            xp.red = false;
1037 <                            xpp.red = true;
1038 <                            x = xpp;
1039 <                        }
1040 <                        else {
1041 <                            if (x == xp.left) {
1042 <                                rotateRight(x = xp);
1043 <                                xpp = (xp = x.parent) == null ? null : xp.parent;
1044 <                            }
1045 <                            if (xp != null) {
1046 <                                xp.red = false;
1047 <                                if (xpp != null) {
1048 <                                    xpp.red = true;
1049 <                                    rotateLeft(xpp);
1050 <                                }
1051 <                            }
1052 <                        }
1053 <                    }
1054 <                }
1055 <                TreeNode r = root;
1056 <                if (r != null && r.red)
1057 <                    r.red = false;
642 >        Node<K,V> find(int h, Object k) {
643 >            Node<K,V> e = this;
644 >            if (k != null) {
645 >                do {
646 >                    K ek;
647 >                    if (e.hash == h &&
648 >                        ((ek = e.key) == k || (ek != null && k.equals(ek))))
649 >                        return e;
650 >                } while ((e = e.next) != null);
651              }
652              return null;
653          }
1061
1062        /**
1063         * Removes the given node, that must be present before this
1064         * call.  This is messier than typical red-black deletion code
1065         * because we cannot swap the contents of an interior node
1066         * with a leaf successor that is pinned by "next" pointers
1067         * that are accessible independently of lock. So instead we
1068         * swap the tree linkages.
1069         */
1070        final void deleteTreeNode(TreeNode p) {
1071            TreeNode next = (TreeNode)p.next; // unlink traversal pointers
1072            TreeNode pred = p.prev;
1073            if (pred == null)
1074                first = next;
1075            else
1076                pred.next = next;
1077            if (next != null)
1078                next.prev = pred;
1079            TreeNode replacement;
1080            TreeNode pl = p.left;
1081            TreeNode pr = p.right;
1082            if (pl != null && pr != null) {
1083                TreeNode s = pr, sl;
1084                while ((sl = s.left) != null) // find successor
1085                    s = sl;
1086                boolean c = s.red; s.red = p.red; p.red = c; // swap colors
1087                TreeNode sr = s.right;
1088                TreeNode pp = p.parent;
1089                if (s == pr) { // p was s's direct parent
1090                    p.parent = s;
1091                    s.right = p;
1092                }
1093                else {
1094                    TreeNode sp = s.parent;
1095                    if ((p.parent = sp) != null) {
1096                        if (s == sp.left)
1097                            sp.left = p;
1098                        else
1099                            sp.right = p;
1100                    }
1101                    if ((s.right = pr) != null)
1102                        pr.parent = s;
1103                }
1104                p.left = null;
1105                if ((p.right = sr) != null)
1106                    sr.parent = p;
1107                if ((s.left = pl) != null)
1108                    pl.parent = s;
1109                if ((s.parent = pp) == null)
1110                    root = s;
1111                else if (p == pp.left)
1112                    pp.left = s;
1113                else
1114                    pp.right = s;
1115                replacement = sr;
1116            }
1117            else
1118                replacement = (pl != null) ? pl : pr;
1119            TreeNode pp = p.parent;
1120            if (replacement == null) {
1121                if (pp == null) {
1122                    root = null;
1123                    return;
1124                }
1125                replacement = p;
1126            }
1127            else {
1128                replacement.parent = pp;
1129                if (pp == null)
1130                    root = replacement;
1131                else if (p == pp.left)
1132                    pp.left = replacement;
1133                else
1134                    pp.right = replacement;
1135                p.left = p.right = p.parent = null;
1136            }
1137            if (!p.red) { // rebalance, from CLR
1138                TreeNode x = replacement;
1139                while (x != null) {
1140                    TreeNode xp, xpl;
1141                    if (x.red || (xp = x.parent) == null) {
1142                        x.red = false;
1143                        break;
1144                    }
1145                    if (x == (xpl = xp.left)) {
1146                        TreeNode sib = xp.right;
1147                        if (sib != null && sib.red) {
1148                            sib.red = false;
1149                            xp.red = true;
1150                            rotateLeft(xp);
1151                            sib = (xp = x.parent) == null ? null : xp.right;
1152                        }
1153                        if (sib == null)
1154                            x = xp;
1155                        else {
1156                            TreeNode sl = sib.left, sr = sib.right;
1157                            if ((sr == null || !sr.red) &&
1158                                (sl == null || !sl.red)) {
1159                                sib.red = true;
1160                                x = xp;
1161                            }
1162                            else {
1163                                if (sr == null || !sr.red) {
1164                                    if (sl != null)
1165                                        sl.red = false;
1166                                    sib.red = true;
1167                                    rotateRight(sib);
1168                                    sib = (xp = x.parent) == null ? null : xp.right;
1169                                }
1170                                if (sib != null) {
1171                                    sib.red = (xp == null) ? false : xp.red;
1172                                    if ((sr = sib.right) != null)
1173                                        sr.red = false;
1174                                }
1175                                if (xp != null) {
1176                                    xp.red = false;
1177                                    rotateLeft(xp);
1178                                }
1179                                x = root;
1180                            }
1181                        }
1182                    }
1183                    else { // symmetric
1184                        TreeNode sib = xpl;
1185                        if (sib != null && sib.red) {
1186                            sib.red = false;
1187                            xp.red = true;
1188                            rotateRight(xp);
1189                            sib = (xp = x.parent) == null ? null : xp.left;
1190                        }
1191                        if (sib == null)
1192                            x = xp;
1193                        else {
1194                            TreeNode sl = sib.left, sr = sib.right;
1195                            if ((sl == null || !sl.red) &&
1196                                (sr == null || !sr.red)) {
1197                                sib.red = true;
1198                                x = xp;
1199                            }
1200                            else {
1201                                if (sl == null || !sl.red) {
1202                                    if (sr != null)
1203                                        sr.red = false;
1204                                    sib.red = true;
1205                                    rotateLeft(sib);
1206                                    sib = (xp = x.parent) == null ? null : xp.left;
1207                                }
1208                                if (sib != null) {
1209                                    sib.red = (xp == null) ? false : xp.red;
1210                                    if ((sl = sib.left) != null)
1211                                        sl.red = false;
1212                                }
1213                                if (xp != null) {
1214                                    xp.red = false;
1215                                    rotateRight(xp);
1216                                }
1217                                x = root;
1218                            }
1219                        }
1220                    }
1221                }
1222            }
1223            if (p == replacement && (pp = p.parent) != null) {
1224                if (p == pp.left) // detach pointers
1225                    pp.left = null;
1226                else if (p == pp.right)
1227                    pp.right = null;
1228                p.parent = null;
1229            }
1230        }
654      }
655  
656 <    /* ---------------- Collision reduction methods -------------- */
656 >    /* ---------------- Static utilities -------------- */
657  
658      /**
659 <     * Spreads higher bits to lower, and also forces top 2 bits to 0.
660 <     * Because the table uses power-of-two masking, sets of hashes
661 <     * that vary only in bits above the current mask will always
662 <     * collide. (Among known examples are sets of Float keys holding
663 <     * consecutive whole numbers in small tables.)  To counter this,
664 <     * we apply a transform that spreads the impact of higher bits
659 >     * Spreads (XORs) higher bits of hash to lower and also forces top
660 >     * bit to 0. Because the table uses power-of-two masking, sets of
661 >     * hashes that vary only in bits above the current mask will
662 >     * always collide. (Among known examples are sets of Float keys
663 >     * holding consecutive whole numbers in small tables.)  So we
664 >     * apply a transform that spreads the impact of higher bits
665       * downward. There is a tradeoff between speed, utility, and
666       * quality of bit-spreading. Because many common sets of hashes
667 <     * are already reasonably distributed across bits (so don't benefit
668 <     * from spreading), and because we use trees to handle large sets
669 <     * of collisions in bins, we don't need excessively high quality.
670 <     */
671 <    private static final int spread(int h) {
672 <        h ^= (h >>> 18) ^ (h >>> 12);
1250 <        return (h ^ (h >>> 10)) & HASH_BITS;
1251 <    }
1252 <
1253 <    /**
1254 <     * Replaces a list bin with a tree bin. Call only when locked.
1255 <     * Fails to replace if the given key is non-comparable or table
1256 <     * is, or needs, resizing.
667 >     * are already reasonably distributed (so don't benefit from
668 >     * spreading), and because we use trees to handle large sets of
669 >     * collisions in bins, we just XOR some shifted bits in the
670 >     * cheapest possible way to reduce systematic lossage, as well as
671 >     * to incorporate impact of the highest bits that would otherwise
672 >     * never be used in index calculations because of table bounds.
673       */
674 <    private final void replaceWithTreeBin(Node[] tab, int index, Object key) {
675 <        if ((key instanceof Comparable) &&
1260 <            (tab.length >= MAXIMUM_CAPACITY || counter.sum() < (long)sizeCtl)) {
1261 <            TreeBin t = new TreeBin();
1262 <            for (Node e = tabAt(tab, index); e != null; e = e.next)
1263 <                t.putTreeNode(e.hash & HASH_BITS, e.key, e.val);
1264 <            setTabAt(tab, index, new Node(MOVED, t, null, null));
1265 <        }
1266 <    }
1267 <
1268 <    /* ---------------- Internal access and update methods -------------- */
1269 <
1270 <    /** Implementation for get and containsKey */
1271 <    private final Object internalGet(Object k) {
1272 <        int h = spread(k.hashCode());
1273 <        retry: for (Node[] tab = table; tab != null;) {
1274 <            Node e, p; Object ek, ev; int eh;      // locals to read fields once
1275 <            for (e = tabAt(tab, (tab.length - 1) & h); e != null; e = e.next) {
1276 <                if ((eh = e.hash) == MOVED) {
1277 <                    if ((ek = e.key) instanceof TreeBin)  // search TreeBin
1278 <                        return ((TreeBin)ek).getValue(h, k);
1279 <                    else {                        // restart with new table
1280 <                        tab = (Node[])ek;
1281 <                        continue retry;
1282 <                    }
1283 <                }
1284 <                else if ((eh & HASH_BITS) == h && (ev = e.val) != null &&
1285 <                         ((ek = e.key) == k || k.equals(ek)))
1286 <                    return ev;
1287 <            }
1288 <            break;
1289 <        }
1290 <        return null;
674 >    static final int spread(int h) {
675 >        return (h ^ (h >>> 16)) & HASH_BITS;
676      }
677  
678      /**
1294     * Implementation for the four public remove/replace methods:
1295     * Replaces node value with v, conditional upon match of cv if
1296     * non-null.  If resulting value is null, delete.
1297     */
1298    private final Object internalReplace(Object k, Object v, Object cv) {
1299        int h = spread(k.hashCode());
1300        Object oldVal = null;
1301        for (Node[] tab = table;;) {
1302            Node f; int i, fh; Object fk;
1303            if (tab == null ||
1304                (f = tabAt(tab, i = (tab.length - 1) & h)) == null)
1305                break;
1306            else if ((fh = f.hash) == MOVED) {
1307                if ((fk = f.key) instanceof TreeBin) {
1308                    TreeBin t = (TreeBin)fk;
1309                    boolean validated = false;
1310                    boolean deleted = false;
1311                    t.acquire(0);
1312                    try {
1313                        if (tabAt(tab, i) == f) {
1314                            validated = true;
1315                            TreeNode p = t.getTreeNode(h, k, t.root);
1316                            if (p != null) {
1317                                Object pv = p.val;
1318                                if (cv == null || cv == pv || cv.equals(pv)) {
1319                                    oldVal = pv;
1320                                    if ((p.val = v) == null) {
1321                                        deleted = true;
1322                                        t.deleteTreeNode(p);
1323                                    }
1324                                }
1325                            }
1326                        }
1327                    } finally {
1328                        t.release(0);
1329                    }
1330                    if (validated) {
1331                        if (deleted)
1332                            counter.add(-1L);
1333                        break;
1334                    }
1335                }
1336                else
1337                    tab = (Node[])fk;
1338            }
1339            else if ((fh & HASH_BITS) != h && f.next == null) // precheck
1340                break;                          // rules out possible existence
1341            else if ((fh & LOCKED) != 0) {
1342                checkForResize();               // try resizing if can't get lock
1343                f.tryAwaitLock(tab, i);
1344            }
1345            else if (f.casHash(fh, fh | LOCKED)) {
1346                boolean validated = false;
1347                boolean deleted = false;
1348                try {
1349                    if (tabAt(tab, i) == f) {
1350                        validated = true;
1351                        for (Node e = f, pred = null;;) {
1352                            Object ek, ev;
1353                            if ((e.hash & HASH_BITS) == h &&
1354                                ((ev = e.val) != null) &&
1355                                ((ek = e.key) == k || k.equals(ek))) {
1356                                if (cv == null || cv == ev || cv.equals(ev)) {
1357                                    oldVal = ev;
1358                                    if ((e.val = v) == null) {
1359                                        deleted = true;
1360                                        Node en = e.next;
1361                                        if (pred != null)
1362                                            pred.next = en;
1363                                        else
1364                                            setTabAt(tab, i, en);
1365                                    }
1366                                }
1367                                break;
1368                            }
1369                            pred = e;
1370                            if ((e = e.next) == null)
1371                                break;
1372                        }
1373                    }
1374                } finally {
1375                    if (!f.casHash(fh | LOCKED, fh)) {
1376                        f.hash = fh;
1377                        synchronized (f) { f.notifyAll(); };
1378                    }
1379                }
1380                if (validated) {
1381                    if (deleted)
1382                        counter.add(-1L);
1383                    break;
1384                }
1385            }
1386        }
1387        return oldVal;
1388    }
1389
1390    /*
1391     * Internal versions of the six insertion methods, each a
1392     * little more complicated than the last. All have
1393     * the same basic structure as the first (internalPut):
1394     *  1. If table uninitialized, create
1395     *  2. If bin empty, try to CAS new node
1396     *  3. If bin stale, use new table
1397     *  4. if bin converted to TreeBin, validate and relay to TreeBin methods
1398     *  5. Lock and validate; if valid, scan and add or update
1399     *
1400     * The others interweave other checks and/or alternative actions:
1401     *  * Plain put checks for and performs resize after insertion.
1402     *  * putIfAbsent prescans for mapping without lock (and fails to add
1403     *    if present), which also makes pre-emptive resize checks worthwhile.
1404     *  * computeIfAbsent extends form used in putIfAbsent with additional
1405     *    mechanics to deal with, calls, potential exceptions and null
1406     *    returns from function call.
1407     *  * compute uses the same function-call mechanics, but without
1408     *    the prescans
1409     *  * merge acts as putIfAbsent in the absent case, but invokes the
1410     *    update function if present
1411     *  * putAll attempts to pre-allocate enough table space
1412     *    and more lazily performs count updates and checks.
1413     *
1414     * Someday when details settle down a bit more, it might be worth
1415     * some factoring to reduce sprawl.
1416     */
1417
1418    /** Implementation for put */
1419    private final Object internalPut(Object k, Object v) {
1420        int h = spread(k.hashCode());
1421        int count = 0;
1422        for (Node[] tab = table;;) {
1423            int i; Node f; int fh; Object fk;
1424            if (tab == null)
1425                tab = initTable();
1426            else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1427                if (casTabAt(tab, i, null, new Node(h, k, v, null)))
1428                    break;                   // no lock when adding to empty bin
1429            }
1430            else if ((fh = f.hash) == MOVED) {
1431                if ((fk = f.key) instanceof TreeBin) {
1432                    TreeBin t = (TreeBin)fk;
1433                    Object oldVal = null;
1434                    t.acquire(0);
1435                    try {
1436                        if (tabAt(tab, i) == f) {
1437                            count = 2;
1438                            TreeNode p = t.putTreeNode(h, k, v);
1439                            if (p != null) {
1440                                oldVal = p.val;
1441                                p.val = v;
1442                            }
1443                        }
1444                    } finally {
1445                        t.release(0);
1446                    }
1447                    if (count != 0) {
1448                        if (oldVal != null)
1449                            return oldVal;
1450                        break;
1451                    }
1452                }
1453                else
1454                    tab = (Node[])fk;
1455            }
1456            else if ((fh & LOCKED) != 0) {
1457                checkForResize();
1458                f.tryAwaitLock(tab, i);
1459            }
1460            else if (f.casHash(fh, fh | LOCKED)) {
1461                Object oldVal = null;
1462                try {                        // needed in case equals() throws
1463                    if (tabAt(tab, i) == f) {
1464                        count = 1;
1465                        for (Node e = f;; ++count) {
1466                            Object ek, ev;
1467                            if ((e.hash & HASH_BITS) == h &&
1468                                (ev = e.val) != null &&
1469                                ((ek = e.key) == k || k.equals(ek))) {
1470                                oldVal = ev;
1471                                e.val = v;
1472                                break;
1473                            }
1474                            Node last = e;
1475                            if ((e = e.next) == null) {
1476                                last.next = new Node(h, k, v, null);
1477                                if (count >= TREE_THRESHOLD)
1478                                    replaceWithTreeBin(tab, i, k);
1479                                break;
1480                            }
1481                        }
1482                    }
1483                } finally {                  // unlock and signal if needed
1484                    if (!f.casHash(fh | LOCKED, fh)) {
1485                        f.hash = fh;
1486                        synchronized (f) { f.notifyAll(); };
1487                    }
1488                }
1489                if (count != 0) {
1490                    if (oldVal != null)
1491                        return oldVal;
1492                    if (tab.length <= 64)
1493                        count = 2;
1494                    break;
1495                }
1496            }
1497        }
1498        counter.add(1L);
1499        if (count > 1)
1500            checkForResize();
1501        return null;
1502    }
1503
1504    /** Implementation for putIfAbsent */
1505    private final Object internalPutIfAbsent(Object k, Object v) {
1506        int h = spread(k.hashCode());
1507        int count = 0;
1508        for (Node[] tab = table;;) {
1509            int i; Node f; int fh; Object fk, fv;
1510            if (tab == null)
1511                tab = initTable();
1512            else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1513                if (casTabAt(tab, i, null, new Node(h, k, v, null)))
1514                    break;
1515            }
1516            else if ((fh = f.hash) == MOVED) {
1517                if ((fk = f.key) instanceof TreeBin) {
1518                    TreeBin t = (TreeBin)fk;
1519                    Object oldVal = null;
1520                    t.acquire(0);
1521                    try {
1522                        if (tabAt(tab, i) == f) {
1523                            count = 2;
1524                            TreeNode p = t.putTreeNode(h, k, v);
1525                            if (p != null)
1526                                oldVal = p.val;
1527                        }
1528                    } finally {
1529                        t.release(0);
1530                    }
1531                    if (count != 0) {
1532                        if (oldVal != null)
1533                            return oldVal;
1534                        break;
1535                    }
1536                }
1537                else
1538                    tab = (Node[])fk;
1539            }
1540            else if ((fh & HASH_BITS) == h && (fv = f.val) != null &&
1541                     ((fk = f.key) == k || k.equals(fk)))
1542                return fv;
1543            else {
1544                Node g = f.next;
1545                if (g != null) { // at least 2 nodes -- search and maybe resize
1546                    for (Node e = g;;) {
1547                        Object ek, ev;
1548                        if ((e.hash & HASH_BITS) == h && (ev = e.val) != null &&
1549                            ((ek = e.key) == k || k.equals(ek)))
1550                            return ev;
1551                        if ((e = e.next) == null) {
1552                            checkForResize();
1553                            break;
1554                        }
1555                    }
1556                }
1557                if (((fh = f.hash) & LOCKED) != 0) {
1558                    checkForResize();
1559                    f.tryAwaitLock(tab, i);
1560                }
1561                else if (tabAt(tab, i) == f && f.casHash(fh, fh | LOCKED)) {
1562                    Object oldVal = null;
1563                    try {
1564                        if (tabAt(tab, i) == f) {
1565                            count = 1;
1566                            for (Node e = f;; ++count) {
1567                                Object ek, ev;
1568                                if ((e.hash & HASH_BITS) == h &&
1569                                    (ev = e.val) != null &&
1570                                    ((ek = e.key) == k || k.equals(ek))) {
1571                                    oldVal = ev;
1572                                    break;
1573                                }
1574                                Node last = e;
1575                                if ((e = e.next) == null) {
1576                                    last.next = new Node(h, k, v, null);
1577                                    if (count >= TREE_THRESHOLD)
1578                                        replaceWithTreeBin(tab, i, k);
1579                                    break;
1580                                }
1581                            }
1582                        }
1583                    } finally {
1584                        if (!f.casHash(fh | LOCKED, fh)) {
1585                            f.hash = fh;
1586                            synchronized (f) { f.notifyAll(); };
1587                        }
1588                    }
1589                    if (count != 0) {
1590                        if (oldVal != null)
1591                            return oldVal;
1592                        if (tab.length <= 64)
1593                            count = 2;
1594                        break;
1595                    }
1596                }
1597            }
1598        }
1599        counter.add(1L);
1600        if (count > 1)
1601            checkForResize();
1602        return null;
1603    }
1604
1605    /** Implementation for computeIfAbsent */
1606    private final Object internalComputeIfAbsent(K k,
1607                                                 Fun<? super K, ?> mf) {
1608        int h = spread(k.hashCode());
1609        Object val = null;
1610        int count = 0;
1611        for (Node[] tab = table;;) {
1612            Node f; int i, fh; Object fk, fv;
1613            if (tab == null)
1614                tab = initTable();
1615            else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1616                Node node = new Node(fh = h | LOCKED, k, null, null);
1617                if (casTabAt(tab, i, null, node)) {
1618                    count = 1;
1619                    try {
1620                        if ((val = mf.apply(k)) != null)
1621                            node.val = val;
1622                    } finally {
1623                        if (val == null)
1624                            setTabAt(tab, i, null);
1625                        if (!node.casHash(fh, h)) {
1626                            node.hash = h;
1627                            synchronized (node) { node.notifyAll(); };
1628                        }
1629                    }
1630                }
1631                if (count != 0)
1632                    break;
1633            }
1634            else if ((fh = f.hash) == MOVED) {
1635                if ((fk = f.key) instanceof TreeBin) {
1636                    TreeBin t = (TreeBin)fk;
1637                    boolean added = false;
1638                    t.acquire(0);
1639                    try {
1640                        if (tabAt(tab, i) == f) {
1641                            count = 1;
1642                            TreeNode p = t.getTreeNode(h, k, t.root);
1643                            if (p != null)
1644                                val = p.val;
1645                            else if ((val = mf.apply(k)) != null) {
1646                                added = true;
1647                                count = 2;
1648                                t.putTreeNode(h, k, val);
1649                            }
1650                        }
1651                    } finally {
1652                        t.release(0);
1653                    }
1654                    if (count != 0) {
1655                        if (!added)
1656                            return val;
1657                        break;
1658                    }
1659                }
1660                else
1661                    tab = (Node[])fk;
1662            }
1663            else if ((fh & HASH_BITS) == h && (fv = f.val) != null &&
1664                     ((fk = f.key) == k || k.equals(fk)))
1665                return fv;
1666            else {
1667                Node g = f.next;
1668                if (g != null) {
1669                    for (Node e = g;;) {
1670                        Object ek, ev;
1671                        if ((e.hash & HASH_BITS) == h && (ev = e.val) != null &&
1672                            ((ek = e.key) == k || k.equals(ek)))
1673                            return ev;
1674                        if ((e = e.next) == null) {
1675                            checkForResize();
1676                            break;
1677                        }
1678                    }
1679                }
1680                if (((fh = f.hash) & LOCKED) != 0) {
1681                    checkForResize();
1682                    f.tryAwaitLock(tab, i);
1683                }
1684                else if (tabAt(tab, i) == f && f.casHash(fh, fh | LOCKED)) {
1685                    boolean added = false;
1686                    try {
1687                        if (tabAt(tab, i) == f) {
1688                            count = 1;
1689                            for (Node e = f;; ++count) {
1690                                Object ek, ev;
1691                                if ((e.hash & HASH_BITS) == h &&
1692                                    (ev = e.val) != null &&
1693                                    ((ek = e.key) == k || k.equals(ek))) {
1694                                    val = ev;
1695                                    break;
1696                                }
1697                                Node last = e;
1698                                if ((e = e.next) == null) {
1699                                    if ((val = mf.apply(k)) != null) {
1700                                        added = true;
1701                                        last.next = new Node(h, k, val, null);
1702                                        if (count >= TREE_THRESHOLD)
1703                                            replaceWithTreeBin(tab, i, k);
1704                                    }
1705                                    break;
1706                                }
1707                            }
1708                        }
1709                    } finally {
1710                        if (!f.casHash(fh | LOCKED, fh)) {
1711                            f.hash = fh;
1712                            synchronized (f) { f.notifyAll(); };
1713                        }
1714                    }
1715                    if (count != 0) {
1716                        if (!added)
1717                            return val;
1718                        if (tab.length <= 64)
1719                            count = 2;
1720                        break;
1721                    }
1722                }
1723            }
1724        }
1725        if (val != null) {
1726            counter.add(1L);
1727            if (count > 1)
1728                checkForResize();
1729        }
1730        return val;
1731    }
1732
1733    /** Implementation for compute */
1734    @SuppressWarnings("unchecked") private final Object internalCompute
1735        (K k, boolean onlyIfPresent, BiFun<? super K, ? super V, ? extends V> mf) {
1736        int h = spread(k.hashCode());
1737        Object val = null;
1738        int delta = 0;
1739        int count = 0;
1740        for (Node[] tab = table;;) {
1741            Node f; int i, fh; Object fk;
1742            if (tab == null)
1743                tab = initTable();
1744            else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1745                if (onlyIfPresent)
1746                    break;
1747                Node node = new Node(fh = h | LOCKED, k, null, null);
1748                if (casTabAt(tab, i, null, node)) {
1749                    try {
1750                        count = 1;
1751                        if ((val = mf.apply(k, null)) != null) {
1752                            node.val = val;
1753                            delta = 1;
1754                        }
1755                    } finally {
1756                        if (delta == 0)
1757                            setTabAt(tab, i, null);
1758                        if (!node.casHash(fh, h)) {
1759                            node.hash = h;
1760                            synchronized (node) { node.notifyAll(); };
1761                        }
1762                    }
1763                }
1764                if (count != 0)
1765                    break;
1766            }
1767            else if ((fh = f.hash) == MOVED) {
1768                if ((fk = f.key) instanceof TreeBin) {
1769                    TreeBin t = (TreeBin)fk;
1770                    t.acquire(0);
1771                    try {
1772                        if (tabAt(tab, i) == f) {
1773                            count = 1;
1774                            TreeNode p = t.getTreeNode(h, k, t.root);
1775                            Object pv = (p == null) ? null : p.val;
1776                            if ((val = mf.apply(k, (V)pv)) != null) {
1777                                if (p != null)
1778                                    p.val = val;
1779                                else {
1780                                    count = 2;
1781                                    delta = 1;
1782                                    t.putTreeNode(h, k, val);
1783                                }
1784                            }
1785                            else if (p != null) {
1786                                delta = -1;
1787                                t.deleteTreeNode(p);
1788                            }
1789                        }
1790                    } finally {
1791                        t.release(0);
1792                    }
1793                    if (count != 0)
1794                        break;
1795                }
1796                else
1797                    tab = (Node[])fk;
1798            }
1799            else if ((fh & LOCKED) != 0) {
1800                checkForResize();
1801                f.tryAwaitLock(tab, i);
1802            }
1803            else if (f.casHash(fh, fh | LOCKED)) {
1804                try {
1805                    if (tabAt(tab, i) == f) {
1806                        count = 1;
1807                        for (Node e = f, pred = null;; ++count) {
1808                            Object ek, ev;
1809                            if ((e.hash & HASH_BITS) == h &&
1810                                (ev = e.val) != null &&
1811                                ((ek = e.key) == k || k.equals(ek))) {
1812                                val = mf.apply(k, (V)ev);
1813                                if (val != null)
1814                                    e.val = val;
1815                                else {
1816                                    delta = -1;
1817                                    Node en = e.next;
1818                                    if (pred != null)
1819                                        pred.next = en;
1820                                    else
1821                                        setTabAt(tab, i, en);
1822                                }
1823                                break;
1824                            }
1825                            pred = e;
1826                            if ((e = e.next) == null) {
1827                                if (!onlyIfPresent && (val = mf.apply(k, null)) != null) {
1828                                    pred.next = new Node(h, k, val, null);
1829                                    delta = 1;
1830                                    if (count >= TREE_THRESHOLD)
1831                                        replaceWithTreeBin(tab, i, k);
1832                                }
1833                                break;
1834                            }
1835                        }
1836                    }
1837                } finally {
1838                    if (!f.casHash(fh | LOCKED, fh)) {
1839                        f.hash = fh;
1840                        synchronized (f) { f.notifyAll(); };
1841                    }
1842                }
1843                if (count != 0) {
1844                    if (tab.length <= 64)
1845                        count = 2;
1846                    break;
1847                }
1848            }
1849        }
1850        if (delta != 0) {
1851            counter.add((long)delta);
1852            if (count > 1)
1853                checkForResize();
1854        }
1855        return val;
1856    }
1857
1858    /** Implementation for merge */
1859    @SuppressWarnings("unchecked") private final Object internalMerge
1860        (K k, V v, BiFun<? super V, ? super V, ? extends V> mf) {
1861        int h = spread(k.hashCode());
1862        Object val = null;
1863        int delta = 0;
1864        int count = 0;
1865        for (Node[] tab = table;;) {
1866            int i; Node f; int fh; Object fk, fv;
1867            if (tab == null)
1868                tab = initTable();
1869            else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1870                if (casTabAt(tab, i, null, new Node(h, k, v, null))) {
1871                    delta = 1;
1872                    val = v;
1873                    break;
1874                }
1875            }
1876            else if ((fh = f.hash) == MOVED) {
1877                if ((fk = f.key) instanceof TreeBin) {
1878                    TreeBin t = (TreeBin)fk;
1879                    t.acquire(0);
1880                    try {
1881                        if (tabAt(tab, i) == f) {
1882                            count = 1;
1883                            TreeNode p = t.getTreeNode(h, k, t.root);
1884                            val = (p == null) ? v : mf.apply((V)p.val, v);
1885                            if (val != null) {
1886                                if (p != null)
1887                                    p.val = val;
1888                                else {
1889                                    count = 2;
1890                                    delta = 1;
1891                                    t.putTreeNode(h, k, val);
1892                                }
1893                            }
1894                            else if (p != null) {
1895                                delta = -1;
1896                                t.deleteTreeNode(p);
1897                            }
1898                        }
1899                    } finally {
1900                        t.release(0);
1901                    }
1902                    if (count != 0)
1903                        break;
1904                }
1905                else
1906                    tab = (Node[])fk;
1907            }
1908            else if ((fh & LOCKED) != 0) {
1909                checkForResize();
1910                f.tryAwaitLock(tab, i);
1911            }
1912            else if (f.casHash(fh, fh | LOCKED)) {
1913                try {
1914                    if (tabAt(tab, i) == f) {
1915                        count = 1;
1916                        for (Node e = f, pred = null;; ++count) {
1917                            Object ek, ev;
1918                            if ((e.hash & HASH_BITS) == h &&
1919                                (ev = e.val) != null &&
1920                                ((ek = e.key) == k || k.equals(ek))) {
1921                                val = mf.apply(v, (V)ev);
1922                                if (val != null)
1923                                    e.val = val;
1924                                else {
1925                                    delta = -1;
1926                                    Node en = e.next;
1927                                    if (pred != null)
1928                                        pred.next = en;
1929                                    else
1930                                        setTabAt(tab, i, en);
1931                                }
1932                                break;
1933                            }
1934                            pred = e;
1935                            if ((e = e.next) == null) {
1936                                val = v;
1937                                pred.next = new Node(h, k, val, null);
1938                                delta = 1;
1939                                if (count >= TREE_THRESHOLD)
1940                                    replaceWithTreeBin(tab, i, k);
1941                                break;
1942                            }
1943                        }
1944                    }
1945                } finally {
1946                    if (!f.casHash(fh | LOCKED, fh)) {
1947                        f.hash = fh;
1948                        synchronized (f) { f.notifyAll(); };
1949                    }
1950                }
1951                if (count != 0) {
1952                    if (tab.length <= 64)
1953                        count = 2;
1954                    break;
1955                }
1956            }
1957        }
1958        if (delta != 0) {
1959            counter.add((long)delta);
1960            if (count > 1)
1961                checkForResize();
1962        }
1963        return val;
1964    }
1965
1966    /** Implementation for putAll */
1967    private final void internalPutAll(Map<?, ?> m) {
1968        tryPresize(m.size());
1969        long delta = 0L;     // number of uncommitted additions
1970        boolean npe = false; // to throw exception on exit for nulls
1971        try {                // to clean up counts on other exceptions
1972            for (Map.Entry<?, ?> entry : m.entrySet()) {
1973                Object k, v;
1974                if (entry == null || (k = entry.getKey()) == null ||
1975                    (v = entry.getValue()) == null) {
1976                    npe = true;
1977                    break;
1978                }
1979                int h = spread(k.hashCode());
1980                for (Node[] tab = table;;) {
1981                    int i; Node f; int fh; Object fk;
1982                    if (tab == null)
1983                        tab = initTable();
1984                    else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null){
1985                        if (casTabAt(tab, i, null, new Node(h, k, v, null))) {
1986                            ++delta;
1987                            break;
1988                        }
1989                    }
1990                    else if ((fh = f.hash) == MOVED) {
1991                        if ((fk = f.key) instanceof TreeBin) {
1992                            TreeBin t = (TreeBin)fk;
1993                            boolean validated = false;
1994                            t.acquire(0);
1995                            try {
1996                                if (tabAt(tab, i) == f) {
1997                                    validated = true;
1998                                    TreeNode p = t.getTreeNode(h, k, t.root);
1999                                    if (p != null)
2000                                        p.val = v;
2001                                    else {
2002                                        t.putTreeNode(h, k, v);
2003                                        ++delta;
2004                                    }
2005                                }
2006                            } finally {
2007                                t.release(0);
2008                            }
2009                            if (validated)
2010                                break;
2011                        }
2012                        else
2013                            tab = (Node[])fk;
2014                    }
2015                    else if ((fh & LOCKED) != 0) {
2016                        counter.add(delta);
2017                        delta = 0L;
2018                        checkForResize();
2019                        f.tryAwaitLock(tab, i);
2020                    }
2021                    else if (f.casHash(fh, fh | LOCKED)) {
2022                        int count = 0;
2023                        try {
2024                            if (tabAt(tab, i) == f) {
2025                                count = 1;
2026                                for (Node e = f;; ++count) {
2027                                    Object ek, ev;
2028                                    if ((e.hash & HASH_BITS) == h &&
2029                                        (ev = e.val) != null &&
2030                                        ((ek = e.key) == k || k.equals(ek))) {
2031                                        e.val = v;
2032                                        break;
2033                                    }
2034                                    Node last = e;
2035                                    if ((e = e.next) == null) {
2036                                        ++delta;
2037                                        last.next = new Node(h, k, v, null);
2038                                        if (count >= TREE_THRESHOLD)
2039                                            replaceWithTreeBin(tab, i, k);
2040                                        break;
2041                                    }
2042                                }
2043                            }
2044                        } finally {
2045                            if (!f.casHash(fh | LOCKED, fh)) {
2046                                f.hash = fh;
2047                                synchronized (f) { f.notifyAll(); };
2048                            }
2049                        }
2050                        if (count != 0) {
2051                            if (count > 1) {
2052                                counter.add(delta);
2053                                delta = 0L;
2054                                checkForResize();
2055                            }
2056                            break;
2057                        }
2058                    }
2059                }
2060            }
2061        } finally {
2062            if (delta != 0)
2063                counter.add(delta);
2064        }
2065        if (npe)
2066            throw new NullPointerException();
2067    }
2068
2069    /* ---------------- Table Initialization and Resizing -------------- */
2070
2071    /**
679       * Returns a power of two table size for the given desired capacity.
680       * See Hackers Delight, sec 3.2
681       */
# Line 2083 | Line 690 | public class ConcurrentHashMapV8<K, V>
690      }
691  
692      /**
693 <     * Initializes table, using the size recorded in sizeCtl.
693 >     * Returns x's Class if it is of the form "class C implements
694 >     * Comparable<C>", else null.
695       */
696 <    private final Node[] initTable() {
697 <        Node[] tab; int sc;
698 <        while ((tab = table) == null) {
699 <            if ((sc = sizeCtl) < 0)
700 <                Thread.yield(); // lost initialization race; just spin
701 <            else if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
702 <                try {
703 <                    if ((tab = table) == null) {
704 <                        int n = (sc > 0) ? sc : DEFAULT_CAPACITY;
705 <                        tab = table = new Node[n];
706 <                        sc = n - (n >>> 2);
707 <                    }
708 <                } finally {
2101 <                    sizeCtl = sc;
2102 <                }
2103 <                break;
2104 <            }
2105 <        }
2106 <        return tab;
2107 <    }
2108 <
2109 <    /**
2110 <     * If table is too small and not already resizing, creates next
2111 <     * table and transfers bins.  Rechecks occupancy after a transfer
2112 <     * to see if another resize is already needed because resizings
2113 <     * are lagging additions.
2114 <     */
2115 <    private final void checkForResize() {
2116 <        Node[] tab; int n, sc;
2117 <        while ((tab = table) != null &&
2118 <               (n = tab.length) < MAXIMUM_CAPACITY &&
2119 <               (sc = sizeCtl) >= 0 && counter.sum() >= (long)sc &&
2120 <               UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
2121 <            try {
2122 <                if (tab == table) {
2123 <                    table = rebuild(tab);
2124 <                    sc = (n << 1) - (n >>> 1);
696 >    static Class<?> comparableClassFor(Object x) {
697 >        if (x instanceof Comparable) {
698 >            Class<?> c; Type[] ts, as; Type t; ParameterizedType p;
699 >            if ((c = x.getClass()) == String.class) // bypass checks
700 >                return c;
701 >            if ((ts = c.getGenericInterfaces()) != null) {
702 >                for (int i = 0; i < ts.length; ++i) {
703 >                    if (((t = ts[i]) instanceof ParameterizedType) &&
704 >                        ((p = (ParameterizedType)t).getRawType() ==
705 >                         Comparable.class) &&
706 >                        (as = p.getActualTypeArguments()) != null &&
707 >                        as.length == 1 && as[0] == c) // type arg is c
708 >                        return c;
709                  }
2126            } finally {
2127                sizeCtl = sc;
710              }
711          }
712 +        return null;
713      }
714  
715      /**
716 <     * Tries to presize table to accommodate the given number of elements.
717 <     *
2135 <     * @param size number of elements (doesn't need to be perfectly accurate)
716 >     * Returns k.compareTo(x) if x matches kc (k's screened comparable
717 >     * class), else 0.
718       */
719 <    private final void tryPresize(int size) {
720 <        int c = (size >= (MAXIMUM_CAPACITY >>> 1)) ? MAXIMUM_CAPACITY :
721 <            tableSizeFor(size + (size >>> 1) + 1);
722 <        int sc;
2141 <        while ((sc = sizeCtl) >= 0) {
2142 <            Node[] tab = table; int n;
2143 <            if (tab == null || (n = tab.length) == 0) {
2144 <                n = (sc > c) ? sc : c;
2145 <                if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
2146 <                    try {
2147 <                        if (table == tab) {
2148 <                            table = new Node[n];
2149 <                            sc = n - (n >>> 2);
2150 <                        }
2151 <                    } finally {
2152 <                        sizeCtl = sc;
2153 <                    }
2154 <                }
2155 <            }
2156 <            else if (c <= sc || n >= MAXIMUM_CAPACITY)
2157 <                break;
2158 <            else if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
2159 <                try {
2160 <                    if (table == tab) {
2161 <                        table = rebuild(tab);
2162 <                        sc = (n << 1) - (n >>> 1);
2163 <                    }
2164 <                } finally {
2165 <                    sizeCtl = sc;
2166 <                }
2167 <            }
2168 <        }
719 >    @SuppressWarnings({"rawtypes","unchecked"}) // for cast to Comparable
720 >    static int compareComparables(Class<?> kc, Object k, Object x) {
721 >        return (x == null || x.getClass() != kc ? 0 :
722 >                ((Comparable)k).compareTo(x));
723      }
724  
725 +    /* ---------------- Table element access -------------- */
726 +
727      /*
728 <     * Moves and/or copies the nodes in each bin to new table. See
729 <     * above for explanation.
730 <     *
731 <     * @return the new table
732 <     */
733 <    private static final Node[] rebuild(Node[] tab) {
734 <        int n = tab.length;
735 <        Node[] nextTab = new Node[n << 1];
736 <        Node fwd = new Node(MOVED, nextTab, null, null);
737 <        int[] buffer = null;       // holds bins to revisit; null until needed
738 <        Node rev = null;           // reverse forwarder; null until needed
739 <        int nbuffered = 0;         // the number of bins in buffer list
740 <        int bufferIndex = 0;       // buffer index of current buffered bin
741 <        int bin = n - 1;           // current non-buffered bin or -1 if none
742 <
743 <        for (int i = bin;;) {      // start upwards sweep
744 <            int fh; Node f;
745 <            if ((f = tabAt(tab, i)) == null) {
746 <                if (bin >= 0) {    // Unbuffered; no lock needed (or available)
747 <                    if (!casTabAt(tab, i, f, fwd))
748 <                        continue;
749 <                }
750 <                else {             // transiently use a locked forwarding node
2195 <                    Node g = new Node(MOVED|LOCKED, nextTab, null, null);
2196 <                    if (!casTabAt(tab, i, f, g))
2197 <                        continue;
2198 <                    setTabAt(nextTab, i, null);
2199 <                    setTabAt(nextTab, i + n, null);
2200 <                    setTabAt(tab, i, fwd);
2201 <                    if (!g.casHash(MOVED|LOCKED, MOVED)) {
2202 <                        g.hash = MOVED;
2203 <                        synchronized (g) { g.notifyAll(); }
2204 <                    }
2205 <                }
2206 <            }
2207 <            else if ((fh = f.hash) == MOVED) {
2208 <                Object fk = f.key;
2209 <                if (fk instanceof TreeBin) {
2210 <                    TreeBin t = (TreeBin)fk;
2211 <                    boolean validated = false;
2212 <                    t.acquire(0);
2213 <                    try {
2214 <                        if (tabAt(tab, i) == f) {
2215 <                            validated = true;
2216 <                            splitTreeBin(nextTab, i, t);
2217 <                            setTabAt(tab, i, fwd);
2218 <                        }
2219 <                    } finally {
2220 <                        t.release(0);
2221 <                    }
2222 <                    if (!validated)
2223 <                        continue;
2224 <                }
2225 <            }
2226 <            else if ((fh & LOCKED) == 0 && f.casHash(fh, fh|LOCKED)) {
2227 <                boolean validated = false;
2228 <                try {              // split to lo and hi lists; copying as needed
2229 <                    if (tabAt(tab, i) == f) {
2230 <                        validated = true;
2231 <                        splitBin(nextTab, i, f);
2232 <                        setTabAt(tab, i, fwd);
2233 <                    }
2234 <                } finally {
2235 <                    if (!f.casHash(fh | LOCKED, fh)) {
2236 <                        f.hash = fh;
2237 <                        synchronized (f) { f.notifyAll(); };
2238 <                    }
2239 <                }
2240 <                if (!validated)
2241 <                    continue;
2242 <            }
2243 <            else {
2244 <                if (buffer == null) // initialize buffer for revisits
2245 <                    buffer = new int[TRANSFER_BUFFER_SIZE];
2246 <                if (bin < 0 && bufferIndex > 0) {
2247 <                    int j = buffer[--bufferIndex];
2248 <                    buffer[bufferIndex] = i;
2249 <                    i = j;         // swap with another bin
2250 <                    continue;
2251 <                }
2252 <                if (bin < 0 || nbuffered >= TRANSFER_BUFFER_SIZE) {
2253 <                    f.tryAwaitLock(tab, i);
2254 <                    continue;      // no other options -- block
2255 <                }
2256 <                if (rev == null)   // initialize reverse-forwarder
2257 <                    rev = new Node(MOVED, tab, null, null);
2258 <                if (tabAt(tab, i) != f || (f.hash & LOCKED) == 0)
2259 <                    continue;      // recheck before adding to list
2260 <                buffer[nbuffered++] = i;
2261 <                setTabAt(nextTab, i, rev);     // install place-holders
2262 <                setTabAt(nextTab, i + n, rev);
2263 <            }
2264 <
2265 <            if (bin > 0)
2266 <                i = --bin;
2267 <            else if (buffer != null && nbuffered > 0) {
2268 <                bin = -1;
2269 <                i = buffer[bufferIndex = --nbuffered];
2270 <            }
2271 <            else
2272 <                return nextTab;
2273 <        }
728 >     * Volatile access methods are used for table elements as well as
729 >     * elements of in-progress next table while resizing.  All uses of
730 >     * the tab arguments must be null checked by callers.  All callers
731 >     * also paranoically precheck that tab's length is not zero (or an
732 >     * equivalent check), thus ensuring that any index argument taking
733 >     * the form of a hash value anded with (length - 1) is a valid
734 >     * index.  Note that, to be correct wrt arbitrary concurrency
735 >     * errors by users, these checks must operate on local variables,
736 >     * which accounts for some odd-looking inline assignments below.
737 >     * Note that calls to setTabAt always occur within locked regions,
738 >     * and so in principle require only release ordering, not need
739 >     * full volatile semantics, but are currently coded as volatile
740 >     * writes to be conservative.
741 >     */
742 >
743 >    @SuppressWarnings("unchecked")
744 >    static final <K,V> Node<K,V> tabAt(Node<K,V>[] tab, int i) {
745 >        return (Node<K,V>)U.getObjectVolatile(tab, ((long)i << ASHIFT) + ABASE);
746 >    }
747 >
748 >    static final <K,V> boolean casTabAt(Node<K,V>[] tab, int i,
749 >                                        Node<K,V> c, Node<K,V> v) {
750 >        return U.compareAndSwapObject(tab, ((long)i << ASHIFT) + ABASE, c, v);
751      }
752  
753 <    /**
754 <     * Splits a normal bin with list headed by e into lo and hi parts;
2278 <     * installs in given table.
2279 <     */
2280 <    private static void splitBin(Node[] nextTab, int i, Node e) {
2281 <        int bit = nextTab.length >>> 1; // bit to split on
2282 <        int runBit = e.hash & bit;
2283 <        Node lastRun = e, lo = null, hi = null;
2284 <        for (Node p = e.next; p != null; p = p.next) {
2285 <            int b = p.hash & bit;
2286 <            if (b != runBit) {
2287 <                runBit = b;
2288 <                lastRun = p;
2289 <            }
2290 <        }
2291 <        if (runBit == 0)
2292 <            lo = lastRun;
2293 <        else
2294 <            hi = lastRun;
2295 <        for (Node p = e; p != lastRun; p = p.next) {
2296 <            int ph = p.hash & HASH_BITS;
2297 <            Object pk = p.key, pv = p.val;
2298 <            if ((ph & bit) == 0)
2299 <                lo = new Node(ph, pk, pv, lo);
2300 <            else
2301 <                hi = new Node(ph, pk, pv, hi);
2302 <        }
2303 <        setTabAt(nextTab, i, lo);
2304 <        setTabAt(nextTab, i + bit, hi);
753 >    static final <K,V> void setTabAt(Node<K,V>[] tab, int i, Node<K,V> v) {
754 >        U.putObjectVolatile(tab, ((long)i << ASHIFT) + ABASE, v);
755      }
756  
757 +    /* ---------------- Fields -------------- */
758 +
759      /**
760 <     * Splits a tree bin into lo and hi parts; installs in given table.
760 >     * The array of bins. Lazily initialized upon first insertion.
761 >     * Size is always a power of two. Accessed directly by iterators.
762       */
763 <    private static void splitTreeBin(Node[] nextTab, int i, TreeBin t) {
2311 <        int bit = nextTab.length >>> 1;
2312 <        TreeBin lt = new TreeBin();
2313 <        TreeBin ht = new TreeBin();
2314 <        int lc = 0, hc = 0;
2315 <        for (Node e = t.first; e != null; e = e.next) {
2316 <            int h = e.hash & HASH_BITS;
2317 <            Object k = e.key, v = e.val;
2318 <            if ((h & bit) == 0) {
2319 <                ++lc;
2320 <                lt.putTreeNode(h, k, v);
2321 <            }
2322 <            else {
2323 <                ++hc;
2324 <                ht.putTreeNode(h, k, v);
2325 <            }
2326 <        }
2327 <        Node ln, hn; // throw away trees if too small
2328 <        if (lc <= (TREE_THRESHOLD >>> 1)) {
2329 <            ln = null;
2330 <            for (Node p = lt.first; p != null; p = p.next)
2331 <                ln = new Node(p.hash, p.key, p.val, ln);
2332 <        }
2333 <        else
2334 <            ln = new Node(MOVED, lt, null, null);
2335 <        setTabAt(nextTab, i, ln);
2336 <        if (hc <= (TREE_THRESHOLD >>> 1)) {
2337 <            hn = null;
2338 <            for (Node p = ht.first; p != null; p = p.next)
2339 <                hn = new Node(p.hash, p.key, p.val, hn);
2340 <        }
2341 <        else
2342 <            hn = new Node(MOVED, ht, null, null);
2343 <        setTabAt(nextTab, i + bit, hn);
2344 <    }
763 >    transient volatile Node<K,V>[] table;
764  
765      /**
766 <     * Implementation for clear. Steps through each bin, removing all
2348 <     * nodes.
766 >     * The next table to use; non-null only while resizing.
767       */
768 <    private final void internalClear() {
2351 <        long delta = 0L; // negative number of deletions
2352 <        int i = 0;
2353 <        Node[] tab = table;
2354 <        while (tab != null && i < tab.length) {
2355 <            int fh; Object fk;
2356 <            Node f = tabAt(tab, i);
2357 <            if (f == null)
2358 <                ++i;
2359 <            else if ((fh = f.hash) == MOVED) {
2360 <                if ((fk = f.key) instanceof TreeBin) {
2361 <                    TreeBin t = (TreeBin)fk;
2362 <                    t.acquire(0);
2363 <                    try {
2364 <                        if (tabAt(tab, i) == f) {
2365 <                            for (Node p = t.first; p != null; p = p.next) {
2366 <                                if (p.val != null) { // (currently always true)
2367 <                                    p.val = null;
2368 <                                    --delta;
2369 <                                }
2370 <                            }
2371 <                            t.first = null;
2372 <                            t.root = null;
2373 <                            ++i;
2374 <                        }
2375 <                    } finally {
2376 <                        t.release(0);
2377 <                    }
2378 <                }
2379 <                else
2380 <                    tab = (Node[])fk;
2381 <            }
2382 <            else if ((fh & LOCKED) != 0) {
2383 <                counter.add(delta); // opportunistically update count
2384 <                delta = 0L;
2385 <                f.tryAwaitLock(tab, i);
2386 <            }
2387 <            else if (f.casHash(fh, fh | LOCKED)) {
2388 <                try {
2389 <                    if (tabAt(tab, i) == f) {
2390 <                        for (Node e = f; e != null; e = e.next) {
2391 <                            if (e.val != null) {  // (currently always true)
2392 <                                e.val = null;
2393 <                                --delta;
2394 <                            }
2395 <                        }
2396 <                        setTabAt(tab, i, null);
2397 <                        ++i;
2398 <                    }
2399 <                } finally {
2400 <                    if (!f.casHash(fh | LOCKED, fh)) {
2401 <                        f.hash = fh;
2402 <                        synchronized (f) { f.notifyAll(); };
2403 <                    }
2404 <                }
2405 <            }
2406 <        }
2407 <        if (delta != 0)
2408 <            counter.add(delta);
2409 <    }
2410 <
2411 <    /* ----------------Table Traversal -------------- */
768 >    private transient volatile Node<K,V>[] nextTable;
769  
770      /**
771 <     * Encapsulates traversal for methods such as containsValue; also
772 <     * serves as a base class for other iterators and bulk tasks.
773 <     *
774 <     * At each step, the iterator snapshots the key ("nextKey") and
775 <     * value ("nextVal") of a valid node (i.e., one that, at point of
2419 <     * snapshot, has a non-null user value). Because val fields can
2420 <     * change (including to null, indicating deletion), field nextVal
2421 <     * might not be accurate at point of use, but still maintains the
2422 <     * weak consistency property of holding a value that was once
2423 <     * valid. To support iterator.remove, the nextKey field is not
2424 <     * updated (nulled out) when the iterator cannot advance.
2425 <     *
2426 <     * Internal traversals directly access these fields, as in:
2427 <     * {@code while (it.advance() != null) { process(it.nextKey); }}
2428 <     *
2429 <     * Exported iterators must track whether the iterator has advanced
2430 <     * (in hasNext vs next) (by setting/checking/nulling field
2431 <     * nextVal), and then extract key, value, or key-value pairs as
2432 <     * return values of next().
2433 <     *
2434 <     * The iterator visits once each still-valid node that was
2435 <     * reachable upon iterator construction. It might miss some that
2436 <     * were added to a bin after the bin was visited, which is OK wrt
2437 <     * consistency guarantees. Maintaining this property in the face
2438 <     * of possible ongoing resizes requires a fair amount of
2439 <     * bookkeeping state that is difficult to optimize away amidst
2440 <     * volatile accesses.  Even so, traversal maintains reasonable
2441 <     * throughput.
2442 <     *
2443 <     * Normally, iteration proceeds bin-by-bin traversing lists.
2444 <     * However, if the table has been resized, then all future steps
2445 <     * must traverse both the bin at the current index as well as at
2446 <     * (index + baseSize); and so on for further resizings. To
2447 <     * paranoically cope with potential sharing by users of iterators
2448 <     * across threads, iteration terminates if a bounds checks fails
2449 <     * for a table read.
2450 <     *
2451 <     * This class extends ForkJoinTask to streamline parallel
2452 <     * iteration in bulk operations (see BulkTask). This adds only an
2453 <     * int of space overhead, which is close enough to negligible in
2454 <     * cases where it is not needed to not worry about it.  Because
2455 <     * ForkJoinTask is Serializable, but iterators need not be, we
2456 <     * need to add warning suppressions.
2457 <     */
2458 <    @SuppressWarnings("serial") static class Traverser<K,V,R> extends ForkJoinTask<R> {
2459 <        final ConcurrentHashMapV8<K, V> map;
2460 <        Node next;           // the next entry to use
2461 <        Object nextKey;      // cached key field of next
2462 <        Object nextVal;      // cached val field of next
2463 <        Node[] tab;          // current table; updated if resized
2464 <        int index;           // index of bin to use next
2465 <        int baseIndex;       // current index of initial table
2466 <        int baseLimit;       // index bound for initial table
2467 <        int baseSize;        // initial table size
771 >     * Base counter value, used mainly when there is no contention,
772 >     * but also as a fallback during table initialization
773 >     * races. Updated via CAS.
774 >     */
775 >    private transient volatile long baseCount;
776  
777 <        /** Creates iterator for all entries in the table. */
778 <        Traverser(ConcurrentHashMapV8<K, V> map) {
779 <            this.map = map;
780 <        }
777 >    /**
778 >     * Table initialization and resizing control.  When negative, the
779 >     * table is being initialized or resized: -1 for initialization,
780 >     * else -(1 + the number of active resizing threads).  Otherwise,
781 >     * when table is null, holds the initial table size to use upon
782 >     * creation, or 0 for default. After initialization, holds the
783 >     * next element count value upon which to resize the table.
784 >     */
785 >    private transient volatile int sizeCtl;
786  
787 <        /** Creates iterator for split() methods */
788 <        Traverser(Traverser<K,V,?> it) {
789 <            ConcurrentHashMapV8<K, V> m; Node[] t;
790 <            if ((m = this.map = it.map) == null)
2478 <                t = null;
2479 <            else if ((t = it.tab) == null && // force parent tab initialization
2480 <                     (t = it.tab = m.table) != null)
2481 <                it.baseLimit = it.baseSize = t.length;
2482 <            this.tab = t;
2483 <            this.baseSize = it.baseSize;
2484 <            it.baseLimit = this.index = this.baseIndex =
2485 <                ((this.baseLimit = it.baseLimit) + it.baseIndex + 1) >>> 1;
2486 <        }
787 >    /**
788 >     * The next table index (plus one) to split while resizing.
789 >     */
790 >    private transient volatile int transferIndex;
791  
792 <        /**
793 <         * Advances next; returns nextVal or null if terminated.
794 <         * See above for explanation.
795 <         */
2492 <        final Object advance() {
2493 <            Node e = next;
2494 <            Object ev = null;
2495 <            outer: do {
2496 <                if (e != null)                  // advance past used/skipped node
2497 <                    e = e.next;
2498 <                while (e == null) {             // get to next non-null bin
2499 <                    ConcurrentHashMapV8<K, V> m;
2500 <                    Node[] t; int b, i, n; Object ek; // checks must use locals
2501 <                    if ((t = tab) != null)
2502 <                        n = t.length;
2503 <                    else if ((m = map) != null && (t = tab = m.table) != null)
2504 <                        n = baseLimit = baseSize = t.length;
2505 <                    else
2506 <                        break outer;
2507 <                    if ((b = baseIndex) >= baseLimit ||
2508 <                        (i = index) < 0 || i >= n)
2509 <                        break outer;
2510 <                    if ((e = tabAt(t, i)) != null && e.hash == MOVED) {
2511 <                        if ((ek = e.key) instanceof TreeBin)
2512 <                            e = ((TreeBin)ek).first;
2513 <                        else {
2514 <                            tab = (Node[])ek;
2515 <                            continue;           // restarts due to null val
2516 <                        }
2517 <                    }                           // visit upper slots if present
2518 <                    index = (i += baseSize) < n ? i : (baseIndex = b + 1);
2519 <                }
2520 <                nextKey = e.key;
2521 <            } while ((ev = e.val) == null);    // skip deleted or special nodes
2522 <            next = e;
2523 <            return nextVal = ev;
2524 <        }
792 >    /**
793 >     * Spinlock (locked via CAS) used when resizing and/or creating CounterCells.
794 >     */
795 >    private transient volatile int cellsBusy;
796  
797 <        public final void remove() {
798 <            Object k = nextKey;
799 <            if (k == null && (advance() == null || (k = nextKey) == null))
800 <                throw new IllegalStateException();
2530 <            map.internalReplace(k, null, null);
2531 <        }
797 >    /**
798 >     * Table of counter cells. When non-null, size is a power of 2.
799 >     */
800 >    private transient volatile CounterCell[] counterCells;
801  
802 <        public final boolean hasNext() {
803 <            return nextVal != null || advance() != null;
804 <        }
802 >    // views
803 >    private transient KeySetView<K,V> keySet;
804 >    private transient ValuesView<K,V> values;
805 >    private transient EntrySetView<K,V> entrySet;
806  
2537        public final boolean hasMoreElements() { return hasNext(); }
2538        public final void setRawResult(Object x) { }
2539        public R getRawResult() { return null; }
2540        public boolean exec() { return true; }
2541    }
807  
808      /* ---------------- Public operations -------------- */
809  
# Line 2546 | Line 811 | public class ConcurrentHashMapV8<K, V>
811       * Creates a new, empty map with the default initial table size (16).
812       */
813      public ConcurrentHashMapV8() {
2549        this.counter = new LongAdder();
814      }
815  
816      /**
# Line 2565 | Line 829 | public class ConcurrentHashMapV8<K, V>
829          int cap = ((initialCapacity >= (MAXIMUM_CAPACITY >>> 1)) ?
830                     MAXIMUM_CAPACITY :
831                     tableSizeFor(initialCapacity + (initialCapacity >>> 1) + 1));
2568        this.counter = new LongAdder();
832          this.sizeCtl = cap;
833      }
834  
# Line 2575 | Line 838 | public class ConcurrentHashMapV8<K, V>
838       * @param m the map
839       */
840      public ConcurrentHashMapV8(Map<? extends K, ? extends V> m) {
2578        this.counter = new LongAdder();
841          this.sizeCtl = DEFAULT_CAPACITY;
842 <        internalPutAll(m);
842 >        putAll(m);
843      }
844  
845      /**
# Line 2618 | Line 880 | public class ConcurrentHashMapV8<K, V>
880       * nonpositive
881       */
882      public ConcurrentHashMapV8(int initialCapacity,
883 <                               float loadFactor, int concurrencyLevel) {
883 >                             float loadFactor, int concurrencyLevel) {
884          if (!(loadFactor > 0.0f) || initialCapacity < 0 || concurrencyLevel <= 0)
885              throw new IllegalArgumentException();
886          if (initialCapacity < concurrencyLevel)   // Use at least as many bins
# Line 2626 | Line 888 | public class ConcurrentHashMapV8<K, V>
888          long size = (long)(1.0 + (long)initialCapacity / loadFactor);
889          int cap = (size >= (long)MAXIMUM_CAPACITY) ?
890              MAXIMUM_CAPACITY : tableSizeFor((int)size);
2629        this.counter = new LongAdder();
891          this.sizeCtl = cap;
892      }
893  
894 <    /**
2634 <     * Creates a new {@link Set} backed by a ConcurrentHashMapV8
2635 <     * from the given type to {@code Boolean.TRUE}.
2636 <     *
2637 <     * @return the new set
2638 <     */
2639 <    public static <K> KeySetView<K,Boolean> newKeySet() {
2640 <        return new KeySetView<K,Boolean>(new ConcurrentHashMapV8<K,Boolean>(),
2641 <                                      Boolean.TRUE);
2642 <    }
2643 <
2644 <    /**
2645 <     * Creates a new {@link Set} backed by a ConcurrentHashMapV8
2646 <     * from the given type to {@code Boolean.TRUE}.
2647 <     *
2648 <     * @param initialCapacity The implementation performs internal
2649 <     * sizing to accommodate this many elements.
2650 <     * @throws IllegalArgumentException if the initial capacity of
2651 <     * elements is negative
2652 <     * @return the new set
2653 <     */
2654 <    public static <K> KeySetView<K,Boolean> newKeySet(int initialCapacity) {
2655 <        return new KeySetView<K,Boolean>(new ConcurrentHashMapV8<K,Boolean>(initialCapacity),
2656 <                                      Boolean.TRUE);
2657 <    }
2658 <
2659 <    /**
2660 <     * {@inheritDoc}
2661 <     */
2662 <    public boolean isEmpty() {
2663 <        return counter.sum() <= 0L; // ignore transient negative values
2664 <    }
894 >    // Original (since JDK1.2) Map methods
895  
896      /**
897       * {@inheritDoc}
898       */
899      public int size() {
900 <        long n = counter.sum();
900 >        long n = sumCount();
901          return ((n < 0L) ? 0 :
902                  (n > (long)Integer.MAX_VALUE) ? Integer.MAX_VALUE :
903                  (int)n);
904      }
905  
906      /**
907 <     * Returns the number of mappings. This method should be used
2678 <     * instead of {@link #size} because a ConcurrentHashMapV8 may
2679 <     * contain more mappings than can be represented as an int. The
2680 <     * value returned is a snapshot; the actual count may differ if
2681 <     * there are ongoing concurrent insertions or removals.
2682 <     *
2683 <     * @return the number of mappings
907 >     * {@inheritDoc}
908       */
909 <    public long mappingCount() {
910 <        long n = counter.sum();
2687 <        return (n < 0L) ? 0L : n; // ignore transient negative values
909 >    public boolean isEmpty() {
910 >        return sumCount() <= 0L; // ignore transient negative values
911      }
912  
913      /**
# Line 2698 | Line 921 | public class ConcurrentHashMapV8<K, V>
921       *
922       * @throws NullPointerException if the specified key is null
923       */
924 <    @SuppressWarnings("unchecked") public V get(Object key) {
925 <        if (key == null)
926 <            throw new NullPointerException();
927 <        return (V)internalGet(key);
928 <    }
929 <
930 <    /**
931 <     * Returns the value to which the specified key is mapped,
932 <     * or the given defaultValue if this map contains no mapping for the key.
933 <     *
934 <     * @param key the key
935 <     * @param defaultValue the value to return if this map contains
936 <     * no mapping for the given key
937 <     * @return the mapping for the key, if present; else the defaultValue
938 <     * @throws NullPointerException if the specified key is null
939 <     */
940 <    @SuppressWarnings("unchecked") public V getValueOrDefault(Object key, V defaultValue) {
941 <        if (key == null)
2719 <            throw new NullPointerException();
2720 <        V v = (V) internalGet(key);
2721 <        return v == null ? defaultValue : v;
924 >    public V get(Object key) {
925 >        Node<K,V>[] tab; Node<K,V> e, p; int n, eh; K ek;
926 >        int h = spread(key.hashCode());
927 >        if ((tab = table) != null && (n = tab.length) > 0 &&
928 >            (e = tabAt(tab, (n - 1) & h)) != null) {
929 >            if ((eh = e.hash) == h) {
930 >                if ((ek = e.key) == key || (ek != null && key.equals(ek)))
931 >                    return e.val;
932 >            }
933 >            else if (eh < 0)
934 >                return (p = e.find(h, key)) != null ? p.val : null;
935 >            while ((e = e.next) != null) {
936 >                if (e.hash == h &&
937 >                    ((ek = e.key) == key || (ek != null && key.equals(ek))))
938 >                    return e.val;
939 >            }
940 >        }
941 >        return null;
942      }
943  
944      /**
945       * Tests if the specified object is a key in this table.
946       *
947 <     * @param  key   possible key
947 >     * @param  key possible key
948       * @return {@code true} if and only if the specified object
949       *         is a key in this table, as determined by the
950       *         {@code equals} method; {@code false} otherwise
951       * @throws NullPointerException if the specified key is null
952       */
953      public boolean containsKey(Object key) {
954 <        if (key == null)
2735 <            throw new NullPointerException();
2736 <        return internalGet(key) != null;
954 >        return get(key) != null;
955      }
956  
957      /**
# Line 2749 | Line 967 | public class ConcurrentHashMapV8<K, V>
967      public boolean containsValue(Object value) {
968          if (value == null)
969              throw new NullPointerException();
970 <        Object v;
971 <        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
972 <        while ((v = it.advance()) != null) {
973 <            if (v == value || value.equals(v))
974 <                return true;
970 >        Node<K,V>[] t;
971 >        if ((t = table) != null) {
972 >            Traverser<K,V> it = new Traverser<K,V>(t, t.length, 0, t.length);
973 >            for (Node<K,V> p; (p = it.advance()) != null; ) {
974 >                V v;
975 >                if ((v = p.val) == value || (v != null && value.equals(v)))
976 >                    return true;
977 >            }
978          }
979          return false;
980      }
981  
982      /**
2762     * Legacy method testing if some key maps into the specified value
2763     * in this table.  This method is identical in functionality to
2764     * {@link #containsValue}, and exists solely to ensure
2765     * full compatibility with class {@link java.util.Hashtable},
2766     * which supported this method prior to introduction of the
2767     * Java Collections framework.
2768     *
2769     * @param  value a value to search for
2770     * @return {@code true} if and only if some key maps to the
2771     *         {@code value} argument in this table as
2772     *         determined by the {@code equals} method;
2773     *         {@code false} otherwise
2774     * @throws NullPointerException if the specified value is null
2775     */
2776    public boolean contains(Object value) {
2777        return containsValue(value);
2778    }
2779
2780    /**
983       * Maps the specified key to the specified value in this table.
984       * Neither the key nor the value can be null.
985       *
986 <     * <p> The value can be retrieved by calling the {@code get} method
986 >     * <p>The value can be retrieved by calling the {@code get} method
987       * with a key that is equal to the original key.
988       *
989       * @param key key with which the specified value is to be associated
# Line 2790 | Line 992 | public class ConcurrentHashMapV8<K, V>
992       *         {@code null} if there was no mapping for {@code key}
993       * @throws NullPointerException if the specified key or value is null
994       */
995 <    @SuppressWarnings("unchecked") public V put(K key, V value) {
996 <        if (key == null || value == null)
995 >    public V put(K key, V value) {
996 >        return putVal(key, value, false);
997 >    }
998 >
999 >    /** Implementation for put and putIfAbsent */
1000 >    final V putVal(K key, V value, boolean onlyIfAbsent) {
1001 >        if (key == null || value == null) throw new NullPointerException();
1002 >        int hash = spread(key.hashCode());
1003 >        int binCount = 0;
1004 >        for (Node<K,V>[] tab = table;;) {
1005 >            Node<K,V> f; int n, i, fh;
1006 >            if (tab == null || (n = tab.length) == 0)
1007 >                tab = initTable();
1008 >            else if ((f = tabAt(tab, i = (n - 1) & hash)) == null) {
1009 >                if (casTabAt(tab, i, null,
1010 >                             new Node<K,V>(hash, key, value, null)))
1011 >                    break;                   // no lock when adding to empty bin
1012 >            }
1013 >            else if ((fh = f.hash) == MOVED)
1014 >                tab = helpTransfer(tab, f);
1015 >            else {
1016 >                V oldVal = null;
1017 >                synchronized (f) {
1018 >                    if (tabAt(tab, i) == f) {
1019 >                        if (fh >= 0) {
1020 >                            binCount = 1;
1021 >                            for (Node<K,V> e = f;; ++binCount) {
1022 >                                K ek;
1023 >                                if (e.hash == hash &&
1024 >                                    ((ek = e.key) == key ||
1025 >                                     (ek != null && key.equals(ek)))) {
1026 >                                    oldVal = e.val;
1027 >                                    if (!onlyIfAbsent)
1028 >                                        e.val = value;
1029 >                                    break;
1030 >                                }
1031 >                                Node<K,V> pred = e;
1032 >                                if ((e = e.next) == null) {
1033 >                                    pred.next = new Node<K,V>(hash, key,
1034 >                                                              value, null);
1035 >                                    break;
1036 >                                }
1037 >                            }
1038 >                        }
1039 >                        else if (f instanceof TreeBin) {
1040 >                            Node<K,V> p;
1041 >                            binCount = 2;
1042 >                            if ((p = ((TreeBin<K,V>)f).putTreeVal(hash, key,
1043 >                                                           value)) != null) {
1044 >                                oldVal = p.val;
1045 >                                if (!onlyIfAbsent)
1046 >                                    p.val = value;
1047 >                            }
1048 >                        }
1049 >                    }
1050 >                }
1051 >                if (binCount != 0) {
1052 >                    if (binCount >= TREEIFY_THRESHOLD)
1053 >                        treeifyBin(tab, i);
1054 >                    if (oldVal != null)
1055 >                        return oldVal;
1056 >                    break;
1057 >                }
1058 >            }
1059 >        }
1060 >        addCount(1L, binCount);
1061 >        return null;
1062 >    }
1063 >
1064 >    /**
1065 >     * Copies all of the mappings from the specified map to this one.
1066 >     * These mappings replace any mappings that this map had for any of the
1067 >     * keys currently in the specified map.
1068 >     *
1069 >     * @param m mappings to be stored in this map
1070 >     */
1071 >    public void putAll(Map<? extends K, ? extends V> m) {
1072 >        tryPresize(m.size());
1073 >        for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
1074 >            putVal(e.getKey(), e.getValue(), false);
1075 >    }
1076 >
1077 >    /**
1078 >     * Removes the key (and its corresponding value) from this map.
1079 >     * This method does nothing if the key is not in the map.
1080 >     *
1081 >     * @param  key the key that needs to be removed
1082 >     * @return the previous value associated with {@code key}, or
1083 >     *         {@code null} if there was no mapping for {@code key}
1084 >     * @throws NullPointerException if the specified key is null
1085 >     */
1086 >    public V remove(Object key) {
1087 >        return replaceNode(key, null, null);
1088 >    }
1089 >
1090 >    /**
1091 >     * Implementation for the four public remove/replace methods:
1092 >     * Replaces node value with v, conditional upon match of cv if
1093 >     * non-null.  If resulting value is null, delete.
1094 >     */
1095 >    final V replaceNode(Object key, V value, Object cv) {
1096 >        int hash = spread(key.hashCode());
1097 >        for (Node<K,V>[] tab = table;;) {
1098 >            Node<K,V> f; int n, i, fh;
1099 >            if (tab == null || (n = tab.length) == 0 ||
1100 >                (f = tabAt(tab, i = (n - 1) & hash)) == null)
1101 >                break;
1102 >            else if ((fh = f.hash) == MOVED)
1103 >                tab = helpTransfer(tab, f);
1104 >            else {
1105 >                V oldVal = null;
1106 >                boolean validated = false;
1107 >                synchronized (f) {
1108 >                    if (tabAt(tab, i) == f) {
1109 >                        if (fh >= 0) {
1110 >                            validated = true;
1111 >                            for (Node<K,V> e = f, pred = null;;) {
1112 >                                K ek;
1113 >                                if (e.hash == hash &&
1114 >                                    ((ek = e.key) == key ||
1115 >                                     (ek != null && key.equals(ek)))) {
1116 >                                    V ev = e.val;
1117 >                                    if (cv == null || cv == ev ||
1118 >                                        (ev != null && cv.equals(ev))) {
1119 >                                        oldVal = ev;
1120 >                                        if (value != null)
1121 >                                            e.val = value;
1122 >                                        else if (pred != null)
1123 >                                            pred.next = e.next;
1124 >                                        else
1125 >                                            setTabAt(tab, i, e.next);
1126 >                                    }
1127 >                                    break;
1128 >                                }
1129 >                                pred = e;
1130 >                                if ((e = e.next) == null)
1131 >                                    break;
1132 >                            }
1133 >                        }
1134 >                        else if (f instanceof TreeBin) {
1135 >                            validated = true;
1136 >                            TreeBin<K,V> t = (TreeBin<K,V>)f;
1137 >                            TreeNode<K,V> r, p;
1138 >                            if ((r = t.root) != null &&
1139 >                                (p = r.findTreeNode(hash, key, null)) != null) {
1140 >                                V pv = p.val;
1141 >                                if (cv == null || cv == pv ||
1142 >                                    (pv != null && cv.equals(pv))) {
1143 >                                    oldVal = pv;
1144 >                                    if (value != null)
1145 >                                        p.val = value;
1146 >                                    else if (t.removeTreeNode(p))
1147 >                                        setTabAt(tab, i, untreeify(t.first));
1148 >                                }
1149 >                            }
1150 >                        }
1151 >                    }
1152 >                }
1153 >                if (validated) {
1154 >                    if (oldVal != null) {
1155 >                        if (value == null)
1156 >                            addCount(-1L, -1);
1157 >                        return oldVal;
1158 >                    }
1159 >                    break;
1160 >                }
1161 >            }
1162 >        }
1163 >        return null;
1164 >    }
1165 >
1166 >    /**
1167 >     * Removes all of the mappings from this map.
1168 >     */
1169 >    public void clear() {
1170 >        long delta = 0L; // negative number of deletions
1171 >        int i = 0;
1172 >        Node<K,V>[] tab = table;
1173 >        while (tab != null && i < tab.length) {
1174 >            int fh;
1175 >            Node<K,V> f = tabAt(tab, i);
1176 >            if (f == null)
1177 >                ++i;
1178 >            else if ((fh = f.hash) == MOVED) {
1179 >                tab = helpTransfer(tab, f);
1180 >                i = 0; // restart
1181 >            }
1182 >            else {
1183 >                synchronized (f) {
1184 >                    if (tabAt(tab, i) == f) {
1185 >                        Node<K,V> p = (fh >= 0 ? f :
1186 >                                       (f instanceof TreeBin) ?
1187 >                                       ((TreeBin<K,V>)f).first : null);
1188 >                        while (p != null) {
1189 >                            --delta;
1190 >                            p = p.next;
1191 >                        }
1192 >                        setTabAt(tab, i++, null);
1193 >                    }
1194 >                }
1195 >            }
1196 >        }
1197 >        if (delta != 0L)
1198 >            addCount(delta, -1);
1199 >    }
1200 >
1201 >    /**
1202 >     * Returns a {@link Set} view of the keys contained in this map.
1203 >     * The set is backed by the map, so changes to the map are
1204 >     * reflected in the set, and vice-versa. The set supports element
1205 >     * removal, which removes the corresponding mapping from this map,
1206 >     * via the {@code Iterator.remove}, {@code Set.remove},
1207 >     * {@code removeAll}, {@code retainAll}, and {@code clear}
1208 >     * operations.  It does not support the {@code add} or
1209 >     * {@code addAll} operations.
1210 >     *
1211 >     * <p>The view's {@code iterator} is a "weakly consistent" iterator
1212 >     * that will never throw {@link ConcurrentModificationException},
1213 >     * and guarantees to traverse elements as they existed upon
1214 >     * construction of the iterator, and may (but is not guaranteed to)
1215 >     * reflect any modifications subsequent to construction.
1216 >     *
1217 >     * @return the set view
1218 >     */
1219 >    public KeySetView<K,V> keySet() {
1220 >        KeySetView<K,V> ks;
1221 >        return (ks = keySet) != null ? ks : (keySet = new KeySetView<K,V>(this, null));
1222 >    }
1223 >
1224 >    /**
1225 >     * Returns a {@link Collection} view of the values contained in this map.
1226 >     * The collection is backed by the map, so changes to the map are
1227 >     * reflected in the collection, and vice-versa.  The collection
1228 >     * supports element removal, which removes the corresponding
1229 >     * mapping from this map, via the {@code Iterator.remove},
1230 >     * {@code Collection.remove}, {@code removeAll},
1231 >     * {@code retainAll}, and {@code clear} operations.  It does not
1232 >     * support the {@code add} or {@code addAll} operations.
1233 >     *
1234 >     * <p>The view's {@code iterator} is a "weakly consistent" iterator
1235 >     * that will never throw {@link ConcurrentModificationException},
1236 >     * and guarantees to traverse elements as they existed upon
1237 >     * construction of the iterator, and may (but is not guaranteed to)
1238 >     * reflect any modifications subsequent to construction.
1239 >     *
1240 >     * @return the collection view
1241 >     */
1242 >    public Collection<V> values() {
1243 >        ValuesView<K,V> vs;
1244 >        return (vs = values) != null ? vs : (values = new ValuesView<K,V>(this));
1245 >    }
1246 >
1247 >    /**
1248 >     * Returns a {@link Set} view of the mappings contained in this map.
1249 >     * The set is backed by the map, so changes to the map are
1250 >     * reflected in the set, and vice-versa.  The set supports element
1251 >     * removal, which removes the corresponding mapping from the map,
1252 >     * via the {@code Iterator.remove}, {@code Set.remove},
1253 >     * {@code removeAll}, {@code retainAll}, and {@code clear}
1254 >     * operations.
1255 >     *
1256 >     * <p>The view's {@code iterator} is a "weakly consistent" iterator
1257 >     * that will never throw {@link ConcurrentModificationException},
1258 >     * and guarantees to traverse elements as they existed upon
1259 >     * construction of the iterator, and may (but is not guaranteed to)
1260 >     * reflect any modifications subsequent to construction.
1261 >     *
1262 >     * @return the set view
1263 >     */
1264 >    public Set<Map.Entry<K,V>> entrySet() {
1265 >        EntrySetView<K,V> es;
1266 >        return (es = entrySet) != null ? es : (entrySet = new EntrySetView<K,V>(this));
1267 >    }
1268 >
1269 >    /**
1270 >     * Returns the hash code value for this {@link Map}, i.e.,
1271 >     * the sum of, for each key-value pair in the map,
1272 >     * {@code key.hashCode() ^ value.hashCode()}.
1273 >     *
1274 >     * @return the hash code value for this map
1275 >     */
1276 >    public int hashCode() {
1277 >        int h = 0;
1278 >        Node<K,V>[] t;
1279 >        if ((t = table) != null) {
1280 >            Traverser<K,V> it = new Traverser<K,V>(t, t.length, 0, t.length);
1281 >            for (Node<K,V> p; (p = it.advance()) != null; )
1282 >                h += p.key.hashCode() ^ p.val.hashCode();
1283 >        }
1284 >        return h;
1285 >    }
1286 >
1287 >    /**
1288 >     * Returns a string representation of this map.  The string
1289 >     * representation consists of a list of key-value mappings (in no
1290 >     * particular order) enclosed in braces ("{@code {}}").  Adjacent
1291 >     * mappings are separated by the characters {@code ", "} (comma
1292 >     * and space).  Each key-value mapping is rendered as the key
1293 >     * followed by an equals sign ("{@code =}") followed by the
1294 >     * associated value.
1295 >     *
1296 >     * @return a string representation of this map
1297 >     */
1298 >    public String toString() {
1299 >        Node<K,V>[] t;
1300 >        int f = (t = table) == null ? 0 : t.length;
1301 >        Traverser<K,V> it = new Traverser<K,V>(t, f, 0, f);
1302 >        StringBuilder sb = new StringBuilder();
1303 >        sb.append('{');
1304 >        Node<K,V> p;
1305 >        if ((p = it.advance()) != null) {
1306 >            for (;;) {
1307 >                K k = p.key;
1308 >                V v = p.val;
1309 >                sb.append(k == this ? "(this Map)" : k);
1310 >                sb.append('=');
1311 >                sb.append(v == this ? "(this Map)" : v);
1312 >                if ((p = it.advance()) == null)
1313 >                    break;
1314 >                sb.append(',').append(' ');
1315 >            }
1316 >        }
1317 >        return sb.append('}').toString();
1318 >    }
1319 >
1320 >    /**
1321 >     * Compares the specified object with this map for equality.
1322 >     * Returns {@code true} if the given object is a map with the same
1323 >     * mappings as this map.  This operation may return misleading
1324 >     * results if either map is concurrently modified during execution
1325 >     * of this method.
1326 >     *
1327 >     * @param o object to be compared for equality with this map
1328 >     * @return {@code true} if the specified object is equal to this map
1329 >     */
1330 >    public boolean equals(Object o) {
1331 >        if (o != this) {
1332 >            if (!(o instanceof Map))
1333 >                return false;
1334 >            Map<?,?> m = (Map<?,?>) o;
1335 >            Node<K,V>[] t;
1336 >            int f = (t = table) == null ? 0 : t.length;
1337 >            Traverser<K,V> it = new Traverser<K,V>(t, f, 0, f);
1338 >            for (Node<K,V> p; (p = it.advance()) != null; ) {
1339 >                V val = p.val;
1340 >                Object v = m.get(p.key);
1341 >                if (v == null || (v != val && !v.equals(val)))
1342 >                    return false;
1343 >            }
1344 >            for (Map.Entry<?,?> e : m.entrySet()) {
1345 >                Object mk, mv, v;
1346 >                if ((mk = e.getKey()) == null ||
1347 >                    (mv = e.getValue()) == null ||
1348 >                    (v = get(mk)) == null ||
1349 >                    (mv != v && !mv.equals(v)))
1350 >                    return false;
1351 >            }
1352 >        }
1353 >        return true;
1354 >    }
1355 >
1356 >    /**
1357 >     * Stripped-down version of helper class used in previous version,
1358 >     * declared for the sake of serialization compatibility
1359 >     */
1360 >    static class Segment<K,V> extends ReentrantLock implements Serializable {
1361 >        private static final long serialVersionUID = 2249069246763182397L;
1362 >        final float loadFactor;
1363 >        Segment(float lf) { this.loadFactor = lf; }
1364 >    }
1365 >
1366 >    /**
1367 >     * Saves the state of the {@code ConcurrentHashMapV8} instance to a
1368 >     * stream (i.e., serializes it).
1369 >     * @param s the stream
1370 >     * @throws java.io.IOException if an I/O error occurs
1371 >     * @serialData
1372 >     * the key (Object) and value (Object)
1373 >     * for each key-value mapping, followed by a null pair.
1374 >     * The key-value mappings are emitted in no particular order.
1375 >     */
1376 >    private void writeObject(java.io.ObjectOutputStream s)
1377 >        throws java.io.IOException {
1378 >        // For serialization compatibility
1379 >        // Emulate segment calculation from previous version of this class
1380 >        int sshift = 0;
1381 >        int ssize = 1;
1382 >        while (ssize < DEFAULT_CONCURRENCY_LEVEL) {
1383 >            ++sshift;
1384 >            ssize <<= 1;
1385 >        }
1386 >        int segmentShift = 32 - sshift;
1387 >        int segmentMask = ssize - 1;
1388 >        @SuppressWarnings("unchecked") Segment<K,V>[] segments = (Segment<K,V>[])
1389 >            new Segment<?,?>[DEFAULT_CONCURRENCY_LEVEL];
1390 >        for (int i = 0; i < segments.length; ++i)
1391 >            segments[i] = new Segment<K,V>(LOAD_FACTOR);
1392 >        s.putFields().put("segments", segments);
1393 >        s.putFields().put("segmentShift", segmentShift);
1394 >        s.putFields().put("segmentMask", segmentMask);
1395 >        s.writeFields();
1396 >
1397 >        Node<K,V>[] t;
1398 >        if ((t = table) != null) {
1399 >            Traverser<K,V> it = new Traverser<K,V>(t, t.length, 0, t.length);
1400 >            for (Node<K,V> p; (p = it.advance()) != null; ) {
1401 >                s.writeObject(p.key);
1402 >                s.writeObject(p.val);
1403 >            }
1404 >        }
1405 >        s.writeObject(null);
1406 >        s.writeObject(null);
1407 >        segments = null; // throw away
1408 >    }
1409 >
1410 >    /**
1411 >     * Reconstitutes the instance from a stream (that is, deserializes it).
1412 >     * @param s the stream
1413 >     * @throws ClassNotFoundException if the class of a serialized object
1414 >     *         could not be found
1415 >     * @throws java.io.IOException if an I/O error occurs
1416 >     */
1417 >    private void readObject(java.io.ObjectInputStream s)
1418 >        throws java.io.IOException, ClassNotFoundException {
1419 >        /*
1420 >         * To improve performance in typical cases, we create nodes
1421 >         * while reading, then place in table once size is known.
1422 >         * However, we must also validate uniqueness and deal with
1423 >         * overpopulated bins while doing so, which requires
1424 >         * specialized versions of putVal mechanics.
1425 >         */
1426 >        sizeCtl = -1; // force exclusion for table construction
1427 >        s.defaultReadObject();
1428 >        long size = 0L;
1429 >        Node<K,V> p = null;
1430 >        for (;;) {
1431 >            @SuppressWarnings("unchecked") K k = (K) s.readObject();
1432 >            @SuppressWarnings("unchecked") V v = (V) s.readObject();
1433 >            if (k != null && v != null) {
1434 >                p = new Node<K,V>(spread(k.hashCode()), k, v, p);
1435 >                ++size;
1436 >            }
1437 >            else
1438 >                break;
1439 >        }
1440 >        if (size == 0L)
1441 >            sizeCtl = 0;
1442 >        else {
1443 >            int n;
1444 >            if (size >= (long)(MAXIMUM_CAPACITY >>> 1))
1445 >                n = MAXIMUM_CAPACITY;
1446 >            else {
1447 >                int sz = (int)size;
1448 >                n = tableSizeFor(sz + (sz >>> 1) + 1);
1449 >            }
1450 >            @SuppressWarnings("unchecked")
1451 >                Node<K,V>[] tab = (Node<K,V>[])new Node<?,?>[n];
1452 >            int mask = n - 1;
1453 >            long added = 0L;
1454 >            while (p != null) {
1455 >                boolean insertAtFront;
1456 >                Node<K,V> next = p.next, first;
1457 >                int h = p.hash, j = h & mask;
1458 >                if ((first = tabAt(tab, j)) == null)
1459 >                    insertAtFront = true;
1460 >                else {
1461 >                    K k = p.key;
1462 >                    if (first.hash < 0) {
1463 >                        TreeBin<K,V> t = (TreeBin<K,V>)first;
1464 >                        if (t.putTreeVal(h, k, p.val) == null)
1465 >                            ++added;
1466 >                        insertAtFront = false;
1467 >                    }
1468 >                    else {
1469 >                        int binCount = 0;
1470 >                        insertAtFront = true;
1471 >                        Node<K,V> q; K qk;
1472 >                        for (q = first; q != null; q = q.next) {
1473 >                            if (q.hash == h &&
1474 >                                ((qk = q.key) == k ||
1475 >                                 (qk != null && k.equals(qk)))) {
1476 >                                insertAtFront = false;
1477 >                                break;
1478 >                            }
1479 >                            ++binCount;
1480 >                        }
1481 >                        if (insertAtFront && binCount >= TREEIFY_THRESHOLD) {
1482 >                            insertAtFront = false;
1483 >                            ++added;
1484 >                            p.next = first;
1485 >                            TreeNode<K,V> hd = null, tl = null;
1486 >                            for (q = p; q != null; q = q.next) {
1487 >                                TreeNode<K,V> t = new TreeNode<K,V>
1488 >                                    (q.hash, q.key, q.val, null, null);
1489 >                                if ((t.prev = tl) == null)
1490 >                                    hd = t;
1491 >                                else
1492 >                                    tl.next = t;
1493 >                                tl = t;
1494 >                            }
1495 >                            setTabAt(tab, j, new TreeBin<K,V>(hd));
1496 >                        }
1497 >                    }
1498 >                }
1499 >                if (insertAtFront) {
1500 >                    ++added;
1501 >                    p.next = first;
1502 >                    setTabAt(tab, j, p);
1503 >                }
1504 >                p = next;
1505 >            }
1506 >            table = tab;
1507 >            sizeCtl = n - (n >>> 2);
1508 >            baseCount = added;
1509 >        }
1510 >    }
1511 >
1512 >    // ConcurrentMap methods
1513 >
1514 >    /**
1515 >     * {@inheritDoc}
1516 >     *
1517 >     * @return the previous value associated with the specified key,
1518 >     *         or {@code null} if there was no mapping for the key
1519 >     * @throws NullPointerException if the specified key or value is null
1520 >     */
1521 >    public V putIfAbsent(K key, V value) {
1522 >        return putVal(key, value, true);
1523 >    }
1524 >
1525 >    /**
1526 >     * {@inheritDoc}
1527 >     *
1528 >     * @throws NullPointerException if the specified key is null
1529 >     */
1530 >    public boolean remove(Object key, Object value) {
1531 >        if (key == null)
1532              throw new NullPointerException();
1533 <        return (V)internalPut(key, value);
1533 >        return value != null && replaceNode(key, null, value) != null;
1534 >    }
1535 >
1536 >    /**
1537 >     * {@inheritDoc}
1538 >     *
1539 >     * @throws NullPointerException if any of the arguments are null
1540 >     */
1541 >    public boolean replace(K key, V oldValue, V newValue) {
1542 >        if (key == null || oldValue == null || newValue == null)
1543 >            throw new NullPointerException();
1544 >        return replaceNode(key, newValue, oldValue) != null;
1545      }
1546  
1547      /**
# Line 2803 | Line 1551 | public class ConcurrentHashMapV8<K, V>
1551       *         or {@code null} if there was no mapping for the key
1552       * @throws NullPointerException if the specified key or value is null
1553       */
1554 <    @SuppressWarnings("unchecked") public V putIfAbsent(K key, V value) {
1554 >    public V replace(K key, V value) {
1555          if (key == null || value == null)
1556              throw new NullPointerException();
1557 <        return (V)internalPutIfAbsent(key, value);
1557 >        return replaceNode(key, value, null);
1558      }
1559  
1560 +    // Overrides of JDK8+ Map extension method defaults
1561 +
1562      /**
1563 <     * Copies all of the mappings from the specified map to this one.
1564 <     * These mappings replace any mappings that this map had for any of the
1565 <     * keys currently in the specified map.
1563 >     * Returns the value to which the specified key is mapped, or the
1564 >     * given default value if this map contains no mapping for the
1565 >     * key.
1566       *
1567 <     * @param m mappings to be stored in this map
1567 >     * @param key the key whose associated value is to be returned
1568 >     * @param defaultValue the value to return if this map contains
1569 >     * no mapping for the given key
1570 >     * @return the mapping for the key, if present; else the default value
1571 >     * @throws NullPointerException if the specified key is null
1572       */
1573 <    public void putAll(Map<? extends K, ? extends V> m) {
1574 <        internalPutAll(m);
1573 >    public V getOrDefault(Object key, V defaultValue) {
1574 >        V v;
1575 >        return (v = get(key)) == null ? defaultValue : v;
1576 >    }
1577 >
1578 >    public void forEach(BiAction<? super K, ? super V> action) {
1579 >        if (action == null) throw new NullPointerException();
1580 >        Node<K,V>[] t;
1581 >        if ((t = table) != null) {
1582 >            Traverser<K,V> it = new Traverser<K,V>(t, t.length, 0, t.length);
1583 >            for (Node<K,V> p; (p = it.advance()) != null; ) {
1584 >                action.apply(p.key, p.val);
1585 >            }
1586 >        }
1587 >    }
1588 >
1589 >    public void replaceAll(BiFun<? super K, ? super V, ? extends V> function) {
1590 >        if (function == null) throw new NullPointerException();
1591 >        Node<K,V>[] t;
1592 >        if ((t = table) != null) {
1593 >            Traverser<K,V> it = new Traverser<K,V>(t, t.length, 0, t.length);
1594 >            for (Node<K,V> p; (p = it.advance()) != null; ) {
1595 >                V oldValue = p.val;
1596 >                for (K key = p.key;;) {
1597 >                    V newValue = function.apply(key, oldValue);
1598 >                    if (newValue == null)
1599 >                        throw new NullPointerException();
1600 >                    if (replaceNode(key, newValue, oldValue) != null ||
1601 >                        (oldValue = get(key)) == null)
1602 >                        break;
1603 >                }
1604 >            }
1605 >        }
1606      }
1607  
1608      /**
1609       * If the specified key is not already associated with a value,
1610 <     * computes its value using the given mappingFunction and enters
1611 <     * it into the map unless null.  This is equivalent to
1612 <     * <pre> {@code
1613 <     * if (map.containsKey(key))
1614 <     *   return map.get(key);
1615 <     * value = mappingFunction.apply(key);
1616 <     * if (value != null)
2832 <     *   map.put(key, value);
2833 <     * return value;}</pre>
2834 <     *
2835 <     * except that the action is performed atomically.  If the
2836 <     * function returns {@code null} no mapping is recorded. If the
2837 <     * function itself throws an (unchecked) exception, the exception
2838 <     * is rethrown to its caller, and no mapping is recorded.  Some
2839 <     * attempted update operations on this map by other threads may be
2840 <     * blocked while computation is in progress, so the computation
2841 <     * should be short and simple, and must not attempt to update any
2842 <     * other mappings of this Map. The most appropriate usage is to
2843 <     * construct a new object serving as an initial mapped value, or
2844 <     * memoized result, as in:
2845 <     *
2846 <     *  <pre> {@code
2847 <     * map.computeIfAbsent(key, new Fun<K, V>() {
2848 <     *   public V map(K k) { return new Value(f(k)); }});}</pre>
1610 >     * attempts to compute its value using the given mapping function
1611 >     * and enters it into this map unless {@code null}.  The entire
1612 >     * method invocation is performed atomically, so the function is
1613 >     * applied at most once per key.  Some attempted update operations
1614 >     * on this map by other threads may be blocked while computation
1615 >     * is in progress, so the computation should be short and simple,
1616 >     * and must not attempt to update any other mappings of this map.
1617       *
1618       * @param key key with which the specified value is to be associated
1619       * @param mappingFunction the function to compute a value
# Line 2859 | Line 1627 | public class ConcurrentHashMapV8<K, V>
1627       * @throws RuntimeException or Error if the mappingFunction does so,
1628       *         in which case the mapping is left unestablished
1629       */
1630 <    @SuppressWarnings("unchecked") public V computeIfAbsent
2863 <        (K key, Fun<? super K, ? extends V> mappingFunction) {
1630 >    public V computeIfAbsent(K key, Fun<? super K, ? extends V> mappingFunction) {
1631          if (key == null || mappingFunction == null)
1632              throw new NullPointerException();
1633 <        return (V)internalComputeIfAbsent(key, mappingFunction);
1633 >        int h = spread(key.hashCode());
1634 >        V val = null;
1635 >        int binCount = 0;
1636 >        for (Node<K,V>[] tab = table;;) {
1637 >            Node<K,V> f; int n, i, fh;
1638 >            if (tab == null || (n = tab.length) == 0)
1639 >                tab = initTable();
1640 >            else if ((f = tabAt(tab, i = (n - 1) & h)) == null) {
1641 >                Node<K,V> r = new ReservationNode<K,V>();
1642 >                synchronized (r) {
1643 >                    if (casTabAt(tab, i, null, r)) {
1644 >                        binCount = 1;
1645 >                        Node<K,V> node = null;
1646 >                        try {
1647 >                            if ((val = mappingFunction.apply(key)) != null)
1648 >                                node = new Node<K,V>(h, key, val, null);
1649 >                        } finally {
1650 >                            setTabAt(tab, i, node);
1651 >                        }
1652 >                    }
1653 >                }
1654 >                if (binCount != 0)
1655 >                    break;
1656 >            }
1657 >            else if ((fh = f.hash) == MOVED)
1658 >                tab = helpTransfer(tab, f);
1659 >            else {
1660 >                boolean added = false;
1661 >                synchronized (f) {
1662 >                    if (tabAt(tab, i) == f) {
1663 >                        if (fh >= 0) {
1664 >                            binCount = 1;
1665 >                            for (Node<K,V> e = f;; ++binCount) {
1666 >                                K ek; V ev;
1667 >                                if (e.hash == h &&
1668 >                                    ((ek = e.key) == key ||
1669 >                                     (ek != null && key.equals(ek)))) {
1670 >                                    val = e.val;
1671 >                                    break;
1672 >                                }
1673 >                                Node<K,V> pred = e;
1674 >                                if ((e = e.next) == null) {
1675 >                                    if ((val = mappingFunction.apply(key)) != null) {
1676 >                                        added = true;
1677 >                                        pred.next = new Node<K,V>(h, key, val, null);
1678 >                                    }
1679 >                                    break;
1680 >                                }
1681 >                            }
1682 >                        }
1683 >                        else if (f instanceof TreeBin) {
1684 >                            binCount = 2;
1685 >                            TreeBin<K,V> t = (TreeBin<K,V>)f;
1686 >                            TreeNode<K,V> r, p;
1687 >                            if ((r = t.root) != null &&
1688 >                                (p = r.findTreeNode(h, key, null)) != null)
1689 >                                val = p.val;
1690 >                            else if ((val = mappingFunction.apply(key)) != null) {
1691 >                                added = true;
1692 >                                t.putTreeVal(h, key, val);
1693 >                            }
1694 >                        }
1695 >                    }
1696 >                }
1697 >                if (binCount != 0) {
1698 >                    if (binCount >= TREEIFY_THRESHOLD)
1699 >                        treeifyBin(tab, i);
1700 >                    if (!added)
1701 >                        return val;
1702 >                    break;
1703 >                }
1704 >            }
1705 >        }
1706 >        if (val != null)
1707 >            addCount(1L, binCount);
1708 >        return val;
1709      }
1710  
1711      /**
1712 <     * If the given key is present, computes a new mapping value given a key and
1713 <     * its current mapped value. This is equivalent to
1714 <     *  <pre> {@code
1715 <     *   if (map.containsKey(key)) {
1716 <     *     value = remappingFunction.apply(key, map.get(key));
1717 <     *     if (value != null)
1718 <     *       map.put(key, value);
2877 <     *     else
2878 <     *       map.remove(key);
2879 <     *   }
2880 <     * }</pre>
2881 <     *
2882 <     * except that the action is performed atomically.  If the
2883 <     * function returns {@code null}, the mapping is removed.  If the
2884 <     * function itself throws an (unchecked) exception, the exception
2885 <     * is rethrown to its caller, and the current mapping is left
2886 <     * unchanged.  Some attempted update operations on this map by
2887 <     * other threads may be blocked while computation is in progress,
2888 <     * so the computation should be short and simple, and must not
2889 <     * attempt to update any other mappings of this Map. For example,
2890 <     * to either create or append new messages to a value mapping:
1712 >     * If the value for the specified key is present, attempts to
1713 >     * compute a new mapping given the key and its current mapped
1714 >     * value.  The entire method invocation is performed atomically.
1715 >     * Some attempted update operations on this map by other threads
1716 >     * may be blocked while computation is in progress, so the
1717 >     * computation should be short and simple, and must not attempt to
1718 >     * update any other mappings of this map.
1719       *
1720 <     * @param key key with which the specified value is to be associated
1720 >     * @param key key with which a value may be associated
1721       * @param remappingFunction the function to compute a value
1722       * @return the new value associated with the specified key, or null if none
1723       * @throws NullPointerException if the specified key or remappingFunction
# Line 2900 | Line 1728 | public class ConcurrentHashMapV8<K, V>
1728       * @throws RuntimeException or Error if the remappingFunction does so,
1729       *         in which case the mapping is unchanged
1730       */
1731 <    @SuppressWarnings("unchecked") public V computeIfPresent
2904 <        (K key, BiFun<? super K, ? super V, ? extends V> remappingFunction) {
1731 >    public V computeIfPresent(K key, BiFun<? super K, ? super V, ? extends V> remappingFunction) {
1732          if (key == null || remappingFunction == null)
1733              throw new NullPointerException();
1734 <        return (V)internalCompute(key, true, remappingFunction);
1734 >        int h = spread(key.hashCode());
1735 >        V val = null;
1736 >        int delta = 0;
1737 >        int binCount = 0;
1738 >        for (Node<K,V>[] tab = table;;) {
1739 >            Node<K,V> f; int n, i, fh;
1740 >            if (tab == null || (n = tab.length) == 0)
1741 >                tab = initTable();
1742 >            else if ((f = tabAt(tab, i = (n - 1) & h)) == null)
1743 >                break;
1744 >            else if ((fh = f.hash) == MOVED)
1745 >                tab = helpTransfer(tab, f);
1746 >            else {
1747 >                synchronized (f) {
1748 >                    if (tabAt(tab, i) == f) {
1749 >                        if (fh >= 0) {
1750 >                            binCount = 1;
1751 >                            for (Node<K,V> e = f, pred = null;; ++binCount) {
1752 >                                K ek;
1753 >                                if (e.hash == h &&
1754 >                                    ((ek = e.key) == key ||
1755 >                                     (ek != null && key.equals(ek)))) {
1756 >                                    val = remappingFunction.apply(key, e.val);
1757 >                                    if (val != null)
1758 >                                        e.val = val;
1759 >                                    else {
1760 >                                        delta = -1;
1761 >                                        Node<K,V> en = e.next;
1762 >                                        if (pred != null)
1763 >                                            pred.next = en;
1764 >                                        else
1765 >                                            setTabAt(tab, i, en);
1766 >                                    }
1767 >                                    break;
1768 >                                }
1769 >                                pred = e;
1770 >                                if ((e = e.next) == null)
1771 >                                    break;
1772 >                            }
1773 >                        }
1774 >                        else if (f instanceof TreeBin) {
1775 >                            binCount = 2;
1776 >                            TreeBin<K,V> t = (TreeBin<K,V>)f;
1777 >                            TreeNode<K,V> r, p;
1778 >                            if ((r = t.root) != null &&
1779 >                                (p = r.findTreeNode(h, key, null)) != null) {
1780 >                                val = remappingFunction.apply(key, p.val);
1781 >                                if (val != null)
1782 >                                    p.val = val;
1783 >                                else {
1784 >                                    delta = -1;
1785 >                                    if (t.removeTreeNode(p))
1786 >                                        setTabAt(tab, i, untreeify(t.first));
1787 >                                }
1788 >                            }
1789 >                        }
1790 >                    }
1791 >                }
1792 >                if (binCount != 0)
1793 >                    break;
1794 >            }
1795 >        }
1796 >        if (delta != 0)
1797 >            addCount((long)delta, binCount);
1798 >        return val;
1799      }
1800  
1801      /**
1802 <     * Computes a new mapping value given a key and
1803 <     * its current mapped value (or {@code null} if there is no current
1804 <     * mapping). This is equivalent to
1805 <     *  <pre> {@code
1806 <     *   value = remappingFunction.apply(key, map.get(key));
1807 <     *   if (value != null)
1808 <     *     map.put(key, value);
2918 <     *   else
2919 <     *     map.remove(key);
2920 <     * }</pre>
2921 <     *
2922 <     * except that the action is performed atomically.  If the
2923 <     * function returns {@code null}, the mapping is removed.  If the
2924 <     * function itself throws an (unchecked) exception, the exception
2925 <     * is rethrown to its caller, and the current mapping is left
2926 <     * unchanged.  Some attempted update operations on this map by
2927 <     * other threads may be blocked while computation is in progress,
2928 <     * so the computation should be short and simple, and must not
2929 <     * attempt to update any other mappings of this Map. For example,
2930 <     * to either create or append new messages to a value mapping:
2931 <     *
2932 <     * <pre> {@code
2933 <     * Map<Key, String> map = ...;
2934 <     * final String msg = ...;
2935 <     * map.compute(key, new BiFun<Key, String, String>() {
2936 <     *   public String apply(Key k, String v) {
2937 <     *    return (v == null) ? msg : v + msg;});}}</pre>
1802 >     * Attempts to compute a mapping for the specified key and its
1803 >     * current mapped value (or {@code null} if there is no current
1804 >     * mapping). The entire method invocation is performed atomically.
1805 >     * Some attempted update operations on this map by other threads
1806 >     * may be blocked while computation is in progress, so the
1807 >     * computation should be short and simple, and must not attempt to
1808 >     * update any other mappings of this Map.
1809       *
1810       * @param key key with which the specified value is to be associated
1811       * @param remappingFunction the function to compute a value
# Line 2947 | Line 1818 | public class ConcurrentHashMapV8<K, V>
1818       * @throws RuntimeException or Error if the remappingFunction does so,
1819       *         in which case the mapping is unchanged
1820       */
1821 <    @SuppressWarnings("unchecked") public V compute
1822 <        (K key, BiFun<? super K, ? super V, ? extends V> remappingFunction) {
1821 >    public V compute(K key,
1822 >                     BiFun<? super K, ? super V, ? extends V> remappingFunction) {
1823          if (key == null || remappingFunction == null)
1824              throw new NullPointerException();
1825 <        return (V)internalCompute(key, false, remappingFunction);
1825 >        int h = spread(key.hashCode());
1826 >        V val = null;
1827 >        int delta = 0;
1828 >        int binCount = 0;
1829 >        for (Node<K,V>[] tab = table;;) {
1830 >            Node<K,V> f; int n, i, fh;
1831 >            if (tab == null || (n = tab.length) == 0)
1832 >                tab = initTable();
1833 >            else if ((f = tabAt(tab, i = (n - 1) & h)) == null) {
1834 >                Node<K,V> r = new ReservationNode<K,V>();
1835 >                synchronized (r) {
1836 >                    if (casTabAt(tab, i, null, r)) {
1837 >                        binCount = 1;
1838 >                        Node<K,V> node = null;
1839 >                        try {
1840 >                            if ((val = remappingFunction.apply(key, null)) != null) {
1841 >                                delta = 1;
1842 >                                node = new Node<K,V>(h, key, val, null);
1843 >                            }
1844 >                        } finally {
1845 >                            setTabAt(tab, i, node);
1846 >                        }
1847 >                    }
1848 >                }
1849 >                if (binCount != 0)
1850 >                    break;
1851 >            }
1852 >            else if ((fh = f.hash) == MOVED)
1853 >                tab = helpTransfer(tab, f);
1854 >            else {
1855 >                synchronized (f) {
1856 >                    if (tabAt(tab, i) == f) {
1857 >                        if (fh >= 0) {
1858 >                            binCount = 1;
1859 >                            for (Node<K,V> e = f, pred = null;; ++binCount) {
1860 >                                K ek;
1861 >                                if (e.hash == h &&
1862 >                                    ((ek = e.key) == key ||
1863 >                                     (ek != null && key.equals(ek)))) {
1864 >                                    val = remappingFunction.apply(key, e.val);
1865 >                                    if (val != null)
1866 >                                        e.val = val;
1867 >                                    else {
1868 >                                        delta = -1;
1869 >                                        Node<K,V> en = e.next;
1870 >                                        if (pred != null)
1871 >                                            pred.next = en;
1872 >                                        else
1873 >                                            setTabAt(tab, i, en);
1874 >                                    }
1875 >                                    break;
1876 >                                }
1877 >                                pred = e;
1878 >                                if ((e = e.next) == null) {
1879 >                                    val = remappingFunction.apply(key, null);
1880 >                                    if (val != null) {
1881 >                                        delta = 1;
1882 >                                        pred.next =
1883 >                                            new Node<K,V>(h, key, val, null);
1884 >                                    }
1885 >                                    break;
1886 >                                }
1887 >                            }
1888 >                        }
1889 >                        else if (f instanceof TreeBin) {
1890 >                            binCount = 1;
1891 >                            TreeBin<K,V> t = (TreeBin<K,V>)f;
1892 >                            TreeNode<K,V> r, p;
1893 >                            if ((r = t.root) != null)
1894 >                                p = r.findTreeNode(h, key, null);
1895 >                            else
1896 >                                p = null;
1897 >                            V pv = (p == null) ? null : p.val;
1898 >                            val = remappingFunction.apply(key, pv);
1899 >                            if (val != null) {
1900 >                                if (p != null)
1901 >                                    p.val = val;
1902 >                                else {
1903 >                                    delta = 1;
1904 >                                    t.putTreeVal(h, key, val);
1905 >                                }
1906 >                            }
1907 >                            else if (p != null) {
1908 >                                delta = -1;
1909 >                                if (t.removeTreeNode(p))
1910 >                                    setTabAt(tab, i, untreeify(t.first));
1911 >                            }
1912 >                        }
1913 >                    }
1914 >                }
1915 >                if (binCount != 0) {
1916 >                    if (binCount >= TREEIFY_THRESHOLD)
1917 >                        treeifyBin(tab, i);
1918 >                    break;
1919 >                }
1920 >            }
1921 >        }
1922 >        if (delta != 0)
1923 >            addCount((long)delta, binCount);
1924 >        return val;
1925      }
1926  
1927      /**
1928 <     * If the specified key is not already associated
1929 <     * with a value, associate it with the given value.
1930 <     * Otherwise, replace the value with the results of
1931 <     * the given remapping function. This is equivalent to:
1932 <     *  <pre> {@code
1933 <     *   if (!map.containsKey(key))
1934 <     *     map.put(value);
1935 <     *   else {
1936 <     *     newValue = remappingFunction.apply(map.get(key), value);
1937 <     *     if (value != null)
1938 <     *       map.put(key, value);
1939 <     *     else
1940 <     *       map.remove(key);
1941 <     *   }
1942 <     * }</pre>
1943 <     * except that the action is performed atomically.  If the
1944 <     * function returns {@code null}, the mapping is removed.  If the
1945 <     * function itself throws an (unchecked) exception, the exception
2976 <     * is rethrown to its caller, and the current mapping is left
2977 <     * unchanged.  Some attempted update operations on this map by
2978 <     * other threads may be blocked while computation is in progress,
2979 <     * so the computation should be short and simple, and must not
2980 <     * attempt to update any other mappings of this Map.
1928 >     * If the specified key is not already associated with a
1929 >     * (non-null) value, associates it with the given value.
1930 >     * Otherwise, replaces the value with the results of the given
1931 >     * remapping function, or removes if {@code null}. The entire
1932 >     * method invocation is performed atomically.  Some attempted
1933 >     * update operations on this map by other threads may be blocked
1934 >     * while computation is in progress, so the computation should be
1935 >     * short and simple, and must not attempt to update any other
1936 >     * mappings of this Map.
1937 >     *
1938 >     * @param key key with which the specified value is to be associated
1939 >     * @param value the value to use if absent
1940 >     * @param remappingFunction the function to recompute a value if present
1941 >     * @return the new value associated with the specified key, or null if none
1942 >     * @throws NullPointerException if the specified key or the
1943 >     *         remappingFunction is null
1944 >     * @throws RuntimeException or Error if the remappingFunction does so,
1945 >     *         in which case the mapping is unchanged
1946       */
1947 <    @SuppressWarnings("unchecked") public V merge
2983 <        (K key, V value, BiFun<? super V, ? super V, ? extends V> remappingFunction) {
1947 >    public V merge(K key, V value, BiFun<? super V, ? super V, ? extends V> remappingFunction) {
1948          if (key == null || value == null || remappingFunction == null)
1949              throw new NullPointerException();
1950 <        return (V)internalMerge(key, value, remappingFunction);
1950 >        int h = spread(key.hashCode());
1951 >        V val = null;
1952 >        int delta = 0;
1953 >        int binCount = 0;
1954 >        for (Node<K,V>[] tab = table;;) {
1955 >            Node<K,V> f; int n, i, fh;
1956 >            if (tab == null || (n = tab.length) == 0)
1957 >                tab = initTable();
1958 >            else if ((f = tabAt(tab, i = (n - 1) & h)) == null) {
1959 >                if (casTabAt(tab, i, null, new Node<K,V>(h, key, value, null))) {
1960 >                    delta = 1;
1961 >                    val = value;
1962 >                    break;
1963 >                }
1964 >            }
1965 >            else if ((fh = f.hash) == MOVED)
1966 >                tab = helpTransfer(tab, f);
1967 >            else {
1968 >                synchronized (f) {
1969 >                    if (tabAt(tab, i) == f) {
1970 >                        if (fh >= 0) {
1971 >                            binCount = 1;
1972 >                            for (Node<K,V> e = f, pred = null;; ++binCount) {
1973 >                                K ek;
1974 >                                if (e.hash == h &&
1975 >                                    ((ek = e.key) == key ||
1976 >                                     (ek != null && key.equals(ek)))) {
1977 >                                    val = remappingFunction.apply(e.val, value);
1978 >                                    if (val != null)
1979 >                                        e.val = val;
1980 >                                    else {
1981 >                                        delta = -1;
1982 >                                        Node<K,V> en = e.next;
1983 >                                        if (pred != null)
1984 >                                            pred.next = en;
1985 >                                        else
1986 >                                            setTabAt(tab, i, en);
1987 >                                    }
1988 >                                    break;
1989 >                                }
1990 >                                pred = e;
1991 >                                if ((e = e.next) == null) {
1992 >                                    delta = 1;
1993 >                                    val = value;
1994 >                                    pred.next =
1995 >                                        new Node<K,V>(h, key, val, null);
1996 >                                    break;
1997 >                                }
1998 >                            }
1999 >                        }
2000 >                        else if (f instanceof TreeBin) {
2001 >                            binCount = 2;
2002 >                            TreeBin<K,V> t = (TreeBin<K,V>)f;
2003 >                            TreeNode<K,V> r = t.root;
2004 >                            TreeNode<K,V> p = (r == null) ? null :
2005 >                                r.findTreeNode(h, key, null);
2006 >                            val = (p == null) ? value :
2007 >                                remappingFunction.apply(p.val, value);
2008 >                            if (val != null) {
2009 >                                if (p != null)
2010 >                                    p.val = val;
2011 >                                else {
2012 >                                    delta = 1;
2013 >                                    t.putTreeVal(h, key, val);
2014 >                                }
2015 >                            }
2016 >                            else if (p != null) {
2017 >                                delta = -1;
2018 >                                if (t.removeTreeNode(p))
2019 >                                    setTabAt(tab, i, untreeify(t.first));
2020 >                            }
2021 >                        }
2022 >                    }
2023 >                }
2024 >                if (binCount != 0) {
2025 >                    if (binCount >= TREEIFY_THRESHOLD)
2026 >                        treeifyBin(tab, i);
2027 >                    break;
2028 >                }
2029 >            }
2030 >        }
2031 >        if (delta != 0)
2032 >            addCount((long)delta, binCount);
2033 >        return val;
2034      }
2035  
2036 +    // Hashtable legacy methods
2037 +
2038      /**
2039 <     * Removes the key (and its corresponding value) from this map.
2040 <     * This method does nothing if the key is not in the map.
2039 >     * Legacy method testing if some key maps into the specified value
2040 >     * in this table.  This method is identical in functionality to
2041 >     * {@link #containsValue(Object)}, and exists solely to ensure
2042 >     * full compatibility with class {@link java.util.Hashtable},
2043 >     * which supported this method prior to introduction of the
2044 >     * Java Collections framework.
2045       *
2046 <     * @param  key the key that needs to be removed
2047 <     * @return the previous value associated with {@code key}, or
2048 <     *         {@code null} if there was no mapping for {@code key}
2049 <     * @throws NullPointerException if the specified key is null
2046 >     * @param  value a value to search for
2047 >     * @return {@code true} if and only if some key maps to the
2048 >     *         {@code value} argument in this table as
2049 >     *         determined by the {@code equals} method;
2050 >     *         {@code false} otherwise
2051 >     * @throws NullPointerException if the specified value is null
2052       */
2053 <    @SuppressWarnings("unchecked") public V remove(Object key) {
2054 <        if (key == null)
3000 <            throw new NullPointerException();
3001 <        return (V)internalReplace(key, null, null);
2053 >    @Deprecated public boolean contains(Object value) {
2054 >        return containsValue(value);
2055      }
2056  
2057      /**
2058 <     * {@inheritDoc}
2058 >     * Returns an enumeration of the keys in this table.
2059       *
2060 <     * @throws NullPointerException if the specified key is null
2060 >     * @return an enumeration of the keys in this table
2061 >     * @see #keySet()
2062       */
2063 <    public boolean remove(Object key, Object value) {
2064 <        if (key == null)
2065 <            throw new NullPointerException();
2066 <        if (value == null)
3013 <            return false;
3014 <        return internalReplace(key, null, value) != null;
2063 >    public Enumeration<K> keys() {
2064 >        Node<K,V>[] t;
2065 >        int f = (t = table) == null ? 0 : t.length;
2066 >        return new KeyIterator<K,V>(t, f, 0, f, this);
2067      }
2068  
2069      /**
2070 <     * {@inheritDoc}
2070 >     * Returns an enumeration of the values in this table.
2071       *
2072 <     * @throws NullPointerException if any of the arguments are null
2072 >     * @return an enumeration of the values in this table
2073 >     * @see #values()
2074       */
2075 <    public boolean replace(K key, V oldValue, V newValue) {
2076 <        if (key == null || oldValue == null || newValue == null)
2077 <            throw new NullPointerException();
2078 <        return internalReplace(key, newValue, oldValue) != null;
2075 >    public Enumeration<V> elements() {
2076 >        Node<K,V>[] t;
2077 >        int f = (t = table) == null ? 0 : t.length;
2078 >        return new ValueIterator<K,V>(t, f, 0, f, this);
2079      }
2080  
2081 +    // ConcurrentHashMapV8-only methods
2082 +
2083      /**
2084 <     * {@inheritDoc}
2084 >     * Returns the number of mappings. This method should be used
2085 >     * instead of {@link #size} because a ConcurrentHashMapV8 may
2086 >     * contain more mappings than can be represented as an int. The
2087 >     * value returned is an estimate; the actual count may differ if
2088 >     * there are concurrent insertions or removals.
2089       *
2090 <     * @return the previous value associated with the specified key,
2091 <     *         or {@code null} if there was no mapping for the key
3033 <     * @throws NullPointerException if the specified key or value is null
2090 >     * @return the number of mappings
2091 >     * @since 1.8
2092       */
2093 <    @SuppressWarnings("unchecked") public V replace(K key, V value) {
2094 <        if (key == null || value == null)
2095 <            throw new NullPointerException();
3038 <        return (V)internalReplace(key, value, null);
2093 >    public long mappingCount() {
2094 >        long n = sumCount();
2095 >        return (n < 0L) ? 0L : n; // ignore transient negative values
2096      }
2097  
2098      /**
2099 <     * Removes all of the mappings from this map.
2099 >     * Creates a new {@link Set} backed by a ConcurrentHashMapV8
2100 >     * from the given type to {@code Boolean.TRUE}.
2101 >     *
2102 >     * @return the new set
2103 >     * @since 1.8
2104       */
2105 <    public void clear() {
2106 <        internalClear();
2105 >    public static <K> KeySetView<K,Boolean> newKeySet() {
2106 >        return new KeySetView<K,Boolean>
2107 >            (new ConcurrentHashMapV8<K,Boolean>(), Boolean.TRUE);
2108      }
2109  
2110      /**
2111 <     * Returns a {@link Set} view of the keys contained in this map.
2112 <     * The set is backed by the map, so changes to the map are
3051 <     * reflected in the set, and vice-versa.
2111 >     * Creates a new {@link Set} backed by a ConcurrentHashMapV8
2112 >     * from the given type to {@code Boolean.TRUE}.
2113       *
2114 <     * @return the set view
2114 >     * @param initialCapacity The implementation performs internal
2115 >     * sizing to accommodate this many elements.
2116 >     * @return the new set
2117 >     * @throws IllegalArgumentException if the initial capacity of
2118 >     * elements is negative
2119 >     * @since 1.8
2120       */
2121 <    public KeySetView<K,V> keySet() {
2122 <        KeySetView<K,V> ks = keySet;
2123 <        return (ks != null) ? ks : (keySet = new KeySetView<K,V>(this, null));
2121 >    public static <K> KeySetView<K,Boolean> newKeySet(int initialCapacity) {
2122 >        return new KeySetView<K,Boolean>
2123 >            (new ConcurrentHashMapV8<K,Boolean>(initialCapacity), Boolean.TRUE);
2124      }
2125  
2126      /**
2127       * Returns a {@link Set} view of the keys in this map, using the
2128       * given common mapped value for any additions (i.e., {@link
2129 <     * Collection#add} and {@link Collection#addAll}). This is of
2130 <     * course only appropriate if it is acceptable to use the same
2131 <     * value for all additions from this view.
2129 >     * Collection#add} and {@link Collection#addAll(Collection)}).
2130 >     * This is of course only appropriate if it is acceptable to use
2131 >     * the same value for all additions from this view.
2132       *
2133 <     * @param mappedValue the mapped value to use for any
3068 <     * additions.
2133 >     * @param mappedValue the mapped value to use for any additions
2134       * @return the set view
2135       * @throws NullPointerException if the mappedValue is null
2136       */
# Line 3075 | Line 2140 | public class ConcurrentHashMapV8<K, V>
2140          return new KeySetView<K,V>(this, mappedValue);
2141      }
2142  
2143 +    /* ---------------- Special Nodes -------------- */
2144 +
2145      /**
2146 <     * Returns a {@link Collection} view of the values contained in this map.
3080 <     * The collection is backed by the map, so changes to the map are
3081 <     * reflected in the collection, and vice-versa.  The collection
3082 <     * supports element removal, which removes the corresponding
3083 <     * mapping from this map, via the {@code Iterator.remove},
3084 <     * {@code Collection.remove}, {@code removeAll},
3085 <     * {@code retainAll}, and {@code clear} operations.  It does not
3086 <     * support the {@code add} or {@code addAll} operations.
3087 <     *
3088 <     * <p>The view's {@code iterator} is a "weakly consistent" iterator
3089 <     * that will never throw {@link ConcurrentModificationException},
3090 <     * and guarantees to traverse elements as they existed upon
3091 <     * construction of the iterator, and may (but is not guaranteed to)
3092 <     * reflect any modifications subsequent to construction.
2146 >     * A node inserted at head of bins during transfer operations.
2147       */
2148 <    public Collection<V> values() {
2149 <        Values<K,V> vs = values;
2150 <        return (vs != null) ? vs : (values = new Values<K,V>(this));
2148 >    static final class ForwardingNode<K,V> extends Node<K,V> {
2149 >        final Node<K,V>[] nextTable;
2150 >        ForwardingNode(Node<K,V>[] tab) {
2151 >            super(MOVED, null, null, null);
2152 >            this.nextTable = tab;
2153 >        }
2154 >
2155 >        Node<K,V> find(int h, Object k) {
2156 >            // loop to avoid arbitrarily deep recursion on forwarding nodes
2157 >            outer: for (Node<K,V>[] tab = nextTable;;) {
2158 >                Node<K,V> e; int n;
2159 >                if (k == null || tab == null || (n = tab.length) == 0 ||
2160 >                    (e = tabAt(tab, (n - 1) & h)) == null)
2161 >                    return null;
2162 >                for (;;) {
2163 >                    int eh; K ek;
2164 >                    if ((eh = e.hash) == h &&
2165 >                        ((ek = e.key) == k || (ek != null && k.equals(ek))))
2166 >                        return e;
2167 >                    if (eh < 0) {
2168 >                        if (e instanceof ForwardingNode) {
2169 >                            tab = ((ForwardingNode<K,V>)e).nextTable;
2170 >                            continue outer;
2171 >                        }
2172 >                        else
2173 >                            return e.find(h, k);
2174 >                    }
2175 >                    if ((e = e.next) == null)
2176 >                        return null;
2177 >                }
2178 >            }
2179 >        }
2180      }
2181  
2182      /**
2183 <     * Returns a {@link Set} view of the mappings contained in this map.
3101 <     * The set is backed by the map, so changes to the map are
3102 <     * reflected in the set, and vice-versa.  The set supports element
3103 <     * removal, which removes the corresponding mapping from the map,
3104 <     * via the {@code Iterator.remove}, {@code Set.remove},
3105 <     * {@code removeAll}, {@code retainAll}, and {@code clear}
3106 <     * operations.  It does not support the {@code add} or
3107 <     * {@code addAll} operations.
3108 <     *
3109 <     * <p>The view's {@code iterator} is a "weakly consistent" iterator
3110 <     * that will never throw {@link ConcurrentModificationException},
3111 <     * and guarantees to traverse elements as they existed upon
3112 <     * construction of the iterator, and may (but is not guaranteed to)
3113 <     * reflect any modifications subsequent to construction.
2183 >     * A place-holder node used in computeIfAbsent and compute
2184       */
2185 <    public Set<Map.Entry<K,V>> entrySet() {
2186 <        EntrySet<K,V> es = entrySet;
2187 <        return (es != null) ? es : (entrySet = new EntrySet<K,V>(this));
2185 >    static final class ReservationNode<K,V> extends Node<K,V> {
2186 >        ReservationNode() {
2187 >            super(RESERVED, null, null, null);
2188 >        }
2189 >
2190 >        Node<K,V> find(int h, Object k) {
2191 >            return null;
2192 >        }
2193      }
2194  
2195 +    /* ---------------- Table Initialization and Resizing -------------- */
2196 +
2197      /**
2198 <     * Returns an enumeration of the keys in this table.
3122 <     *
3123 <     * @return an enumeration of the keys in this table
3124 <     * @see #keySet()
2198 >     * Initializes table, using the size recorded in sizeCtl.
2199       */
2200 <    public Enumeration<K> keys() {
2201 <        return new KeyIterator<K,V>(this);
2200 >    private final Node<K,V>[] initTable() {
2201 >        Node<K,V>[] tab; int sc;
2202 >        while ((tab = table) == null || tab.length == 0) {
2203 >            if ((sc = sizeCtl) < 0)
2204 >                Thread.yield(); // lost initialization race; just spin
2205 >            else if (U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
2206 >                try {
2207 >                    if ((tab = table) == null || tab.length == 0) {
2208 >                        int n = (sc > 0) ? sc : DEFAULT_CAPACITY;
2209 >                        @SuppressWarnings("unchecked")
2210 >                            Node<K,V>[] nt = (Node<K,V>[])new Node<?,?>[n];
2211 >                        table = tab = nt;
2212 >                        sc = n - (n >>> 2);
2213 >                    }
2214 >                } finally {
2215 >                    sizeCtl = sc;
2216 >                }
2217 >                break;
2218 >            }
2219 >        }
2220 >        return tab;
2221      }
2222  
2223      /**
2224 <     * Returns an enumeration of the values in this table.
2225 <     *
2226 <     * @return an enumeration of the values in this table
2227 <     * @see #values()
2224 >     * Adds to count, and if table is too small and not already
2225 >     * resizing, initiates transfer. If already resizing, helps
2226 >     * perform transfer if work is available.  Rechecks occupancy
2227 >     * after a transfer to see if another resize is already needed
2228 >     * because resizings are lagging additions.
2229 >     *
2230 >     * @param x the count to add
2231 >     * @param check if <0, don't check resize, if <= 1 only check if uncontended
2232 >     */
2233 >    private final void addCount(long x, int check) {
2234 >        CounterCell[] as; long b, s;
2235 >        if ((as = counterCells) != null ||
2236 >            !U.compareAndSwapLong(this, BASECOUNT, b = baseCount, s = b + x)) {
2237 >            CounterHashCode hc; CounterCell a; long v; int m;
2238 >            boolean uncontended = true;
2239 >            if ((hc = threadCounterHashCode.get()) == null ||
2240 >                as == null || (m = as.length - 1) < 0 ||
2241 >                (a = as[m & hc.code]) == null ||
2242 >                !(uncontended =
2243 >                  U.compareAndSwapLong(a, CELLVALUE, v = a.value, v + x))) {
2244 >                fullAddCount(x, hc, uncontended);
2245 >                return;
2246 >            }
2247 >            if (check <= 1)
2248 >                return;
2249 >            s = sumCount();
2250 >        }
2251 >        if (check >= 0) {
2252 >            Node<K,V>[] tab, nt; int sc;
2253 >            while (s >= (long)(sc = sizeCtl) && (tab = table) != null &&
2254 >                   tab.length < MAXIMUM_CAPACITY) {
2255 >                if (sc < 0) {
2256 >                    if (sc == -1 || transferIndex <= 0 ||
2257 >                        (nt = nextTable) == null)
2258 >                        break;
2259 >                    if (U.compareAndSwapInt(this, SIZECTL, sc, sc - 1))
2260 >                        transfer(tab, nt);
2261 >                }
2262 >                else if (U.compareAndSwapInt(this, SIZECTL, sc, -2))
2263 >                    transfer(tab, null);
2264 >                s = sumCount();
2265 >            }
2266 >        }
2267 >    }
2268 >
2269 >    /**
2270 >     * Helps transfer if a resize is in progress.
2271       */
2272 <    public Enumeration<V> elements() {
2273 <        return new ValueIterator<K,V>(this);
2272 >    final Node<K,V>[] helpTransfer(Node<K,V>[] tab, Node<K,V> f) {
2273 >        Node<K,V>[] nextTab; int sc;
2274 >        if ((f instanceof ForwardingNode) &&
2275 >            (nextTab = ((ForwardingNode<K,V>)f).nextTable) != null) {
2276 >            while (transferIndex > 0 && nextTab == nextTable &&
2277 >                   (sc = sizeCtl) < -1) {
2278 >                if (U.compareAndSwapInt(this, SIZECTL, sc, sc - 1)) {
2279 >                    transfer(tab, nextTab);
2280 >                    break;
2281 >                }
2282 >            }
2283 >            return nextTab;
2284 >        }
2285 >        return table;
2286      }
2287  
2288      /**
2289 <     * Returns a partitionable iterator of the keys in this map.
2289 >     * Tries to presize table to accommodate the given number of elements.
2290       *
2291 <     * @return a partitionable iterator of the keys in this map
2291 >     * @param size number of elements (doesn't need to be perfectly accurate)
2292       */
2293 <    public Spliterator<K> keySpliterator() {
2294 <        return new KeyIterator<K,V>(this);
2293 >    private final void tryPresize(int size) {
2294 >        int c = (size >= (MAXIMUM_CAPACITY >>> 1)) ? MAXIMUM_CAPACITY :
2295 >            tableSizeFor(size + (size >>> 1) + 1);
2296 >        int sc;
2297 >        while ((sc = sizeCtl) >= 0) {
2298 >            Node<K,V>[] tab = table; int n;
2299 >            if (tab == null || (n = tab.length) == 0) {
2300 >                n = (sc > c) ? sc : c;
2301 >                if (U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
2302 >                    try {
2303 >                        if (table == tab) {
2304 >                            @SuppressWarnings("unchecked")
2305 >                                Node<K,V>[] nt = (Node<K,V>[])new Node<?,?>[n];
2306 >                            table = nt;
2307 >                            sc = n - (n >>> 2);
2308 >                        }
2309 >                    } finally {
2310 >                        sizeCtl = sc;
2311 >                    }
2312 >                }
2313 >            }
2314 >            else if (c <= sc || n >= MAXIMUM_CAPACITY)
2315 >                break;
2316 >            else if (tab == table &&
2317 >                     U.compareAndSwapInt(this, SIZECTL, sc, -2))
2318 >                transfer(tab, null);
2319 >        }
2320      }
2321  
2322      /**
2323 <     * Returns a partitionable iterator of the values in this map.
2324 <     *
3152 <     * @return a partitionable iterator of the values in this map
2323 >     * Moves and/or copies the nodes in each bin to new table. See
2324 >     * above for explanation.
2325       */
2326 <    public Spliterator<V> valueSpliterator() {
2327 <        return new ValueIterator<K,V>(this);
2326 >    private final void transfer(Node<K,V>[] tab, Node<K,V>[] nextTab) {
2327 >        int n = tab.length, stride;
2328 >        if ((stride = (NCPU > 1) ? (n >>> 3) / NCPU : n) < MIN_TRANSFER_STRIDE)
2329 >            stride = MIN_TRANSFER_STRIDE; // subdivide range
2330 >        if (nextTab == null) {            // initiating
2331 >            try {
2332 >                @SuppressWarnings("unchecked")
2333 >                Node<K,V>[] nt = (Node<K,V>[])new Node<?,?>[n << 1];
2334 >                nextTab = nt;
2335 >            } catch (Throwable ex) {      // try to cope with OOME
2336 >                sizeCtl = Integer.MAX_VALUE;
2337 >                return;
2338 >            }
2339 >            nextTable = nextTab;
2340 >            transferIndex = n;
2341 >        }
2342 >        int nextn = nextTab.length;
2343 >        ForwardingNode<K,V> fwd = new ForwardingNode<K,V>(nextTab);
2344 >        boolean advance = true;
2345 >        boolean finishing = false; // to ensure sweep before committing nextTab
2346 >        for (int i = 0, bound = 0;;) {
2347 >            Node<K,V> f; int fh;
2348 >            while (advance) {
2349 >                int nextIndex, nextBound;
2350 >                if (--i >= bound || finishing)
2351 >                    advance = false;
2352 >                else if ((nextIndex = transferIndex) <= 0) {
2353 >                    i = -1;
2354 >                    advance = false;
2355 >                }
2356 >                else if (U.compareAndSwapInt
2357 >                         (this, TRANSFERINDEX, nextIndex,
2358 >                          nextBound = (nextIndex > stride ?
2359 >                                       nextIndex - stride : 0))) {
2360 >                    bound = nextBound;
2361 >                    i = nextIndex - 1;
2362 >                    advance = false;
2363 >                }
2364 >            }
2365 >            if (i < 0 || i >= n || i + n >= nextn) {
2366 >                int sc;
2367 >                if (finishing) {
2368 >                    nextTable = null;
2369 >                    table = nextTab;
2370 >                    sizeCtl = (n << 1) - (n >>> 1);
2371 >                    return;
2372 >                }
2373 >                if (U.compareAndSwapInt(this, SIZECTL, sc = sizeCtl, ++sc)) {
2374 >                    if (sc != -1)
2375 >                        return;
2376 >                    finishing = advance = true;
2377 >                    i = n; // recheck before commit
2378 >                }
2379 >            }
2380 >            else if ((f = tabAt(tab, i)) == null)
2381 >                advance = casTabAt(tab, i, null, fwd);
2382 >            else if ((fh = f.hash) == MOVED)
2383 >                advance = true; // already processed
2384 >            else {
2385 >                synchronized (f) {
2386 >                    if (tabAt(tab, i) == f) {
2387 >                        Node<K,V> ln, hn;
2388 >                        if (fh >= 0) {
2389 >                            int runBit = fh & n;
2390 >                            Node<K,V> lastRun = f;
2391 >                            for (Node<K,V> p = f.next; p != null; p = p.next) {
2392 >                                int b = p.hash & n;
2393 >                                if (b != runBit) {
2394 >                                    runBit = b;
2395 >                                    lastRun = p;
2396 >                                }
2397 >                            }
2398 >                            if (runBit == 0) {
2399 >                                ln = lastRun;
2400 >                                hn = null;
2401 >                            }
2402 >                            else {
2403 >                                hn = lastRun;
2404 >                                ln = null;
2405 >                            }
2406 >                            for (Node<K,V> p = f; p != lastRun; p = p.next) {
2407 >                                int ph = p.hash; K pk = p.key; V pv = p.val;
2408 >                                if ((ph & n) == 0)
2409 >                                    ln = new Node<K,V>(ph, pk, pv, ln);
2410 >                                else
2411 >                                    hn = new Node<K,V>(ph, pk, pv, hn);
2412 >                            }
2413 >                            setTabAt(nextTab, i, ln);
2414 >                            setTabAt(nextTab, i + n, hn);
2415 >                            setTabAt(tab, i, fwd);
2416 >                            advance = true;
2417 >                        }
2418 >                        else if (f instanceof TreeBin) {
2419 >                            TreeBin<K,V> t = (TreeBin<K,V>)f;
2420 >                            TreeNode<K,V> lo = null, loTail = null;
2421 >                            TreeNode<K,V> hi = null, hiTail = null;
2422 >                            int lc = 0, hc = 0;
2423 >                            for (Node<K,V> e = t.first; e != null; e = e.next) {
2424 >                                int h = e.hash;
2425 >                                TreeNode<K,V> p = new TreeNode<K,V>
2426 >                                    (h, e.key, e.val, null, null);
2427 >                                if ((h & n) == 0) {
2428 >                                    if ((p.prev = loTail) == null)
2429 >                                        lo = p;
2430 >                                    else
2431 >                                        loTail.next = p;
2432 >                                    loTail = p;
2433 >                                    ++lc;
2434 >                                }
2435 >                                else {
2436 >                                    if ((p.prev = hiTail) == null)
2437 >                                        hi = p;
2438 >                                    else
2439 >                                        hiTail.next = p;
2440 >                                    hiTail = p;
2441 >                                    ++hc;
2442 >                                }
2443 >                            }
2444 >                            ln = (lc <= UNTREEIFY_THRESHOLD) ? untreeify(lo) :
2445 >                                (hc != 0) ? new TreeBin<K,V>(lo) : t;
2446 >                            hn = (hc <= UNTREEIFY_THRESHOLD) ? untreeify(hi) :
2447 >                                (lc != 0) ? new TreeBin<K,V>(hi) : t;
2448 >                            setTabAt(nextTab, i, ln);
2449 >                            setTabAt(nextTab, i + n, hn);
2450 >                            setTabAt(tab, i, fwd);
2451 >                            advance = true;
2452 >                        }
2453 >                    }
2454 >                }
2455 >            }
2456 >        }
2457      }
2458  
2459 +    /* ---------------- Conversion from/to TreeBins -------------- */
2460 +
2461      /**
2462 <     * Returns a partitionable iterator of the entries in this map.
2463 <     *
3161 <     * @return a partitionable iterator of the entries in this map
2462 >     * Replaces all linked nodes in bin at given index unless table is
2463 >     * too small, in which case resizes instead.
2464       */
2465 <    public Spliterator<Map.Entry<K,V>> entrySpliterator() {
2466 <        return new EntryIterator<K,V>(this);
2465 >    private final void treeifyBin(Node<K,V>[] tab, int index) {
2466 >        Node<K,V> b; int n, sc;
2467 >        if (tab != null) {
2468 >            if ((n = tab.length) < MIN_TREEIFY_CAPACITY) {
2469 >                if (tab == table && (sc = sizeCtl) >= 0 &&
2470 >                    U.compareAndSwapInt(this, SIZECTL, sc, -2))
2471 >                    transfer(tab, null);
2472 >            }
2473 >            else if ((b = tabAt(tab, index)) != null && b.hash >= 0) {
2474 >                synchronized (b) {
2475 >                    if (tabAt(tab, index) == b) {
2476 >                        TreeNode<K,V> hd = null, tl = null;
2477 >                        for (Node<K,V> e = b; e != null; e = e.next) {
2478 >                            TreeNode<K,V> p =
2479 >                                new TreeNode<K,V>(e.hash, e.key, e.val,
2480 >                                                  null, null);
2481 >                            if ((p.prev = tl) == null)
2482 >                                hd = p;
2483 >                            else
2484 >                                tl.next = p;
2485 >                            tl = p;
2486 >                        }
2487 >                        setTabAt(tab, index, new TreeBin<K,V>(hd));
2488 >                    }
2489 >                }
2490 >            }
2491 >        }
2492      }
2493  
2494      /**
2495 <     * Returns the hash code value for this {@link Map}, i.e.,
3169 <     * the sum of, for each key-value pair in the map,
3170 <     * {@code key.hashCode() ^ value.hashCode()}.
3171 <     *
3172 <     * @return the hash code value for this map
2495 >     * Returns a list on non-TreeNodes replacing those in given list.
2496       */
2497 <    public int hashCode() {
2498 <        int h = 0;
2499 <        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
2500 <        Object v;
2501 <        while ((v = it.advance()) != null) {
2502 <            h += it.nextKey.hashCode() ^ v.hashCode();
2497 >    static <K,V> Node<K,V> untreeify(Node<K,V> b) {
2498 >        Node<K,V> hd = null, tl = null;
2499 >        for (Node<K,V> q = b; q != null; q = q.next) {
2500 >            Node<K,V> p = new Node<K,V>(q.hash, q.key, q.val, null);
2501 >            if (tl == null)
2502 >                hd = p;
2503 >            else
2504 >                tl.next = p;
2505 >            tl = p;
2506          }
2507 <        return h;
2507 >        return hd;
2508      }
2509  
2510 +    /* ---------------- TreeNodes -------------- */
2511 +
2512      /**
2513 <     * Returns a string representation of this map.  The string
3186 <     * representation consists of a list of key-value mappings (in no
3187 <     * particular order) enclosed in braces ("{@code {}}").  Adjacent
3188 <     * mappings are separated by the characters {@code ", "} (comma
3189 <     * and space).  Each key-value mapping is rendered as the key
3190 <     * followed by an equals sign ("{@code =}") followed by the
3191 <     * associated value.
3192 <     *
3193 <     * @return a string representation of this map
2513 >     * Nodes for use in TreeBins
2514       */
2515 <    public String toString() {
2516 <        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
2517 <        StringBuilder sb = new StringBuilder();
2518 <        sb.append('{');
2519 <        Object v;
2520 <        if ((v = it.advance()) != null) {
2521 <            for (;;) {
2522 <                Object k = it.nextKey;
2523 <                sb.append(k == this ? "(this Map)" : k);
2524 <                sb.append('=');
2525 <                sb.append(v == this ? "(this Map)" : v);
2526 <                if ((v = it.advance()) == null)
2515 >    static final class TreeNode<K,V> extends Node<K,V> {
2516 >        TreeNode<K,V> parent;  // red-black tree links
2517 >        TreeNode<K,V> left;
2518 >        TreeNode<K,V> right;
2519 >        TreeNode<K,V> prev;    // needed to unlink next upon deletion
2520 >        boolean red;
2521 >
2522 >        TreeNode(int hash, K key, V val, Node<K,V> next,
2523 >                 TreeNode<K,V> parent) {
2524 >            super(hash, key, val, next);
2525 >            this.parent = parent;
2526 >        }
2527 >
2528 >        Node<K,V> find(int h, Object k) {
2529 >            return findTreeNode(h, k, null);
2530 >        }
2531 >
2532 >        /**
2533 >         * Returns the TreeNode (or null if not found) for the given key
2534 >         * starting at given root.
2535 >         */
2536 >        final TreeNode<K,V> findTreeNode(int h, Object k, Class<?> kc) {
2537 >            if (k != null) {
2538 >                TreeNode<K,V> p = this;
2539 >                do  {
2540 >                    int ph, dir; K pk; TreeNode<K,V> q;
2541 >                    TreeNode<K,V> pl = p.left, pr = p.right;
2542 >                    if ((ph = p.hash) > h)
2543 >                        p = pl;
2544 >                    else if (ph < h)
2545 >                        p = pr;
2546 >                    else if ((pk = p.key) == k || (pk != null && k.equals(pk)))
2547 >                        return p;
2548 >                    else if (pl == null)
2549 >                        p = pr;
2550 >                    else if (pr == null)
2551 >                        p = pl;
2552 >                    else if ((kc != null ||
2553 >                              (kc = comparableClassFor(k)) != null) &&
2554 >                             (dir = compareComparables(kc, k, pk)) != 0)
2555 >                        p = (dir < 0) ? pl : pr;
2556 >                    else if ((q = pr.findTreeNode(h, k, kc)) != null)
2557 >                        return q;
2558 >                    else
2559 >                        p = pl;
2560 >                } while (p != null);
2561 >            }
2562 >            return null;
2563 >        }
2564 >    }
2565 >
2566 >    /* ---------------- TreeBins -------------- */
2567 >
2568 >    /**
2569 >     * TreeNodes used at the heads of bins. TreeBins do not hold user
2570 >     * keys or values, but instead point to list of TreeNodes and
2571 >     * their root. They also maintain a parasitic read-write lock
2572 >     * forcing writers (who hold bin lock) to wait for readers (who do
2573 >     * not) to complete before tree restructuring operations.
2574 >     */
2575 >    static final class TreeBin<K,V> extends Node<K,V> {
2576 >        TreeNode<K,V> root;
2577 >        volatile TreeNode<K,V> first;
2578 >        volatile Thread waiter;
2579 >        volatile int lockState;
2580 >        // values for lockState
2581 >        static final int WRITER = 1; // set while holding write lock
2582 >        static final int WAITER = 2; // set when waiting for write lock
2583 >        static final int READER = 4; // increment value for setting read lock
2584 >
2585 >        /**
2586 >         * Tie-breaking utility for ordering insertions when equal
2587 >         * hashCodes and non-comparable. We don't require a total
2588 >         * order, just a consistent insertion rule to maintain
2589 >         * equivalence across rebalancings. Tie-breaking further than
2590 >         * necessary simplifies testing a bit.
2591 >         */
2592 >        static int tieBreakOrder(Object a, Object b) {
2593 >            int d;
2594 >            if (a == null || b == null ||
2595 >                (d = a.getClass().getName().
2596 >                 compareTo(b.getClass().getName())) == 0)
2597 >                d = (System.identityHashCode(a) <= System.identityHashCode(b) ?
2598 >                     -1 : 1);
2599 >            return d;
2600 >        }
2601 >
2602 >        /**
2603 >         * Creates bin with initial set of nodes headed by b.
2604 >         */
2605 >        TreeBin(TreeNode<K,V> b) {
2606 >            super(TREEBIN, null, null, null);
2607 >            this.first = b;
2608 >            TreeNode<K,V> r = null;
2609 >            for (TreeNode<K,V> x = b, next; x != null; x = next) {
2610 >                next = (TreeNode<K,V>)x.next;
2611 >                x.left = x.right = null;
2612 >                if (r == null) {
2613 >                    x.parent = null;
2614 >                    x.red = false;
2615 >                    r = x;
2616 >                }
2617 >                else {
2618 >                    K k = x.key;
2619 >                    int h = x.hash;
2620 >                    Class<?> kc = null;
2621 >                    for (TreeNode<K,V> p = r;;) {
2622 >                        int dir, ph;
2623 >                        K pk = p.key;
2624 >                        if ((ph = p.hash) > h)
2625 >                            dir = -1;
2626 >                        else if (ph < h)
2627 >                            dir = 1;
2628 >                        else if ((kc == null &&
2629 >                                  (kc = comparableClassFor(k)) == null) ||
2630 >                                 (dir = compareComparables(kc, k, pk)) == 0)
2631 >                            dir = tieBreakOrder(k, pk);
2632 >                            TreeNode<K,V> xp = p;
2633 >                        if ((p = (dir <= 0) ? p.left : p.right) == null) {
2634 >                            x.parent = xp;
2635 >                            if (dir <= 0)
2636 >                                xp.left = x;
2637 >                            else
2638 >                                xp.right = x;
2639 >                            r = balanceInsertion(r, x);
2640 >                            break;
2641 >                        }
2642 >                    }
2643 >                }
2644 >            }
2645 >            this.root = r;
2646 >            assert checkInvariants(root);
2647 >        }
2648 >
2649 >        /**
2650 >         * Acquires write lock for tree restructuring.
2651 >         */
2652 >        private final void lockRoot() {
2653 >            if (!U.compareAndSwapInt(this, LOCKSTATE, 0, WRITER))
2654 >                contendedLock(); // offload to separate method
2655 >        }
2656 >
2657 >        /**
2658 >         * Releases write lock for tree restructuring.
2659 >         */
2660 >        private final void unlockRoot() {
2661 >            lockState = 0;
2662 >        }
2663 >
2664 >        /**
2665 >         * Possibly blocks awaiting root lock.
2666 >         */
2667 >        private final void contendedLock() {
2668 >            boolean waiting = false;
2669 >            for (int s;;) {
2670 >                if (((s = lockState) & WRITER) == 0) {
2671 >                    if (U.compareAndSwapInt(this, LOCKSTATE, s, WRITER)) {
2672 >                        if (waiting)
2673 >                            waiter = null;
2674 >                        return;
2675 >                    }
2676 >                }
2677 >                else if ((s & WAITER) == 0) {
2678 >                    if (U.compareAndSwapInt(this, LOCKSTATE, s, s | WAITER)) {
2679 >                        waiting = true;
2680 >                        waiter = Thread.currentThread();
2681 >                    }
2682 >                }
2683 >                else if (waiting)
2684 >                    LockSupport.park(this);
2685 >            }
2686 >        }
2687 >
2688 >        /**
2689 >         * Returns matching node or null if none. Tries to search
2690 >         * using tree comparisons from root, but continues linear
2691 >         * search when lock not available.
2692 >         */
2693 > final Node<K,V> find(int h, Object k) {
2694 >            if (k != null) {
2695 >                for (Node<K,V> e = first; e != null; e = e.next) {
2696 >                    int s; K ek;
2697 >                    if (((s = lockState) & (WAITER|WRITER)) != 0) {
2698 >                        if (e.hash == h &&
2699 >                            ((ek = e.key) == k || (ek != null && k.equals(ek))))
2700 >                            return e;
2701 >                    }
2702 >                    else if (U.compareAndSwapInt(this, LOCKSTATE, s,
2703 >                                                 s + READER)) {
2704 >                        TreeNode<K,V> r, p;
2705 >                        try {
2706 >                            p = ((r = root) == null ? null :
2707 >                                 r.findTreeNode(h, k, null));
2708 >                        } finally {
2709 >                            Thread w;
2710 >                            int ls;
2711 >                            do {} while (!U.compareAndSwapInt
2712 >                                         (this, LOCKSTATE,
2713 >                                          ls = lockState, ls - READER));
2714 >                            if (ls == (READER|WAITER) && (w = waiter) != null)
2715 >                                LockSupport.unpark(w);
2716 >                        }
2717 >                        return p;
2718 >                    }
2719 >                }
2720 >            }
2721 >            return null;
2722 >        }
2723 >
2724 >        /**
2725 >         * Finds or adds a node.
2726 >         * @return null if added
2727 >         */
2728 >        final TreeNode<K,V> putTreeVal(int h, K k, V v) {
2729 >            Class<?> kc = null;
2730 >            boolean searched = false;
2731 >            for (TreeNode<K,V> p = root;;) {
2732 >                int dir, ph; K pk;
2733 >                if (p == null) {
2734 >                    first = root = new TreeNode<K,V>(h, k, v, null, null);
2735                      break;
2736 <                sb.append(',').append(' ');
2736 >                }
2737 >                else if ((ph = p.hash) > h)
2738 >                    dir = -1;
2739 >                else if (ph < h)
2740 >                    dir = 1;
2741 >                else if ((pk = p.key) == k || (pk != null && k.equals(pk)))
2742 >                    return p;
2743 >                else if ((kc == null &&
2744 >                          (kc = comparableClassFor(k)) == null) ||
2745 >                         (dir = compareComparables(kc, k, pk)) == 0) {
2746 >                    if (!searched) {
2747 >                        TreeNode<K,V> q, ch;
2748 >                        searched = true;
2749 >                        if (((ch = p.left) != null &&
2750 >                             (q = ch.findTreeNode(h, k, kc)) != null) ||
2751 >                            ((ch = p.right) != null &&
2752 >                             (q = ch.findTreeNode(h, k, kc)) != null))
2753 >                            return q;
2754 >                    }
2755 >                    dir = tieBreakOrder(k, pk);
2756 >                }
2757 >
2758 >                TreeNode<K,V> xp = p;
2759 >                if ((p = (dir <= 0) ? p.left : p.right) == null) {
2760 >                    TreeNode<K,V> x, f = first;
2761 >                    first = x = new TreeNode<K,V>(h, k, v, f, xp);
2762 >                    if (f != null)
2763 >                        f.prev = x;
2764 >                    if (dir <= 0)
2765 >                        xp.left = x;
2766 >                    else
2767 >                        xp.right = x;
2768 >                    if (!xp.red)
2769 >                        x.red = true;
2770 >                    else {
2771 >                        lockRoot();
2772 >                        try {
2773 >                            root = balanceInsertion(root, x);
2774 >                        } finally {
2775 >                            unlockRoot();
2776 >                        }
2777 >                    }
2778 >                    break;
2779 >                }
2780 >            }
2781 >            assert checkInvariants(root);
2782 >            return null;
2783 >        }
2784 >
2785 >        /**
2786 >         * Removes the given node, that must be present before this
2787 >         * call.  This is messier than typical red-black deletion code
2788 >         * because we cannot swap the contents of an interior node
2789 >         * with a leaf successor that is pinned by "next" pointers
2790 >         * that are accessible independently of lock. So instead we
2791 >         * swap the tree linkages.
2792 >         *
2793 >         * @return true if now too small, so should be untreeified
2794 >         */
2795 >        final boolean removeTreeNode(TreeNode<K,V> p) {
2796 >            TreeNode<K,V> next = (TreeNode<K,V>)p.next;
2797 >            TreeNode<K,V> pred = p.prev;  // unlink traversal pointers
2798 >            TreeNode<K,V> r, rl;
2799 >            if (pred == null)
2800 >                first = next;
2801 >            else
2802 >                pred.next = next;
2803 >            if (next != null)
2804 >                next.prev = pred;
2805 >            if (first == null) {
2806 >                root = null;
2807 >                return true;
2808 >            }
2809 >            if ((r = root) == null || r.right == null || // too small
2810 >                (rl = r.left) == null || rl.left == null)
2811 >                return true;
2812 >            lockRoot();
2813 >            try {
2814 >                TreeNode<K,V> replacement;
2815 >                TreeNode<K,V> pl = p.left;
2816 >                TreeNode<K,V> pr = p.right;
2817 >                if (pl != null && pr != null) {
2818 >                    TreeNode<K,V> s = pr, sl;
2819 >                    while ((sl = s.left) != null) // find successor
2820 >                        s = sl;
2821 >                    boolean c = s.red; s.red = p.red; p.red = c; // swap colors
2822 >                    TreeNode<K,V> sr = s.right;
2823 >                    TreeNode<K,V> pp = p.parent;
2824 >                    if (s == pr) { // p was s's direct parent
2825 >                        p.parent = s;
2826 >                        s.right = p;
2827 >                    }
2828 >                    else {
2829 >                        TreeNode<K,V> sp = s.parent;
2830 >                        if ((p.parent = sp) != null) {
2831 >                            if (s == sp.left)
2832 >                                sp.left = p;
2833 >                            else
2834 >                                sp.right = p;
2835 >                        }
2836 >                        if ((s.right = pr) != null)
2837 >                            pr.parent = s;
2838 >                    }
2839 >                    p.left = null;
2840 >                    if ((p.right = sr) != null)
2841 >                        sr.parent = p;
2842 >                    if ((s.left = pl) != null)
2843 >                        pl.parent = s;
2844 >                    if ((s.parent = pp) == null)
2845 >                        r = s;
2846 >                    else if (p == pp.left)
2847 >                        pp.left = s;
2848 >                    else
2849 >                        pp.right = s;
2850 >                    if (sr != null)
2851 >                        replacement = sr;
2852 >                    else
2853 >                        replacement = p;
2854 >                }
2855 >                else if (pl != null)
2856 >                    replacement = pl;
2857 >                else if (pr != null)
2858 >                    replacement = pr;
2859 >                else
2860 >                    replacement = p;
2861 >                if (replacement != p) {
2862 >                    TreeNode<K,V> pp = replacement.parent = p.parent;
2863 >                    if (pp == null)
2864 >                        r = replacement;
2865 >                    else if (p == pp.left)
2866 >                        pp.left = replacement;
2867 >                    else
2868 >                        pp.right = replacement;
2869 >                    p.left = p.right = p.parent = null;
2870 >                }
2871 >
2872 >                root = (p.red) ? r : balanceDeletion(r, replacement);
2873 >
2874 >                if (p == replacement) {  // detach pointers
2875 >                    TreeNode<K,V> pp;
2876 >                    if ((pp = p.parent) != null) {
2877 >                        if (p == pp.left)
2878 >                            pp.left = null;
2879 >                        else if (p == pp.right)
2880 >                            pp.right = null;
2881 >                        p.parent = null;
2882 >                    }
2883 >                }
2884 >            } finally {
2885 >                unlockRoot();
2886 >            }
2887 >            assert checkInvariants(root);
2888 >            return false;
2889 >        }
2890 >
2891 >        /* ------------------------------------------------------------ */
2892 >        // Red-black tree methods, all adapted from CLR
2893 >
2894 >        static <K,V> TreeNode<K,V> rotateLeft(TreeNode<K,V> root,
2895 >                                              TreeNode<K,V> p) {
2896 >            TreeNode<K,V> r, pp, rl;
2897 >            if (p != null && (r = p.right) != null) {
2898 >                if ((rl = p.right = r.left) != null)
2899 >                    rl.parent = p;
2900 >                if ((pp = r.parent = p.parent) == null)
2901 >                    (root = r).red = false;
2902 >                else if (pp.left == p)
2903 >                    pp.left = r;
2904 >                else
2905 >                    pp.right = r;
2906 >                r.left = p;
2907 >                p.parent = r;
2908 >            }
2909 >            return root;
2910 >        }
2911 >
2912 >        static <K,V> TreeNode<K,V> rotateRight(TreeNode<K,V> root,
2913 >                                               TreeNode<K,V> p) {
2914 >            TreeNode<K,V> l, pp, lr;
2915 >            if (p != null && (l = p.left) != null) {
2916 >                if ((lr = p.left = l.right) != null)
2917 >                    lr.parent = p;
2918 >                if ((pp = l.parent = p.parent) == null)
2919 >                    (root = l).red = false;
2920 >                else if (pp.right == p)
2921 >                    pp.right = l;
2922 >                else
2923 >                    pp.left = l;
2924 >                l.right = p;
2925 >                p.parent = l;
2926 >            }
2927 >            return root;
2928 >        }
2929 >
2930 >        static <K,V> TreeNode<K,V> balanceInsertion(TreeNode<K,V> root,
2931 >                                                    TreeNode<K,V> x) {
2932 >            x.red = true;
2933 >            for (TreeNode<K,V> xp, xpp, xppl, xppr;;) {
2934 >                if ((xp = x.parent) == null) {
2935 >                    x.red = false;
2936 >                    return x;
2937 >                }
2938 >                else if (!xp.red || (xpp = xp.parent) == null)
2939 >                    return root;
2940 >                if (xp == (xppl = xpp.left)) {
2941 >                    if ((xppr = xpp.right) != null && xppr.red) {
2942 >                        xppr.red = false;
2943 >                        xp.red = false;
2944 >                        xpp.red = true;
2945 >                        x = xpp;
2946 >                    }
2947 >                    else {
2948 >                        if (x == xp.right) {
2949 >                            root = rotateLeft(root, x = xp);
2950 >                            xpp = (xp = x.parent) == null ? null : xp.parent;
2951 >                        }
2952 >                        if (xp != null) {
2953 >                            xp.red = false;
2954 >                            if (xpp != null) {
2955 >                                xpp.red = true;
2956 >                                root = rotateRight(root, xpp);
2957 >                            }
2958 >                        }
2959 >                    }
2960 >                }
2961 >                else {
2962 >                    if (xppl != null && xppl.red) {
2963 >                        xppl.red = false;
2964 >                        xp.red = false;
2965 >                        xpp.red = true;
2966 >                        x = xpp;
2967 >                    }
2968 >                    else {
2969 >                        if (x == xp.left) {
2970 >                            root = rotateRight(root, x = xp);
2971 >                            xpp = (xp = x.parent) == null ? null : xp.parent;
2972 >                        }
2973 >                        if (xp != null) {
2974 >                            xp.red = false;
2975 >                            if (xpp != null) {
2976 >                                xpp.red = true;
2977 >                                root = rotateLeft(root, xpp);
2978 >                            }
2979 >                        }
2980 >                    }
2981 >                }
2982 >            }
2983 >        }
2984 >
2985 >        static <K,V> TreeNode<K,V> balanceDeletion(TreeNode<K,V> root,
2986 >                                                   TreeNode<K,V> x) {
2987 >            for (TreeNode<K,V> xp, xpl, xpr;;)  {
2988 >                if (x == null || x == root)
2989 >                    return root;
2990 >                else if ((xp = x.parent) == null) {
2991 >                    x.red = false;
2992 >                    return x;
2993 >                }
2994 >                else if (x.red) {
2995 >                    x.red = false;
2996 >                    return root;
2997 >                }
2998 >                else if ((xpl = xp.left) == x) {
2999 >                    if ((xpr = xp.right) != null && xpr.red) {
3000 >                        xpr.red = false;
3001 >                        xp.red = true;
3002 >                        root = rotateLeft(root, xp);
3003 >                        xpr = (xp = x.parent) == null ? null : xp.right;
3004 >                    }
3005 >                    if (xpr == null)
3006 >                        x = xp;
3007 >                    else {
3008 >                        TreeNode<K,V> sl = xpr.left, sr = xpr.right;
3009 >                        if ((sr == null || !sr.red) &&
3010 >                            (sl == null || !sl.red)) {
3011 >                            xpr.red = true;
3012 >                            x = xp;
3013 >                        }
3014 >                        else {
3015 >                            if (sr == null || !sr.red) {
3016 >                                if (sl != null)
3017 >                                    sl.red = false;
3018 >                                xpr.red = true;
3019 >                                root = rotateRight(root, xpr);
3020 >                                xpr = (xp = x.parent) == null ?
3021 >                                    null : xp.right;
3022 >                            }
3023 >                            if (xpr != null) {
3024 >                                xpr.red = (xp == null) ? false : xp.red;
3025 >                                if ((sr = xpr.right) != null)
3026 >                                    sr.red = false;
3027 >                            }
3028 >                            if (xp != null) {
3029 >                                xp.red = false;
3030 >                                root = rotateLeft(root, xp);
3031 >                            }
3032 >                            x = root;
3033 >                        }
3034 >                    }
3035 >                }
3036 >                else { // symmetric
3037 >                    if (xpl != null && xpl.red) {
3038 >                        xpl.red = false;
3039 >                        xp.red = true;
3040 >                        root = rotateRight(root, xp);
3041 >                        xpl = (xp = x.parent) == null ? null : xp.left;
3042 >                    }
3043 >                    if (xpl == null)
3044 >                        x = xp;
3045 >                    else {
3046 >                        TreeNode<K,V> sl = xpl.left, sr = xpl.right;
3047 >                        if ((sl == null || !sl.red) &&
3048 >                            (sr == null || !sr.red)) {
3049 >                            xpl.red = true;
3050 >                            x = xp;
3051 >                        }
3052 >                        else {
3053 >                            if (sl == null || !sl.red) {
3054 >                                if (sr != null)
3055 >                                    sr.red = false;
3056 >                                xpl.red = true;
3057 >                                root = rotateLeft(root, xpl);
3058 >                                xpl = (xp = x.parent) == null ?
3059 >                                    null : xp.left;
3060 >                            }
3061 >                            if (xpl != null) {
3062 >                                xpl.red = (xp == null) ? false : xp.red;
3063 >                                if ((sl = xpl.left) != null)
3064 >                                    sl.red = false;
3065 >                            }
3066 >                            if (xp != null) {
3067 >                                xp.red = false;
3068 >                                root = rotateRight(root, xp);
3069 >                            }
3070 >                            x = root;
3071 >                        }
3072 >                    }
3073 >                }
3074 >            }
3075 >        }
3076 >
3077 >        /**
3078 >         * Recursive invariant check
3079 >         */
3080 >        static <K,V> boolean checkInvariants(TreeNode<K,V> t) {
3081 >            TreeNode<K,V> tp = t.parent, tl = t.left, tr = t.right,
3082 >                tb = t.prev, tn = (TreeNode<K,V>)t.next;
3083 >            if (tb != null && tb.next != t)
3084 >                return false;
3085 >            if (tn != null && tn.prev != t)
3086 >                return false;
3087 >            if (tp != null && t != tp.left && t != tp.right)
3088 >                return false;
3089 >            if (tl != null && (tl.parent != t || tl.hash > t.hash))
3090 >                return false;
3091 >            if (tr != null && (tr.parent != t || tr.hash < t.hash))
3092 >                return false;
3093 >            if (t.red && tl != null && tl.red && tr != null && tr.red)
3094 >                return false;
3095 >            if (tl != null && !checkInvariants(tl))
3096 >                return false;
3097 >            if (tr != null && !checkInvariants(tr))
3098 >                return false;
3099 >            return true;
3100 >        }
3101 >
3102 >        private static final sun.misc.Unsafe U;
3103 >        private static final long LOCKSTATE;
3104 >        static {
3105 >            try {
3106 >                U = getUnsafe();
3107 >                Class<?> k = TreeBin.class;
3108 >                LOCKSTATE = U.objectFieldOffset
3109 >                    (k.getDeclaredField("lockState"));
3110 >            } catch (Exception e) {
3111 >                throw new Error(e);
3112              }
3113          }
3211        return sb.append('}').toString();
3114      }
3115  
3116 +    /* ----------------Table Traversal -------------- */
3117 +
3118      /**
3119 <     * Compares the specified object with this map for equality.
3120 <     * Returns {@code true} if the given object is a map with the same
3121 <     * mappings as this map.  This operation may return misleading
3122 <     * results if either map is concurrently modified during execution
3123 <     * of this method.
3119 >     * Records the table, its length, and current traversal index for a
3120 >     * traverser that must process a region of a forwarded table before
3121 >     * proceeding with current table.
3122 >     */
3123 >    static final class TableStack<K,V> {
3124 >        int length;
3125 >        int index;
3126 >        Node<K,V>[] tab;
3127 >        TableStack<K,V> next;
3128 >    }
3129 >
3130 >    /**
3131 >     * Encapsulates traversal for methods such as containsValue; also
3132 >     * serves as a base class for other iterators and spliterators.
3133       *
3134 <     * @param o object to be compared for equality with this map
3135 <     * @return {@code true} if the specified object is equal to this map
3134 >     * Method advance visits once each still-valid node that was
3135 >     * reachable upon iterator construction. It might miss some that
3136 >     * were added to a bin after the bin was visited, which is OK wrt
3137 >     * consistency guarantees. Maintaining this property in the face
3138 >     * of possible ongoing resizes requires a fair amount of
3139 >     * bookkeeping state that is difficult to optimize away amidst
3140 >     * volatile accesses.  Even so, traversal maintains reasonable
3141 >     * throughput.
3142 >     *
3143 >     * Normally, iteration proceeds bin-by-bin traversing lists.
3144 >     * However, if the table has been resized, then all future steps
3145 >     * must traverse both the bin at the current index as well as at
3146 >     * (index + baseSize); and so on for further resizings. To
3147 >     * paranoically cope with potential sharing by users of iterators
3148 >     * across threads, iteration terminates if a bounds checks fails
3149 >     * for a table read.
3150       */
3151 <    public boolean equals(Object o) {
3152 <        if (o != this) {
3153 <            if (!(o instanceof Map))
3154 <                return false;
3155 <            Map<?,?> m = (Map<?,?>) o;
3156 <            Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3157 <            Object val;
3158 <            while ((val = it.advance()) != null) {
3159 <                Object v = m.get(it.nextKey);
3160 <                if (v == null || (v != val && !v.equals(val)))
3161 <                    return false;
3162 <            }
3163 <            for (Map.Entry<?,?> e : m.entrySet()) {
3164 <                Object mk, mv, v;
3165 <                if ((mk = e.getKey()) == null ||
3166 <                    (mv = e.getValue()) == null ||
3167 <                    (v = internalGet(mk)) == null ||
3168 <                    (mv != v && !mv.equals(v)))
3169 <                    return false;
3151 >    static class Traverser<K,V> {
3152 >        Node<K,V>[] tab;        // current table; updated if resized
3153 >        Node<K,V> next;         // the next entry to use
3154 >        TableStack<K,V> stack, spare; // to save/restore on ForwardingNodes
3155 >        int index;              // index of bin to use next
3156 >        int baseIndex;          // current index of initial table
3157 >        int baseLimit;          // index bound for initial table
3158 >        final int baseSize;     // initial table size
3159 >
3160 >        Traverser(Node<K,V>[] tab, int size, int index, int limit) {
3161 >            this.tab = tab;
3162 >            this.baseSize = size;
3163 >            this.baseIndex = this.index = index;
3164 >            this.baseLimit = limit;
3165 >            this.next = null;
3166 >        }
3167 >
3168 >        /**
3169 >         * Advances if possible, returning next valid node, or null if none.
3170 >         */
3171 >        final Node<K,V> advance() {
3172 >            Node<K,V> e;
3173 >            if ((e = next) != null)
3174 >                e = e.next;
3175 >            for (;;) {
3176 >                Node<K,V>[] t; int i, n;  // must use locals in checks
3177 >                if (e != null)
3178 >                    return next = e;
3179 >                if (baseIndex >= baseLimit || (t = tab) == null ||
3180 >                    (n = t.length) <= (i = index) || i < 0)
3181 >                    return next = null;
3182 >                if ((e = tabAt(t, i)) != null && e.hash < 0) {
3183 >                    if (e instanceof ForwardingNode) {
3184 >                        tab = ((ForwardingNode<K,V>)e).nextTable;
3185 >                        e = null;
3186 >                        pushState(t, i, n);
3187 >                        continue;
3188 >                    }
3189 >                    else if (e instanceof TreeBin)
3190 >                        e = ((TreeBin<K,V>)e).first;
3191 >                    else
3192 >                        e = null;
3193 >                }
3194 >                if (stack != null)
3195 >                    recoverState(n);
3196 >                else if ((index = i + baseSize) >= n)
3197 >                    index = ++baseIndex; // visit upper slots if present
3198              }
3199          }
3245        return true;
3246    }
3200  
3201 <    /* ----------------Iterators -------------- */
3201 >        /**
3202 >         * Saves traversal state upon encountering a forwarding node.
3203 >         */
3204 >        private void pushState(Node<K,V>[] t, int i, int n) {
3205 >            TableStack<K,V> s = spare;  // reuse if possible
3206 >            if (s != null)
3207 >                spare = s.next;
3208 >            else
3209 >                s = new TableStack<K,V>();
3210 >            s.tab = t;
3211 >            s.length = n;
3212 >            s.index = i;
3213 >            s.next = stack;
3214 >            stack = s;
3215 >        }
3216 >
3217 >        /**
3218 >         * Possibly pops traversal state.
3219 >         *
3220 >         * @param n length of current table
3221 >         */
3222 >        private void recoverState(int n) {
3223 >            TableStack<K,V> s; int len;
3224 >            while ((s = stack) != null && (index += (len = s.length)) >= n) {
3225 >                n = len;
3226 >                index = s.index;
3227 >                tab = s.tab;
3228 >                s.tab = null;
3229 >                TableStack<K,V> next = s.next;
3230 >                s.next = spare; // save for reuse
3231 >                stack = next;
3232 >                spare = s;
3233 >            }
3234 >            if (s == null && (index += baseSize) >= n)
3235 >                index = ++baseIndex;
3236 >        }
3237 >    }
3238  
3239 <    @SuppressWarnings("serial") static final class KeyIterator<K,V> extends Traverser<K,V,Object>
3240 <        implements Spliterator<K>, Enumeration<K> {
3241 <        KeyIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3242 <        KeyIterator(Traverser<K,V,Object> it) {
3243 <            super(it);
3239 >    /**
3240 >     * Base of key, value, and entry Iterators. Adds fields to
3241 >     * Traverser to support iterator.remove.
3242 >     */
3243 >    static class BaseIterator<K,V> extends Traverser<K,V> {
3244 >        final ConcurrentHashMapV8<K,V> map;
3245 >        Node<K,V> lastReturned;
3246 >        BaseIterator(Node<K,V>[] tab, int size, int index, int limit,
3247 >                    ConcurrentHashMapV8<K,V> map) {
3248 >            super(tab, size, index, limit);
3249 >            this.map = map;
3250 >            advance();
3251          }
3252 <        public KeyIterator<K,V> split() {
3253 <            if (nextKey != null)
3252 >
3253 >        public final boolean hasNext() { return next != null; }
3254 >        public final boolean hasMoreElements() { return next != null; }
3255 >
3256 >        public final void remove() {
3257 >            Node<K,V> p;
3258 >            if ((p = lastReturned) == null)
3259                  throw new IllegalStateException();
3260 <            return new KeyIterator<K,V>(this);
3260 >            lastReturned = null;
3261 >            map.replaceNode(p.key, null, null);
3262          }
3263 <        @SuppressWarnings("unchecked") public final K next() {
3264 <            if (nextVal == null && advance() == null)
3263 >    }
3264 >
3265 >    static final class KeyIterator<K,V> extends BaseIterator<K,V>
3266 >        implements Iterator<K>, Enumeration<K> {
3267 >        KeyIterator(Node<K,V>[] tab, int index, int size, int limit,
3268 >                    ConcurrentHashMapV8<K,V> map) {
3269 >            super(tab, index, size, limit, map);
3270 >        }
3271 >
3272 >        public final K next() {
3273 >            Node<K,V> p;
3274 >            if ((p = next) == null)
3275                  throw new NoSuchElementException();
3276 <            Object k = nextKey;
3277 <            nextVal = null;
3278 <            return (K) k;
3276 >            K k = p.key;
3277 >            lastReturned = p;
3278 >            advance();
3279 >            return k;
3280          }
3281  
3282          public final K nextElement() { return next(); }
3283      }
3284  
3285 <    @SuppressWarnings("serial") static final class ValueIterator<K,V> extends Traverser<K,V,Object>
3286 <        implements Spliterator<V>, Enumeration<V> {
3287 <        ValueIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3288 <        ValueIterator(Traverser<K,V,Object> it) {
3289 <            super(it);
3277 <        }
3278 <        public ValueIterator<K,V> split() {
3279 <            if (nextKey != null)
3280 <                throw new IllegalStateException();
3281 <            return new ValueIterator<K,V>(this);
3285 >    static final class ValueIterator<K,V> extends BaseIterator<K,V>
3286 >        implements Iterator<V>, Enumeration<V> {
3287 >        ValueIterator(Node<K,V>[] tab, int index, int size, int limit,
3288 >                      ConcurrentHashMapV8<K,V> map) {
3289 >            super(tab, index, size, limit, map);
3290          }
3291  
3292 <        @SuppressWarnings("unchecked") public final V next() {
3293 <            Object v;
3294 <            if ((v = nextVal) == null && (v = advance()) == null)
3292 >        public final V next() {
3293 >            Node<K,V> p;
3294 >            if ((p = next) == null)
3295                  throw new NoSuchElementException();
3296 <            nextVal = null;
3297 <            return (V) v;
3296 >            V v = p.val;
3297 >            lastReturned = p;
3298 >            advance();
3299 >            return v;
3300          }
3301  
3302          public final V nextElement() { return next(); }
3303      }
3304  
3305 <    @SuppressWarnings("serial") static final class EntryIterator<K,V> extends Traverser<K,V,Object>
3306 <        implements Spliterator<Map.Entry<K,V>> {
3307 <        EntryIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3308 <        EntryIterator(Traverser<K,V,Object> it) {
3309 <            super(it);
3300 <        }
3301 <        public EntryIterator<K,V> split() {
3302 <            if (nextKey != null)
3303 <                throw new IllegalStateException();
3304 <            return new EntryIterator<K,V>(this);
3305 >    static final class EntryIterator<K,V> extends BaseIterator<K,V>
3306 >        implements Iterator<Map.Entry<K,V>> {
3307 >        EntryIterator(Node<K,V>[] tab, int index, int size, int limit,
3308 >                      ConcurrentHashMapV8<K,V> map) {
3309 >            super(tab, index, size, limit, map);
3310          }
3311  
3312 <        @SuppressWarnings("unchecked") public final Map.Entry<K,V> next() {
3313 <            Object v;
3314 <            if ((v = nextVal) == null && (v = advance()) == null)
3312 >        public final Map.Entry<K,V> next() {
3313 >            Node<K,V> p;
3314 >            if ((p = next) == null)
3315                  throw new NoSuchElementException();
3316 <            Object k = nextKey;
3317 <            nextVal = null;
3318 <            return new MapEntry<K,V>((K)k, (V)v, map);
3316 >            K k = p.key;
3317 >            V v = p.val;
3318 >            lastReturned = p;
3319 >            advance();
3320 >            return new MapEntry<K,V>(k, v, map);
3321          }
3322      }
3323  
3324      /**
3325 <     * Exported Entry for iterators
3325 >     * Exported Entry for EntryIterator
3326       */
3327 <    static final class MapEntry<K,V> implements Map.Entry<K, V> {
3327 >    static final class MapEntry<K,V> implements Map.Entry<K,V> {
3328          final K key; // non-null
3329          V val;       // non-null
3330 <        final ConcurrentHashMapV8<K, V> map;
3331 <        MapEntry(K key, V val, ConcurrentHashMapV8<K, V> map) {
3330 >        final ConcurrentHashMapV8<K,V> map;
3331 >        MapEntry(K key, V val, ConcurrentHashMapV8<K,V> map) {
3332              this.key = key;
3333              this.val = val;
3334              this.map = map;
3335          }
3336 <        public final K getKey()       { return key; }
3337 <        public final V getValue()     { return val; }
3338 <        public final int hashCode()   { return key.hashCode() ^ val.hashCode(); }
3339 <        public final String toString(){ return key + "=" + val; }
3336 >        public K getKey()        { return key; }
3337 >        public V getValue()      { return val; }
3338 >        public int hashCode()    { return key.hashCode() ^ val.hashCode(); }
3339 >        public String toString() { return key + "=" + val; }
3340  
3341 <        public final boolean equals(Object o) {
3341 >        public boolean equals(Object o) {
3342              Object k, v; Map.Entry<?,?> e;
3343              return ((o instanceof Map.Entry) &&
3344                      (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
# Line 3345 | Line 3352 | public class ConcurrentHashMapV8<K, V>
3352           * value to return is somewhat arbitrary here. Since we do not
3353           * necessarily track asynchronous changes, the most recent
3354           * "previous" value could be different from what we return (or
3355 <         * could even have been removed in which case the put will
3355 >         * could even have been removed, in which case the put will
3356           * re-establish). We do not and cannot guarantee more.
3357           */
3358 <        public final V setValue(V value) {
3358 >        public V setValue(V value) {
3359              if (value == null) throw new NullPointerException();
3360              V v = val;
3361              val = value;
# Line 3357 | Line 3364 | public class ConcurrentHashMapV8<K, V>
3364          }
3365      }
3366  
3367 <    /* ----------------Views -------------- */
3367 >    static final class KeySpliterator<K,V> extends Traverser<K,V>
3368 >        implements ConcurrentHashMapSpliterator<K> {
3369 >        long est;               // size estimate
3370 >        KeySpliterator(Node<K,V>[] tab, int size, int index, int limit,
3371 >                       long est) {
3372 >            super(tab, size, index, limit);
3373 >            this.est = est;
3374 >        }
3375 >
3376 >        public ConcurrentHashMapSpliterator<K> trySplit() {
3377 >            int i, f, h;
3378 >            return (h = ((i = baseIndex) + (f = baseLimit)) >>> 1) <= i ? null :
3379 >                new KeySpliterator<K,V>(tab, baseSize, baseLimit = h,
3380 >                                        f, est >>>= 1);
3381 >        }
3382  
3383 <    /**
3384 <     * Base class for views.
3385 <     */
3386 <    static abstract class CHMView<K, V> {
3387 <        final ConcurrentHashMapV8<K, V> map;
3367 <        CHMView(ConcurrentHashMapV8<K, V> map)  { this.map = map; }
3368 <        public final int size()                 { return map.size(); }
3369 <        public final boolean isEmpty()          { return map.isEmpty(); }
3370 <        public final void clear()               { map.clear(); }
3383 >        public void forEachRemaining(Action<? super K> action) {
3384 >            if (action == null) throw new NullPointerException();
3385 >            for (Node<K,V> p; (p = advance()) != null;)
3386 >                action.apply(p.key);
3387 >        }
3388  
3389 <        // implementations below rely on concrete classes supplying these
3390 <        abstract public Iterator<?> iterator();
3391 <        abstract public boolean contains(Object o);
3392 <        abstract public boolean remove(Object o);
3389 >        public boolean tryAdvance(Action<? super K> action) {
3390 >            if (action == null) throw new NullPointerException();
3391 >            Node<K,V> p;
3392 >            if ((p = advance()) == null)
3393 >                return false;
3394 >            action.apply(p.key);
3395 >            return true;
3396 >        }
3397  
3398 <        private static final String oomeMsg = "Required array size too large";
3398 >        public long estimateSize() { return est; }
3399  
3400 <        public final Object[] toArray() {
3380 <            long sz = map.mappingCount();
3381 <            if (sz > (long)(MAX_ARRAY_SIZE))
3382 <                throw new OutOfMemoryError(oomeMsg);
3383 <            int n = (int)sz;
3384 <            Object[] r = new Object[n];
3385 <            int i = 0;
3386 <            Iterator<?> it = iterator();
3387 <            while (it.hasNext()) {
3388 <                if (i == n) {
3389 <                    if (n >= MAX_ARRAY_SIZE)
3390 <                        throw new OutOfMemoryError(oomeMsg);
3391 <                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
3392 <                        n = MAX_ARRAY_SIZE;
3393 <                    else
3394 <                        n += (n >>> 1) + 1;
3395 <                    r = Arrays.copyOf(r, n);
3396 <                }
3397 <                r[i++] = it.next();
3398 <            }
3399 <            return (i == n) ? r : Arrays.copyOf(r, i);
3400 <        }
3400 >    }
3401  
3402 <        @SuppressWarnings("unchecked") public final <T> T[] toArray(T[] a) {
3403 <            long sz = map.mappingCount();
3404 <            if (sz > (long)(MAX_ARRAY_SIZE))
3405 <                throw new OutOfMemoryError(oomeMsg);
3406 <            int m = (int)sz;
3407 <            T[] r = (a.length >= m) ? a :
3408 <                (T[])java.lang.reflect.Array
3409 <                .newInstance(a.getClass().getComponentType(), m);
3410 <            int n = r.length;
3411 <            int i = 0;
3412 <            Iterator<?> it = iterator();
3413 <            while (it.hasNext()) {
3414 <                if (i == n) {
3415 <                    if (n >= MAX_ARRAY_SIZE)
3416 <                        throw new OutOfMemoryError(oomeMsg);
3417 <                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
3418 <                        n = MAX_ARRAY_SIZE;
3419 <                    else
3420 <                        n += (n >>> 1) + 1;
3421 <                    r = Arrays.copyOf(r, n);
3422 <                }
3423 <                r[i++] = (T)it.next();
3424 <            }
3425 <            if (a == r && i < n) {
3426 <                r[i] = null; // null-terminate
3427 <                return r;
3428 <            }
3429 <            return (i == n) ? r : Arrays.copyOf(r, i);
3402 >    static final class ValueSpliterator<K,V> extends Traverser<K,V>
3403 >        implements ConcurrentHashMapSpliterator<V> {
3404 >        long est;               // size estimate
3405 >        ValueSpliterator(Node<K,V>[] tab, int size, int index, int limit,
3406 >                         long est) {
3407 >            super(tab, size, index, limit);
3408 >            this.est = est;
3409          }
3410  
3411 <        public final int hashCode() {
3412 <            int h = 0;
3413 <            for (Iterator<?> it = iterator(); it.hasNext();)
3414 <                h += it.next().hashCode();
3415 <            return h;
3411 >        public ConcurrentHashMapSpliterator<V> trySplit() {
3412 >            int i, f, h;
3413 >            return (h = ((i = baseIndex) + (f = baseLimit)) >>> 1) <= i ? null :
3414 >                new ValueSpliterator<K,V>(tab, baseSize, baseLimit = h,
3415 >                                          f, est >>>= 1);
3416          }
3417  
3418 <        public final String toString() {
3419 <            StringBuilder sb = new StringBuilder();
3420 <            sb.append('[');
3421 <            Iterator<?> it = iterator();
3443 <            if (it.hasNext()) {
3444 <                for (;;) {
3445 <                    Object e = it.next();
3446 <                    sb.append(e == this ? "(this Collection)" : e);
3447 <                    if (!it.hasNext())
3448 <                        break;
3449 <                    sb.append(',').append(' ');
3450 <                }
3451 <            }
3452 <            return sb.append(']').toString();
3418 >        public void forEachRemaining(Action<? super V> action) {
3419 >            if (action == null) throw new NullPointerException();
3420 >            for (Node<K,V> p; (p = advance()) != null;)
3421 >                action.apply(p.val);
3422          }
3423  
3424 <        public final boolean containsAll(Collection<?> c) {
3425 <            if (c != this) {
3426 <                for (Iterator<?> it = c.iterator(); it.hasNext();) {
3427 <                    Object e = it.next();
3428 <                    if (e == null || !contains(e))
3429 <                        return false;
3461 <                }
3462 <            }
3424 >        public boolean tryAdvance(Action<? super V> action) {
3425 >            if (action == null) throw new NullPointerException();
3426 >            Node<K,V> p;
3427 >            if ((p = advance()) == null)
3428 >                return false;
3429 >            action.apply(p.val);
3430              return true;
3431          }
3432  
3433 <        public final boolean removeAll(Collection<?> c) {
3467 <            boolean modified = false;
3468 <            for (Iterator<?> it = iterator(); it.hasNext();) {
3469 <                if (c.contains(it.next())) {
3470 <                    it.remove();
3471 <                    modified = true;
3472 <                }
3473 <            }
3474 <            return modified;
3475 <        }
3476 <
3477 <        public final boolean retainAll(Collection<?> c) {
3478 <            boolean modified = false;
3479 <            for (Iterator<?> it = iterator(); it.hasNext();) {
3480 <                if (!c.contains(it.next())) {
3481 <                    it.remove();
3482 <                    modified = true;
3483 <                }
3484 <            }
3485 <            return modified;
3486 <        }
3433 >        public long estimateSize() { return est; }
3434  
3435      }
3436  
3437 <    static final class Values<K,V> extends CHMView<K,V>
3438 <        implements Collection<V> {
3439 <        Values(ConcurrentHashMapV8<K, V> map)   { super(map); }
3440 <        public final boolean contains(Object o) { return map.containsValue(o); }
3441 <        public final boolean remove(Object o) {
3442 <            if (o != null) {
3443 <                Iterator<V> it = new ValueIterator<K,V>(map);
3444 <                while (it.hasNext()) {
3445 <                    if (o.equals(it.next())) {
3499 <                        it.remove();
3500 <                        return true;
3501 <                    }
3502 <                }
3503 <            }
3504 <            return false;
3505 <        }
3506 <        public final Iterator<V> iterator() {
3507 <            return new ValueIterator<K,V>(map);
3508 <        }
3509 <        public final boolean add(V e) {
3510 <            throw new UnsupportedOperationException();
3511 <        }
3512 <        public final boolean addAll(Collection<? extends V> c) {
3513 <            throw new UnsupportedOperationException();
3437 >    static final class EntrySpliterator<K,V> extends Traverser<K,V>
3438 >        implements ConcurrentHashMapSpliterator<Map.Entry<K,V>> {
3439 >        final ConcurrentHashMapV8<K,V> map; // To export MapEntry
3440 >        long est;               // size estimate
3441 >        EntrySpliterator(Node<K,V>[] tab, int size, int index, int limit,
3442 >                         long est, ConcurrentHashMapV8<K,V> map) {
3443 >            super(tab, size, index, limit);
3444 >            this.map = map;
3445 >            this.est = est;
3446          }
3447  
3448 <    }
3449 <
3450 <    static final class EntrySet<K,V> extends CHMView<K,V>
3451 <        implements Set<Map.Entry<K,V>> {
3452 <        EntrySet(ConcurrentHashMapV8<K, V> map) { super(map); }
3521 <        public final boolean contains(Object o) {
3522 <            Object k, v, r; Map.Entry<?,?> e;
3523 <            return ((o instanceof Map.Entry) &&
3524 <                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
3525 <                    (r = map.get(k)) != null &&
3526 <                    (v = e.getValue()) != null &&
3527 <                    (v == r || v.equals(r)));
3448 >        public ConcurrentHashMapSpliterator<Map.Entry<K,V>> trySplit() {
3449 >            int i, f, h;
3450 >            return (h = ((i = baseIndex) + (f = baseLimit)) >>> 1) <= i ? null :
3451 >                new EntrySpliterator<K,V>(tab, baseSize, baseLimit = h,
3452 >                                          f, est >>>= 1, map);
3453          }
3454 <        public final boolean remove(Object o) {
3455 <            Object k, v; Map.Entry<?,?> e;
3456 <            return ((o instanceof Map.Entry) &&
3457 <                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
3458 <                    (v = e.getValue()) != null &&
3534 <                    map.remove(k, v));
3535 <        }
3536 <        public final Iterator<Map.Entry<K,V>> iterator() {
3537 <            return new EntryIterator<K,V>(map);
3538 <        }
3539 <        public final boolean add(Entry<K,V> e) {
3540 <            throw new UnsupportedOperationException();
3541 <        }
3542 <        public final boolean addAll(Collection<? extends Entry<K,V>> c) {
3543 <            throw new UnsupportedOperationException();
3454 >
3455 >        public void forEachRemaining(Action<? super Map.Entry<K,V>> action) {
3456 >            if (action == null) throw new NullPointerException();
3457 >            for (Node<K,V> p; (p = advance()) != null; )
3458 >                action.apply(new MapEntry<K,V>(p.key, p.val, map));
3459          }
3460 <        public boolean equals(Object o) {
3461 <            Set<?> c;
3462 <            return ((o instanceof Set) &&
3463 <                    ((c = (Set<?>)o) == this ||
3464 <                     (containsAll(c) && c.containsAll(this))));
3460 >
3461 >        public boolean tryAdvance(Action<? super Map.Entry<K,V>> action) {
3462 >            if (action == null) throw new NullPointerException();
3463 >            Node<K,V> p;
3464 >            if ((p = advance()) == null)
3465 >                return false;
3466 >            action.apply(new MapEntry<K,V>(p.key, p.val, map));
3467 >            return true;
3468          }
3551    }
3469  
3470 <    /* ---------------- Serialization Support -------------- */
3470 >        public long estimateSize() { return est; }
3471  
3555    /**
3556     * Stripped-down version of helper class used in previous version,
3557     * declared for the sake of serialization compatibility
3558     */
3559    static class Segment<K,V> implements Serializable {
3560        private static final long serialVersionUID = 2249069246763182397L;
3561        final float loadFactor;
3562        Segment(float lf) { this.loadFactor = lf; }
3472      }
3473  
3474 <    /**
3566 <     * Saves the state of the {@code ConcurrentHashMapV8} instance to a
3567 <     * stream (i.e., serializes it).
3568 <     * @param s the stream
3569 <     * @serialData
3570 <     * the key (Object) and value (Object)
3571 <     * for each key-value mapping, followed by a null pair.
3572 <     * The key-value mappings are emitted in no particular order.
3573 <     */
3574 <    @SuppressWarnings("unchecked") private void writeObject(java.io.ObjectOutputStream s)
3575 <        throws java.io.IOException {
3576 <        if (segments == null) { // for serialization compatibility
3577 <            segments = (Segment<K,V>[])
3578 <                new Segment<?,?>[DEFAULT_CONCURRENCY_LEVEL];
3579 <            for (int i = 0; i < segments.length; ++i)
3580 <                segments[i] = new Segment<K,V>(LOAD_FACTOR);
3581 <        }
3582 <        s.defaultWriteObject();
3583 <        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3584 <        Object v;
3585 <        while ((v = it.advance()) != null) {
3586 <            s.writeObject(it.nextKey);
3587 <            s.writeObject(v);
3588 <        }
3589 <        s.writeObject(null);
3590 <        s.writeObject(null);
3591 <        segments = null; // throw away
3592 <    }
3474 >    // Parallel bulk operations
3475  
3476      /**
3477 <     * Reconstitutes the instance from a stream (that is, deserializes it).
3478 <     * @param s the stream
3477 >     * Computes initial batch value for bulk tasks. The returned value
3478 >     * is approximately exp2 of the number of times (minus one) to
3479 >     * split task by two before executing leaf action. This value is
3480 >     * faster to compute and more convenient to use as a guide to
3481 >     * splitting than is the depth, since it is used while dividing by
3482 >     * two anyway.
3483       */
3484 <    @SuppressWarnings("unchecked") private void readObject(java.io.ObjectInputStream s)
3485 <        throws java.io.IOException, ClassNotFoundException {
3486 <        s.defaultReadObject();
3487 <        this.segments = null; // unneeded
3488 <        // initialize transient final field
3489 <        UNSAFE.putObjectVolatile(this, counterOffset, new LongAdder());
3604 <
3605 <        // Create all nodes, then place in table once size is known
3606 <        long size = 0L;
3607 <        Node p = null;
3608 <        for (;;) {
3609 <            K k = (K) s.readObject();
3610 <            V v = (V) s.readObject();
3611 <            if (k != null && v != null) {
3612 <                int h = spread(k.hashCode());
3613 <                p = new Node(h, k, v, p);
3614 <                ++size;
3615 <            }
3616 <            else
3617 <                break;
3618 <        }
3619 <        if (p != null) {
3620 <            boolean init = false;
3621 <            int n;
3622 <            if (size >= (long)(MAXIMUM_CAPACITY >>> 1))
3623 <                n = MAXIMUM_CAPACITY;
3624 <            else {
3625 <                int sz = (int)size;
3626 <                n = tableSizeFor(sz + (sz >>> 1) + 1);
3627 <            }
3628 <            int sc = sizeCtl;
3629 <            boolean collide = false;
3630 <            if (n > sc &&
3631 <                UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
3632 <                try {
3633 <                    if (table == null) {
3634 <                        init = true;
3635 <                        Node[] tab = new Node[n];
3636 <                        int mask = n - 1;
3637 <                        while (p != null) {
3638 <                            int j = p.hash & mask;
3639 <                            Node next = p.next;
3640 <                            Node q = p.next = tabAt(tab, j);
3641 <                            setTabAt(tab, j, p);
3642 <                            if (!collide && q != null && q.hash == p.hash)
3643 <                                collide = true;
3644 <                            p = next;
3645 <                        }
3646 <                        table = tab;
3647 <                        counter.add(size);
3648 <                        sc = n - (n >>> 2);
3649 <                    }
3650 <                } finally {
3651 <                    sizeCtl = sc;
3652 <                }
3653 <                if (collide) { // rescan and convert to TreeBins
3654 <                    Node[] tab = table;
3655 <                    for (int i = 0; i < tab.length; ++i) {
3656 <                        int c = 0;
3657 <                        for (Node e = tabAt(tab, i); e != null; e = e.next) {
3658 <                            if (++c > TREE_THRESHOLD &&
3659 <                                (e.key instanceof Comparable)) {
3660 <                                replaceWithTreeBin(tab, i, e.key);
3661 <                                break;
3662 <                            }
3663 <                        }
3664 <                    }
3665 <                }
3666 <            }
3667 <            if (!init) { // Can only happen if unsafely published.
3668 <                while (p != null) {
3669 <                    internalPut(p.key, p.val);
3670 <                    p = p.next;
3671 <                }
3672 <            }
3673 <        }
3484 >    final int batchFor(long b) {
3485 >        long n;
3486 >        if (b == Long.MAX_VALUE || (n = sumCount()) <= 1L || n < b)
3487 >            return 0;
3488 >        int sp = ForkJoinPool.getCommonPoolParallelism() << 2; // slack of 4
3489 >        return (b <= 0L || (n /= b) >= sp) ? sp : (int)n;
3490      }
3491  
3676
3677    // -------------------------------------------------------
3678
3679    // Sams
3680    /** Interface describing a void action of one argument */
3681    public interface Action<A> { void apply(A a); }
3682    /** Interface describing a void action of two arguments */
3683    public interface BiAction<A,B> { void apply(A a, B b); }
3684    /** Interface describing a function of one argument */
3685    public interface Fun<A,T> { T apply(A a); }
3686    /** Interface describing a function of two arguments */
3687    public interface BiFun<A,B,T> { T apply(A a, B b); }
3688    /** Interface describing a function of no arguments */
3689    public interface Generator<T> { T apply(); }
3690    /** Interface describing a function mapping its argument to a double */
3691    public interface ObjectToDouble<A> { double apply(A a); }
3692    /** Interface describing a function mapping its argument to a long */
3693    public interface ObjectToLong<A> { long apply(A a); }
3694    /** Interface describing a function mapping its argument to an int */
3695    public interface ObjectToInt<A> {int apply(A a); }
3696    /** Interface describing a function mapping two arguments to a double */
3697    public interface ObjectByObjectToDouble<A,B> { double apply(A a, B b); }
3698    /** Interface describing a function mapping two arguments to a long */
3699    public interface ObjectByObjectToLong<A,B> { long apply(A a, B b); }
3700    /** Interface describing a function mapping two arguments to an int */
3701    public interface ObjectByObjectToInt<A,B> {int apply(A a, B b); }
3702    /** Interface describing a function mapping a double to a double */
3703    public interface DoubleToDouble { double apply(double a); }
3704    /** Interface describing a function mapping a long to a long */
3705    public interface LongToLong { long apply(long a); }
3706    /** Interface describing a function mapping an int to an int */
3707    public interface IntToInt { int apply(int a); }
3708    /** Interface describing a function mapping two doubles to a double */
3709    public interface DoubleByDoubleToDouble { double apply(double a, double b); }
3710    /** Interface describing a function mapping two longs to a long */
3711    public interface LongByLongToLong { long apply(long a, long b); }
3712    /** Interface describing a function mapping two ints to an int */
3713    public interface IntByIntToInt { int apply(int a, int b); }
3714
3715
3716    // -------------------------------------------------------
3717
3492      /**
3493       * Performs the given action for each (key, value).
3494       *
3495 +     * @param parallelismThreshold the (estimated) number of elements
3496 +     * needed for this operation to be executed in parallel
3497       * @param action the action
3498 +     * @since 1.8
3499       */
3500 <    public void forEach(BiAction<K,V> action) {
3501 <        ForkJoinTasks.forEach
3502 <            (this, action).invoke();
3500 >    public void forEach(long parallelismThreshold,
3501 >                        BiAction<? super K,? super V> action) {
3502 >        if (action == null) throw new NullPointerException();
3503 >        new ForEachMappingTask<K,V>
3504 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3505 >             action).invoke();
3506      }
3507  
3508      /**
3509       * Performs the given action for each non-null transformation
3510       * of each (key, value).
3511       *
3512 +     * @param parallelismThreshold the (estimated) number of elements
3513 +     * needed for this operation to be executed in parallel
3514       * @param transformer a function returning the transformation
3515 <     * for an element, or null of there is no transformation (in
3516 <     * which case the action is not applied).
3515 >     * for an element, or null if there is no transformation (in
3516 >     * which case the action is not applied)
3517       * @param action the action
3518 +     * @since 1.8
3519       */
3520 <    public <U> void forEach(BiFun<? super K, ? super V, ? extends U> transformer,
3521 <                            Action<U> action) {
3522 <        ForkJoinTasks.forEach
3523 <            (this, transformer, action).invoke();
3520 >    public <U> void forEach(long parallelismThreshold,
3521 >                            BiFun<? super K, ? super V, ? extends U> transformer,
3522 >                            Action<? super U> action) {
3523 >        if (transformer == null || action == null)
3524 >            throw new NullPointerException();
3525 >        new ForEachTransformedMappingTask<K,V,U>
3526 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3527 >             transformer, action).invoke();
3528      }
3529  
3530      /**
# Line 3747 | Line 3534 | public class ConcurrentHashMapV8<K, V>
3534       * results of any other parallel invocations of the search
3535       * function are ignored.
3536       *
3537 +     * @param parallelismThreshold the (estimated) number of elements
3538 +     * needed for this operation to be executed in parallel
3539       * @param searchFunction a function returning a non-null
3540       * result on success, else null
3541       * @return a non-null result from applying the given search
3542       * function on each (key, value), or null if none
3543 +     * @since 1.8
3544       */
3545 <    public <U> U search(BiFun<? super K, ? super V, ? extends U> searchFunction) {
3546 <        return ForkJoinTasks.search
3547 <            (this, searchFunction).invoke();
3545 >    public <U> U search(long parallelismThreshold,
3546 >                        BiFun<? super K, ? super V, ? extends U> searchFunction) {
3547 >        if (searchFunction == null) throw new NullPointerException();
3548 >        return new SearchMappingsTask<K,V,U>
3549 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3550 >             searchFunction, new AtomicReference<U>()).invoke();
3551      }
3552  
3553      /**
# Line 3762 | Line 3555 | public class ConcurrentHashMapV8<K, V>
3555       * of all (key, value) pairs using the given reducer to
3556       * combine values, or null if none.
3557       *
3558 +     * @param parallelismThreshold the (estimated) number of elements
3559 +     * needed for this operation to be executed in parallel
3560       * @param transformer a function returning the transformation
3561 <     * for an element, or null of there is no transformation (in
3562 <     * which case it is not combined).
3561 >     * for an element, or null if there is no transformation (in
3562 >     * which case it is not combined)
3563       * @param reducer a commutative associative combining function
3564       * @return the result of accumulating the given transformation
3565       * of all (key, value) pairs
3566 +     * @since 1.8
3567       */
3568 <    public <U> U reduce(BiFun<? super K, ? super V, ? extends U> transformer,
3568 >    public <U> U reduce(long parallelismThreshold,
3569 >                        BiFun<? super K, ? super V, ? extends U> transformer,
3570                          BiFun<? super U, ? super U, ? extends U> reducer) {
3571 <        return ForkJoinTasks.reduce
3572 <            (this, transformer, reducer).invoke();
3571 >        if (transformer == null || reducer == null)
3572 >            throw new NullPointerException();
3573 >        return new MapReduceMappingsTask<K,V,U>
3574 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3575 >             null, transformer, reducer).invoke();
3576      }
3577  
3578      /**
# Line 3780 | Line 3580 | public class ConcurrentHashMapV8<K, V>
3580       * of all (key, value) pairs using the given reducer to
3581       * combine values, and the given basis as an identity value.
3582       *
3583 +     * @param parallelismThreshold the (estimated) number of elements
3584 +     * needed for this operation to be executed in parallel
3585       * @param transformer a function returning the transformation
3586       * for an element
3587       * @param basis the identity (initial default value) for the reduction
3588       * @param reducer a commutative associative combining function
3589       * @return the result of accumulating the given transformation
3590       * of all (key, value) pairs
3591 +     * @since 1.8
3592       */
3593 <    public double reduceToDouble(ObjectByObjectToDouble<? super K, ? super V> transformer,
3593 >    public double reduceToDouble(long parallelismThreshold,
3594 >                                 ObjectByObjectToDouble<? super K, ? super V> transformer,
3595                                   double basis,
3596                                   DoubleByDoubleToDouble reducer) {
3597 <        return ForkJoinTasks.reduceToDouble
3598 <            (this, transformer, basis, reducer).invoke();
3597 >        if (transformer == null || reducer == null)
3598 >            throw new NullPointerException();
3599 >        return new MapReduceMappingsToDoubleTask<K,V>
3600 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3601 >             null, transformer, basis, reducer).invoke();
3602      }
3603  
3604      /**
# Line 3799 | Line 3606 | public class ConcurrentHashMapV8<K, V>
3606       * of all (key, value) pairs using the given reducer to
3607       * combine values, and the given basis as an identity value.
3608       *
3609 +     * @param parallelismThreshold the (estimated) number of elements
3610 +     * needed for this operation to be executed in parallel
3611       * @param transformer a function returning the transformation
3612       * for an element
3613       * @param basis the identity (initial default value) for the reduction
3614       * @param reducer a commutative associative combining function
3615       * @return the result of accumulating the given transformation
3616       * of all (key, value) pairs
3617 +     * @since 1.8
3618       */
3619 <    public long reduceToLong(ObjectByObjectToLong<? super K, ? super V> transformer,
3619 >    public long reduceToLong(long parallelismThreshold,
3620 >                             ObjectByObjectToLong<? super K, ? super V> transformer,
3621                               long basis,
3622                               LongByLongToLong reducer) {
3623 <        return ForkJoinTasks.reduceToLong
3624 <            (this, transformer, basis, reducer).invoke();
3623 >        if (transformer == null || reducer == null)
3624 >            throw new NullPointerException();
3625 >        return new MapReduceMappingsToLongTask<K,V>
3626 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3627 >             null, transformer, basis, reducer).invoke();
3628      }
3629  
3630      /**
# Line 3818 | Line 3632 | public class ConcurrentHashMapV8<K, V>
3632       * of all (key, value) pairs using the given reducer to
3633       * combine values, and the given basis as an identity value.
3634       *
3635 +     * @param parallelismThreshold the (estimated) number of elements
3636 +     * needed for this operation to be executed in parallel
3637       * @param transformer a function returning the transformation
3638       * for an element
3639       * @param basis the identity (initial default value) for the reduction
3640       * @param reducer a commutative associative combining function
3641       * @return the result of accumulating the given transformation
3642       * of all (key, value) pairs
3643 +     * @since 1.8
3644       */
3645 <    public int reduceToInt(ObjectByObjectToInt<? super K, ? super V> transformer,
3645 >    public int reduceToInt(long parallelismThreshold,
3646 >                           ObjectByObjectToInt<? super K, ? super V> transformer,
3647                             int basis,
3648                             IntByIntToInt reducer) {
3649 <        return ForkJoinTasks.reduceToInt
3650 <            (this, transformer, basis, reducer).invoke();
3649 >        if (transformer == null || reducer == null)
3650 >            throw new NullPointerException();
3651 >        return new MapReduceMappingsToIntTask<K,V>
3652 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3653 >             null, transformer, basis, reducer).invoke();
3654      }
3655  
3656      /**
3657       * Performs the given action for each key.
3658       *
3659 +     * @param parallelismThreshold the (estimated) number of elements
3660 +     * needed for this operation to be executed in parallel
3661       * @param action the action
3662 +     * @since 1.8
3663       */
3664 <    public void forEachKey(Action<K> action) {
3665 <        ForkJoinTasks.forEachKey
3666 <            (this, action).invoke();
3664 >    public void forEachKey(long parallelismThreshold,
3665 >                           Action<? super K> action) {
3666 >        if (action == null) throw new NullPointerException();
3667 >        new ForEachKeyTask<K,V>
3668 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3669 >             action).invoke();
3670      }
3671  
3672      /**
3673       * Performs the given action for each non-null transformation
3674       * of each key.
3675       *
3676 +     * @param parallelismThreshold the (estimated) number of elements
3677 +     * needed for this operation to be executed in parallel
3678       * @param transformer a function returning the transformation
3679 <     * for an element, or null of there is no transformation (in
3680 <     * which case the action is not applied).
3679 >     * for an element, or null if there is no transformation (in
3680 >     * which case the action is not applied)
3681       * @param action the action
3682 +     * @since 1.8
3683       */
3684 <    public <U> void forEachKey(Fun<? super K, ? extends U> transformer,
3685 <                               Action<U> action) {
3686 <        ForkJoinTasks.forEachKey
3687 <            (this, transformer, action).invoke();
3684 >    public <U> void forEachKey(long parallelismThreshold,
3685 >                               Fun<? super K, ? extends U> transformer,
3686 >                               Action<? super U> action) {
3687 >        if (transformer == null || action == null)
3688 >            throw new NullPointerException();
3689 >        new ForEachTransformedKeyTask<K,V,U>
3690 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3691 >             transformer, action).invoke();
3692      }
3693  
3694      /**
# Line 3864 | Line 3698 | public class ConcurrentHashMapV8<K, V>
3698       * any other parallel invocations of the search function are
3699       * ignored.
3700       *
3701 +     * @param parallelismThreshold the (estimated) number of elements
3702 +     * needed for this operation to be executed in parallel
3703       * @param searchFunction a function returning a non-null
3704       * result on success, else null
3705       * @return a non-null result from applying the given search
3706       * function on each key, or null if none
3707 +     * @since 1.8
3708       */
3709 <    public <U> U searchKeys(Fun<? super K, ? extends U> searchFunction) {
3710 <        return ForkJoinTasks.searchKeys
3711 <            (this, searchFunction).invoke();
3709 >    public <U> U searchKeys(long parallelismThreshold,
3710 >                            Fun<? super K, ? extends U> searchFunction) {
3711 >        if (searchFunction == null) throw new NullPointerException();
3712 >        return new SearchKeysTask<K,V,U>
3713 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3714 >             searchFunction, new AtomicReference<U>()).invoke();
3715      }
3716  
3717      /**
3718       * Returns the result of accumulating all keys using the given
3719       * reducer to combine values, or null if none.
3720       *
3721 +     * @param parallelismThreshold the (estimated) number of elements
3722 +     * needed for this operation to be executed in parallel
3723       * @param reducer a commutative associative combining function
3724       * @return the result of accumulating all keys using the given
3725       * reducer to combine values, or null if none
3726 +     * @since 1.8
3727       */
3728 <    public K reduceKeys(BiFun<? super K, ? super K, ? extends K> reducer) {
3729 <        return ForkJoinTasks.reduceKeys
3730 <            (this, reducer).invoke();
3728 >    public K reduceKeys(long parallelismThreshold,
3729 >                        BiFun<? super K, ? super K, ? extends K> reducer) {
3730 >        if (reducer == null) throw new NullPointerException();
3731 >        return new ReduceKeysTask<K,V>
3732 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3733 >             null, reducer).invoke();
3734      }
3735  
3736      /**
# Line 3892 | Line 3738 | public class ConcurrentHashMapV8<K, V>
3738       * of all keys using the given reducer to combine values, or
3739       * null if none.
3740       *
3741 +     * @param parallelismThreshold the (estimated) number of elements
3742 +     * needed for this operation to be executed in parallel
3743       * @param transformer a function returning the transformation
3744 <     * for an element, or null of there is no transformation (in
3745 <     * which case it is not combined).
3744 >     * for an element, or null if there is no transformation (in
3745 >     * which case it is not combined)
3746       * @param reducer a commutative associative combining function
3747       * @return the result of accumulating the given transformation
3748       * of all keys
3749 +     * @since 1.8
3750       */
3751 <    public <U> U reduceKeys(Fun<? super K, ? extends U> transformer,
3752 <                            BiFun<? super U, ? super U, ? extends U> reducer) {
3753 <        return ForkJoinTasks.reduceKeys
3754 <            (this, transformer, reducer).invoke();
3751 >    public <U> U reduceKeys(long parallelismThreshold,
3752 >                            Fun<? super K, ? extends U> transformer,
3753 >         BiFun<? super U, ? super U, ? extends U> reducer) {
3754 >        if (transformer == null || reducer == null)
3755 >            throw new NullPointerException();
3756 >        return new MapReduceKeysTask<K,V,U>
3757 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3758 >             null, transformer, reducer).invoke();
3759      }
3760  
3761      /**
# Line 3910 | Line 3763 | public class ConcurrentHashMapV8<K, V>
3763       * of all keys using the given reducer to combine values, and
3764       * the given basis as an identity value.
3765       *
3766 +     * @param parallelismThreshold the (estimated) number of elements
3767 +     * needed for this operation to be executed in parallel
3768       * @param transformer a function returning the transformation
3769       * for an element
3770       * @param basis the identity (initial default value) for the reduction
3771       * @param reducer a commutative associative combining function
3772 <     * @return  the result of accumulating the given transformation
3772 >     * @return the result of accumulating the given transformation
3773       * of all keys
3774 +     * @since 1.8
3775       */
3776 <    public double reduceKeysToDouble(ObjectToDouble<? super K> transformer,
3776 >    public double reduceKeysToDouble(long parallelismThreshold,
3777 >                                     ObjectToDouble<? super K> transformer,
3778                                       double basis,
3779                                       DoubleByDoubleToDouble reducer) {
3780 <        return ForkJoinTasks.reduceKeysToDouble
3781 <            (this, transformer, basis, reducer).invoke();
3780 >        if (transformer == null || reducer == null)
3781 >            throw new NullPointerException();
3782 >        return new MapReduceKeysToDoubleTask<K,V>
3783 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3784 >             null, transformer, basis, reducer).invoke();
3785      }
3786  
3787      /**
# Line 3929 | Line 3789 | public class ConcurrentHashMapV8<K, V>
3789       * of all keys using the given reducer to combine values, and
3790       * the given basis as an identity value.
3791       *
3792 +     * @param parallelismThreshold the (estimated) number of elements
3793 +     * needed for this operation to be executed in parallel
3794       * @param transformer a function returning the transformation
3795       * for an element
3796       * @param basis the identity (initial default value) for the reduction
3797       * @param reducer a commutative associative combining function
3798       * @return the result of accumulating the given transformation
3799       * of all keys
3800 +     * @since 1.8
3801       */
3802 <    public long reduceKeysToLong(ObjectToLong<? super K> transformer,
3802 >    public long reduceKeysToLong(long parallelismThreshold,
3803 >                                 ObjectToLong<? super K> transformer,
3804                                   long basis,
3805                                   LongByLongToLong reducer) {
3806 <        return ForkJoinTasks.reduceKeysToLong
3807 <            (this, transformer, basis, reducer).invoke();
3806 >        if (transformer == null || reducer == null)
3807 >            throw new NullPointerException();
3808 >        return new MapReduceKeysToLongTask<K,V>
3809 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3810 >             null, transformer, basis, reducer).invoke();
3811      }
3812  
3813      /**
# Line 3948 | Line 3815 | public class ConcurrentHashMapV8<K, V>
3815       * of all keys using the given reducer to combine values, and
3816       * the given basis as an identity value.
3817       *
3818 +     * @param parallelismThreshold the (estimated) number of elements
3819 +     * needed for this operation to be executed in parallel
3820       * @param transformer a function returning the transformation
3821       * for an element
3822       * @param basis the identity (initial default value) for the reduction
3823       * @param reducer a commutative associative combining function
3824       * @return the result of accumulating the given transformation
3825       * of all keys
3826 +     * @since 1.8
3827       */
3828 <    public int reduceKeysToInt(ObjectToInt<? super K> transformer,
3828 >    public int reduceKeysToInt(long parallelismThreshold,
3829 >                               ObjectToInt<? super K> transformer,
3830                                 int basis,
3831                                 IntByIntToInt reducer) {
3832 <        return ForkJoinTasks.reduceKeysToInt
3833 <            (this, transformer, basis, reducer).invoke();
3832 >        if (transformer == null || reducer == null)
3833 >            throw new NullPointerException();
3834 >        return new MapReduceKeysToIntTask<K,V>
3835 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3836 >             null, transformer, basis, reducer).invoke();
3837      }
3838  
3839      /**
3840       * Performs the given action for each value.
3841       *
3842 +     * @param parallelismThreshold the (estimated) number of elements
3843 +     * needed for this operation to be executed in parallel
3844       * @param action the action
3845 +     * @since 1.8
3846       */
3847 <    public void forEachValue(Action<V> action) {
3848 <        ForkJoinTasks.forEachValue
3849 <            (this, action).invoke();
3847 >    public void forEachValue(long parallelismThreshold,
3848 >                             Action<? super V> action) {
3849 >        if (action == null)
3850 >            throw new NullPointerException();
3851 >        new ForEachValueTask<K,V>
3852 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3853 >             action).invoke();
3854      }
3855  
3856      /**
3857       * Performs the given action for each non-null transformation
3858       * of each value.
3859       *
3860 +     * @param parallelismThreshold the (estimated) number of elements
3861 +     * needed for this operation to be executed in parallel
3862       * @param transformer a function returning the transformation
3863 <     * for an element, or null of there is no transformation (in
3864 <     * which case the action is not applied).
3863 >     * for an element, or null if there is no transformation (in
3864 >     * which case the action is not applied)
3865 >     * @param action the action
3866 >     * @since 1.8
3867       */
3868 <    public <U> void forEachValue(Fun<? super V, ? extends U> transformer,
3869 <                                 Action<U> action) {
3870 <        ForkJoinTasks.forEachValue
3871 <            (this, transformer, action).invoke();
3868 >    public <U> void forEachValue(long parallelismThreshold,
3869 >                                 Fun<? super V, ? extends U> transformer,
3870 >                                 Action<? super U> action) {
3871 >        if (transformer == null || action == null)
3872 >            throw new NullPointerException();
3873 >        new ForEachTransformedValueTask<K,V,U>
3874 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3875 >             transformer, action).invoke();
3876      }
3877  
3878      /**
# Line 3993 | Line 3882 | public class ConcurrentHashMapV8<K, V>
3882       * any other parallel invocations of the search function are
3883       * ignored.
3884       *
3885 +     * @param parallelismThreshold the (estimated) number of elements
3886 +     * needed for this operation to be executed in parallel
3887       * @param searchFunction a function returning a non-null
3888       * result on success, else null
3889       * @return a non-null result from applying the given search
3890       * function on each value, or null if none
3891 <     *
3891 >     * @since 1.8
3892       */
3893 <    public <U> U searchValues(Fun<? super V, ? extends U> searchFunction) {
3894 <        return ForkJoinTasks.searchValues
3895 <            (this, searchFunction).invoke();
3893 >    public <U> U searchValues(long parallelismThreshold,
3894 >                              Fun<? super V, ? extends U> searchFunction) {
3895 >        if (searchFunction == null) throw new NullPointerException();
3896 >        return new SearchValuesTask<K,V,U>
3897 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3898 >             searchFunction, new AtomicReference<U>()).invoke();
3899      }
3900  
3901      /**
3902       * Returns the result of accumulating all values using the
3903       * given reducer to combine values, or null if none.
3904       *
3905 +     * @param parallelismThreshold the (estimated) number of elements
3906 +     * needed for this operation to be executed in parallel
3907       * @param reducer a commutative associative combining function
3908 <     * @return  the result of accumulating all values
3908 >     * @return the result of accumulating all values
3909 >     * @since 1.8
3910       */
3911 <    public V reduceValues(BiFun<? super V, ? super V, ? extends V> reducer) {
3912 <        return ForkJoinTasks.reduceValues
3913 <            (this, reducer).invoke();
3911 >    public V reduceValues(long parallelismThreshold,
3912 >                          BiFun<? super V, ? super V, ? extends V> reducer) {
3913 >        if (reducer == null) throw new NullPointerException();
3914 >        return new ReduceValuesTask<K,V>
3915 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3916 >             null, reducer).invoke();
3917      }
3918  
3919      /**
# Line 4021 | Line 3921 | public class ConcurrentHashMapV8<K, V>
3921       * of all values using the given reducer to combine values, or
3922       * null if none.
3923       *
3924 +     * @param parallelismThreshold the (estimated) number of elements
3925 +     * needed for this operation to be executed in parallel
3926       * @param transformer a function returning the transformation
3927 <     * for an element, or null of there is no transformation (in
3928 <     * which case it is not combined).
3927 >     * for an element, or null if there is no transformation (in
3928 >     * which case it is not combined)
3929       * @param reducer a commutative associative combining function
3930       * @return the result of accumulating the given transformation
3931       * of all values
3932 +     * @since 1.8
3933       */
3934 <    public <U> U reduceValues(Fun<? super V, ? extends U> transformer,
3934 >    public <U> U reduceValues(long parallelismThreshold,
3935 >                              Fun<? super V, ? extends U> transformer,
3936                                BiFun<? super U, ? super U, ? extends U> reducer) {
3937 <        return ForkJoinTasks.reduceValues
3938 <            (this, transformer, reducer).invoke();
3937 >        if (transformer == null || reducer == null)
3938 >            throw new NullPointerException();
3939 >        return new MapReduceValuesTask<K,V,U>
3940 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3941 >             null, transformer, reducer).invoke();
3942      }
3943  
3944      /**
# Line 4039 | Line 3946 | public class ConcurrentHashMapV8<K, V>
3946       * of all values using the given reducer to combine values,
3947       * and the given basis as an identity value.
3948       *
3949 +     * @param parallelismThreshold the (estimated) number of elements
3950 +     * needed for this operation to be executed in parallel
3951       * @param transformer a function returning the transformation
3952       * for an element
3953       * @param basis the identity (initial default value) for the reduction
3954       * @param reducer a commutative associative combining function
3955       * @return the result of accumulating the given transformation
3956       * of all values
3957 +     * @since 1.8
3958       */
3959 <    public double reduceValuesToDouble(ObjectToDouble<? super V> transformer,
3959 >    public double reduceValuesToDouble(long parallelismThreshold,
3960 >                                       ObjectToDouble<? super V> transformer,
3961                                         double basis,
3962                                         DoubleByDoubleToDouble reducer) {
3963 <        return ForkJoinTasks.reduceValuesToDouble
3964 <            (this, transformer, basis, reducer).invoke();
3963 >        if (transformer == null || reducer == null)
3964 >            throw new NullPointerException();
3965 >        return new MapReduceValuesToDoubleTask<K,V>
3966 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3967 >             null, transformer, basis, reducer).invoke();
3968      }
3969  
3970      /**
# Line 4058 | Line 3972 | public class ConcurrentHashMapV8<K, V>
3972       * of all values using the given reducer to combine values,
3973       * and the given basis as an identity value.
3974       *
3975 +     * @param parallelismThreshold the (estimated) number of elements
3976 +     * needed for this operation to be executed in parallel
3977       * @param transformer a function returning the transformation
3978       * for an element
3979       * @param basis the identity (initial default value) for the reduction
3980       * @param reducer a commutative associative combining function
3981       * @return the result of accumulating the given transformation
3982       * of all values
3983 +     * @since 1.8
3984       */
3985 <    public long reduceValuesToLong(ObjectToLong<? super V> transformer,
3985 >    public long reduceValuesToLong(long parallelismThreshold,
3986 >                                   ObjectToLong<? super V> transformer,
3987                                     long basis,
3988                                     LongByLongToLong reducer) {
3989 <        return ForkJoinTasks.reduceValuesToLong
3990 <            (this, transformer, basis, reducer).invoke();
3989 >        if (transformer == null || reducer == null)
3990 >            throw new NullPointerException();
3991 >        return new MapReduceValuesToLongTask<K,V>
3992 >            (null, batchFor(parallelismThreshold), 0, 0, table,
3993 >             null, transformer, basis, reducer).invoke();
3994      }
3995  
3996      /**
# Line 4077 | Line 3998 | public class ConcurrentHashMapV8<K, V>
3998       * of all values using the given reducer to combine values,
3999       * and the given basis as an identity value.
4000       *
4001 +     * @param parallelismThreshold the (estimated) number of elements
4002 +     * needed for this operation to be executed in parallel
4003       * @param transformer a function returning the transformation
4004       * for an element
4005       * @param basis the identity (initial default value) for the reduction
4006       * @param reducer a commutative associative combining function
4007       * @return the result of accumulating the given transformation
4008       * of all values
4009 +     * @since 1.8
4010       */
4011 <    public int reduceValuesToInt(ObjectToInt<? super V> transformer,
4011 >    public int reduceValuesToInt(long parallelismThreshold,
4012 >                                 ObjectToInt<? super V> transformer,
4013                                   int basis,
4014                                   IntByIntToInt reducer) {
4015 <        return ForkJoinTasks.reduceValuesToInt
4016 <            (this, transformer, basis, reducer).invoke();
4015 >        if (transformer == null || reducer == null)
4016 >            throw new NullPointerException();
4017 >        return new MapReduceValuesToIntTask<K,V>
4018 >            (null, batchFor(parallelismThreshold), 0, 0, table,
4019 >             null, transformer, basis, reducer).invoke();
4020      }
4021  
4022      /**
4023       * Performs the given action for each entry.
4024       *
4025 +     * @param parallelismThreshold the (estimated) number of elements
4026 +     * needed for this operation to be executed in parallel
4027       * @param action the action
4028 +     * @since 1.8
4029       */
4030 <    public void forEachEntry(Action<Map.Entry<K,V>> action) {
4031 <        ForkJoinTasks.forEachEntry
4032 <            (this, action).invoke();
4030 >    public void forEachEntry(long parallelismThreshold,
4031 >                             Action<? super Map.Entry<K,V>> action) {
4032 >        if (action == null) throw new NullPointerException();
4033 >        new ForEachEntryTask<K,V>(null, batchFor(parallelismThreshold), 0, 0, table,
4034 >                                  action).invoke();
4035      }
4036  
4037      /**
4038       * Performs the given action for each non-null transformation
4039       * of each entry.
4040       *
4041 +     * @param parallelismThreshold the (estimated) number of elements
4042 +     * needed for this operation to be executed in parallel
4043       * @param transformer a function returning the transformation
4044 <     * for an element, or null of there is no transformation (in
4045 <     * which case the action is not applied).
4044 >     * for an element, or null if there is no transformation (in
4045 >     * which case the action is not applied)
4046       * @param action the action
4047 +     * @since 1.8
4048       */
4049 <    public <U> void forEachEntry(Fun<Map.Entry<K,V>, ? extends U> transformer,
4050 <                                 Action<U> action) {
4051 <        ForkJoinTasks.forEachEntry
4052 <            (this, transformer, action).invoke();
4049 >    public <U> void forEachEntry(long parallelismThreshold,
4050 >                                 Fun<Map.Entry<K,V>, ? extends U> transformer,
4051 >                                 Action<? super U> action) {
4052 >        if (transformer == null || action == null)
4053 >            throw new NullPointerException();
4054 >        new ForEachTransformedEntryTask<K,V,U>
4055 >            (null, batchFor(parallelismThreshold), 0, 0, table,
4056 >             transformer, action).invoke();
4057      }
4058  
4059      /**
# Line 4123 | Line 4063 | public class ConcurrentHashMapV8<K, V>
4063       * any other parallel invocations of the search function are
4064       * ignored.
4065       *
4066 +     * @param parallelismThreshold the (estimated) number of elements
4067 +     * needed for this operation to be executed in parallel
4068       * @param searchFunction a function returning a non-null
4069       * result on success, else null
4070       * @return a non-null result from applying the given search
4071       * function on each entry, or null if none
4072 +     * @since 1.8
4073       */
4074 <    public <U> U searchEntries(Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4075 <        return ForkJoinTasks.searchEntries
4076 <            (this, searchFunction).invoke();
4074 >    public <U> U searchEntries(long parallelismThreshold,
4075 >                               Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4076 >        if (searchFunction == null) throw new NullPointerException();
4077 >        return new SearchEntriesTask<K,V,U>
4078 >            (null, batchFor(parallelismThreshold), 0, 0, table,
4079 >             searchFunction, new AtomicReference<U>()).invoke();
4080      }
4081  
4082      /**
4083       * Returns the result of accumulating all entries using the
4084       * given reducer to combine values, or null if none.
4085       *
4086 +     * @param parallelismThreshold the (estimated) number of elements
4087 +     * needed for this operation to be executed in parallel
4088       * @param reducer a commutative associative combining function
4089       * @return the result of accumulating all entries
4090 +     * @since 1.8
4091       */
4092 <    public Map.Entry<K,V> reduceEntries(BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4093 <        return ForkJoinTasks.reduceEntries
4094 <            (this, reducer).invoke();
4092 >    public Map.Entry<K,V> reduceEntries(long parallelismThreshold,
4093 >                                        BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4094 >        if (reducer == null) throw new NullPointerException();
4095 >        return new ReduceEntriesTask<K,V>
4096 >            (null, batchFor(parallelismThreshold), 0, 0, table,
4097 >             null, reducer).invoke();
4098      }
4099  
4100      /**
# Line 4150 | Line 4102 | public class ConcurrentHashMapV8<K, V>
4102       * of all entries using the given reducer to combine values,
4103       * or null if none.
4104       *
4105 +     * @param parallelismThreshold the (estimated) number of elements
4106 +     * needed for this operation to be executed in parallel
4107       * @param transformer a function returning the transformation
4108 <     * for an element, or null of there is no transformation (in
4109 <     * which case it is not combined).
4108 >     * for an element, or null if there is no transformation (in
4109 >     * which case it is not combined)
4110       * @param reducer a commutative associative combining function
4111       * @return the result of accumulating the given transformation
4112       * of all entries
4113 +     * @since 1.8
4114       */
4115 <    public <U> U reduceEntries(Fun<Map.Entry<K,V>, ? extends U> transformer,
4115 >    public <U> U reduceEntries(long parallelismThreshold,
4116 >                               Fun<Map.Entry<K,V>, ? extends U> transformer,
4117                                 BiFun<? super U, ? super U, ? extends U> reducer) {
4118 <        return ForkJoinTasks.reduceEntries
4119 <            (this, transformer, reducer).invoke();
4118 >        if (transformer == null || reducer == null)
4119 >            throw new NullPointerException();
4120 >        return new MapReduceEntriesTask<K,V,U>
4121 >            (null, batchFor(parallelismThreshold), 0, 0, table,
4122 >             null, transformer, reducer).invoke();
4123      }
4124  
4125      /**
# Line 4168 | Line 4127 | public class ConcurrentHashMapV8<K, V>
4127       * of all entries using the given reducer to combine values,
4128       * and the given basis as an identity value.
4129       *
4130 +     * @param parallelismThreshold the (estimated) number of elements
4131 +     * needed for this operation to be executed in parallel
4132       * @param transformer a function returning the transformation
4133       * for an element
4134       * @param basis the identity (initial default value) for the reduction
4135       * @param reducer a commutative associative combining function
4136       * @return the result of accumulating the given transformation
4137       * of all entries
4138 +     * @since 1.8
4139       */
4140 <    public double reduceEntriesToDouble(ObjectToDouble<Map.Entry<K,V>> transformer,
4140 >    public double reduceEntriesToDouble(long parallelismThreshold,
4141 >                                        ObjectToDouble<Map.Entry<K,V>> transformer,
4142                                          double basis,
4143                                          DoubleByDoubleToDouble reducer) {
4144 <        return ForkJoinTasks.reduceEntriesToDouble
4145 <            (this, transformer, basis, reducer).invoke();
4144 >        if (transformer == null || reducer == null)
4145 >            throw new NullPointerException();
4146 >        return new MapReduceEntriesToDoubleTask<K,V>
4147 >            (null, batchFor(parallelismThreshold), 0, 0, table,
4148 >             null, transformer, basis, reducer).invoke();
4149      }
4150  
4151      /**
# Line 4187 | Line 4153 | public class ConcurrentHashMapV8<K, V>
4153       * of all entries using the given reducer to combine values,
4154       * and the given basis as an identity value.
4155       *
4156 +     * @param parallelismThreshold the (estimated) number of elements
4157 +     * needed for this operation to be executed in parallel
4158       * @param transformer a function returning the transformation
4159       * for an element
4160       * @param basis the identity (initial default value) for the reduction
4161       * @param reducer a commutative associative combining function
4162 <     * @return  the result of accumulating the given transformation
4162 >     * @return the result of accumulating the given transformation
4163       * of all entries
4164 +     * @since 1.8
4165       */
4166 <    public long reduceEntriesToLong(ObjectToLong<Map.Entry<K,V>> transformer,
4166 >    public long reduceEntriesToLong(long parallelismThreshold,
4167 >                                    ObjectToLong<Map.Entry<K,V>> transformer,
4168                                      long basis,
4169                                      LongByLongToLong reducer) {
4170 <        return ForkJoinTasks.reduceEntriesToLong
4171 <            (this, transformer, basis, reducer).invoke();
4170 >        if (transformer == null || reducer == null)
4171 >            throw new NullPointerException();
4172 >        return new MapReduceEntriesToLongTask<K,V>
4173 >            (null, batchFor(parallelismThreshold), 0, 0, table,
4174 >             null, transformer, basis, reducer).invoke();
4175      }
4176  
4177      /**
# Line 4206 | Line 4179 | public class ConcurrentHashMapV8<K, V>
4179       * of all entries using the given reducer to combine values,
4180       * and the given basis as an identity value.
4181       *
4182 +     * @param parallelismThreshold the (estimated) number of elements
4183 +     * needed for this operation to be executed in parallel
4184       * @param transformer a function returning the transformation
4185       * for an element
4186       * @param basis the identity (initial default value) for the reduction
4187       * @param reducer a commutative associative combining function
4188       * @return the result of accumulating the given transformation
4189       * of all entries
4190 +     * @since 1.8
4191       */
4192 <    public int reduceEntriesToInt(ObjectToInt<Map.Entry<K,V>> transformer,
4192 >    public int reduceEntriesToInt(long parallelismThreshold,
4193 >                                  ObjectToInt<Map.Entry<K,V>> transformer,
4194                                    int basis,
4195                                    IntByIntToInt reducer) {
4196 <        return ForkJoinTasks.reduceEntriesToInt
4197 <            (this, transformer, basis, reducer).invoke();
4196 >        if (transformer == null || reducer == null)
4197 >            throw new NullPointerException();
4198 >        return new MapReduceEntriesToIntTask<K,V>
4199 >            (null, batchFor(parallelismThreshold), 0, 0, table,
4200 >             null, transformer, basis, reducer).invoke();
4201      }
4202  
4203 <    // ---------------------------------------------------------------------
4203 >
4204 >    /* ----------------Views -------------- */
4205  
4206      /**
4207 <     * Predefined tasks for performing bulk parallel operations on
4227 <     * ConcurrentHashMapV8s. These tasks follow the forms and rules used
4228 <     * for bulk operations. Each method has the same name, but returns
4229 <     * a task rather than invoking it. These methods may be useful in
4230 <     * custom applications such as submitting a task without waiting
4231 <     * for completion, using a custom pool, or combining with other
4232 <     * tasks.
4207 >     * Base class for views.
4208       */
4209 <    public static class ForkJoinTasks {
4210 <        private ForkJoinTasks() {}
4211 <
4212 <        /**
4213 <         * Returns a task that when invoked, performs the given
4239 <         * action for each (key, value)
4240 <         *
4241 <         * @param map the map
4242 <         * @param action the action
4243 <         * @return the task
4244 <         */
4245 <        public static <K,V> ForkJoinTask<Void> forEach
4246 <            (ConcurrentHashMapV8<K,V> map,
4247 <             BiAction<K,V> action) {
4248 <            if (action == null) throw new NullPointerException();
4249 <            return new ForEachMappingTask<K,V>(map, null, -1, null, action);
4250 <        }
4251 <
4252 <        /**
4253 <         * Returns a task that when invoked, performs the given
4254 <         * action for each non-null transformation of each (key, value)
4255 <         *
4256 <         * @param map the map
4257 <         * @param transformer a function returning the transformation
4258 <         * for an element, or null if there is no transformation (in
4259 <         * which case the action is not applied)
4260 <         * @param action the action
4261 <         * @return the task
4262 <         */
4263 <        public static <K,V,U> ForkJoinTask<Void> forEach
4264 <            (ConcurrentHashMapV8<K,V> map,
4265 <             BiFun<? super K, ? super V, ? extends U> transformer,
4266 <             Action<U> action) {
4267 <            if (transformer == null || action == null)
4268 <                throw new NullPointerException();
4269 <            return new ForEachTransformedMappingTask<K,V,U>
4270 <                (map, null, -1, null, transformer, action);
4271 <        }
4209 >    abstract static class CollectionView<K,V,E>
4210 >        implements Collection<E>, java.io.Serializable {
4211 >        private static final long serialVersionUID = 7249069246763182397L;
4212 >        final ConcurrentHashMapV8<K,V> map;
4213 >        CollectionView(ConcurrentHashMapV8<K,V> map)  { this.map = map; }
4214  
4215          /**
4216 <         * Returns a task that when invoked, returns a non-null result
4275 <         * from applying the given search function on each (key,
4276 <         * value), or null if none. Upon success, further element
4277 <         * processing is suppressed and the results of any other
4278 <         * parallel invocations of the search function are ignored.
4216 >         * Returns the map backing this view.
4217           *
4218 <         * @param map the map
4281 <         * @param searchFunction a function returning a non-null
4282 <         * result on success, else null
4283 <         * @return the task
4218 >         * @return the map backing this view
4219           */
4220 <        public static <K,V,U> ForkJoinTask<U> search
4286 <            (ConcurrentHashMapV8<K,V> map,
4287 <             BiFun<? super K, ? super V, ? extends U> searchFunction) {
4288 <            if (searchFunction == null) throw new NullPointerException();
4289 <            return new SearchMappingsTask<K,V,U>
4290 <                (map, null, -1, null, searchFunction,
4291 <                 new AtomicReference<U>());
4292 <        }
4220 >        public ConcurrentHashMapV8<K,V> getMap() { return map; }
4221  
4222          /**
4223 <         * Returns a task that when invoked, returns the result of
4224 <         * accumulating the given transformation of all (key, value) pairs
4297 <         * using the given reducer to combine values, or null if none.
4298 <         *
4299 <         * @param map the map
4300 <         * @param transformer a function returning the transformation
4301 <         * for an element, or null if there is no transformation (in
4302 <         * which case it is not combined).
4303 <         * @param reducer a commutative associative combining function
4304 <         * @return the task
4223 >         * Removes all of the elements from this view, by removing all
4224 >         * the mappings from the map backing this view.
4225           */
4226 <        public static <K,V,U> ForkJoinTask<U> reduce
4227 <            (ConcurrentHashMapV8<K,V> map,
4228 <             BiFun<? super K, ? super V, ? extends U> transformer,
4309 <             BiFun<? super U, ? super U, ? extends U> reducer) {
4310 <            if (transformer == null || reducer == null)
4311 <                throw new NullPointerException();
4312 <            return new MapReduceMappingsTask<K,V,U>
4313 <                (map, null, -1, null, transformer, reducer);
4314 <        }
4226 >        public final void clear()      { map.clear(); }
4227 >        public final int size()        { return map.size(); }
4228 >        public final boolean isEmpty() { return map.isEmpty(); }
4229  
4230 +        // implementations below rely on concrete classes supplying these
4231 +        // abstract methods
4232          /**
4233 <         * Returns a task that when invoked, returns the result of
4234 <         * accumulating the given transformation of all (key, value) pairs
4235 <         * using the given reducer to combine values, and the given
4236 <         * basis as an identity value.
4237 <         *
4238 <         * @param map the map
4239 <         * @param transformer a function returning the transformation
4240 <         * for an element
4241 <         * @param basis the identity (initial default value) for the reduction
4242 <         * @param reducer a commutative associative combining function
4327 <         * @return the task
4328 <         */
4329 <        public static <K,V> ForkJoinTask<Double> reduceToDouble
4330 <            (ConcurrentHashMapV8<K,V> map,
4331 <             ObjectByObjectToDouble<? super K, ? super V> transformer,
4332 <             double basis,
4333 <             DoubleByDoubleToDouble reducer) {
4334 <            if (transformer == null || reducer == null)
4335 <                throw new NullPointerException();
4336 <            return new MapReduceMappingsToDoubleTask<K,V>
4337 <                (map, null, -1, null, transformer, basis, reducer);
4338 <        }
4233 >         * Returns a "weakly consistent" iterator that will never
4234 >         * throw {@link ConcurrentModificationException}, and
4235 >         * guarantees to traverse elements as they existed upon
4236 >         * construction of the iterator, and may (but is not
4237 >         * guaranteed to) reflect any modifications subsequent to
4238 >         * construction.
4239 >         */
4240 >        public abstract Iterator<E> iterator();
4241 >        public abstract boolean contains(Object o);
4242 >        public abstract boolean remove(Object o);
4243  
4244 <        /**
4341 <         * Returns a task that when invoked, returns the result of
4342 <         * accumulating the given transformation of all (key, value) pairs
4343 <         * using the given reducer to combine values, and the given
4344 <         * basis as an identity value.
4345 <         *
4346 <         * @param map the map
4347 <         * @param transformer a function returning the transformation
4348 <         * for an element
4349 <         * @param basis the identity (initial default value) for the reduction
4350 <         * @param reducer a commutative associative combining function
4351 <         * @return the task
4352 <         */
4353 <        public static <K,V> ForkJoinTask<Long> reduceToLong
4354 <            (ConcurrentHashMapV8<K,V> map,
4355 <             ObjectByObjectToLong<? super K, ? super V> transformer,
4356 <             long basis,
4357 <             LongByLongToLong reducer) {
4358 <            if (transformer == null || reducer == null)
4359 <                throw new NullPointerException();
4360 <            return new MapReduceMappingsToLongTask<K,V>
4361 <                (map, null, -1, null, transformer, basis, reducer);
4362 <        }
4244 >        private static final String oomeMsg = "Required array size too large";
4245  
4246 <        /**
4247 <         * Returns a task that when invoked, returns the result of
4248 <         * accumulating the given transformation of all (key, value) pairs
4249 <         * using the given reducer to combine values, and the given
4250 <         * basis as an identity value.
4251 <         *
4252 <         * @param transformer a function returning the transformation
4253 <         * for an element
4254 <         * @param basis the identity (initial default value) for the reduction
4255 <         * @param reducer a commutative associative combining function
4256 <         * @return the task
4257 <         */
4258 <        public static <K,V> ForkJoinTask<Integer> reduceToInt
4259 <            (ConcurrentHashMapV8<K,V> map,
4260 <             ObjectByObjectToInt<? super K, ? super V> transformer,
4261 <             int basis,
4262 <             IntByIntToInt reducer) {
4263 <            if (transformer == null || reducer == null)
4264 <                throw new NullPointerException();
4265 <            return new MapReduceMappingsToIntTask<K,V>
4384 <                (map, null, -1, null, transformer, basis, reducer);
4246 >        public final Object[] toArray() {
4247 >            long sz = map.mappingCount();
4248 >            if (sz > MAX_ARRAY_SIZE)
4249 >                throw new OutOfMemoryError(oomeMsg);
4250 >            int n = (int)sz;
4251 >            Object[] r = new Object[n];
4252 >            int i = 0;
4253 >            for (E e : this) {
4254 >                if (i == n) {
4255 >                    if (n >= MAX_ARRAY_SIZE)
4256 >                        throw new OutOfMemoryError(oomeMsg);
4257 >                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
4258 >                        n = MAX_ARRAY_SIZE;
4259 >                    else
4260 >                        n += (n >>> 1) + 1;
4261 >                    r = Arrays.copyOf(r, n);
4262 >                }
4263 >                r[i++] = e;
4264 >            }
4265 >            return (i == n) ? r : Arrays.copyOf(r, i);
4266          }
4267  
4268 <        /**
4269 <         * Returns a task that when invoked, performs the given action
4270 <         * for each key.
4271 <         *
4272 <         * @param map the map
4273 <         * @param action the action
4274 <         * @return the task
4275 <         */
4276 <        public static <K,V> ForkJoinTask<Void> forEachKey
4277 <            (ConcurrentHashMapV8<K,V> map,
4278 <             Action<K> action) {
4279 <            if (action == null) throw new NullPointerException();
4280 <            return new ForEachKeyTask<K,V>(map, null, -1, null, action);
4268 >        @SuppressWarnings("unchecked")
4269 >        public final <T> T[] toArray(T[] a) {
4270 >            long sz = map.mappingCount();
4271 >            if (sz > MAX_ARRAY_SIZE)
4272 >                throw new OutOfMemoryError(oomeMsg);
4273 >            int m = (int)sz;
4274 >            T[] r = (a.length >= m) ? a :
4275 >                (T[])java.lang.reflect.Array
4276 >                .newInstance(a.getClass().getComponentType(), m);
4277 >            int n = r.length;
4278 >            int i = 0;
4279 >            for (E e : this) {
4280 >                if (i == n) {
4281 >                    if (n >= MAX_ARRAY_SIZE)
4282 >                        throw new OutOfMemoryError(oomeMsg);
4283 >                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
4284 >                        n = MAX_ARRAY_SIZE;
4285 >                    else
4286 >                        n += (n >>> 1) + 1;
4287 >                    r = Arrays.copyOf(r, n);
4288 >                }
4289 >                r[i++] = (T)e;
4290 >            }
4291 >            if (a == r && i < n) {
4292 >                r[i] = null; // null-terminate
4293 >                return r;
4294 >            }
4295 >            return (i == n) ? r : Arrays.copyOf(r, i);
4296          }
4297  
4298          /**
4299 <         * Returns a task that when invoked, performs the given action
4300 <         * for each non-null transformation of each key.
4299 >         * Returns a string representation of this collection.
4300 >         * The string representation consists of the string representations
4301 >         * of the collection's elements in the order they are returned by
4302 >         * its iterator, enclosed in square brackets ({@code "[]"}).
4303 >         * Adjacent elements are separated by the characters {@code ", "}
4304 >         * (comma and space).  Elements are converted to strings as by
4305 >         * {@link String#valueOf(Object)}.
4306           *
4307 <         * @param map the map
4407 <         * @param transformer a function returning the transformation
4408 <         * for an element, or null if there is no transformation (in
4409 <         * which case the action is not applied)
4410 <         * @param action the action
4411 <         * @return the task
4307 >         * @return a string representation of this collection
4308           */
4309 <        public static <K,V,U> ForkJoinTask<Void> forEachKey
4310 <            (ConcurrentHashMapV8<K,V> map,
4311 <             Fun<? super K, ? extends U> transformer,
4312 <             Action<U> action) {
4313 <            if (transformer == null || action == null)
4314 <                throw new NullPointerException();
4315 <            return new ForEachTransformedKeyTask<K,V,U>
4316 <                (map, null, -1, null, transformer, action);
4309 >        public final String toString() {
4310 >            StringBuilder sb = new StringBuilder();
4311 >            sb.append('[');
4312 >            Iterator<E> it = iterator();
4313 >            if (it.hasNext()) {
4314 >                for (;;) {
4315 >                    Object e = it.next();
4316 >                    sb.append(e == this ? "(this Collection)" : e);
4317 >                    if (!it.hasNext())
4318 >                        break;
4319 >                    sb.append(',').append(' ');
4320 >                }
4321 >            }
4322 >            return sb.append(']').toString();
4323          }
4324  
4325 <        /**
4326 <         * Returns a task that when invoked, returns a non-null result
4327 <         * from applying the given search function on each key, or
4328 <         * null if none.  Upon success, further element processing is
4329 <         * suppressed and the results of any other parallel
4330 <         * invocations of the search function are ignored.
4331 <         *
4332 <         * @param map the map
4431 <         * @param searchFunction a function returning a non-null
4432 <         * result on success, else null
4433 <         * @return the task
4434 <         */
4435 <        public static <K,V,U> ForkJoinTask<U> searchKeys
4436 <            (ConcurrentHashMapV8<K,V> map,
4437 <             Fun<? super K, ? extends U> searchFunction) {
4438 <            if (searchFunction == null) throw new NullPointerException();
4439 <            return new SearchKeysTask<K,V,U>
4440 <                (map, null, -1, null, searchFunction,
4441 <                 new AtomicReference<U>());
4325 >        public final boolean containsAll(Collection<?> c) {
4326 >            if (c != this) {
4327 >                for (Object e : c) {
4328 >                    if (e == null || !contains(e))
4329 >                        return false;
4330 >                }
4331 >            }
4332 >            return true;
4333          }
4334  
4335 <        /**
4336 <         * Returns a task that when invoked, returns the result of
4337 <         * accumulating all keys using the given reducer to combine
4338 <         * values, or null if none.
4339 <         *
4340 <         * @param map the map
4341 <         * @param reducer a commutative associative combining function
4342 <         * @return the task
4343 <         */
4453 <        public static <K,V> ForkJoinTask<K> reduceKeys
4454 <            (ConcurrentHashMapV8<K,V> map,
4455 <             BiFun<? super K, ? super K, ? extends K> reducer) {
4456 <            if (reducer == null) throw new NullPointerException();
4457 <            return new ReduceKeysTask<K,V>
4458 <                (map, null, -1, null, reducer);
4335 >        public final boolean removeAll(Collection<?> c) {
4336 >            boolean modified = false;
4337 >            for (Iterator<E> it = iterator(); it.hasNext();) {
4338 >                if (c.contains(it.next())) {
4339 >                    it.remove();
4340 >                    modified = true;
4341 >                }
4342 >            }
4343 >            return modified;
4344          }
4345  
4346 <        /**
4347 <         * Returns a task that when invoked, returns the result of
4348 <         * accumulating the given transformation of all keys using the given
4349 <         * reducer to combine values, or null if none.
4350 <         *
4351 <         * @param map the map
4352 <         * @param transformer a function returning the transformation
4353 <         * for an element, or null if there is no transformation (in
4354 <         * which case it is not combined).
4470 <         * @param reducer a commutative associative combining function
4471 <         * @return the task
4472 <         */
4473 <        public static <K,V,U> ForkJoinTask<U> reduceKeys
4474 <            (ConcurrentHashMapV8<K,V> map,
4475 <             Fun<? super K, ? extends U> transformer,
4476 <             BiFun<? super U, ? super U, ? extends U> reducer) {
4477 <            if (transformer == null || reducer == null)
4478 <                throw new NullPointerException();
4479 <            return new MapReduceKeysTask<K,V,U>
4480 <                (map, null, -1, null, transformer, reducer);
4346 >        public final boolean retainAll(Collection<?> c) {
4347 >            boolean modified = false;
4348 >            for (Iterator<E> it = iterator(); it.hasNext();) {
4349 >                if (!c.contains(it.next())) {
4350 >                    it.remove();
4351 >                    modified = true;
4352 >                }
4353 >            }
4354 >            return modified;
4355          }
4356  
4357 <        /**
4484 <         * Returns a task that when invoked, returns the result of
4485 <         * accumulating the given transformation of all keys using the given
4486 <         * reducer to combine values, and the given basis as an
4487 <         * identity value.
4488 <         *
4489 <         * @param map the map
4490 <         * @param transformer a function returning the transformation
4491 <         * for an element
4492 <         * @param basis the identity (initial default value) for the reduction
4493 <         * @param reducer a commutative associative combining function
4494 <         * @return the task
4495 <         */
4496 <        public static <K,V> ForkJoinTask<Double> reduceKeysToDouble
4497 <            (ConcurrentHashMapV8<K,V> map,
4498 <             ObjectToDouble<? super K> transformer,
4499 <             double basis,
4500 <             DoubleByDoubleToDouble reducer) {
4501 <            if (transformer == null || reducer == null)
4502 <                throw new NullPointerException();
4503 <            return new MapReduceKeysToDoubleTask<K,V>
4504 <                (map, null, -1, null, transformer, basis, reducer);
4505 <        }
4357 >    }
4358  
4359 <        /**
4360 <         * Returns a task that when invoked, returns the result of
4361 <         * accumulating the given transformation of all keys using the given
4362 <         * reducer to combine values, and the given basis as an
4363 <         * identity value.
4364 <         *
4365 <         * @param map the map
4366 <         * @param transformer a function returning the transformation
4367 <         * for an element
4368 <         * @param basis the identity (initial default value) for the reduction
4369 <         * @param reducer a commutative associative combining function
4370 <         * @return the task
4371 <         */
4372 <        public static <K,V> ForkJoinTask<Long> reduceKeysToLong
4373 <            (ConcurrentHashMapV8<K,V> map,
4374 <             ObjectToLong<? super K> transformer,
4375 <             long basis,
4376 <             LongByLongToLong reducer) {
4525 <            if (transformer == null || reducer == null)
4526 <                throw new NullPointerException();
4527 <            return new MapReduceKeysToLongTask<K,V>
4528 <                (map, null, -1, null, transformer, basis, reducer);
4359 >    /**
4360 >     * A view of a ConcurrentHashMapV8 as a {@link Set} of keys, in
4361 >     * which additions may optionally be enabled by mapping to a
4362 >     * common value.  This class cannot be directly instantiated.
4363 >     * See {@link #keySet() keySet()},
4364 >     * {@link #keySet(Object) keySet(V)},
4365 >     * {@link #newKeySet() newKeySet()},
4366 >     * {@link #newKeySet(int) newKeySet(int)}.
4367 >     *
4368 >     * @since 1.8
4369 >     */
4370 >    public static class KeySetView<K,V> extends CollectionView<K,V,K>
4371 >        implements Set<K>, java.io.Serializable {
4372 >        private static final long serialVersionUID = 7249069246763182397L;
4373 >        private final V value;
4374 >        KeySetView(ConcurrentHashMapV8<K,V> map, V value) {  // non-public
4375 >            super(map);
4376 >            this.value = value;
4377          }
4378  
4379          /**
4380 <         * Returns a task that when invoked, returns the result of
4381 <         * accumulating the given transformation of all keys using the given
4534 <         * reducer to combine values, and the given basis as an
4535 <         * identity value.
4380 >         * Returns the default mapped value for additions,
4381 >         * or {@code null} if additions are not supported.
4382           *
4383 <         * @param map the map
4384 <         * @param transformer a function returning the transformation
4539 <         * for an element
4540 <         * @param basis the identity (initial default value) for the reduction
4541 <         * @param reducer a commutative associative combining function
4542 <         * @return the task
4383 >         * @return the default mapped value for additions, or {@code null}
4384 >         * if not supported
4385           */
4386 <        public static <K,V> ForkJoinTask<Integer> reduceKeysToInt
4545 <            (ConcurrentHashMapV8<K,V> map,
4546 <             ObjectToInt<? super K> transformer,
4547 <             int basis,
4548 <             IntByIntToInt reducer) {
4549 <            if (transformer == null || reducer == null)
4550 <                throw new NullPointerException();
4551 <            return new MapReduceKeysToIntTask<K,V>
4552 <                (map, null, -1, null, transformer, basis, reducer);
4553 <        }
4386 >        public V getMappedValue() { return value; }
4387  
4388          /**
4389 <         * Returns a task that when invoked, performs the given action
4390 <         * for each value.
4558 <         *
4559 <         * @param map the map
4560 <         * @param action the action
4389 >         * {@inheritDoc}
4390 >         * @throws NullPointerException if the specified key is null
4391           */
4392 <        public static <K,V> ForkJoinTask<Void> forEachValue
4563 <            (ConcurrentHashMapV8<K,V> map,
4564 <             Action<V> action) {
4565 <            if (action == null) throw new NullPointerException();
4566 <            return new ForEachValueTask<K,V>(map, null, -1, null, action);
4567 <        }
4392 >        public boolean contains(Object o) { return map.containsKey(o); }
4393  
4394          /**
4395 <         * Returns a task that when invoked, performs the given action
4396 <         * for each non-null transformation of each value.
4395 >         * Removes the key from this map view, by removing the key (and its
4396 >         * corresponding value) from the backing map.  This method does
4397 >         * nothing if the key is not in the map.
4398           *
4399 <         * @param map the map
4400 <         * @param transformer a function returning the transformation
4401 <         * for an element, or null if there is no transformation (in
4576 <         * which case the action is not applied)
4577 <         * @param action the action
4399 >         * @param  o the key to be removed from the backing map
4400 >         * @return {@code true} if the backing map contained the specified key
4401 >         * @throws NullPointerException if the specified key is null
4402           */
4403 <        public static <K,V,U> ForkJoinTask<Void> forEachValue
4580 <            (ConcurrentHashMapV8<K,V> map,
4581 <             Fun<? super V, ? extends U> transformer,
4582 <             Action<U> action) {
4583 <            if (transformer == null || action == null)
4584 <                throw new NullPointerException();
4585 <            return new ForEachTransformedValueTask<K,V,U>
4586 <                (map, null, -1, null, transformer, action);
4587 <        }
4403 >        public boolean remove(Object o) { return map.remove(o) != null; }
4404  
4405          /**
4406 <         * Returns a task that when invoked, returns a non-null result
4591 <         * from applying the given search function on each value, or
4592 <         * null if none.  Upon success, further element processing is
4593 <         * suppressed and the results of any other parallel
4594 <         * invocations of the search function are ignored.
4595 <         *
4596 <         * @param map the map
4597 <         * @param searchFunction a function returning a non-null
4598 <         * result on success, else null
4599 <         * @return the task
4406 >         * @return an iterator over the keys of the backing map
4407           */
4408 <        public static <K,V,U> ForkJoinTask<U> searchValues
4409 <            (ConcurrentHashMapV8<K,V> map,
4410 <             Fun<? super V, ? extends U> searchFunction) {
4411 <            if (searchFunction == null) throw new NullPointerException();
4412 <            return new SearchValuesTask<K,V,U>
4606 <                (map, null, -1, null, searchFunction,
4607 <                 new AtomicReference<U>());
4408 >        public Iterator<K> iterator() {
4409 >            Node<K,V>[] t;
4410 >            ConcurrentHashMapV8<K,V> m = map;
4411 >            int f = (t = m.table) == null ? 0 : t.length;
4412 >            return new KeyIterator<K,V>(t, f, 0, f, m);
4413          }
4414  
4415          /**
4416 <         * Returns a task that when invoked, returns the result of
4417 <         * accumulating all values using the given reducer to combine
4613 <         * values, or null if none.
4416 >         * Adds the specified key to this set view by mapping the key to
4417 >         * the default mapped value in the backing map, if defined.
4418           *
4419 <         * @param map the map
4420 <         * @param reducer a commutative associative combining function
4421 <         * @return the task
4419 >         * @param e key to be added
4420 >         * @return {@code true} if this set changed as a result of the call
4421 >         * @throws NullPointerException if the specified key is null
4422 >         * @throws UnsupportedOperationException if no default mapped value
4423 >         * for additions was provided
4424           */
4425 <        public static <K,V> ForkJoinTask<V> reduceValues
4426 <            (ConcurrentHashMapV8<K,V> map,
4427 <             BiFun<? super V, ? super V, ? extends V> reducer) {
4428 <            if (reducer == null) throw new NullPointerException();
4429 <            return new ReduceValuesTask<K,V>
4624 <                (map, null, -1, null, reducer);
4425 >        public boolean add(K e) {
4426 >            V v;
4427 >            if ((v = value) == null)
4428 >                throw new UnsupportedOperationException();
4429 >            return map.putVal(e, v, true) == null;
4430          }
4431  
4432          /**
4433 <         * Returns a task that when invoked, returns the result of
4434 <         * accumulating the given transformation of all values using the
4630 <         * given reducer to combine values, or null if none.
4433 >         * Adds all of the elements in the specified collection to this set,
4434 >         * as if by calling {@link #add} on each one.
4435           *
4436 <         * @param map the map
4437 <         * @param transformer a function returning the transformation
4438 <         * for an element, or null if there is no transformation (in
4439 <         * which case it is not combined).
4440 <         * @param reducer a commutative associative combining function
4441 <         * @return the task
4436 >         * @param c the elements to be inserted into this set
4437 >         * @return {@code true} if this set changed as a result of the call
4438 >         * @throws NullPointerException if the collection or any of its
4439 >         * elements are {@code null}
4440 >         * @throws UnsupportedOperationException if no default mapped value
4441 >         * for additions was provided
4442           */
4443 <        public static <K,V,U> ForkJoinTask<U> reduceValues
4444 <            (ConcurrentHashMapV8<K,V> map,
4445 <             Fun<? super V, ? extends U> transformer,
4446 <             BiFun<? super U, ? super U, ? extends U> reducer) {
4447 <            if (transformer == null || reducer == null)
4448 <                throw new NullPointerException();
4449 <            return new MapReduceValuesTask<K,V,U>
4450 <                (map, null, -1, null, transformer, reducer);
4443 >        public boolean addAll(Collection<? extends K> c) {
4444 >            boolean added = false;
4445 >            V v;
4446 >            if ((v = value) == null)
4447 >                throw new UnsupportedOperationException();
4448 >            for (K e : c) {
4449 >                if (map.putVal(e, v, true) == null)
4450 >                    added = true;
4451 >            }
4452 >            return added;
4453          }
4454  
4455 <        /**
4456 <         * Returns a task that when invoked, returns the result of
4457 <         * accumulating the given transformation of all values using the
4458 <         * given reducer to combine values, and the given basis as an
4459 <         * identity value.
4654 <         *
4655 <         * @param map the map
4656 <         * @param transformer a function returning the transformation
4657 <         * for an element
4658 <         * @param basis the identity (initial default value) for the reduction
4659 <         * @param reducer a commutative associative combining function
4660 <         * @return the task
4661 <         */
4662 <        public static <K,V> ForkJoinTask<Double> reduceValuesToDouble
4663 <            (ConcurrentHashMapV8<K,V> map,
4664 <             ObjectToDouble<? super V> transformer,
4665 <             double basis,
4666 <             DoubleByDoubleToDouble reducer) {
4667 <            if (transformer == null || reducer == null)
4668 <                throw new NullPointerException();
4669 <            return new MapReduceValuesToDoubleTask<K,V>
4670 <                (map, null, -1, null, transformer, basis, reducer);
4455 >        public int hashCode() {
4456 >            int h = 0;
4457 >            for (K e : this)
4458 >                h += e.hashCode();
4459 >            return h;
4460          }
4461  
4462 <        /**
4463 <         * Returns a task that when invoked, returns the result of
4464 <         * accumulating the given transformation of all values using the
4465 <         * given reducer to combine values, and the given basis as an
4466 <         * identity value.
4678 <         *
4679 <         * @param map the map
4680 <         * @param transformer a function returning the transformation
4681 <         * for an element
4682 <         * @param basis the identity (initial default value) for the reduction
4683 <         * @param reducer a commutative associative combining function
4684 <         * @return the task
4685 <         */
4686 <        public static <K,V> ForkJoinTask<Long> reduceValuesToLong
4687 <            (ConcurrentHashMapV8<K,V> map,
4688 <             ObjectToLong<? super V> transformer,
4689 <             long basis,
4690 <             LongByLongToLong reducer) {
4691 <            if (transformer == null || reducer == null)
4692 <                throw new NullPointerException();
4693 <            return new MapReduceValuesToLongTask<K,V>
4694 <                (map, null, -1, null, transformer, basis, reducer);
4462 >        public boolean equals(Object o) {
4463 >            Set<?> c;
4464 >            return ((o instanceof Set) &&
4465 >                    ((c = (Set<?>)o) == this ||
4466 >                     (containsAll(c) && c.containsAll(this))));
4467          }
4468  
4469 <        /**
4470 <         * Returns a task that when invoked, returns the result of
4471 <         * accumulating the given transformation of all values using the
4472 <         * given reducer to combine values, and the given basis as an
4473 <         * identity value.
4474 <         *
4703 <         * @param map the map
4704 <         * @param transformer a function returning the transformation
4705 <         * for an element
4706 <         * @param basis the identity (initial default value) for the reduction
4707 <         * @param reducer a commutative associative combining function
4708 <         * @return the task
4709 <         */
4710 <        public static <K,V> ForkJoinTask<Integer> reduceValuesToInt
4711 <            (ConcurrentHashMapV8<K,V> map,
4712 <             ObjectToInt<? super V> transformer,
4713 <             int basis,
4714 <             IntByIntToInt reducer) {
4715 <            if (transformer == null || reducer == null)
4716 <                throw new NullPointerException();
4717 <            return new MapReduceValuesToIntTask<K,V>
4718 <                (map, null, -1, null, transformer, basis, reducer);
4469 >        public ConcurrentHashMapSpliterator<K> spliterator() {
4470 >            Node<K,V>[] t;
4471 >            ConcurrentHashMapV8<K,V> m = map;
4472 >            long n = m.sumCount();
4473 >            int f = (t = m.table) == null ? 0 : t.length;
4474 >            return new KeySpliterator<K,V>(t, f, 0, f, n < 0L ? 0L : n);
4475          }
4476  
4477 <        /**
4722 <         * Returns a task that when invoked, perform the given action
4723 <         * for each entry.
4724 <         *
4725 <         * @param map the map
4726 <         * @param action the action
4727 <         */
4728 <        public static <K,V> ForkJoinTask<Void> forEachEntry
4729 <            (ConcurrentHashMapV8<K,V> map,
4730 <             Action<Map.Entry<K,V>> action) {
4477 >        public void forEach(Action<? super K> action) {
4478              if (action == null) throw new NullPointerException();
4479 <            return new ForEachEntryTask<K,V>(map, null, -1, null, action);
4479 >            Node<K,V>[] t;
4480 >            if ((t = map.table) != null) {
4481 >                Traverser<K,V> it = new Traverser<K,V>(t, t.length, 0, t.length);
4482 >                for (Node<K,V> p; (p = it.advance()) != null; )
4483 >                    action.apply(p.key);
4484 >            }
4485          }
4486 +    }
4487  
4488 <        /**
4489 <         * Returns a task that when invoked, perform the given action
4490 <         * for each non-null transformation of each entry.
4491 <         *
4492 <         * @param map the map
4493 <         * @param transformer a function returning the transformation
4494 <         * for an element, or null if there is no transformation (in
4495 <         * which case the action is not applied)
4496 <         * @param action the action
4497 <         */
4498 <        public static <K,V,U> ForkJoinTask<Void> forEachEntry
4746 <            (ConcurrentHashMapV8<K,V> map,
4747 <             Fun<Map.Entry<K,V>, ? extends U> transformer,
4748 <             Action<U> action) {
4749 <            if (transformer == null || action == null)
4750 <                throw new NullPointerException();
4751 <            return new ForEachTransformedEntryTask<K,V,U>
4752 <                (map, null, -1, null, transformer, action);
4488 >    /**
4489 >     * A view of a ConcurrentHashMapV8 as a {@link Collection} of
4490 >     * values, in which additions are disabled. This class cannot be
4491 >     * directly instantiated. See {@link #values()}.
4492 >     */
4493 >    static final class ValuesView<K,V> extends CollectionView<K,V,V>
4494 >        implements Collection<V>, java.io.Serializable {
4495 >        private static final long serialVersionUID = 2249069246763182397L;
4496 >        ValuesView(ConcurrentHashMapV8<K,V> map) { super(map); }
4497 >        public final boolean contains(Object o) {
4498 >            return map.containsValue(o);
4499          }
4500  
4501 <        /**
4502 <         * Returns a task that when invoked, returns a non-null result
4503 <         * from applying the given search function on each entry, or
4504 <         * null if none.  Upon success, further element processing is
4505 <         * suppressed and the results of any other parallel
4506 <         * invocations of the search function are ignored.
4507 <         *
4508 <         * @param map the map
4509 <         * @param searchFunction a function returning a non-null
4510 <         * result on success, else null
4765 <         * @return the task
4766 <         */
4767 <        public static <K,V,U> ForkJoinTask<U> searchEntries
4768 <            (ConcurrentHashMapV8<K,V> map,
4769 <             Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4770 <            if (searchFunction == null) throw new NullPointerException();
4771 <            return new SearchEntriesTask<K,V,U>
4772 <                (map, null, -1, null, searchFunction,
4773 <                 new AtomicReference<U>());
4501 >        public final boolean remove(Object o) {
4502 >            if (o != null) {
4503 >                for (Iterator<V> it = iterator(); it.hasNext();) {
4504 >                    if (o.equals(it.next())) {
4505 >                        it.remove();
4506 >                        return true;
4507 >                    }
4508 >                }
4509 >            }
4510 >            return false;
4511          }
4512  
4513 <        /**
4514 <         * Returns a task that when invoked, returns the result of
4515 <         * accumulating all entries using the given reducer to combine
4516 <         * values, or null if none.
4517 <         *
4781 <         * @param map the map
4782 <         * @param reducer a commutative associative combining function
4783 <         * @return the task
4784 <         */
4785 <        public static <K,V> ForkJoinTask<Map.Entry<K,V>> reduceEntries
4786 <            (ConcurrentHashMapV8<K,V> map,
4787 <             BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4788 <            if (reducer == null) throw new NullPointerException();
4789 <            return new ReduceEntriesTask<K,V>
4790 <                (map, null, -1, null, reducer);
4513 >        public final Iterator<V> iterator() {
4514 >            ConcurrentHashMapV8<K,V> m = map;
4515 >            Node<K,V>[] t;
4516 >            int f = (t = m.table) == null ? 0 : t.length;
4517 >            return new ValueIterator<K,V>(t, f, 0, f, m);
4518          }
4519  
4520 <        /**
4521 <         * Returns a task that when invoked, returns the result of
4795 <         * accumulating the given transformation of all entries using the
4796 <         * given reducer to combine values, or null if none.
4797 <         *
4798 <         * @param map the map
4799 <         * @param transformer a function returning the transformation
4800 <         * for an element, or null if there is no transformation (in
4801 <         * which case it is not combined).
4802 <         * @param reducer a commutative associative combining function
4803 <         * @return the task
4804 <         */
4805 <        public static <K,V,U> ForkJoinTask<U> reduceEntries
4806 <            (ConcurrentHashMapV8<K,V> map,
4807 <             Fun<Map.Entry<K,V>, ? extends U> transformer,
4808 <             BiFun<? super U, ? super U, ? extends U> reducer) {
4809 <            if (transformer == null || reducer == null)
4810 <                throw new NullPointerException();
4811 <            return new MapReduceEntriesTask<K,V,U>
4812 <                (map, null, -1, null, transformer, reducer);
4520 >        public final boolean add(V e) {
4521 >            throw new UnsupportedOperationException();
4522          }
4523 <
4524 <        /**
4816 <         * Returns a task that when invoked, returns the result of
4817 <         * accumulating the given transformation of all entries using the
4818 <         * given reducer to combine values, and the given basis as an
4819 <         * identity value.
4820 <         *
4821 <         * @param map the map
4822 <         * @param transformer a function returning the transformation
4823 <         * for an element
4824 <         * @param basis the identity (initial default value) for the reduction
4825 <         * @param reducer a commutative associative combining function
4826 <         * @return the task
4827 <         */
4828 <        public static <K,V> ForkJoinTask<Double> reduceEntriesToDouble
4829 <            (ConcurrentHashMapV8<K,V> map,
4830 <             ObjectToDouble<Map.Entry<K,V>> transformer,
4831 <             double basis,
4832 <             DoubleByDoubleToDouble reducer) {
4833 <            if (transformer == null || reducer == null)
4834 <                throw new NullPointerException();
4835 <            return new MapReduceEntriesToDoubleTask<K,V>
4836 <                (map, null, -1, null, transformer, basis, reducer);
4523 >        public final boolean addAll(Collection<? extends V> c) {
4524 >            throw new UnsupportedOperationException();
4525          }
4526  
4527 <        /**
4528 <         * Returns a task that when invoked, returns the result of
4529 <         * accumulating the given transformation of all entries using the
4530 <         * given reducer to combine values, and the given basis as an
4531 <         * identity value.
4532 <         *
4845 <         * @param map the map
4846 <         * @param transformer a function returning the transformation
4847 <         * for an element
4848 <         * @param basis the identity (initial default value) for the reduction
4849 <         * @param reducer a commutative associative combining function
4850 <         * @return the task
4851 <         */
4852 <        public static <K,V> ForkJoinTask<Long> reduceEntriesToLong
4853 <            (ConcurrentHashMapV8<K,V> map,
4854 <             ObjectToLong<Map.Entry<K,V>> transformer,
4855 <             long basis,
4856 <             LongByLongToLong reducer) {
4857 <            if (transformer == null || reducer == null)
4858 <                throw new NullPointerException();
4859 <            return new MapReduceEntriesToLongTask<K,V>
4860 <                (map, null, -1, null, transformer, basis, reducer);
4527 >        public ConcurrentHashMapSpliterator<V> spliterator() {
4528 >            Node<K,V>[] t;
4529 >            ConcurrentHashMapV8<K,V> m = map;
4530 >            long n = m.sumCount();
4531 >            int f = (t = m.table) == null ? 0 : t.length;
4532 >            return new ValueSpliterator<K,V>(t, f, 0, f, n < 0L ? 0L : n);
4533          }
4534  
4535 <        /**
4536 <         * Returns a task that when invoked, returns the result of
4537 <         * accumulating the given transformation of all entries using the
4538 <         * given reducer to combine values, and the given basis as an
4539 <         * identity value.
4540 <         *
4541 <         * @param map the map
4542 <         * @param transformer a function returning the transformation
4871 <         * for an element
4872 <         * @param basis the identity (initial default value) for the reduction
4873 <         * @param reducer a commutative associative combining function
4874 <         * @return the task
4875 <         */
4876 <        public static <K,V> ForkJoinTask<Integer> reduceEntriesToInt
4877 <            (ConcurrentHashMapV8<K,V> map,
4878 <             ObjectToInt<Map.Entry<K,V>> transformer,
4879 <             int basis,
4880 <             IntByIntToInt reducer) {
4881 <            if (transformer == null || reducer == null)
4882 <                throw new NullPointerException();
4883 <            return new MapReduceEntriesToIntTask<K,V>
4884 <                (map, null, -1, null, transformer, basis, reducer);
4535 >        public void forEach(Action<? super V> action) {
4536 >            if (action == null) throw new NullPointerException();
4537 >            Node<K,V>[] t;
4538 >            if ((t = map.table) != null) {
4539 >                Traverser<K,V> it = new Traverser<K,V>(t, t.length, 0, t.length);
4540 >                for (Node<K,V> p; (p = it.advance()) != null; )
4541 >                    action.apply(p.val);
4542 >            }
4543          }
4544      }
4545  
4888    // -------------------------------------------------------
4889
4546      /**
4547 <     * Base for FJ tasks for bulk operations. This adds a variant of
4548 <     * CountedCompleters and some split and merge bookkeeping to
4549 <     * iterator functionality. The forEach and reduce methods are
4550 <     * similar to those illustrated in CountedCompleter documentation,
4551 <     * except that bottom-up reduction completions perform them within
4552 <     * their compute methods. The search methods are like forEach
4553 <     * except they continually poll for success and exit early.  Also,
4554 <     * exceptions are handled in a simpler manner, by just trying to
4899 <     * complete root task exceptionally.
4900 <     */
4901 <    @SuppressWarnings("serial") static abstract class BulkTask<K,V,R> extends Traverser<K,V,R> {
4902 <        final BulkTask<K,V,?> parent;  // completion target
4903 <        int batch;                     // split control; -1 for unknown
4904 <        int pending;                   // completion control
4547 >     * A view of a ConcurrentHashMapV8 as a {@link Set} of (key, value)
4548 >     * entries.  This class cannot be directly instantiated. See
4549 >     * {@link #entrySet()}.
4550 >     */
4551 >    static final class EntrySetView<K,V> extends CollectionView<K,V,Map.Entry<K,V>>
4552 >        implements Set<Map.Entry<K,V>>, java.io.Serializable {
4553 >        private static final long serialVersionUID = 2249069246763182397L;
4554 >        EntrySetView(ConcurrentHashMapV8<K,V> map) { super(map); }
4555  
4556 <        BulkTask(ConcurrentHashMapV8<K,V> map, BulkTask<K,V,?> parent,
4557 <                 int batch) {
4558 <            super(map);
4559 <            this.parent = parent;
4560 <            this.batch = batch;
4561 <            if (parent != null && map != null) { // split parent
4562 <                Node[] t;
4913 <                if ((t = parent.tab) == null &&
4914 <                    (t = parent.tab = map.table) != null)
4915 <                    parent.baseLimit = parent.baseSize = t.length;
4916 <                this.tab = t;
4917 <                this.baseSize = parent.baseSize;
4918 <                int hi = this.baseLimit = parent.baseLimit;
4919 <                parent.baseLimit = this.index = this.baseIndex =
4920 <                    (hi + parent.baseIndex + 1) >>> 1;
4921 <            }
4556 >        public boolean contains(Object o) {
4557 >            Object k, v, r; Map.Entry<?,?> e;
4558 >            return ((o instanceof Map.Entry) &&
4559 >                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
4560 >                    (r = map.get(k)) != null &&
4561 >                    (v = e.getValue()) != null &&
4562 >                    (v == r || v.equals(r)));
4563          }
4564  
4565 <        /**
4566 <         * Forces root task to complete.
4567 <         * @param ex if null, complete normally, else exceptionally
4568 <         * @return false to simplify use
4569 <         */
4570 <        final boolean tryCompleteComputation(Throwable ex) {
4930 <            for (BulkTask<K,V,?> a = this;;) {
4931 <                BulkTask<K,V,?> p = a.parent;
4932 <                if (p == null) {
4933 <                    if (ex != null)
4934 <                        a.completeExceptionally(ex);
4935 <                    else
4936 <                        a.quietlyComplete();
4937 <                    return false;
4938 <                }
4939 <                a = p;
4940 <            }
4565 >        public boolean remove(Object o) {
4566 >            Object k, v; Map.Entry<?,?> e;
4567 >            return ((o instanceof Map.Entry) &&
4568 >                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
4569 >                    (v = e.getValue()) != null &&
4570 >                    map.remove(k, v));
4571          }
4572  
4573          /**
4574 <         * Version of tryCompleteComputation for function screening checks
4574 >         * @return an iterator over the entries of the backing map
4575           */
4576 <        final boolean abortOnNullFunction() {
4577 <            return tryCompleteComputation(new Error("Unexpected null function"));
4576 >        public Iterator<Map.Entry<K,V>> iterator() {
4577 >            ConcurrentHashMapV8<K,V> m = map;
4578 >            Node<K,V>[] t;
4579 >            int f = (t = m.table) == null ? 0 : t.length;
4580 >            return new EntryIterator<K,V>(t, f, 0, f, m);
4581          }
4582  
4583 <        // utilities
4583 >        public boolean add(Entry<K,V> e) {
4584 >            return map.putVal(e.getKey(), e.getValue(), false) == null;
4585 >        }
4586  
4587 <        /** CompareAndSet pending count */
4588 <        final boolean casPending(int cmp, int val) {
4589 <            return U.compareAndSwapInt(this, PENDING, cmp, val);
4587 >        public boolean addAll(Collection<? extends Entry<K,V>> c) {
4588 >            boolean added = false;
4589 >            for (Entry<K,V> e : c) {
4590 >                if (add(e))
4591 >                    added = true;
4592 >            }
4593 >            return added;
4594          }
4595  
4596 <        /**
4597 <         * Returns approx exp2 of the number of times (minus one) to
4598 <         * split task by two before executing leaf action. This value
4599 <         * is faster to compute and more convenient to use as a guide
4600 <         * to splitting than is the depth, since it is used while
4601 <         * dividing by two anyway.
4602 <         */
4964 <        final int batch() {
4965 <            ConcurrentHashMapV8<K, V> m; int b; Node[] t;  ForkJoinPool pool;
4966 <            if ((b = batch) < 0 && (m = map) != null) { // force initialization
4967 <                if ((t = tab) == null && (t = tab = m.table) != null)
4968 <                    baseLimit = baseSize = t.length;
4969 <                if (t != null) {
4970 <                    long n = m.counter.sum();
4971 <                    int par = ((pool = getPool()) == null) ?
4972 <                        ForkJoinPool.getCommonPoolParallelism() :
4973 <                        pool.getParallelism();
4974 <                    int sp = par << 3; // slack of 8
4975 <                    b = batch = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp;
4596 >        public final int hashCode() {
4597 >            int h = 0;
4598 >            Node<K,V>[] t;
4599 >            if ((t = map.table) != null) {
4600 >                Traverser<K,V> it = new Traverser<K,V>(t, t.length, 0, t.length);
4601 >                for (Node<K,V> p; (p = it.advance()) != null; ) {
4602 >                    h += p.hashCode();
4603                  }
4604              }
4605 <            return b;
4605 >            return h;
4606          }
4607  
4608 <        /**
4609 <         * Returns exportable snapshot entry.
4610 <         */
4611 <        static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
4612 <            return new AbstractMap.SimpleEntry<K,V>(k, v);
4608 >        public final boolean equals(Object o) {
4609 >            Set<?> c;
4610 >            return ((o instanceof Set) &&
4611 >                    ((c = (Set<?>)o) == this ||
4612 >                     (containsAll(c) && c.containsAll(this))));
4613          }
4614  
4615 <        // Unsafe mechanics
4616 <        private static final sun.misc.Unsafe U;
4617 <        private static final long PENDING;
4618 <        static {
4619 <            try {
4620 <                U = getUnsafe();
4621 <                PENDING = U.objectFieldOffset
4622 <                    (BulkTask.class.getDeclaredField("pending"));
4623 <            } catch (Exception e) {
4624 <                throw new Error(e);
4615 >        public ConcurrentHashMapSpliterator<Map.Entry<K,V>> spliterator() {
4616 >            Node<K,V>[] t;
4617 >            ConcurrentHashMapV8<K,V> m = map;
4618 >            long n = m.sumCount();
4619 >            int f = (t = m.table) == null ? 0 : t.length;
4620 >            return new EntrySpliterator<K,V>(t, f, 0, f, n < 0L ? 0L : n, m);
4621 >        }
4622 >
4623 >        public void forEach(Action<? super Map.Entry<K,V>> action) {
4624 >            if (action == null) throw new NullPointerException();
4625 >            Node<K,V>[] t;
4626 >            if ((t = map.table) != null) {
4627 >                Traverser<K,V> it = new Traverser<K,V>(t, t.length, 0, t.length);
4628 >                for (Node<K,V> p; (p = it.advance()) != null; )
4629 >                    action.apply(new MapEntry<K,V>(p.key, p.val, map));
4630              }
4631          }
4632 +
4633      }
4634  
4635 +    // -------------------------------------------------------
4636 +
4637      /**
4638 <     * Base class for non-reductive actions
4638 >     * Base class for bulk tasks. Repeats some fields and code from
4639 >     * class Traverser, because we need to subclass CountedCompleter.
4640       */
4641 <    @SuppressWarnings("serial") static abstract class BulkAction<K,V,R> extends BulkTask<K,V,R> {
4642 <        BulkAction<K,V,?> nextTask;
4643 <        BulkAction(ConcurrentHashMapV8<K,V> map, BulkTask<K,V,?> parent,
4644 <                   int batch, BulkAction<K,V,?> nextTask) {
4645 <            super(map, parent, batch);
4646 <            this.nextTask = nextTask;
4641 >    abstract static class BulkTask<K,V,R> extends CountedCompleter<R> {
4642 >        Node<K,V>[] tab;        // same as Traverser
4643 >        Node<K,V> next;
4644 >        int index;
4645 >        int baseIndex;
4646 >        int baseLimit;
4647 >        final int baseSize;
4648 >        int batch;              // split control
4649 >
4650 >        BulkTask(BulkTask<K,V,?> par, int b, int i, int f, Node<K,V>[] t) {
4651 >            super(par);
4652 >            this.batch = b;
4653 >            this.index = this.baseIndex = i;
4654 >            if ((this.tab = t) == null)
4655 >                this.baseSize = this.baseLimit = 0;
4656 >            else if (par == null)
4657 >                this.baseSize = this.baseLimit = t.length;
4658 >            else {
4659 >                this.baseLimit = f;
4660 >                this.baseSize = par.baseSize;
4661 >            }
4662          }
4663  
4664          /**
4665 <         * Try to complete task and upward parents. Upon hitting
5015 <         * non-completed parent, if a non-FJ task, try to help out the
5016 <         * computation.
4665 >         * Same as Traverser version
4666           */
4667 <        final void tryComplete(BulkAction<K,V,?> subtasks) {
4668 <            BulkTask<K,V,?> a = this, s = a;
4669 <            for (int c;;) {
4670 <                if ((c = a.pending) == 0) {
4671 <                    if ((a = (s = a).parent) == null) {
4672 <                        s.quietlyComplete();
4673 <                        break;
4674 <                    }
4675 <                }
4676 <                else if (a.casPending(c, c - 1)) {
4677 <                    if (subtasks != null && !inForkJoinPool()) {
4678 <                        while ((s = a.parent) != null)
4679 <                            a = s;
4680 <                        while (!a.isDone()) {
4681 <                            BulkAction<K,V,?> next = subtasks.nextTask;
4682 <                            if (subtasks.tryUnfork())
5034 <                                subtasks.exec();
5035 <                            if ((subtasks = next) == null)
5036 <                                break;
5037 <                        }
4667 >        final Node<K,V> advance() {
4668 >            Node<K,V> e;
4669 >            if ((e = next) != null)
4670 >                e = e.next;
4671 >            for (;;) {
4672 >                Node<K,V>[] t; int i, n; K ek;  // must use locals in checks
4673 >                if (e != null)
4674 >                    return next = e;
4675 >                if (baseIndex >= baseLimit || (t = tab) == null ||
4676 >                    (n = t.length) <= (i = index) || i < 0)
4677 >                    return next = null;
4678 >                if ((e = tabAt(t, index)) != null && e.hash < 0) {
4679 >                    if (e instanceof ForwardingNode) {
4680 >                        tab = ((ForwardingNode<K,V>)e).nextTable;
4681 >                        e = null;
4682 >                        continue;
4683                      }
4684 <                    break;
4684 >                    else if (e instanceof TreeBin)
4685 >                        e = ((TreeBin<K,V>)e).first;
4686 >                    else
4687 >                        e = null;
4688                  }
4689 +                if ((index += baseSize) >= n)
4690 +                    index = ++baseIndex;    // visit upper slots if present
4691              }
4692          }
5043
4693      }
4694  
4695      /*
4696       * Task classes. Coded in a regular but ugly format/style to
4697       * simplify checks that each variant differs in the right way from
4698 <     * others.
4699 <     */
4700 <
4701 <    @SuppressWarnings("serial") static final class ForEachKeyTask<K,V>
4702 <        extends BulkAction<K,V,Void> {
4703 <        final Action<K> action;
4698 >     * others. The null screenings exist because compilers cannot tell
4699 >     * that we've already null-checked task arguments, so we force
4700 >     * simplest hoisted bypass to help avoid convoluted traps.
4701 >     */
4702 >    @SuppressWarnings("serial")
4703 >    static final class ForEachKeyTask<K,V>
4704 >        extends BulkTask<K,V,Void> {
4705 >        final Action<? super K> action;
4706          ForEachKeyTask
4707 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
4708 <             ForEachKeyTask<K,V> nextTask,
4709 <             Action<K> action) {
5059 <            super(m, p, b, nextTask);
4707 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
4708 >             Action<? super K> action) {
4709 >            super(p, b, i, f, t);
4710              this.action = action;
4711          }
4712 <        @SuppressWarnings("unchecked") public final boolean exec() {
4713 <            final Action<K> action = this.action;
4714 <            if (action == null)
4715 <                return abortOnNullFunction();
4716 <            ForEachKeyTask<K,V> subtasks = null;
4717 <            try {
4718 <                int b = batch(), c;
4719 <                while (b > 1 && baseIndex != baseLimit) {
4720 <                    do {} while (!casPending(c = pending, c+1));
4721 <                    (subtasks = new ForEachKeyTask<K,V>
4722 <                     (map, this, b >>>= 1, subtasks, action)).fork();
4723 <                }
4724 <                while (advance() != null)
5075 <                    action.apply((K)nextKey);
5076 <            } catch (Throwable ex) {
5077 <                return tryCompleteComputation(ex);
4712 >        public final void compute() {
4713 >            final Action<? super K> action;
4714 >            if ((action = this.action) != null) {
4715 >                for (int i = baseIndex, f, h; batch > 0 &&
4716 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
4717 >                    addToPendingCount(1);
4718 >                    new ForEachKeyTask<K,V>
4719 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
4720 >                         action).fork();
4721 >                }
4722 >                for (Node<K,V> p; (p = advance()) != null;)
4723 >                    action.apply(p.key);
4724 >                propagateCompletion();
4725              }
5079            tryComplete(subtasks);
5080            return false;
4726          }
4727      }
4728  
4729 <    @SuppressWarnings("serial") static final class ForEachValueTask<K,V>
4730 <        extends BulkAction<K,V,Void> {
4731 <        final Action<V> action;
4729 >    @SuppressWarnings("serial")
4730 >    static final class ForEachValueTask<K,V>
4731 >        extends BulkTask<K,V,Void> {
4732 >        final Action<? super V> action;
4733          ForEachValueTask
4734 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
4735 <             ForEachValueTask<K,V> nextTask,
4736 <             Action<V> action) {
5091 <            super(m, p, b, nextTask);
4734 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
4735 >             Action<? super V> action) {
4736 >            super(p, b, i, f, t);
4737              this.action = action;
4738          }
4739 <        @SuppressWarnings("unchecked") public final boolean exec() {
4740 <            final Action<V> action = this.action;
4741 <            if (action == null)
4742 <                return abortOnNullFunction();
4743 <            ForEachValueTask<K,V> subtasks = null;
4744 <            try {
4745 <                int b = batch(), c;
4746 <                while (b > 1 && baseIndex != baseLimit) {
4747 <                    do {} while (!casPending(c = pending, c+1));
4748 <                    (subtasks = new ForEachValueTask<K,V>
4749 <                     (map, this, b >>>= 1, subtasks, action)).fork();
4750 <                }
4751 <                Object v;
5107 <                while ((v = advance()) != null)
5108 <                    action.apply((V)v);
5109 <            } catch (Throwable ex) {
5110 <                return tryCompleteComputation(ex);
4739 >        public final void compute() {
4740 >            final Action<? super V> action;
4741 >            if ((action = this.action) != null) {
4742 >                for (int i = baseIndex, f, h; batch > 0 &&
4743 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
4744 >                    addToPendingCount(1);
4745 >                    new ForEachValueTask<K,V>
4746 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
4747 >                         action).fork();
4748 >                }
4749 >                for (Node<K,V> p; (p = advance()) != null;)
4750 >                    action.apply(p.val);
4751 >                propagateCompletion();
4752              }
5112            tryComplete(subtasks);
5113            return false;
4753          }
4754      }
4755  
4756 <    @SuppressWarnings("serial") static final class ForEachEntryTask<K,V>
4757 <        extends BulkAction<K,V,Void> {
4758 <        final Action<Entry<K,V>> action;
4756 >    @SuppressWarnings("serial")
4757 >    static final class ForEachEntryTask<K,V>
4758 >        extends BulkTask<K,V,Void> {
4759 >        final Action<? super Entry<K,V>> action;
4760          ForEachEntryTask
4761 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
4762 <             ForEachEntryTask<K,V> nextTask,
4763 <             Action<Entry<K,V>> action) {
5124 <            super(m, p, b, nextTask);
4761 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
4762 >             Action<? super Entry<K,V>> action) {
4763 >            super(p, b, i, f, t);
4764              this.action = action;
4765          }
4766 <        @SuppressWarnings("unchecked") public final boolean exec() {
4767 <            final Action<Entry<K,V>> action = this.action;
4768 <            if (action == null)
4769 <                return abortOnNullFunction();
4770 <            ForEachEntryTask<K,V> subtasks = null;
4771 <            try {
4772 <                int b = batch(), c;
4773 <                while (b > 1 && baseIndex != baseLimit) {
4774 <                    do {} while (!casPending(c = pending, c+1));
4775 <                    (subtasks = new ForEachEntryTask<K,V>
4776 <                     (map, this, b >>>= 1, subtasks, action)).fork();
4777 <                }
4778 <                Object v;
5140 <                while ((v = advance()) != null)
5141 <                    action.apply(entryFor((K)nextKey, (V)v));
5142 <            } catch (Throwable ex) {
5143 <                return tryCompleteComputation(ex);
4766 >        public final void compute() {
4767 >            final Action<? super Entry<K,V>> action;
4768 >            if ((action = this.action) != null) {
4769 >                for (int i = baseIndex, f, h; batch > 0 &&
4770 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
4771 >                    addToPendingCount(1);
4772 >                    new ForEachEntryTask<K,V>
4773 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
4774 >                         action).fork();
4775 >                }
4776 >                for (Node<K,V> p; (p = advance()) != null; )
4777 >                    action.apply(p);
4778 >                propagateCompletion();
4779              }
5145            tryComplete(subtasks);
5146            return false;
4780          }
4781      }
4782  
4783 <    @SuppressWarnings("serial") static final class ForEachMappingTask<K,V>
4784 <        extends BulkAction<K,V,Void> {
4785 <        final BiAction<K,V> action;
4783 >    @SuppressWarnings("serial")
4784 >    static final class ForEachMappingTask<K,V>
4785 >        extends BulkTask<K,V,Void> {
4786 >        final BiAction<? super K, ? super V> action;
4787          ForEachMappingTask
4788 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
4789 <             ForEachMappingTask<K,V> nextTask,
4790 <             BiAction<K,V> action) {
5157 <            super(m, p, b, nextTask);
4788 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
4789 >             BiAction<? super K,? super V> action) {
4790 >            super(p, b, i, f, t);
4791              this.action = action;
4792          }
4793 <        @SuppressWarnings("unchecked") public final boolean exec() {
4794 <            final BiAction<K,V> action = this.action;
4795 <            if (action == null)
4796 <                return abortOnNullFunction();
4797 <            ForEachMappingTask<K,V> subtasks = null;
4798 <            try {
4799 <                int b = batch(), c;
4800 <                while (b > 1 && baseIndex != baseLimit) {
4801 <                    do {} while (!casPending(c = pending, c+1));
4802 <                    (subtasks = new ForEachMappingTask<K,V>
4803 <                     (map, this, b >>>= 1, subtasks, action)).fork();
4804 <                }
4805 <                Object v;
5173 <                while ((v = advance()) != null)
5174 <                    action.apply((K)nextKey, (V)v);
5175 <            } catch (Throwable ex) {
5176 <                return tryCompleteComputation(ex);
4793 >        public final void compute() {
4794 >            final BiAction<? super K, ? super V> action;
4795 >            if ((action = this.action) != null) {
4796 >                for (int i = baseIndex, f, h; batch > 0 &&
4797 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
4798 >                    addToPendingCount(1);
4799 >                    new ForEachMappingTask<K,V>
4800 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
4801 >                         action).fork();
4802 >                }
4803 >                for (Node<K,V> p; (p = advance()) != null; )
4804 >                    action.apply(p.key, p.val);
4805 >                propagateCompletion();
4806              }
5178            tryComplete(subtasks);
5179            return false;
4807          }
4808      }
4809  
4810 <    @SuppressWarnings("serial") static final class ForEachTransformedKeyTask<K,V,U>
4811 <        extends BulkAction<K,V,Void> {
4810 >    @SuppressWarnings("serial")
4811 >    static final class ForEachTransformedKeyTask<K,V,U>
4812 >        extends BulkTask<K,V,Void> {
4813          final Fun<? super K, ? extends U> transformer;
4814 <        final Action<U> action;
4814 >        final Action<? super U> action;
4815          ForEachTransformedKeyTask
4816 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
4817 <             ForEachTransformedKeyTask<K,V,U> nextTask,
4818 <             Fun<? super K, ? extends U> transformer,
4819 <             Action<U> action) {
4820 <            super(m, p, b, nextTask);
4821 <            this.transformer = transformer;
4822 <            this.action = action;
4823 <
4824 <        }
4825 <        @SuppressWarnings("unchecked") public final boolean exec() {
4826 <            final Fun<? super K, ? extends U> transformer =
4827 <                this.transformer;
4828 <            final Action<U> action = this.action;
4829 <            if (transformer == null || action == null)
4830 <                return abortOnNullFunction();
4831 <            ForEachTransformedKeyTask<K,V,U> subtasks = null;
4832 <            try {
4833 <                int b = batch(), c;
4834 <                while (b > 1 && baseIndex != baseLimit) {
4835 <                    do {} while (!casPending(c = pending, c+1));
5208 <                    (subtasks = new ForEachTransformedKeyTask<K,V,U>
5209 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5210 <                }
5211 <                U u;
5212 <                while (advance() != null) {
5213 <                    if ((u = transformer.apply((K)nextKey)) != null)
4816 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
4817 >             Fun<? super K, ? extends U> transformer, Action<? super U> action) {
4818 >            super(p, b, i, f, t);
4819 >            this.transformer = transformer; this.action = action;
4820 >        }
4821 >        public final void compute() {
4822 >            final Fun<? super K, ? extends U> transformer;
4823 >            final Action<? super U> action;
4824 >            if ((transformer = this.transformer) != null &&
4825 >                (action = this.action) != null) {
4826 >                for (int i = baseIndex, f, h; batch > 0 &&
4827 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
4828 >                    addToPendingCount(1);
4829 >                    new ForEachTransformedKeyTask<K,V,U>
4830 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
4831 >                         transformer, action).fork();
4832 >                }
4833 >                for (Node<K,V> p; (p = advance()) != null; ) {
4834 >                    U u;
4835 >                    if ((u = transformer.apply(p.key)) != null)
4836                          action.apply(u);
4837                  }
4838 <            } catch (Throwable ex) {
5217 <                return tryCompleteComputation(ex);
4838 >                propagateCompletion();
4839              }
5219            tryComplete(subtasks);
5220            return false;
4840          }
4841      }
4842  
4843 <    @SuppressWarnings("serial") static final class ForEachTransformedValueTask<K,V,U>
4844 <        extends BulkAction<K,V,Void> {
4843 >    @SuppressWarnings("serial")
4844 >    static final class ForEachTransformedValueTask<K,V,U>
4845 >        extends BulkTask<K,V,Void> {
4846          final Fun<? super V, ? extends U> transformer;
4847 <        final Action<U> action;
4847 >        final Action<? super U> action;
4848          ForEachTransformedValueTask
4849 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
4850 <             ForEachTransformedValueTask<K,V,U> nextTask,
4851 <             Fun<? super V, ? extends U> transformer,
4852 <             Action<U> action) {
4853 <            super(m, p, b, nextTask);
4854 <            this.transformer = transformer;
4855 <            this.action = action;
4856 <
4857 <        }
4858 <        @SuppressWarnings("unchecked") public final boolean exec() {
4859 <            final Fun<? super V, ? extends U> transformer =
4860 <                this.transformer;
4861 <            final Action<U> action = this.action;
4862 <            if (transformer == null || action == null)
4863 <                return abortOnNullFunction();
4864 <            ForEachTransformedValueTask<K,V,U> subtasks = null;
4865 <            try {
4866 <                int b = batch(), c;
4867 <                while (b > 1 && baseIndex != baseLimit) {
4868 <                    do {} while (!casPending(c = pending, c+1));
5249 <                    (subtasks = new ForEachTransformedValueTask<K,V,U>
5250 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5251 <                }
5252 <                Object v; U u;
5253 <                while ((v = advance()) != null) {
5254 <                    if ((u = transformer.apply((V)v)) != null)
4849 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
4850 >             Fun<? super V, ? extends U> transformer, Action<? super U> action) {
4851 >            super(p, b, i, f, t);
4852 >            this.transformer = transformer; this.action = action;
4853 >        }
4854 >        public final void compute() {
4855 >            final Fun<? super V, ? extends U> transformer;
4856 >            final Action<? super U> action;
4857 >            if ((transformer = this.transformer) != null &&
4858 >                (action = this.action) != null) {
4859 >                for (int i = baseIndex, f, h; batch > 0 &&
4860 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
4861 >                    addToPendingCount(1);
4862 >                    new ForEachTransformedValueTask<K,V,U>
4863 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
4864 >                         transformer, action).fork();
4865 >                }
4866 >                for (Node<K,V> p; (p = advance()) != null; ) {
4867 >                    U u;
4868 >                    if ((u = transformer.apply(p.val)) != null)
4869                          action.apply(u);
4870                  }
4871 <            } catch (Throwable ex) {
5258 <                return tryCompleteComputation(ex);
4871 >                propagateCompletion();
4872              }
5260            tryComplete(subtasks);
5261            return false;
4873          }
4874      }
4875  
4876 <    @SuppressWarnings("serial") static final class ForEachTransformedEntryTask<K,V,U>
4877 <        extends BulkAction<K,V,Void> {
4876 >    @SuppressWarnings("serial")
4877 >    static final class ForEachTransformedEntryTask<K,V,U>
4878 >        extends BulkTask<K,V,Void> {
4879          final Fun<Map.Entry<K,V>, ? extends U> transformer;
4880 <        final Action<U> action;
4880 >        final Action<? super U> action;
4881          ForEachTransformedEntryTask
4882 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
4883 <             ForEachTransformedEntryTask<K,V,U> nextTask,
4884 <             Fun<Map.Entry<K,V>, ? extends U> transformer,
4885 <             Action<U> action) {
4886 <            super(m, p, b, nextTask);
4887 <            this.transformer = transformer;
4888 <            this.action = action;
4889 <
4890 <        }
4891 <        @SuppressWarnings("unchecked") public final boolean exec() {
4892 <            final Fun<Map.Entry<K,V>, ? extends U> transformer =
4893 <                this.transformer;
4894 <            final Action<U> action = this.action;
4895 <            if (transformer == null || action == null)
4896 <                return abortOnNullFunction();
4897 <            ForEachTransformedEntryTask<K,V,U> subtasks = null;
4898 <            try {
4899 <                int b = batch(), c;
4900 <                while (b > 1 && baseIndex != baseLimit) {
4901 <                    do {} while (!casPending(c = pending, c+1));
5290 <                    (subtasks = new ForEachTransformedEntryTask<K,V,U>
5291 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5292 <                }
5293 <                Object v; U u;
5294 <                while ((v = advance()) != null) {
5295 <                    if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
4882 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
4883 >             Fun<Map.Entry<K,V>, ? extends U> transformer, Action<? super U> action) {
4884 >            super(p, b, i, f, t);
4885 >            this.transformer = transformer; this.action = action;
4886 >        }
4887 >        public final void compute() {
4888 >            final Fun<Map.Entry<K,V>, ? extends U> transformer;
4889 >            final Action<? super U> action;
4890 >            if ((transformer = this.transformer) != null &&
4891 >                (action = this.action) != null) {
4892 >                for (int i = baseIndex, f, h; batch > 0 &&
4893 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
4894 >                    addToPendingCount(1);
4895 >                    new ForEachTransformedEntryTask<K,V,U>
4896 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
4897 >                         transformer, action).fork();
4898 >                }
4899 >                for (Node<K,V> p; (p = advance()) != null; ) {
4900 >                    U u;
4901 >                    if ((u = transformer.apply(p)) != null)
4902                          action.apply(u);
4903                  }
4904 <            } catch (Throwable ex) {
5299 <                return tryCompleteComputation(ex);
4904 >                propagateCompletion();
4905              }
5301            tryComplete(subtasks);
5302            return false;
4906          }
4907      }
4908  
4909 <    @SuppressWarnings("serial") static final class ForEachTransformedMappingTask<K,V,U>
4910 <        extends BulkAction<K,V,Void> {
4909 >    @SuppressWarnings("serial")
4910 >    static final class ForEachTransformedMappingTask<K,V,U>
4911 >        extends BulkTask<K,V,Void> {
4912          final BiFun<? super K, ? super V, ? extends U> transformer;
4913 <        final Action<U> action;
4913 >        final Action<? super U> action;
4914          ForEachTransformedMappingTask
4915 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5312 <             ForEachTransformedMappingTask<K,V,U> nextTask,
4915 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
4916               BiFun<? super K, ? super V, ? extends U> transformer,
4917 <             Action<U> action) {
4918 <            super(m, p, b, nextTask);
4919 <            this.transformer = transformer;
4920 <            this.action = action;
4921 <
4922 <        }
4923 <        @SuppressWarnings("unchecked") public final boolean exec() {
4924 <            final BiFun<? super K, ? super V, ? extends U> transformer =
4925 <                this.transformer;
4926 <            final Action<U> action = this.action;
4927 <            if (transformer == null || action == null)
4928 <                return abortOnNullFunction();
4929 <            ForEachTransformedMappingTask<K,V,U> subtasks = null;
4930 <            try {
4931 <                int b = batch(), c;
4932 <                while (b > 1 && baseIndex != baseLimit) {
4933 <                    do {} while (!casPending(c = pending, c+1));
4934 <                    (subtasks = new ForEachTransformedMappingTask<K,V,U>
4935 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5333 <                }
5334 <                Object v; U u;
5335 <                while ((v = advance()) != null) {
5336 <                    if ((u = transformer.apply((K)nextKey, (V)v)) != null)
4917 >             Action<? super U> action) {
4918 >            super(p, b, i, f, t);
4919 >            this.transformer = transformer; this.action = action;
4920 >        }
4921 >        public final void compute() {
4922 >            final BiFun<? super K, ? super V, ? extends U> transformer;
4923 >            final Action<? super U> action;
4924 >            if ((transformer = this.transformer) != null &&
4925 >                (action = this.action) != null) {
4926 >                for (int i = baseIndex, f, h; batch > 0 &&
4927 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
4928 >                    addToPendingCount(1);
4929 >                    new ForEachTransformedMappingTask<K,V,U>
4930 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
4931 >                         transformer, action).fork();
4932 >                }
4933 >                for (Node<K,V> p; (p = advance()) != null; ) {
4934 >                    U u;
4935 >                    if ((u = transformer.apply(p.key, p.val)) != null)
4936                          action.apply(u);
4937                  }
4938 <            } catch (Throwable ex) {
5340 <                return tryCompleteComputation(ex);
4938 >                propagateCompletion();
4939              }
5342            tryComplete(subtasks);
5343            return false;
4940          }
4941      }
4942  
4943 <    @SuppressWarnings("serial") static final class SearchKeysTask<K,V,U>
4944 <        extends BulkAction<K,V,U> {
4943 >    @SuppressWarnings("serial")
4944 >    static final class SearchKeysTask<K,V,U>
4945 >        extends BulkTask<K,V,U> {
4946          final Fun<? super K, ? extends U> searchFunction;
4947          final AtomicReference<U> result;
4948          SearchKeysTask
4949 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5353 <             SearchKeysTask<K,V,U> nextTask,
4949 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
4950               Fun<? super K, ? extends U> searchFunction,
4951               AtomicReference<U> result) {
4952 <            super(m, p, b, nextTask);
4952 >            super(p, b, i, f, t);
4953              this.searchFunction = searchFunction; this.result = result;
4954          }
4955 <        @SuppressWarnings("unchecked") public final boolean exec() {
4956 <            AtomicReference<U> result = this.result;
4957 <            final Fun<? super K, ? extends U> searchFunction =
4958 <                this.searchFunction;
4959 <            if (searchFunction == null || result == null)
4960 <                return abortOnNullFunction();
4961 <            SearchKeysTask<K,V,U> subtasks = null;
4962 <            try {
4963 <                int b = batch(), c;
4964 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
4965 <                    do {} while (!casPending(c = pending, c+1));
4966 <                    (subtasks = new SearchKeysTask<K,V,U>
4967 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
4968 <                }
4969 <                U u;
4970 <                while (result.get() == null && advance() != null) {
4971 <                    if ((u = searchFunction.apply((K)nextKey)) != null) {
4955 >        public final U getRawResult() { return result.get(); }
4956 >        public final void compute() {
4957 >            final Fun<? super K, ? extends U> searchFunction;
4958 >            final AtomicReference<U> result;
4959 >            if ((searchFunction = this.searchFunction) != null &&
4960 >                (result = this.result) != null) {
4961 >                for (int i = baseIndex, f, h; batch > 0 &&
4962 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
4963 >                    if (result.get() != null)
4964 >                        return;
4965 >                    addToPendingCount(1);
4966 >                    new SearchKeysTask<K,V,U>
4967 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
4968 >                         searchFunction, result).fork();
4969 >                }
4970 >                while (result.get() == null) {
4971 >                    U u;
4972 >                    Node<K,V> p;
4973 >                    if ((p = advance()) == null) {
4974 >                        propagateCompletion();
4975 >                        break;
4976 >                    }
4977 >                    if ((u = searchFunction.apply(p.key)) != null) {
4978                          if (result.compareAndSet(null, u))
4979 <                            tryCompleteComputation(null);
4979 >                            quietlyCompleteRoot();
4980                          break;
4981                      }
4982                  }
5381            } catch (Throwable ex) {
5382                return tryCompleteComputation(ex);
4983              }
5384            tryComplete(subtasks);
5385            return false;
4984          }
5387        public final U getRawResult() { return result.get(); }
4985      }
4986  
4987 <    @SuppressWarnings("serial") static final class SearchValuesTask<K,V,U>
4988 <        extends BulkAction<K,V,U> {
4987 >    @SuppressWarnings("serial")
4988 >    static final class SearchValuesTask<K,V,U>
4989 >        extends BulkTask<K,V,U> {
4990          final Fun<? super V, ? extends U> searchFunction;
4991          final AtomicReference<U> result;
4992          SearchValuesTask
4993 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5396 <             SearchValuesTask<K,V,U> nextTask,
4993 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
4994               Fun<? super V, ? extends U> searchFunction,
4995               AtomicReference<U> result) {
4996 <            super(m, p, b, nextTask);
4996 >            super(p, b, i, f, t);
4997              this.searchFunction = searchFunction; this.result = result;
4998          }
4999 <        @SuppressWarnings("unchecked") public final boolean exec() {
5000 <            AtomicReference<U> result = this.result;
5001 <            final Fun<? super V, ? extends U> searchFunction =
5002 <                this.searchFunction;
5003 <            if (searchFunction == null || result == null)
5004 <                return abortOnNullFunction();
5005 <            SearchValuesTask<K,V,U> subtasks = null;
5006 <            try {
5007 <                int b = batch(), c;
5008 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5009 <                    do {} while (!casPending(c = pending, c+1));
5010 <                    (subtasks = new SearchValuesTask<K,V,U>
5011 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5012 <                }
5013 <                Object v; U u;
5014 <                while (result.get() == null && (v = advance()) != null) {
5015 <                    if ((u = searchFunction.apply((V)v)) != null) {
4999 >        public final U getRawResult() { return result.get(); }
5000 >        public final void compute() {
5001 >            final Fun<? super V, ? extends U> searchFunction;
5002 >            final AtomicReference<U> result;
5003 >            if ((searchFunction = this.searchFunction) != null &&
5004 >                (result = this.result) != null) {
5005 >                for (int i = baseIndex, f, h; batch > 0 &&
5006 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5007 >                    if (result.get() != null)
5008 >                        return;
5009 >                    addToPendingCount(1);
5010 >                    new SearchValuesTask<K,V,U>
5011 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
5012 >                         searchFunction, result).fork();
5013 >                }
5014 >                while (result.get() == null) {
5015 >                    U u;
5016 >                    Node<K,V> p;
5017 >                    if ((p = advance()) == null) {
5018 >                        propagateCompletion();
5019 >                        break;
5020 >                    }
5021 >                    if ((u = searchFunction.apply(p.val)) != null) {
5022                          if (result.compareAndSet(null, u))
5023 <                            tryCompleteComputation(null);
5023 >                            quietlyCompleteRoot();
5024                          break;
5025                      }
5026                  }
5424            } catch (Throwable ex) {
5425                return tryCompleteComputation(ex);
5027              }
5427            tryComplete(subtasks);
5428            return false;
5028          }
5430        public final U getRawResult() { return result.get(); }
5029      }
5030  
5031 <    @SuppressWarnings("serial") static final class SearchEntriesTask<K,V,U>
5032 <        extends BulkAction<K,V,U> {
5031 >    @SuppressWarnings("serial")
5032 >    static final class SearchEntriesTask<K,V,U>
5033 >        extends BulkTask<K,V,U> {
5034          final Fun<Entry<K,V>, ? extends U> searchFunction;
5035          final AtomicReference<U> result;
5036          SearchEntriesTask
5037 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5439 <             SearchEntriesTask<K,V,U> nextTask,
5037 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5038               Fun<Entry<K,V>, ? extends U> searchFunction,
5039               AtomicReference<U> result) {
5040 <            super(m, p, b, nextTask);
5040 >            super(p, b, i, f, t);
5041              this.searchFunction = searchFunction; this.result = result;
5042          }
5043 <        @SuppressWarnings("unchecked") public final boolean exec() {
5044 <            AtomicReference<U> result = this.result;
5045 <            final Fun<Entry<K,V>, ? extends U> searchFunction =
5046 <                this.searchFunction;
5047 <            if (searchFunction == null || result == null)
5048 <                return abortOnNullFunction();
5049 <            SearchEntriesTask<K,V,U> subtasks = null;
5050 <            try {
5051 <                int b = batch(), c;
5052 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5053 <                    do {} while (!casPending(c = pending, c+1));
5054 <                    (subtasks = new SearchEntriesTask<K,V,U>
5055 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5056 <                }
5057 <                Object v; U u;
5058 <                while (result.get() == null && (v = advance()) != null) {
5059 <                    if ((u = searchFunction.apply(entryFor((K)nextKey, (V)v))) != null) {
5060 <                        if (result.compareAndSet(null, u))
5061 <                            tryCompleteComputation(null);
5043 >        public final U getRawResult() { return result.get(); }
5044 >        public final void compute() {
5045 >            final Fun<Entry<K,V>, ? extends U> searchFunction;
5046 >            final AtomicReference<U> result;
5047 >            if ((searchFunction = this.searchFunction) != null &&
5048 >                (result = this.result) != null) {
5049 >                for (int i = baseIndex, f, h; batch > 0 &&
5050 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5051 >                    if (result.get() != null)
5052 >                        return;
5053 >                    addToPendingCount(1);
5054 >                    new SearchEntriesTask<K,V,U>
5055 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
5056 >                         searchFunction, result).fork();
5057 >                }
5058 >                while (result.get() == null) {
5059 >                    U u;
5060 >                    Node<K,V> p;
5061 >                    if ((p = advance()) == null) {
5062 >                        propagateCompletion();
5063                          break;
5064                      }
5065 +                    if ((u = searchFunction.apply(p)) != null) {
5066 +                        if (result.compareAndSet(null, u))
5067 +                            quietlyCompleteRoot();
5068 +                        return;
5069 +                    }
5070                  }
5467            } catch (Throwable ex) {
5468                return tryCompleteComputation(ex);
5071              }
5470            tryComplete(subtasks);
5471            return false;
5072          }
5473        public final U getRawResult() { return result.get(); }
5073      }
5074  
5075 <    @SuppressWarnings("serial") static final class SearchMappingsTask<K,V,U>
5076 <        extends BulkAction<K,V,U> {
5075 >    @SuppressWarnings("serial")
5076 >    static final class SearchMappingsTask<K,V,U>
5077 >        extends BulkTask<K,V,U> {
5078          final BiFun<? super K, ? super V, ? extends U> searchFunction;
5079          final AtomicReference<U> result;
5080          SearchMappingsTask
5081 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5482 <             SearchMappingsTask<K,V,U> nextTask,
5081 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5082               BiFun<? super K, ? super V, ? extends U> searchFunction,
5083               AtomicReference<U> result) {
5084 <            super(m, p, b, nextTask);
5084 >            super(p, b, i, f, t);
5085              this.searchFunction = searchFunction; this.result = result;
5086          }
5087 <        @SuppressWarnings("unchecked") public final boolean exec() {
5088 <            AtomicReference<U> result = this.result;
5089 <            final BiFun<? super K, ? super V, ? extends U> searchFunction =
5090 <                this.searchFunction;
5091 <            if (searchFunction == null || result == null)
5092 <                return abortOnNullFunction();
5093 <            SearchMappingsTask<K,V,U> subtasks = null;
5094 <            try {
5095 <                int b = batch(), c;
5096 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5097 <                    do {} while (!casPending(c = pending, c+1));
5098 <                    (subtasks = new SearchMappingsTask<K,V,U>
5099 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5100 <                }
5101 <                Object v; U u;
5102 <                while (result.get() == null && (v = advance()) != null) {
5103 <                    if ((u = searchFunction.apply((K)nextKey, (V)v)) != null) {
5087 >        public final U getRawResult() { return result.get(); }
5088 >        public final void compute() {
5089 >            final BiFun<? super K, ? super V, ? extends U> searchFunction;
5090 >            final AtomicReference<U> result;
5091 >            if ((searchFunction = this.searchFunction) != null &&
5092 >                (result = this.result) != null) {
5093 >                for (int i = baseIndex, f, h; batch > 0 &&
5094 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5095 >                    if (result.get() != null)
5096 >                        return;
5097 >                    addToPendingCount(1);
5098 >                    new SearchMappingsTask<K,V,U>
5099 >                        (this, batch >>>= 1, baseLimit = h, f, tab,
5100 >                         searchFunction, result).fork();
5101 >                }
5102 >                while (result.get() == null) {
5103 >                    U u;
5104 >                    Node<K,V> p;
5105 >                    if ((p = advance()) == null) {
5106 >                        propagateCompletion();
5107 >                        break;
5108 >                    }
5109 >                    if ((u = searchFunction.apply(p.key, p.val)) != null) {
5110                          if (result.compareAndSet(null, u))
5111 <                            tryCompleteComputation(null);
5111 >                            quietlyCompleteRoot();
5112                          break;
5113                      }
5114                  }
5510            } catch (Throwable ex) {
5511                return tryCompleteComputation(ex);
5115              }
5513            tryComplete(subtasks);
5514            return false;
5116          }
5516        public final U getRawResult() { return result.get(); }
5117      }
5118  
5119 <    @SuppressWarnings("serial") static final class ReduceKeysTask<K,V>
5119 >    @SuppressWarnings("serial")
5120 >    static final class ReduceKeysTask<K,V>
5121          extends BulkTask<K,V,K> {
5122          final BiFun<? super K, ? super K, ? extends K> reducer;
5123          K result;
5124          ReduceKeysTask<K,V> rights, nextRight;
5125          ReduceKeysTask
5126 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5126 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5127               ReduceKeysTask<K,V> nextRight,
5128               BiFun<? super K, ? super K, ? extends K> reducer) {
5129 <            super(m, p, b); this.nextRight = nextRight;
5129 >            super(p, b, i, f, t); this.nextRight = nextRight;
5130              this.reducer = reducer;
5131          }
5132 <        @SuppressWarnings("unchecked") public final boolean exec() {
5133 <            final BiFun<? super K, ? super K, ? extends K> reducer =
5134 <                this.reducer;
5135 <            if (reducer == null)
5136 <                return abortOnNullFunction();
5137 <            try {
5138 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5538 <                    do {} while (!casPending(c = pending, c+1));
5132 >        public final K getRawResult() { return result; }
5133 >        public final void compute() {
5134 >            final BiFun<? super K, ? super K, ? extends K> reducer;
5135 >            if ((reducer = this.reducer) != null) {
5136 >                for (int i = baseIndex, f, h; batch > 0 &&
5137 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5138 >                    addToPendingCount(1);
5139                      (rights = new ReduceKeysTask<K,V>
5140 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5140 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5141 >                      rights, reducer)).fork();
5142                  }
5143                  K r = null;
5144 <                while (advance() != null) {
5145 <                    K u = (K)nextKey;
5146 <                    r = (r == null) ? u : reducer.apply(r, u);
5144 >                for (Node<K,V> p; (p = advance()) != null; ) {
5145 >                    K u = p.key;
5146 >                    r = (r == null) ? u : u == null ? r : reducer.apply(r, u);
5147                  }
5148                  result = r;
5149 <                for (ReduceKeysTask<K,V> t = this, s;;) {
5150 <                    int c; BulkTask<K,V,?> par; K tr, sr;
5151 <                    if ((c = t.pending) == 0) {
5152 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5153 <                            if ((sr = s.result) != null)
5154 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5155 <                        }
5156 <                        if ((par = t.parent) == null ||
5157 <                            !(par instanceof ReduceKeysTask)) {
5158 <                            t.quietlyComplete();
5159 <                            break;
5559 <                        }
5560 <                        t = (ReduceKeysTask<K,V>)par;
5149 >                CountedCompleter<?> c;
5150 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5151 >                    @SuppressWarnings("unchecked") ReduceKeysTask<K,V>
5152 >                        t = (ReduceKeysTask<K,V>)c,
5153 >                        s = t.rights;
5154 >                    while (s != null) {
5155 >                        K tr, sr;
5156 >                        if ((sr = s.result) != null)
5157 >                            t.result = (((tr = t.result) == null) ? sr :
5158 >                                        reducer.apply(tr, sr));
5159 >                        s = t.rights = s.nextRight;
5160                      }
5562                    else if (t.casPending(c, c - 1))
5563                        break;
5161                  }
5565            } catch (Throwable ex) {
5566                return tryCompleteComputation(ex);
5162              }
5568            ReduceKeysTask<K,V> s = rights;
5569            if (s != null && !inForkJoinPool()) {
5570                do  {
5571                    if (s.tryUnfork())
5572                        s.exec();
5573                } while ((s = s.nextRight) != null);
5574            }
5575            return false;
5163          }
5577        public final K getRawResult() { return result; }
5164      }
5165  
5166 <    @SuppressWarnings("serial") static final class ReduceValuesTask<K,V>
5166 >    @SuppressWarnings("serial")
5167 >    static final class ReduceValuesTask<K,V>
5168          extends BulkTask<K,V,V> {
5169          final BiFun<? super V, ? super V, ? extends V> reducer;
5170          V result;
5171          ReduceValuesTask<K,V> rights, nextRight;
5172          ReduceValuesTask
5173 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5173 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5174               ReduceValuesTask<K,V> nextRight,
5175               BiFun<? super V, ? super V, ? extends V> reducer) {
5176 <            super(m, p, b); this.nextRight = nextRight;
5176 >            super(p, b, i, f, t); this.nextRight = nextRight;
5177              this.reducer = reducer;
5178          }
5179 <        @SuppressWarnings("unchecked") public final boolean exec() {
5180 <            final BiFun<? super V, ? super V, ? extends V> reducer =
5181 <                this.reducer;
5182 <            if (reducer == null)
5183 <                return abortOnNullFunction();
5184 <            try {
5185 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5599 <                    do {} while (!casPending(c = pending, c+1));
5179 >        public final V getRawResult() { return result; }
5180 >        public final void compute() {
5181 >            final BiFun<? super V, ? super V, ? extends V> reducer;
5182 >            if ((reducer = this.reducer) != null) {
5183 >                for (int i = baseIndex, f, h; batch > 0 &&
5184 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5185 >                    addToPendingCount(1);
5186                      (rights = new ReduceValuesTask<K,V>
5187 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5187 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5188 >                      rights, reducer)).fork();
5189                  }
5190                  V r = null;
5191 <                Object v;
5192 <                while ((v = advance()) != null) {
5193 <                    V u = (V)v;
5607 <                    r = (r == null) ? u : reducer.apply(r, u);
5191 >                for (Node<K,V> p; (p = advance()) != null; ) {
5192 >                    V v = p.val;
5193 >                    r = (r == null) ? v : reducer.apply(r, v);
5194                  }
5195                  result = r;
5196 <                for (ReduceValuesTask<K,V> t = this, s;;) {
5197 <                    int c; BulkTask<K,V,?> par; V tr, sr;
5198 <                    if ((c = t.pending) == 0) {
5199 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5200 <                            if ((sr = s.result) != null)
5201 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5202 <                        }
5203 <                        if ((par = t.parent) == null ||
5204 <                            !(par instanceof ReduceValuesTask)) {
5205 <                            t.quietlyComplete();
5206 <                            break;
5621 <                        }
5622 <                        t = (ReduceValuesTask<K,V>)par;
5196 >                CountedCompleter<?> c;
5197 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5198 >                    @SuppressWarnings("unchecked") ReduceValuesTask<K,V>
5199 >                        t = (ReduceValuesTask<K,V>)c,
5200 >                        s = t.rights;
5201 >                    while (s != null) {
5202 >                        V tr, sr;
5203 >                        if ((sr = s.result) != null)
5204 >                            t.result = (((tr = t.result) == null) ? sr :
5205 >                                        reducer.apply(tr, sr));
5206 >                        s = t.rights = s.nextRight;
5207                      }
5624                    else if (t.casPending(c, c - 1))
5625                        break;
5208                  }
5627            } catch (Throwable ex) {
5628                return tryCompleteComputation(ex);
5629            }
5630            ReduceValuesTask<K,V> s = rights;
5631            if (s != null && !inForkJoinPool()) {
5632                do  {
5633                    if (s.tryUnfork())
5634                        s.exec();
5635                } while ((s = s.nextRight) != null);
5209              }
5637            return false;
5210          }
5639        public final V getRawResult() { return result; }
5211      }
5212  
5213 <    @SuppressWarnings("serial") static final class ReduceEntriesTask<K,V>
5213 >    @SuppressWarnings("serial")
5214 >    static final class ReduceEntriesTask<K,V>
5215          extends BulkTask<K,V,Map.Entry<K,V>> {
5216          final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer;
5217          Map.Entry<K,V> result;
5218          ReduceEntriesTask<K,V> rights, nextRight;
5219          ReduceEntriesTask
5220 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5220 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5221               ReduceEntriesTask<K,V> nextRight,
5222               BiFun<Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
5223 <            super(m, p, b); this.nextRight = nextRight;
5223 >            super(p, b, i, f, t); this.nextRight = nextRight;
5224              this.reducer = reducer;
5225          }
5226 <        @SuppressWarnings("unchecked") public final boolean exec() {
5227 <            final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer =
5228 <                this.reducer;
5229 <            if (reducer == null)
5230 <                return abortOnNullFunction();
5231 <            try {
5232 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5661 <                    do {} while (!casPending(c = pending, c+1));
5226 >        public final Map.Entry<K,V> getRawResult() { return result; }
5227 >        public final void compute() {
5228 >            final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer;
5229 >            if ((reducer = this.reducer) != null) {
5230 >                for (int i = baseIndex, f, h; batch > 0 &&
5231 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5232 >                    addToPendingCount(1);
5233                      (rights = new ReduceEntriesTask<K,V>
5234 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5234 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5235 >                      rights, reducer)).fork();
5236                  }
5237                  Map.Entry<K,V> r = null;
5238 <                Object v;
5239 <                while ((v = advance()) != null) {
5668 <                    Map.Entry<K,V> u = entryFor((K)nextKey, (V)v);
5669 <                    r = (r == null) ? u : reducer.apply(r, u);
5670 <                }
5238 >                for (Node<K,V> p; (p = advance()) != null; )
5239 >                    r = (r == null) ? p : reducer.apply(r, p);
5240                  result = r;
5241 <                for (ReduceEntriesTask<K,V> t = this, s;;) {
5242 <                    int c; BulkTask<K,V,?> par; Map.Entry<K,V> tr, sr;
5243 <                    if ((c = t.pending) == 0) {
5244 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5245 <                            if ((sr = s.result) != null)
5246 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5247 <                        }
5248 <                        if ((par = t.parent) == null ||
5249 <                            !(par instanceof ReduceEntriesTask)) {
5250 <                            t.quietlyComplete();
5251 <                            break;
5683 <                        }
5684 <                        t = (ReduceEntriesTask<K,V>)par;
5241 >                CountedCompleter<?> c;
5242 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5243 >                    @SuppressWarnings("unchecked") ReduceEntriesTask<K,V>
5244 >                        t = (ReduceEntriesTask<K,V>)c,
5245 >                        s = t.rights;
5246 >                    while (s != null) {
5247 >                        Map.Entry<K,V> tr, sr;
5248 >                        if ((sr = s.result) != null)
5249 >                            t.result = (((tr = t.result) == null) ? sr :
5250 >                                        reducer.apply(tr, sr));
5251 >                        s = t.rights = s.nextRight;
5252                      }
5686                    else if (t.casPending(c, c - 1))
5687                        break;
5253                  }
5689            } catch (Throwable ex) {
5690                return tryCompleteComputation(ex);
5691            }
5692            ReduceEntriesTask<K,V> s = rights;
5693            if (s != null && !inForkJoinPool()) {
5694                do  {
5695                    if (s.tryUnfork())
5696                        s.exec();
5697                } while ((s = s.nextRight) != null);
5254              }
5699            return false;
5255          }
5701        public final Map.Entry<K,V> getRawResult() { return result; }
5256      }
5257  
5258 <    @SuppressWarnings("serial") static final class MapReduceKeysTask<K,V,U>
5258 >    @SuppressWarnings("serial")
5259 >    static final class MapReduceKeysTask<K,V,U>
5260          extends BulkTask<K,V,U> {
5261          final Fun<? super K, ? extends U> transformer;
5262          final BiFun<? super U, ? super U, ? extends U> reducer;
5263          U result;
5264          MapReduceKeysTask<K,V,U> rights, nextRight;
5265          MapReduceKeysTask
5266 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5266 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5267               MapReduceKeysTask<K,V,U> nextRight,
5268               Fun<? super K, ? extends U> transformer,
5269               BiFun<? super U, ? super U, ? extends U> reducer) {
5270 <            super(m, p, b); this.nextRight = nextRight;
5270 >            super(p, b, i, f, t); this.nextRight = nextRight;
5271              this.transformer = transformer;
5272              this.reducer = reducer;
5273          }
5274 <        @SuppressWarnings("unchecked") public final boolean exec() {
5275 <            final Fun<? super K, ? extends U> transformer =
5276 <                this.transformer;
5277 <            final BiFun<? super U, ? super U, ? extends U> reducer =
5278 <                this.reducer;
5279 <            if (transformer == null || reducer == null)
5280 <                return abortOnNullFunction();
5281 <            try {
5282 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5728 <                    do {} while (!casPending(c = pending, c+1));
5274 >        public final U getRawResult() { return result; }
5275 >        public final void compute() {
5276 >            final Fun<? super K, ? extends U> transformer;
5277 >            final BiFun<? super U, ? super U, ? extends U> reducer;
5278 >            if ((transformer = this.transformer) != null &&
5279 >                (reducer = this.reducer) != null) {
5280 >                for (int i = baseIndex, f, h; batch > 0 &&
5281 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5282 >                    addToPendingCount(1);
5283                      (rights = new MapReduceKeysTask<K,V,U>
5284 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
5284 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5285 >                      rights, transformer, reducer)).fork();
5286                  }
5287 <                U r = null, u;
5288 <                while (advance() != null) {
5289 <                    if ((u = transformer.apply((K)nextKey)) != null)
5287 >                U r = null;
5288 >                for (Node<K,V> p; (p = advance()) != null; ) {
5289 >                    U u;
5290 >                    if ((u = transformer.apply(p.key)) != null)
5291                          r = (r == null) ? u : reducer.apply(r, u);
5292                  }
5293                  result = r;
5294 <                for (MapReduceKeysTask<K,V,U> t = this, s;;) {
5295 <                    int c; BulkTask<K,V,?> par; U tr, sr;
5296 <                    if ((c = t.pending) == 0) {
5297 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5298 <                            if ((sr = s.result) != null)
5299 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5300 <                        }
5301 <                        if ((par = t.parent) == null ||
5302 <                            !(par instanceof MapReduceKeysTask)) {
5303 <                            t.quietlyComplete();
5304 <                            break;
5749 <                        }
5750 <                        t = (MapReduceKeysTask<K,V,U>)par;
5294 >                CountedCompleter<?> c;
5295 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5296 >                    @SuppressWarnings("unchecked") MapReduceKeysTask<K,V,U>
5297 >                        t = (MapReduceKeysTask<K,V,U>)c,
5298 >                        s = t.rights;
5299 >                    while (s != null) {
5300 >                        U tr, sr;
5301 >                        if ((sr = s.result) != null)
5302 >                            t.result = (((tr = t.result) == null) ? sr :
5303 >                                        reducer.apply(tr, sr));
5304 >                        s = t.rights = s.nextRight;
5305                      }
5752                    else if (t.casPending(c, c - 1))
5753                        break;
5306                  }
5755            } catch (Throwable ex) {
5756                return tryCompleteComputation(ex);
5307              }
5758            MapReduceKeysTask<K,V,U> s = rights;
5759            if (s != null && !inForkJoinPool()) {
5760                do  {
5761                    if (s.tryUnfork())
5762                        s.exec();
5763                } while ((s = s.nextRight) != null);
5764            }
5765            return false;
5308          }
5767        public final U getRawResult() { return result; }
5309      }
5310  
5311 <    @SuppressWarnings("serial") static final class MapReduceValuesTask<K,V,U>
5311 >    @SuppressWarnings("serial")
5312 >    static final class MapReduceValuesTask<K,V,U>
5313          extends BulkTask<K,V,U> {
5314          final Fun<? super V, ? extends U> transformer;
5315          final BiFun<? super U, ? super U, ? extends U> reducer;
5316          U result;
5317          MapReduceValuesTask<K,V,U> rights, nextRight;
5318          MapReduceValuesTask
5319 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5319 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5320               MapReduceValuesTask<K,V,U> nextRight,
5321               Fun<? super V, ? extends U> transformer,
5322               BiFun<? super U, ? super U, ? extends U> reducer) {
5323 <            super(m, p, b); this.nextRight = nextRight;
5323 >            super(p, b, i, f, t); this.nextRight = nextRight;
5324              this.transformer = transformer;
5325              this.reducer = reducer;
5326          }
5327 <        @SuppressWarnings("unchecked") public final boolean exec() {
5328 <            final Fun<? super V, ? extends U> transformer =
5329 <                this.transformer;
5330 <            final BiFun<? super U, ? super U, ? extends U> reducer =
5331 <                this.reducer;
5332 <            if (transformer == null || reducer == null)
5333 <                return abortOnNullFunction();
5334 <            try {
5335 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5794 <                    do {} while (!casPending(c = pending, c+1));
5327 >        public final U getRawResult() { return result; }
5328 >        public final void compute() {
5329 >            final Fun<? super V, ? extends U> transformer;
5330 >            final BiFun<? super U, ? super U, ? extends U> reducer;
5331 >            if ((transformer = this.transformer) != null &&
5332 >                (reducer = this.reducer) != null) {
5333 >                for (int i = baseIndex, f, h; batch > 0 &&
5334 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5335 >                    addToPendingCount(1);
5336                      (rights = new MapReduceValuesTask<K,V,U>
5337 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
5337 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5338 >                      rights, transformer, reducer)).fork();
5339                  }
5340 <                U r = null, u;
5341 <                Object v;
5342 <                while ((v = advance()) != null) {
5343 <                    if ((u = transformer.apply((V)v)) != null)
5340 >                U r = null;
5341 >                for (Node<K,V> p; (p = advance()) != null; ) {
5342 >                    U u;
5343 >                    if ((u = transformer.apply(p.val)) != null)
5344                          r = (r == null) ? u : reducer.apply(r, u);
5345                  }
5346                  result = r;
5347 <                for (MapReduceValuesTask<K,V,U> t = this, s;;) {
5348 <                    int c; BulkTask<K,V,?> par; U tr, sr;
5349 <                    if ((c = t.pending) == 0) {
5350 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5351 <                            if ((sr = s.result) != null)
5352 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5353 <                        }
5354 <                        if ((par = t.parent) == null ||
5355 <                            !(par instanceof MapReduceValuesTask)) {
5356 <                            t.quietlyComplete();
5357 <                            break;
5816 <                        }
5817 <                        t = (MapReduceValuesTask<K,V,U>)par;
5347 >                CountedCompleter<?> c;
5348 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5349 >                    @SuppressWarnings("unchecked") MapReduceValuesTask<K,V,U>
5350 >                        t = (MapReduceValuesTask<K,V,U>)c,
5351 >                        s = t.rights;
5352 >                    while (s != null) {
5353 >                        U tr, sr;
5354 >                        if ((sr = s.result) != null)
5355 >                            t.result = (((tr = t.result) == null) ? sr :
5356 >                                        reducer.apply(tr, sr));
5357 >                        s = t.rights = s.nextRight;
5358                      }
5819                    else if (t.casPending(c, c - 1))
5820                        break;
5359                  }
5822            } catch (Throwable ex) {
5823                return tryCompleteComputation(ex);
5824            }
5825            MapReduceValuesTask<K,V,U> s = rights;
5826            if (s != null && !inForkJoinPool()) {
5827                do  {
5828                    if (s.tryUnfork())
5829                        s.exec();
5830                } while ((s = s.nextRight) != null);
5360              }
5832            return false;
5361          }
5834        public final U getRawResult() { return result; }
5362      }
5363  
5364 <    @SuppressWarnings("serial") static final class MapReduceEntriesTask<K,V,U>
5364 >    @SuppressWarnings("serial")
5365 >    static final class MapReduceEntriesTask<K,V,U>
5366          extends BulkTask<K,V,U> {
5367          final Fun<Map.Entry<K,V>, ? extends U> transformer;
5368          final BiFun<? super U, ? super U, ? extends U> reducer;
5369          U result;
5370          MapReduceEntriesTask<K,V,U> rights, nextRight;
5371          MapReduceEntriesTask
5372 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5372 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5373               MapReduceEntriesTask<K,V,U> nextRight,
5374               Fun<Map.Entry<K,V>, ? extends U> transformer,
5375               BiFun<? super U, ? super U, ? extends U> reducer) {
5376 <            super(m, p, b); this.nextRight = nextRight;
5376 >            super(p, b, i, f, t); this.nextRight = nextRight;
5377              this.transformer = transformer;
5378              this.reducer = reducer;
5379          }
5380 <        @SuppressWarnings("unchecked") public final boolean exec() {
5381 <            final Fun<Map.Entry<K,V>, ? extends U> transformer =
5382 <                this.transformer;
5383 <            final BiFun<? super U, ? super U, ? extends U> reducer =
5384 <                this.reducer;
5385 <            if (transformer == null || reducer == null)
5386 <                return abortOnNullFunction();
5387 <            try {
5388 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5861 <                    do {} while (!casPending(c = pending, c+1));
5380 >        public final U getRawResult() { return result; }
5381 >        public final void compute() {
5382 >            final Fun<Map.Entry<K,V>, ? extends U> transformer;
5383 >            final BiFun<? super U, ? super U, ? extends U> reducer;
5384 >            if ((transformer = this.transformer) != null &&
5385 >                (reducer = this.reducer) != null) {
5386 >                for (int i = baseIndex, f, h; batch > 0 &&
5387 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5388 >                    addToPendingCount(1);
5389                      (rights = new MapReduceEntriesTask<K,V,U>
5390 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
5390 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5391 >                      rights, transformer, reducer)).fork();
5392                  }
5393 <                U r = null, u;
5394 <                Object v;
5395 <                while ((v = advance()) != null) {
5396 <                    if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
5393 >                U r = null;
5394 >                for (Node<K,V> p; (p = advance()) != null; ) {
5395 >                    U u;
5396 >                    if ((u = transformer.apply(p)) != null)
5397                          r = (r == null) ? u : reducer.apply(r, u);
5398                  }
5399                  result = r;
5400 <                for (MapReduceEntriesTask<K,V,U> t = this, s;;) {
5401 <                    int c; BulkTask<K,V,?> par; U tr, sr;
5402 <                    if ((c = t.pending) == 0) {
5403 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5404 <                            if ((sr = s.result) != null)
5405 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5406 <                        }
5407 <                        if ((par = t.parent) == null ||
5408 <                            !(par instanceof MapReduceEntriesTask)) {
5409 <                            t.quietlyComplete();
5410 <                            break;
5883 <                        }
5884 <                        t = (MapReduceEntriesTask<K,V,U>)par;
5400 >                CountedCompleter<?> c;
5401 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5402 >                    @SuppressWarnings("unchecked") MapReduceEntriesTask<K,V,U>
5403 >                        t = (MapReduceEntriesTask<K,V,U>)c,
5404 >                        s = t.rights;
5405 >                    while (s != null) {
5406 >                        U tr, sr;
5407 >                        if ((sr = s.result) != null)
5408 >                            t.result = (((tr = t.result) == null) ? sr :
5409 >                                        reducer.apply(tr, sr));
5410 >                        s = t.rights = s.nextRight;
5411                      }
5886                    else if (t.casPending(c, c - 1))
5887                        break;
5412                  }
5889            } catch (Throwable ex) {
5890                return tryCompleteComputation(ex);
5891            }
5892            MapReduceEntriesTask<K,V,U> s = rights;
5893            if (s != null && !inForkJoinPool()) {
5894                do  {
5895                    if (s.tryUnfork())
5896                        s.exec();
5897                } while ((s = s.nextRight) != null);
5413              }
5899            return false;
5414          }
5901        public final U getRawResult() { return result; }
5415      }
5416  
5417 <    @SuppressWarnings("serial") static final class MapReduceMappingsTask<K,V,U>
5417 >    @SuppressWarnings("serial")
5418 >    static final class MapReduceMappingsTask<K,V,U>
5419          extends BulkTask<K,V,U> {
5420          final BiFun<? super K, ? super V, ? extends U> transformer;
5421          final BiFun<? super U, ? super U, ? extends U> reducer;
5422          U result;
5423          MapReduceMappingsTask<K,V,U> rights, nextRight;
5424          MapReduceMappingsTask
5425 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5425 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5426               MapReduceMappingsTask<K,V,U> nextRight,
5427               BiFun<? super K, ? super V, ? extends U> transformer,
5428               BiFun<? super U, ? super U, ? extends U> reducer) {
5429 <            super(m, p, b); this.nextRight = nextRight;
5429 >            super(p, b, i, f, t); this.nextRight = nextRight;
5430              this.transformer = transformer;
5431              this.reducer = reducer;
5432          }
5433 <        @SuppressWarnings("unchecked") public final boolean exec() {
5434 <            final BiFun<? super K, ? super V, ? extends U> transformer =
5435 <                this.transformer;
5436 <            final BiFun<? super U, ? super U, ? extends U> reducer =
5437 <                this.reducer;
5438 <            if (transformer == null || reducer == null)
5439 <                return abortOnNullFunction();
5440 <            try {
5441 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5928 <                    do {} while (!casPending(c = pending, c+1));
5433 >        public final U getRawResult() { return result; }
5434 >        public final void compute() {
5435 >            final BiFun<? super K, ? super V, ? extends U> transformer;
5436 >            final BiFun<? super U, ? super U, ? extends U> reducer;
5437 >            if ((transformer = this.transformer) != null &&
5438 >                (reducer = this.reducer) != null) {
5439 >                for (int i = baseIndex, f, h; batch > 0 &&
5440 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5441 >                    addToPendingCount(1);
5442                      (rights = new MapReduceMappingsTask<K,V,U>
5443 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
5443 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5444 >                      rights, transformer, reducer)).fork();
5445                  }
5446 <                U r = null, u;
5447 <                Object v;
5448 <                while ((v = advance()) != null) {
5449 <                    if ((u = transformer.apply((K)nextKey, (V)v)) != null)
5446 >                U r = null;
5447 >                for (Node<K,V> p; (p = advance()) != null; ) {
5448 >                    U u;
5449 >                    if ((u = transformer.apply(p.key, p.val)) != null)
5450                          r = (r == null) ? u : reducer.apply(r, u);
5451                  }
5452                  result = r;
5453 <                for (MapReduceMappingsTask<K,V,U> t = this, s;;) {
5454 <                    int c; BulkTask<K,V,?> par; U tr, sr;
5455 <                    if ((c = t.pending) == 0) {
5456 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5457 <                            if ((sr = s.result) != null)
5458 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5459 <                        }
5460 <                        if ((par = t.parent) == null ||
5461 <                            !(par instanceof MapReduceMappingsTask)) {
5462 <                            t.quietlyComplete();
5463 <                            break;
5950 <                        }
5951 <                        t = (MapReduceMappingsTask<K,V,U>)par;
5453 >                CountedCompleter<?> c;
5454 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5455 >                    @SuppressWarnings("unchecked") MapReduceMappingsTask<K,V,U>
5456 >                        t = (MapReduceMappingsTask<K,V,U>)c,
5457 >                        s = t.rights;
5458 >                    while (s != null) {
5459 >                        U tr, sr;
5460 >                        if ((sr = s.result) != null)
5461 >                            t.result = (((tr = t.result) == null) ? sr :
5462 >                                        reducer.apply(tr, sr));
5463 >                        s = t.rights = s.nextRight;
5464                      }
5953                    else if (t.casPending(c, c - 1))
5954                        break;
5465                  }
5956            } catch (Throwable ex) {
5957                return tryCompleteComputation(ex);
5958            }
5959            MapReduceMappingsTask<K,V,U> s = rights;
5960            if (s != null && !inForkJoinPool()) {
5961                do  {
5962                    if (s.tryUnfork())
5963                        s.exec();
5964                } while ((s = s.nextRight) != null);
5466              }
5966            return false;
5467          }
5968        public final U getRawResult() { return result; }
5468      }
5469  
5470 <    @SuppressWarnings("serial") static final class MapReduceKeysToDoubleTask<K,V>
5470 >    @SuppressWarnings("serial")
5471 >    static final class MapReduceKeysToDoubleTask<K,V>
5472          extends BulkTask<K,V,Double> {
5473          final ObjectToDouble<? super K> transformer;
5474          final DoubleByDoubleToDouble reducer;
# Line 5976 | Line 5476 | public class ConcurrentHashMapV8<K, V>
5476          double result;
5477          MapReduceKeysToDoubleTask<K,V> rights, nextRight;
5478          MapReduceKeysToDoubleTask
5479 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5479 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5480               MapReduceKeysToDoubleTask<K,V> nextRight,
5481               ObjectToDouble<? super K> transformer,
5482               double basis,
5483               DoubleByDoubleToDouble reducer) {
5484 <            super(m, p, b); this.nextRight = nextRight;
5484 >            super(p, b, i, f, t); this.nextRight = nextRight;
5485              this.transformer = transformer;
5486              this.basis = basis; this.reducer = reducer;
5487          }
5488 <        @SuppressWarnings("unchecked") public final boolean exec() {
5489 <            final ObjectToDouble<? super K> transformer =
5490 <                this.transformer;
5491 <            final DoubleByDoubleToDouble reducer = this.reducer;
5492 <            if (transformer == null || reducer == null)
5493 <                return abortOnNullFunction();
5494 <            try {
5495 <                final double id = this.basis;
5496 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5497 <                    do {} while (!casPending(c = pending, c+1));
5488 >        public final Double getRawResult() { return result; }
5489 >        public final void compute() {
5490 >            final ObjectToDouble<? super K> transformer;
5491 >            final DoubleByDoubleToDouble reducer;
5492 >            if ((transformer = this.transformer) != null &&
5493 >                (reducer = this.reducer) != null) {
5494 >                double r = this.basis;
5495 >                for (int i = baseIndex, f, h; batch > 0 &&
5496 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5497 >                    addToPendingCount(1);
5498                      (rights = new MapReduceKeysToDoubleTask<K,V>
5499 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5499 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5500 >                      rights, transformer, r, reducer)).fork();
5501                  }
5502 <                double r = id;
5503 <                while (advance() != null)
6003 <                    r = reducer.apply(r, transformer.apply((K)nextKey));
5502 >                for (Node<K,V> p; (p = advance()) != null; )
5503 >                    r = reducer.apply(r, transformer.apply(p.key));
5504                  result = r;
5505 <                for (MapReduceKeysToDoubleTask<K,V> t = this, s;;) {
5506 <                    int c; BulkTask<K,V,?> par;
5507 <                    if ((c = t.pending) == 0) {
5508 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5509 <                            t.result = reducer.apply(t.result, s.result);
5510 <                        }
5511 <                        if ((par = t.parent) == null ||
5512 <                            !(par instanceof MapReduceKeysToDoubleTask)) {
6013 <                            t.quietlyComplete();
6014 <                            break;
6015 <                        }
6016 <                        t = (MapReduceKeysToDoubleTask<K,V>)par;
5505 >                CountedCompleter<?> c;
5506 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5507 >                    @SuppressWarnings("unchecked") MapReduceKeysToDoubleTask<K,V>
5508 >                        t = (MapReduceKeysToDoubleTask<K,V>)c,
5509 >                        s = t.rights;
5510 >                    while (s != null) {
5511 >                        t.result = reducer.apply(t.result, s.result);
5512 >                        s = t.rights = s.nextRight;
5513                      }
6018                    else if (t.casPending(c, c - 1))
6019                        break;
5514                  }
6021            } catch (Throwable ex) {
6022                return tryCompleteComputation(ex);
5515              }
6024            MapReduceKeysToDoubleTask<K,V> s = rights;
6025            if (s != null && !inForkJoinPool()) {
6026                do  {
6027                    if (s.tryUnfork())
6028                        s.exec();
6029                } while ((s = s.nextRight) != null);
6030            }
6031            return false;
5516          }
6033        public final Double getRawResult() { return result; }
5517      }
5518  
5519 <    @SuppressWarnings("serial") static final class MapReduceValuesToDoubleTask<K,V>
5519 >    @SuppressWarnings("serial")
5520 >    static final class MapReduceValuesToDoubleTask<K,V>
5521          extends BulkTask<K,V,Double> {
5522          final ObjectToDouble<? super V> transformer;
5523          final DoubleByDoubleToDouble reducer;
# Line 6041 | Line 5525 | public class ConcurrentHashMapV8<K, V>
5525          double result;
5526          MapReduceValuesToDoubleTask<K,V> rights, nextRight;
5527          MapReduceValuesToDoubleTask
5528 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5528 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5529               MapReduceValuesToDoubleTask<K,V> nextRight,
5530               ObjectToDouble<? super V> transformer,
5531               double basis,
5532               DoubleByDoubleToDouble reducer) {
5533 <            super(m, p, b); this.nextRight = nextRight;
5533 >            super(p, b, i, f, t); this.nextRight = nextRight;
5534              this.transformer = transformer;
5535              this.basis = basis; this.reducer = reducer;
5536          }
5537 <        @SuppressWarnings("unchecked") public final boolean exec() {
5538 <            final ObjectToDouble<? super V> transformer =
5539 <                this.transformer;
5540 <            final DoubleByDoubleToDouble reducer = this.reducer;
5541 <            if (transformer == null || reducer == null)
5542 <                return abortOnNullFunction();
5543 <            try {
5544 <                final double id = this.basis;
5545 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5546 <                    do {} while (!casPending(c = pending, c+1));
5537 >        public final Double getRawResult() { return result; }
5538 >        public final void compute() {
5539 >            final ObjectToDouble<? super V> transformer;
5540 >            final DoubleByDoubleToDouble reducer;
5541 >            if ((transformer = this.transformer) != null &&
5542 >                (reducer = this.reducer) != null) {
5543 >                double r = this.basis;
5544 >                for (int i = baseIndex, f, h; batch > 0 &&
5545 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5546 >                    addToPendingCount(1);
5547                      (rights = new MapReduceValuesToDoubleTask<K,V>
5548 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5548 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5549 >                      rights, transformer, r, reducer)).fork();
5550                  }
5551 <                double r = id;
5552 <                Object v;
6068 <                while ((v = advance()) != null)
6069 <                    r = reducer.apply(r, transformer.apply((V)v));
5551 >                for (Node<K,V> p; (p = advance()) != null; )
5552 >                    r = reducer.apply(r, transformer.apply(p.val));
5553                  result = r;
5554 <                for (MapReduceValuesToDoubleTask<K,V> t = this, s;;) {
5555 <                    int c; BulkTask<K,V,?> par;
5556 <                    if ((c = t.pending) == 0) {
5557 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5558 <                            t.result = reducer.apply(t.result, s.result);
5559 <                        }
5560 <                        if ((par = t.parent) == null ||
5561 <                            !(par instanceof MapReduceValuesToDoubleTask)) {
6079 <                            t.quietlyComplete();
6080 <                            break;
6081 <                        }
6082 <                        t = (MapReduceValuesToDoubleTask<K,V>)par;
5554 >                CountedCompleter<?> c;
5555 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5556 >                    @SuppressWarnings("unchecked") MapReduceValuesToDoubleTask<K,V>
5557 >                        t = (MapReduceValuesToDoubleTask<K,V>)c,
5558 >                        s = t.rights;
5559 >                    while (s != null) {
5560 >                        t.result = reducer.apply(t.result, s.result);
5561 >                        s = t.rights = s.nextRight;
5562                      }
6084                    else if (t.casPending(c, c - 1))
6085                        break;
5563                  }
6087            } catch (Throwable ex) {
6088                return tryCompleteComputation(ex);
5564              }
6090            MapReduceValuesToDoubleTask<K,V> s = rights;
6091            if (s != null && !inForkJoinPool()) {
6092                do  {
6093                    if (s.tryUnfork())
6094                        s.exec();
6095                } while ((s = s.nextRight) != null);
6096            }
6097            return false;
5565          }
6099        public final Double getRawResult() { return result; }
5566      }
5567  
5568 <    @SuppressWarnings("serial") static final class MapReduceEntriesToDoubleTask<K,V>
5568 >    @SuppressWarnings("serial")
5569 >    static final class MapReduceEntriesToDoubleTask<K,V>
5570          extends BulkTask<K,V,Double> {
5571          final ObjectToDouble<Map.Entry<K,V>> transformer;
5572          final DoubleByDoubleToDouble reducer;
# Line 6107 | Line 5574 | public class ConcurrentHashMapV8<K, V>
5574          double result;
5575          MapReduceEntriesToDoubleTask<K,V> rights, nextRight;
5576          MapReduceEntriesToDoubleTask
5577 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5577 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5578               MapReduceEntriesToDoubleTask<K,V> nextRight,
5579               ObjectToDouble<Map.Entry<K,V>> transformer,
5580               double basis,
5581               DoubleByDoubleToDouble reducer) {
5582 <            super(m, p, b); this.nextRight = nextRight;
5582 >            super(p, b, i, f, t); this.nextRight = nextRight;
5583              this.transformer = transformer;
5584              this.basis = basis; this.reducer = reducer;
5585          }
5586 <        @SuppressWarnings("unchecked") public final boolean exec() {
5587 <            final ObjectToDouble<Map.Entry<K,V>> transformer =
5588 <                this.transformer;
5589 <            final DoubleByDoubleToDouble reducer = this.reducer;
5590 <            if (transformer == null || reducer == null)
5591 <                return abortOnNullFunction();
5592 <            try {
5593 <                final double id = this.basis;
5594 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5595 <                    do {} while (!casPending(c = pending, c+1));
5586 >        public final Double getRawResult() { return result; }
5587 >        public final void compute() {
5588 >            final ObjectToDouble<Map.Entry<K,V>> transformer;
5589 >            final DoubleByDoubleToDouble reducer;
5590 >            if ((transformer = this.transformer) != null &&
5591 >                (reducer = this.reducer) != null) {
5592 >                double r = this.basis;
5593 >                for (int i = baseIndex, f, h; batch > 0 &&
5594 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5595 >                    addToPendingCount(1);
5596                      (rights = new MapReduceEntriesToDoubleTask<K,V>
5597 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5597 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5598 >                      rights, transformer, r, reducer)).fork();
5599                  }
5600 <                double r = id;
5601 <                Object v;
6134 <                while ((v = advance()) != null)
6135 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
5600 >                for (Node<K,V> p; (p = advance()) != null; )
5601 >                    r = reducer.apply(r, transformer.apply(p));
5602                  result = r;
5603 <                for (MapReduceEntriesToDoubleTask<K,V> t = this, s;;) {
5604 <                    int c; BulkTask<K,V,?> par;
5605 <                    if ((c = t.pending) == 0) {
5606 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5607 <                            t.result = reducer.apply(t.result, s.result);
5608 <                        }
5609 <                        if ((par = t.parent) == null ||
5610 <                            !(par instanceof MapReduceEntriesToDoubleTask)) {
6145 <                            t.quietlyComplete();
6146 <                            break;
6147 <                        }
6148 <                        t = (MapReduceEntriesToDoubleTask<K,V>)par;
5603 >                CountedCompleter<?> c;
5604 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5605 >                    @SuppressWarnings("unchecked") MapReduceEntriesToDoubleTask<K,V>
5606 >                        t = (MapReduceEntriesToDoubleTask<K,V>)c,
5607 >                        s = t.rights;
5608 >                    while (s != null) {
5609 >                        t.result = reducer.apply(t.result, s.result);
5610 >                        s = t.rights = s.nextRight;
5611                      }
6150                    else if (t.casPending(c, c - 1))
6151                        break;
5612                  }
6153            } catch (Throwable ex) {
6154                return tryCompleteComputation(ex);
6155            }
6156            MapReduceEntriesToDoubleTask<K,V> s = rights;
6157            if (s != null && !inForkJoinPool()) {
6158                do  {
6159                    if (s.tryUnfork())
6160                        s.exec();
6161                } while ((s = s.nextRight) != null);
5613              }
6163            return false;
5614          }
6165        public final Double getRawResult() { return result; }
5615      }
5616  
5617 <    @SuppressWarnings("serial") static final class MapReduceMappingsToDoubleTask<K,V>
5617 >    @SuppressWarnings("serial")
5618 >    static final class MapReduceMappingsToDoubleTask<K,V>
5619          extends BulkTask<K,V,Double> {
5620          final ObjectByObjectToDouble<? super K, ? super V> transformer;
5621          final DoubleByDoubleToDouble reducer;
# Line 6173 | Line 5623 | public class ConcurrentHashMapV8<K, V>
5623          double result;
5624          MapReduceMappingsToDoubleTask<K,V> rights, nextRight;
5625          MapReduceMappingsToDoubleTask
5626 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5626 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5627               MapReduceMappingsToDoubleTask<K,V> nextRight,
5628               ObjectByObjectToDouble<? super K, ? super V> transformer,
5629               double basis,
5630               DoubleByDoubleToDouble reducer) {
5631 <            super(m, p, b); this.nextRight = nextRight;
5631 >            super(p, b, i, f, t); this.nextRight = nextRight;
5632              this.transformer = transformer;
5633              this.basis = basis; this.reducer = reducer;
5634          }
5635 <        @SuppressWarnings("unchecked") public final boolean exec() {
5636 <            final ObjectByObjectToDouble<? super K, ? super V> transformer =
5637 <                this.transformer;
5638 <            final DoubleByDoubleToDouble reducer = this.reducer;
5639 <            if (transformer == null || reducer == null)
5640 <                return abortOnNullFunction();
5641 <            try {
5642 <                final double id = this.basis;
5643 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5644 <                    do {} while (!casPending(c = pending, c+1));
5635 >        public final Double getRawResult() { return result; }
5636 >        public final void compute() {
5637 >            final ObjectByObjectToDouble<? super K, ? super V> transformer;
5638 >            final DoubleByDoubleToDouble reducer;
5639 >            if ((transformer = this.transformer) != null &&
5640 >                (reducer = this.reducer) != null) {
5641 >                double r = this.basis;
5642 >                for (int i = baseIndex, f, h; batch > 0 &&
5643 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5644 >                    addToPendingCount(1);
5645                      (rights = new MapReduceMappingsToDoubleTask<K,V>
5646 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5646 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5647 >                      rights, transformer, r, reducer)).fork();
5648                  }
5649 <                double r = id;
5650 <                Object v;
6200 <                while ((v = advance()) != null)
6201 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
5649 >                for (Node<K,V> p; (p = advance()) != null; )
5650 >                    r = reducer.apply(r, transformer.apply(p.key, p.val));
5651                  result = r;
5652 <                for (MapReduceMappingsToDoubleTask<K,V> t = this, s;;) {
5653 <                    int c; BulkTask<K,V,?> par;
5654 <                    if ((c = t.pending) == 0) {
5655 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5656 <                            t.result = reducer.apply(t.result, s.result);
5657 <                        }
5658 <                        if ((par = t.parent) == null ||
5659 <                            !(par instanceof MapReduceMappingsToDoubleTask)) {
6211 <                            t.quietlyComplete();
6212 <                            break;
6213 <                        }
6214 <                        t = (MapReduceMappingsToDoubleTask<K,V>)par;
5652 >                CountedCompleter<?> c;
5653 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5654 >                    @SuppressWarnings("unchecked") MapReduceMappingsToDoubleTask<K,V>
5655 >                        t = (MapReduceMappingsToDoubleTask<K,V>)c,
5656 >                        s = t.rights;
5657 >                    while (s != null) {
5658 >                        t.result = reducer.apply(t.result, s.result);
5659 >                        s = t.rights = s.nextRight;
5660                      }
6216                    else if (t.casPending(c, c - 1))
6217                        break;
5661                  }
6219            } catch (Throwable ex) {
6220                return tryCompleteComputation(ex);
5662              }
6222            MapReduceMappingsToDoubleTask<K,V> s = rights;
6223            if (s != null && !inForkJoinPool()) {
6224                do  {
6225                    if (s.tryUnfork())
6226                        s.exec();
6227                } while ((s = s.nextRight) != null);
6228            }
6229            return false;
5663          }
6231        public final Double getRawResult() { return result; }
5664      }
5665  
5666 <    @SuppressWarnings("serial") static final class MapReduceKeysToLongTask<K,V>
5666 >    @SuppressWarnings("serial")
5667 >    static final class MapReduceKeysToLongTask<K,V>
5668          extends BulkTask<K,V,Long> {
5669          final ObjectToLong<? super K> transformer;
5670          final LongByLongToLong reducer;
# Line 6239 | Line 5672 | public class ConcurrentHashMapV8<K, V>
5672          long result;
5673          MapReduceKeysToLongTask<K,V> rights, nextRight;
5674          MapReduceKeysToLongTask
5675 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5675 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5676               MapReduceKeysToLongTask<K,V> nextRight,
5677               ObjectToLong<? super K> transformer,
5678               long basis,
5679               LongByLongToLong reducer) {
5680 <            super(m, p, b); this.nextRight = nextRight;
5680 >            super(p, b, i, f, t); this.nextRight = nextRight;
5681              this.transformer = transformer;
5682              this.basis = basis; this.reducer = reducer;
5683          }
5684 <        @SuppressWarnings("unchecked") public final boolean exec() {
5685 <            final ObjectToLong<? super K> transformer =
5686 <                this.transformer;
5687 <            final LongByLongToLong reducer = this.reducer;
5688 <            if (transformer == null || reducer == null)
5689 <                return abortOnNullFunction();
5690 <            try {
5691 <                final long id = this.basis;
5692 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5693 <                    do {} while (!casPending(c = pending, c+1));
5684 >        public final Long getRawResult() { return result; }
5685 >        public final void compute() {
5686 >            final ObjectToLong<? super K> transformer;
5687 >            final LongByLongToLong reducer;
5688 >            if ((transformer = this.transformer) != null &&
5689 >                (reducer = this.reducer) != null) {
5690 >                long r = this.basis;
5691 >                for (int i = baseIndex, f, h; batch > 0 &&
5692 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5693 >                    addToPendingCount(1);
5694                      (rights = new MapReduceKeysToLongTask<K,V>
5695 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5695 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5696 >                      rights, transformer, r, reducer)).fork();
5697                  }
5698 <                long r = id;
5699 <                while (advance() != null)
6266 <                    r = reducer.apply(r, transformer.apply((K)nextKey));
5698 >                for (Node<K,V> p; (p = advance()) != null; )
5699 >                    r = reducer.apply(r, transformer.apply(p.key));
5700                  result = r;
5701 <                for (MapReduceKeysToLongTask<K,V> t = this, s;;) {
5702 <                    int c; BulkTask<K,V,?> par;
5703 <                    if ((c = t.pending) == 0) {
5704 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5705 <                            t.result = reducer.apply(t.result, s.result);
5706 <                        }
5707 <                        if ((par = t.parent) == null ||
5708 <                            !(par instanceof MapReduceKeysToLongTask)) {
6276 <                            t.quietlyComplete();
6277 <                            break;
6278 <                        }
6279 <                        t = (MapReduceKeysToLongTask<K,V>)par;
5701 >                CountedCompleter<?> c;
5702 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5703 >                    @SuppressWarnings("unchecked") MapReduceKeysToLongTask<K,V>
5704 >                        t = (MapReduceKeysToLongTask<K,V>)c,
5705 >                        s = t.rights;
5706 >                    while (s != null) {
5707 >                        t.result = reducer.apply(t.result, s.result);
5708 >                        s = t.rights = s.nextRight;
5709                      }
6281                    else if (t.casPending(c, c - 1))
6282                        break;
5710                  }
6284            } catch (Throwable ex) {
6285                return tryCompleteComputation(ex);
6286            }
6287            MapReduceKeysToLongTask<K,V> s = rights;
6288            if (s != null && !inForkJoinPool()) {
6289                do  {
6290                    if (s.tryUnfork())
6291                        s.exec();
6292                } while ((s = s.nextRight) != null);
5711              }
6294            return false;
5712          }
6296        public final Long getRawResult() { return result; }
5713      }
5714  
5715 <    @SuppressWarnings("serial") static final class MapReduceValuesToLongTask<K,V>
5715 >    @SuppressWarnings("serial")
5716 >    static final class MapReduceValuesToLongTask<K,V>
5717          extends BulkTask<K,V,Long> {
5718          final ObjectToLong<? super V> transformer;
5719          final LongByLongToLong reducer;
# Line 6304 | Line 5721 | public class ConcurrentHashMapV8<K, V>
5721          long result;
5722          MapReduceValuesToLongTask<K,V> rights, nextRight;
5723          MapReduceValuesToLongTask
5724 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5724 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5725               MapReduceValuesToLongTask<K,V> nextRight,
5726               ObjectToLong<? super V> transformer,
5727               long basis,
5728               LongByLongToLong reducer) {
5729 <            super(m, p, b); this.nextRight = nextRight;
5729 >            super(p, b, i, f, t); this.nextRight = nextRight;
5730              this.transformer = transformer;
5731              this.basis = basis; this.reducer = reducer;
5732          }
5733 <        @SuppressWarnings("unchecked") public final boolean exec() {
5734 <            final ObjectToLong<? super V> transformer =
5735 <                this.transformer;
5736 <            final LongByLongToLong reducer = this.reducer;
5737 <            if (transformer == null || reducer == null)
5738 <                return abortOnNullFunction();
5739 <            try {
5740 <                final long id = this.basis;
5741 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5742 <                    do {} while (!casPending(c = pending, c+1));
5733 >        public final Long getRawResult() { return result; }
5734 >        public final void compute() {
5735 >            final ObjectToLong<? super V> transformer;
5736 >            final LongByLongToLong reducer;
5737 >            if ((transformer = this.transformer) != null &&
5738 >                (reducer = this.reducer) != null) {
5739 >                long r = this.basis;
5740 >                for (int i = baseIndex, f, h; batch > 0 &&
5741 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5742 >                    addToPendingCount(1);
5743                      (rights = new MapReduceValuesToLongTask<K,V>
5744 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5744 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5745 >                      rights, transformer, r, reducer)).fork();
5746                  }
5747 <                long r = id;
5748 <                Object v;
6331 <                while ((v = advance()) != null)
6332 <                    r = reducer.apply(r, transformer.apply((V)v));
5747 >                for (Node<K,V> p; (p = advance()) != null; )
5748 >                    r = reducer.apply(r, transformer.apply(p.val));
5749                  result = r;
5750 <                for (MapReduceValuesToLongTask<K,V> t = this, s;;) {
5751 <                    int c; BulkTask<K,V,?> par;
5752 <                    if ((c = t.pending) == 0) {
5753 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5754 <                            t.result = reducer.apply(t.result, s.result);
5755 <                        }
5756 <                        if ((par = t.parent) == null ||
5757 <                            !(par instanceof MapReduceValuesToLongTask)) {
6342 <                            t.quietlyComplete();
6343 <                            break;
6344 <                        }
6345 <                        t = (MapReduceValuesToLongTask<K,V>)par;
5750 >                CountedCompleter<?> c;
5751 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5752 >                    @SuppressWarnings("unchecked") MapReduceValuesToLongTask<K,V>
5753 >                        t = (MapReduceValuesToLongTask<K,V>)c,
5754 >                        s = t.rights;
5755 >                    while (s != null) {
5756 >                        t.result = reducer.apply(t.result, s.result);
5757 >                        s = t.rights = s.nextRight;
5758                      }
6347                    else if (t.casPending(c, c - 1))
6348                        break;
5759                  }
6350            } catch (Throwable ex) {
6351                return tryCompleteComputation(ex);
5760              }
6353            MapReduceValuesToLongTask<K,V> s = rights;
6354            if (s != null && !inForkJoinPool()) {
6355                do  {
6356                    if (s.tryUnfork())
6357                        s.exec();
6358                } while ((s = s.nextRight) != null);
6359            }
6360            return false;
5761          }
6362        public final Long getRawResult() { return result; }
5762      }
5763  
5764 <    @SuppressWarnings("serial") static final class MapReduceEntriesToLongTask<K,V>
5764 >    @SuppressWarnings("serial")
5765 >    static final class MapReduceEntriesToLongTask<K,V>
5766          extends BulkTask<K,V,Long> {
5767          final ObjectToLong<Map.Entry<K,V>> transformer;
5768          final LongByLongToLong reducer;
# Line 6370 | Line 5770 | public class ConcurrentHashMapV8<K, V>
5770          long result;
5771          MapReduceEntriesToLongTask<K,V> rights, nextRight;
5772          MapReduceEntriesToLongTask
5773 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5773 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5774               MapReduceEntriesToLongTask<K,V> nextRight,
5775               ObjectToLong<Map.Entry<K,V>> transformer,
5776               long basis,
5777               LongByLongToLong reducer) {
5778 <            super(m, p, b); this.nextRight = nextRight;
5778 >            super(p, b, i, f, t); this.nextRight = nextRight;
5779              this.transformer = transformer;
5780              this.basis = basis; this.reducer = reducer;
5781          }
5782 <        @SuppressWarnings("unchecked") public final boolean exec() {
5783 <            final ObjectToLong<Map.Entry<K,V>> transformer =
5784 <                this.transformer;
5785 <            final LongByLongToLong reducer = this.reducer;
5786 <            if (transformer == null || reducer == null)
5787 <                return abortOnNullFunction();
5788 <            try {
5789 <                final long id = this.basis;
5790 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5791 <                    do {} while (!casPending(c = pending, c+1));
5782 >        public final Long getRawResult() { return result; }
5783 >        public final void compute() {
5784 >            final ObjectToLong<Map.Entry<K,V>> transformer;
5785 >            final LongByLongToLong reducer;
5786 >            if ((transformer = this.transformer) != null &&
5787 >                (reducer = this.reducer) != null) {
5788 >                long r = this.basis;
5789 >                for (int i = baseIndex, f, h; batch > 0 &&
5790 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5791 >                    addToPendingCount(1);
5792                      (rights = new MapReduceEntriesToLongTask<K,V>
5793 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5793 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5794 >                      rights, transformer, r, reducer)).fork();
5795                  }
5796 <                long r = id;
5797 <                Object v;
6397 <                while ((v = advance()) != null)
6398 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
5796 >                for (Node<K,V> p; (p = advance()) != null; )
5797 >                    r = reducer.apply(r, transformer.apply(p));
5798                  result = r;
5799 <                for (MapReduceEntriesToLongTask<K,V> t = this, s;;) {
5800 <                    int c; BulkTask<K,V,?> par;
5801 <                    if ((c = t.pending) == 0) {
5802 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5803 <                            t.result = reducer.apply(t.result, s.result);
5804 <                        }
5805 <                        if ((par = t.parent) == null ||
5806 <                            !(par instanceof MapReduceEntriesToLongTask)) {
6408 <                            t.quietlyComplete();
6409 <                            break;
6410 <                        }
6411 <                        t = (MapReduceEntriesToLongTask<K,V>)par;
5799 >                CountedCompleter<?> c;
5800 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5801 >                    @SuppressWarnings("unchecked") MapReduceEntriesToLongTask<K,V>
5802 >                        t = (MapReduceEntriesToLongTask<K,V>)c,
5803 >                        s = t.rights;
5804 >                    while (s != null) {
5805 >                        t.result = reducer.apply(t.result, s.result);
5806 >                        s = t.rights = s.nextRight;
5807                      }
6413                    else if (t.casPending(c, c - 1))
6414                        break;
5808                  }
6416            } catch (Throwable ex) {
6417                return tryCompleteComputation(ex);
6418            }
6419            MapReduceEntriesToLongTask<K,V> s = rights;
6420            if (s != null && !inForkJoinPool()) {
6421                do  {
6422                    if (s.tryUnfork())
6423                        s.exec();
6424                } while ((s = s.nextRight) != null);
5809              }
6426            return false;
5810          }
6428        public final Long getRawResult() { return result; }
5811      }
5812  
5813 <    @SuppressWarnings("serial") static final class MapReduceMappingsToLongTask<K,V>
5813 >    @SuppressWarnings("serial")
5814 >    static final class MapReduceMappingsToLongTask<K,V>
5815          extends BulkTask<K,V,Long> {
5816          final ObjectByObjectToLong<? super K, ? super V> transformer;
5817          final LongByLongToLong reducer;
# Line 6436 | Line 5819 | public class ConcurrentHashMapV8<K, V>
5819          long result;
5820          MapReduceMappingsToLongTask<K,V> rights, nextRight;
5821          MapReduceMappingsToLongTask
5822 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5822 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5823               MapReduceMappingsToLongTask<K,V> nextRight,
5824               ObjectByObjectToLong<? super K, ? super V> transformer,
5825               long basis,
5826               LongByLongToLong reducer) {
5827 <            super(m, p, b); this.nextRight = nextRight;
5827 >            super(p, b, i, f, t); this.nextRight = nextRight;
5828              this.transformer = transformer;
5829              this.basis = basis; this.reducer = reducer;
5830          }
5831 <        @SuppressWarnings("unchecked") public final boolean exec() {
5832 <            final ObjectByObjectToLong<? super K, ? super V> transformer =
5833 <                this.transformer;
5834 <            final LongByLongToLong reducer = this.reducer;
5835 <            if (transformer == null || reducer == null)
5836 <                return abortOnNullFunction();
5837 <            try {
5838 <                final long id = this.basis;
5839 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5840 <                    do {} while (!casPending(c = pending, c+1));
5831 >        public final Long getRawResult() { return result; }
5832 >        public final void compute() {
5833 >            final ObjectByObjectToLong<? super K, ? super V> transformer;
5834 >            final LongByLongToLong reducer;
5835 >            if ((transformer = this.transformer) != null &&
5836 >                (reducer = this.reducer) != null) {
5837 >                long r = this.basis;
5838 >                for (int i = baseIndex, f, h; batch > 0 &&
5839 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5840 >                    addToPendingCount(1);
5841                      (rights = new MapReduceMappingsToLongTask<K,V>
5842 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5842 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5843 >                      rights, transformer, r, reducer)).fork();
5844                  }
5845 <                long r = id;
5846 <                Object v;
6463 <                while ((v = advance()) != null)
6464 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
5845 >                for (Node<K,V> p; (p = advance()) != null; )
5846 >                    r = reducer.apply(r, transformer.apply(p.key, p.val));
5847                  result = r;
5848 <                for (MapReduceMappingsToLongTask<K,V> t = this, s;;) {
5849 <                    int c; BulkTask<K,V,?> par;
5850 <                    if ((c = t.pending) == 0) {
5851 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5852 <                            t.result = reducer.apply(t.result, s.result);
5853 <                        }
5854 <                        if ((par = t.parent) == null ||
5855 <                            !(par instanceof MapReduceMappingsToLongTask)) {
6474 <                            t.quietlyComplete();
6475 <                            break;
6476 <                        }
6477 <                        t = (MapReduceMappingsToLongTask<K,V>)par;
5848 >                CountedCompleter<?> c;
5849 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5850 >                    @SuppressWarnings("unchecked") MapReduceMappingsToLongTask<K,V>
5851 >                        t = (MapReduceMappingsToLongTask<K,V>)c,
5852 >                        s = t.rights;
5853 >                    while (s != null) {
5854 >                        t.result = reducer.apply(t.result, s.result);
5855 >                        s = t.rights = s.nextRight;
5856                      }
6479                    else if (t.casPending(c, c - 1))
6480                        break;
5857                  }
6482            } catch (Throwable ex) {
6483                return tryCompleteComputation(ex);
6484            }
6485            MapReduceMappingsToLongTask<K,V> s = rights;
6486            if (s != null && !inForkJoinPool()) {
6487                do  {
6488                    if (s.tryUnfork())
6489                        s.exec();
6490                } while ((s = s.nextRight) != null);
5858              }
6492            return false;
5859          }
6494        public final Long getRawResult() { return result; }
5860      }
5861  
5862 <    @SuppressWarnings("serial") static final class MapReduceKeysToIntTask<K,V>
5862 >    @SuppressWarnings("serial")
5863 >    static final class MapReduceKeysToIntTask<K,V>
5864          extends BulkTask<K,V,Integer> {
5865          final ObjectToInt<? super K> transformer;
5866          final IntByIntToInt reducer;
# Line 6502 | Line 5868 | public class ConcurrentHashMapV8<K, V>
5868          int result;
5869          MapReduceKeysToIntTask<K,V> rights, nextRight;
5870          MapReduceKeysToIntTask
5871 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5871 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5872               MapReduceKeysToIntTask<K,V> nextRight,
5873               ObjectToInt<? super K> transformer,
5874               int basis,
5875               IntByIntToInt reducer) {
5876 <            super(m, p, b); this.nextRight = nextRight;
5876 >            super(p, b, i, f, t); this.nextRight = nextRight;
5877              this.transformer = transformer;
5878              this.basis = basis; this.reducer = reducer;
5879          }
5880 <        @SuppressWarnings("unchecked") public final boolean exec() {
5881 <            final ObjectToInt<? super K> transformer =
5882 <                this.transformer;
5883 <            final IntByIntToInt reducer = this.reducer;
5884 <            if (transformer == null || reducer == null)
5885 <                return abortOnNullFunction();
5886 <            try {
5887 <                final int id = this.basis;
5888 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5889 <                    do {} while (!casPending(c = pending, c+1));
5880 >        public final Integer getRawResult() { return result; }
5881 >        public final void compute() {
5882 >            final ObjectToInt<? super K> transformer;
5883 >            final IntByIntToInt reducer;
5884 >            if ((transformer = this.transformer) != null &&
5885 >                (reducer = this.reducer) != null) {
5886 >                int r = this.basis;
5887 >                for (int i = baseIndex, f, h; batch > 0 &&
5888 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5889 >                    addToPendingCount(1);
5890                      (rights = new MapReduceKeysToIntTask<K,V>
5891 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5891 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5892 >                      rights, transformer, r, reducer)).fork();
5893                  }
5894 <                int r = id;
5895 <                while (advance() != null)
6529 <                    r = reducer.apply(r, transformer.apply((K)nextKey));
5894 >                for (Node<K,V> p; (p = advance()) != null; )
5895 >                    r = reducer.apply(r, transformer.apply(p.key));
5896                  result = r;
5897 <                for (MapReduceKeysToIntTask<K,V> t = this, s;;) {
5898 <                    int c; BulkTask<K,V,?> par;
5899 <                    if ((c = t.pending) == 0) {
5900 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5901 <                            t.result = reducer.apply(t.result, s.result);
5902 <                        }
5903 <                        if ((par = t.parent) == null ||
5904 <                            !(par instanceof MapReduceKeysToIntTask)) {
6539 <                            t.quietlyComplete();
6540 <                            break;
6541 <                        }
6542 <                        t = (MapReduceKeysToIntTask<K,V>)par;
5897 >                CountedCompleter<?> c;
5898 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5899 >                    @SuppressWarnings("unchecked") MapReduceKeysToIntTask<K,V>
5900 >                        t = (MapReduceKeysToIntTask<K,V>)c,
5901 >                        s = t.rights;
5902 >                    while (s != null) {
5903 >                        t.result = reducer.apply(t.result, s.result);
5904 >                        s = t.rights = s.nextRight;
5905                      }
6544                    else if (t.casPending(c, c - 1))
6545                        break;
5906                  }
6547            } catch (Throwable ex) {
6548                return tryCompleteComputation(ex);
6549            }
6550            MapReduceKeysToIntTask<K,V> s = rights;
6551            if (s != null && !inForkJoinPool()) {
6552                do  {
6553                    if (s.tryUnfork())
6554                        s.exec();
6555                } while ((s = s.nextRight) != null);
5907              }
6557            return false;
5908          }
6559        public final Integer getRawResult() { return result; }
5909      }
5910  
5911 <    @SuppressWarnings("serial") static final class MapReduceValuesToIntTask<K,V>
5911 >    @SuppressWarnings("serial")
5912 >    static final class MapReduceValuesToIntTask<K,V>
5913          extends BulkTask<K,V,Integer> {
5914          final ObjectToInt<? super V> transformer;
5915          final IntByIntToInt reducer;
# Line 6567 | Line 5917 | public class ConcurrentHashMapV8<K, V>
5917          int result;
5918          MapReduceValuesToIntTask<K,V> rights, nextRight;
5919          MapReduceValuesToIntTask
5920 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5920 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5921               MapReduceValuesToIntTask<K,V> nextRight,
5922               ObjectToInt<? super V> transformer,
5923               int basis,
5924               IntByIntToInt reducer) {
5925 <            super(m, p, b); this.nextRight = nextRight;
5925 >            super(p, b, i, f, t); this.nextRight = nextRight;
5926              this.transformer = transformer;
5927              this.basis = basis; this.reducer = reducer;
5928          }
5929 <        @SuppressWarnings("unchecked") public final boolean exec() {
5930 <            final ObjectToInt<? super V> transformer =
5931 <                this.transformer;
5932 <            final IntByIntToInt reducer = this.reducer;
5933 <            if (transformer == null || reducer == null)
5934 <                return abortOnNullFunction();
5935 <            try {
5936 <                final int id = this.basis;
5937 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5938 <                    do {} while (!casPending(c = pending, c+1));
5929 >        public final Integer getRawResult() { return result; }
5930 >        public final void compute() {
5931 >            final ObjectToInt<? super V> transformer;
5932 >            final IntByIntToInt reducer;
5933 >            if ((transformer = this.transformer) != null &&
5934 >                (reducer = this.reducer) != null) {
5935 >                int r = this.basis;
5936 >                for (int i = baseIndex, f, h; batch > 0 &&
5937 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5938 >                    addToPendingCount(1);
5939                      (rights = new MapReduceValuesToIntTask<K,V>
5940 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5940 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5941 >                      rights, transformer, r, reducer)).fork();
5942                  }
5943 <                int r = id;
5944 <                Object v;
6594 <                while ((v = advance()) != null)
6595 <                    r = reducer.apply(r, transformer.apply((V)v));
5943 >                for (Node<K,V> p; (p = advance()) != null; )
5944 >                    r = reducer.apply(r, transformer.apply(p.val));
5945                  result = r;
5946 <                for (MapReduceValuesToIntTask<K,V> t = this, s;;) {
5947 <                    int c; BulkTask<K,V,?> par;
5948 <                    if ((c = t.pending) == 0) {
5949 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5950 <                            t.result = reducer.apply(t.result, s.result);
5951 <                        }
5952 <                        if ((par = t.parent) == null ||
5953 <                            !(par instanceof MapReduceValuesToIntTask)) {
6605 <                            t.quietlyComplete();
6606 <                            break;
6607 <                        }
6608 <                        t = (MapReduceValuesToIntTask<K,V>)par;
5946 >                CountedCompleter<?> c;
5947 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5948 >                    @SuppressWarnings("unchecked") MapReduceValuesToIntTask<K,V>
5949 >                        t = (MapReduceValuesToIntTask<K,V>)c,
5950 >                        s = t.rights;
5951 >                    while (s != null) {
5952 >                        t.result = reducer.apply(t.result, s.result);
5953 >                        s = t.rights = s.nextRight;
5954                      }
6610                    else if (t.casPending(c, c - 1))
6611                        break;
5955                  }
6613            } catch (Throwable ex) {
6614                return tryCompleteComputation(ex);
5956              }
6616            MapReduceValuesToIntTask<K,V> s = rights;
6617            if (s != null && !inForkJoinPool()) {
6618                do  {
6619                    if (s.tryUnfork())
6620                        s.exec();
6621                } while ((s = s.nextRight) != null);
6622            }
6623            return false;
5957          }
6625        public final Integer getRawResult() { return result; }
5958      }
5959  
5960 <    @SuppressWarnings("serial") static final class MapReduceEntriesToIntTask<K,V>
5960 >    @SuppressWarnings("serial")
5961 >    static final class MapReduceEntriesToIntTask<K,V>
5962          extends BulkTask<K,V,Integer> {
5963          final ObjectToInt<Map.Entry<K,V>> transformer;
5964          final IntByIntToInt reducer;
# Line 6633 | Line 5966 | public class ConcurrentHashMapV8<K, V>
5966          int result;
5967          MapReduceEntriesToIntTask<K,V> rights, nextRight;
5968          MapReduceEntriesToIntTask
5969 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5969 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
5970               MapReduceEntriesToIntTask<K,V> nextRight,
5971               ObjectToInt<Map.Entry<K,V>> transformer,
5972               int basis,
5973               IntByIntToInt reducer) {
5974 <            super(m, p, b); this.nextRight = nextRight;
5974 >            super(p, b, i, f, t); this.nextRight = nextRight;
5975              this.transformer = transformer;
5976              this.basis = basis; this.reducer = reducer;
5977          }
5978 <        @SuppressWarnings("unchecked") public final boolean exec() {
5979 <            final ObjectToInt<Map.Entry<K,V>> transformer =
5980 <                this.transformer;
5981 <            final IntByIntToInt reducer = this.reducer;
5982 <            if (transformer == null || reducer == null)
5983 <                return abortOnNullFunction();
5984 <            try {
5985 <                final int id = this.basis;
5986 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5987 <                    do {} while (!casPending(c = pending, c+1));
5978 >        public final Integer getRawResult() { return result; }
5979 >        public final void compute() {
5980 >            final ObjectToInt<Map.Entry<K,V>> transformer;
5981 >            final IntByIntToInt reducer;
5982 >            if ((transformer = this.transformer) != null &&
5983 >                (reducer = this.reducer) != null) {
5984 >                int r = this.basis;
5985 >                for (int i = baseIndex, f, h; batch > 0 &&
5986 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
5987 >                    addToPendingCount(1);
5988                      (rights = new MapReduceEntriesToIntTask<K,V>
5989 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5989 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
5990 >                      rights, transformer, r, reducer)).fork();
5991                  }
5992 <                int r = id;
5993 <                Object v;
6660 <                while ((v = advance()) != null)
6661 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
5992 >                for (Node<K,V> p; (p = advance()) != null; )
5993 >                    r = reducer.apply(r, transformer.apply(p));
5994                  result = r;
5995 <                for (MapReduceEntriesToIntTask<K,V> t = this, s;;) {
5996 <                    int c; BulkTask<K,V,?> par;
5997 <                    if ((c = t.pending) == 0) {
5998 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5999 <                            t.result = reducer.apply(t.result, s.result);
6000 <                        }
6001 <                        if ((par = t.parent) == null ||
6002 <                            !(par instanceof MapReduceEntriesToIntTask)) {
6671 <                            t.quietlyComplete();
6672 <                            break;
6673 <                        }
6674 <                        t = (MapReduceEntriesToIntTask<K,V>)par;
5995 >                CountedCompleter<?> c;
5996 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5997 >                    @SuppressWarnings("unchecked") MapReduceEntriesToIntTask<K,V>
5998 >                        t = (MapReduceEntriesToIntTask<K,V>)c,
5999 >                        s = t.rights;
6000 >                    while (s != null) {
6001 >                        t.result = reducer.apply(t.result, s.result);
6002 >                        s = t.rights = s.nextRight;
6003                      }
6676                    else if (t.casPending(c, c - 1))
6677                        break;
6004                  }
6679            } catch (Throwable ex) {
6680                return tryCompleteComputation(ex);
6005              }
6682            MapReduceEntriesToIntTask<K,V> s = rights;
6683            if (s != null && !inForkJoinPool()) {
6684                do  {
6685                    if (s.tryUnfork())
6686                        s.exec();
6687                } while ((s = s.nextRight) != null);
6688            }
6689            return false;
6006          }
6691        public final Integer getRawResult() { return result; }
6007      }
6008  
6009 <    @SuppressWarnings("serial") static final class MapReduceMappingsToIntTask<K,V>
6009 >    @SuppressWarnings("serial")
6010 >    static final class MapReduceMappingsToIntTask<K,V>
6011          extends BulkTask<K,V,Integer> {
6012          final ObjectByObjectToInt<? super K, ? super V> transformer;
6013          final IntByIntToInt reducer;
# Line 6699 | Line 6015 | public class ConcurrentHashMapV8<K, V>
6015          int result;
6016          MapReduceMappingsToIntTask<K,V> rights, nextRight;
6017          MapReduceMappingsToIntTask
6018 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6019 <             MapReduceMappingsToIntTask<K,V> rights,
6018 >            (BulkTask<K,V,?> p, int b, int i, int f, Node<K,V>[] t,
6019 >             MapReduceMappingsToIntTask<K,V> nextRight,
6020               ObjectByObjectToInt<? super K, ? super V> transformer,
6021               int basis,
6022               IntByIntToInt reducer) {
6023 <            super(m, p, b); this.nextRight = nextRight;
6023 >            super(p, b, i, f, t); this.nextRight = nextRight;
6024              this.transformer = transformer;
6025              this.basis = basis; this.reducer = reducer;
6026          }
6027 <        @SuppressWarnings("unchecked") public final boolean exec() {
6028 <            final ObjectByObjectToInt<? super K, ? super V> transformer =
6029 <                this.transformer;
6030 <            final IntByIntToInt reducer = this.reducer;
6031 <            if (transformer == null || reducer == null)
6032 <                return abortOnNullFunction();
6033 <            try {
6034 <                final int id = this.basis;
6035 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6036 <                    do {} while (!casPending(c = pending, c+1));
6027 >        public final Integer getRawResult() { return result; }
6028 >        public final void compute() {
6029 >            final ObjectByObjectToInt<? super K, ? super V> transformer;
6030 >            final IntByIntToInt reducer;
6031 >            if ((transformer = this.transformer) != null &&
6032 >                (reducer = this.reducer) != null) {
6033 >                int r = this.basis;
6034 >                for (int i = baseIndex, f, h; batch > 0 &&
6035 >                         (h = ((f = baseLimit) + i) >>> 1) > i;) {
6036 >                    addToPendingCount(1);
6037                      (rights = new MapReduceMappingsToIntTask<K,V>
6038 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6038 >                     (this, batch >>>= 1, baseLimit = h, f, tab,
6039 >                      rights, transformer, r, reducer)).fork();
6040                  }
6041 <                int r = id;
6042 <                Object v;
6726 <                while ((v = advance()) != null)
6727 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6041 >                for (Node<K,V> p; (p = advance()) != null; )
6042 >                    r = reducer.apply(r, transformer.apply(p.key, p.val));
6043                  result = r;
6044 <                for (MapReduceMappingsToIntTask<K,V> t = this, s;;) {
6045 <                    int c; BulkTask<K,V,?> par;
6046 <                    if ((c = t.pending) == 0) {
6047 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6048 <                            t.result = reducer.apply(t.result, s.result);
6049 <                        }
6050 <                        if ((par = t.parent) == null ||
6051 <                            !(par instanceof MapReduceMappingsToIntTask)) {
6737 <                            t.quietlyComplete();
6738 <                            break;
6739 <                        }
6740 <                        t = (MapReduceMappingsToIntTask<K,V>)par;
6044 >                CountedCompleter<?> c;
6045 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6046 >                    @SuppressWarnings("unchecked") MapReduceMappingsToIntTask<K,V>
6047 >                        t = (MapReduceMappingsToIntTask<K,V>)c,
6048 >                        s = t.rights;
6049 >                    while (s != null) {
6050 >                        t.result = reducer.apply(t.result, s.result);
6051 >                        s = t.rights = s.nextRight;
6052                      }
6742                    else if (t.casPending(c, c - 1))
6743                        break;
6053                  }
6745            } catch (Throwable ex) {
6746                return tryCompleteComputation(ex);
6054              }
6055 <            MapReduceMappingsToIntTask<K,V> s = rights;
6056 <            if (s != null && !inForkJoinPool()) {
6057 <                do  {
6058 <                    if (s.tryUnfork())
6059 <                        s.exec();
6060 <                } while ((s = s.nextRight) != null);
6055 >        }
6056 >    }
6057 >
6058 >    /* ---------------- Counters -------------- */
6059 >
6060 >    // Adapted from LongAdder and Striped64.
6061 >    // See their internal docs for explanation.
6062 >
6063 >    // A padded cell for distributing counts
6064 >    static final class CounterCell {
6065 >        volatile long p0, p1, p2, p3, p4, p5, p6;
6066 >        volatile long value;
6067 >        volatile long q0, q1, q2, q3, q4, q5, q6;
6068 >        CounterCell(long x) { value = x; }
6069 >    }
6070 >
6071 >    /**
6072 >     * Holder for the thread-local hash code determining which
6073 >     * CounterCell to use. The code is initialized via the
6074 >     * counterHashCodeGenerator, but may be moved upon collisions.
6075 >     */
6076 >    static final class CounterHashCode {
6077 >        int code;
6078 >    }
6079 >
6080 >    /**
6081 >     * Generates initial value for per-thread CounterHashCodes.
6082 >     */
6083 >    static final AtomicInteger counterHashCodeGenerator = new AtomicInteger();
6084 >
6085 >    /**
6086 >     * Increment for counterHashCodeGenerator. See class ThreadLocal
6087 >     * for explanation.
6088 >     */
6089 >    static final int SEED_INCREMENT = 0x61c88647;
6090 >
6091 >    /**
6092 >     * Per-thread counter hash codes. Shared across all instances.
6093 >     */
6094 >    static final ThreadLocal<CounterHashCode> threadCounterHashCode =
6095 >        new ThreadLocal<CounterHashCode>();
6096 >
6097 >
6098 >    final long sumCount() {
6099 >        CounterCell[] as = counterCells; CounterCell a;
6100 >        long sum = baseCount;
6101 >        if (as != null) {
6102 >            for (int i = 0; i < as.length; ++i) {
6103 >                if ((a = as[i]) != null)
6104 >                    sum += a.value;
6105              }
6755            return false;
6106          }
6107 <        public final Integer getRawResult() { return result; }
6107 >        return sum;
6108      }
6109  
6110 +    // See LongAdder version for explanation
6111 +    private final void fullAddCount(long x, CounterHashCode hc,
6112 +                                    boolean wasUncontended) {
6113 +        int h;
6114 +        if (hc == null) {
6115 +            hc = new CounterHashCode();
6116 +            int s = counterHashCodeGenerator.addAndGet(SEED_INCREMENT);
6117 +            h = hc.code = (s == 0) ? 1 : s; // Avoid zero
6118 +            threadCounterHashCode.set(hc);
6119 +        }
6120 +        else
6121 +            h = hc.code;
6122 +        boolean collide = false;                // True if last slot nonempty
6123 +        for (;;) {
6124 +            CounterCell[] as; CounterCell a; int n; long v;
6125 +            if ((as = counterCells) != null && (n = as.length) > 0) {
6126 +                if ((a = as[(n - 1) & h]) == null) {
6127 +                    if (cellsBusy == 0) {            // Try to attach new Cell
6128 +                        CounterCell r = new CounterCell(x); // Optimistic create
6129 +                        if (cellsBusy == 0 &&
6130 +                            U.compareAndSwapInt(this, CELLSBUSY, 0, 1)) {
6131 +                            boolean created = false;
6132 +                            try {               // Recheck under lock
6133 +                                CounterCell[] rs; int m, j;
6134 +                                if ((rs = counterCells) != null &&
6135 +                                    (m = rs.length) > 0 &&
6136 +                                    rs[j = (m - 1) & h] == null) {
6137 +                                    rs[j] = r;
6138 +                                    created = true;
6139 +                                }
6140 +                            } finally {
6141 +                                cellsBusy = 0;
6142 +                            }
6143 +                            if (created)
6144 +                                break;
6145 +                            continue;           // Slot is now non-empty
6146 +                        }
6147 +                    }
6148 +                    collide = false;
6149 +                }
6150 +                else if (!wasUncontended)       // CAS already known to fail
6151 +                    wasUncontended = true;      // Continue after rehash
6152 +                else if (U.compareAndSwapLong(a, CELLVALUE, v = a.value, v + x))
6153 +                    break;
6154 +                else if (counterCells != as || n >= NCPU)
6155 +                    collide = false;            // At max size or stale
6156 +                else if (!collide)
6157 +                    collide = true;
6158 +                else if (cellsBusy == 0 &&
6159 +                         U.compareAndSwapInt(this, CELLSBUSY, 0, 1)) {
6160 +                    try {
6161 +                        if (counterCells == as) {// Expand table unless stale
6162 +                            CounterCell[] rs = new CounterCell[n << 1];
6163 +                            for (int i = 0; i < n; ++i)
6164 +                                rs[i] = as[i];
6165 +                            counterCells = rs;
6166 +                        }
6167 +                    } finally {
6168 +                        cellsBusy = 0;
6169 +                    }
6170 +                    collide = false;
6171 +                    continue;                   // Retry with expanded table
6172 +                }
6173 +                h ^= h << 13;                   // Rehash
6174 +                h ^= h >>> 17;
6175 +                h ^= h << 5;
6176 +            }
6177 +            else if (cellsBusy == 0 && counterCells == as &&
6178 +                     U.compareAndSwapInt(this, CELLSBUSY, 0, 1)) {
6179 +                boolean init = false;
6180 +                try {                           // Initialize table
6181 +                    if (counterCells == as) {
6182 +                        CounterCell[] rs = new CounterCell[2];
6183 +                        rs[h & 1] = new CounterCell(x);
6184 +                        counterCells = rs;
6185 +                        init = true;
6186 +                    }
6187 +                } finally {
6188 +                    cellsBusy = 0;
6189 +                }
6190 +                if (init)
6191 +                    break;
6192 +            }
6193 +            else if (U.compareAndSwapLong(this, BASECOUNT, v = baseCount, v + x))
6194 +                break;                          // Fall back on using base
6195 +        }
6196 +        hc.code = h;                            // Record index for next time
6197 +    }
6198  
6199      // Unsafe mechanics
6200 <    private static final sun.misc.Unsafe UNSAFE;
6201 <    private static final long counterOffset;
6202 <    private static final long sizeCtlOffset;
6200 >    private static final sun.misc.Unsafe U;
6201 >    private static final long SIZECTL;
6202 >    private static final long TRANSFERINDEX;
6203 >    private static final long BASECOUNT;
6204 >    private static final long CELLSBUSY;
6205 >    private static final long CELLVALUE;
6206      private static final long ABASE;
6207      private static final int ASHIFT;
6208  
6209      static {
6769        int ss;
6210          try {
6211 <            UNSAFE = getUnsafe();
6211 >            U = getUnsafe();
6212              Class<?> k = ConcurrentHashMapV8.class;
6213 <            counterOffset = UNSAFE.objectFieldOffset
6774 <                (k.getDeclaredField("counter"));
6775 <            sizeCtlOffset = UNSAFE.objectFieldOffset
6213 >            SIZECTL = U.objectFieldOffset
6214                  (k.getDeclaredField("sizeCtl"));
6215 <            Class<?> sc = Node[].class;
6216 <            ABASE = UNSAFE.arrayBaseOffset(sc);
6217 <            ss = UNSAFE.arrayIndexScale(sc);
6215 >            TRANSFERINDEX = U.objectFieldOffset
6216 >                (k.getDeclaredField("transferIndex"));
6217 >            BASECOUNT = U.objectFieldOffset
6218 >                (k.getDeclaredField("baseCount"));
6219 >            CELLSBUSY = U.objectFieldOffset
6220 >                (k.getDeclaredField("cellsBusy"));
6221 >            Class<?> ck = CounterCell.class;
6222 >            CELLVALUE = U.objectFieldOffset
6223 >                (ck.getDeclaredField("value"));
6224 >            Class<?> ak = Node[].class;
6225 >            ABASE = U.arrayBaseOffset(ak);
6226 >            int scale = U.arrayIndexScale(ak);
6227 >            if ((scale & (scale - 1)) != 0)
6228 >                throw new Error("data type scale not a power of two");
6229 >            ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
6230          } catch (Exception e) {
6231              throw new Error(e);
6232          }
6783        if ((ss & (ss-1)) != 0)
6784            throw new Error("data type scale not a power of two");
6785        ASHIFT = 31 - Integer.numberOfLeadingZeros(ss);
6233      }
6234  
6235      /**
# Line 6795 | Line 6242 | public class ConcurrentHashMapV8<K, V>
6242      private static sun.misc.Unsafe getUnsafe() {
6243          try {
6244              return sun.misc.Unsafe.getUnsafe();
6245 <        } catch (SecurityException se) {
6246 <            try {
6247 <                return java.security.AccessController.doPrivileged
6248 <                    (new java.security
6249 <                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
6250 <                        public sun.misc.Unsafe run() throws Exception {
6251 <                            java.lang.reflect.Field f = sun.misc
6252 <                                .Unsafe.class.getDeclaredField("theUnsafe");
6253 <                            f.setAccessible(true);
6254 <                            return (sun.misc.Unsafe) f.get(null);
6255 <                        }});
6256 <            } catch (java.security.PrivilegedActionException e) {
6257 <                throw new RuntimeException("Could not initialize intrinsics",
6258 <                                           e.getCause());
6259 <            }
6245 >        } catch (SecurityException tryReflectionInstead) {}
6246 >        try {
6247 >            return java.security.AccessController.doPrivileged
6248 >            (new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
6249 >                public sun.misc.Unsafe run() throws Exception {
6250 >                    Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class;
6251 >                    for (java.lang.reflect.Field f : k.getDeclaredFields()) {
6252 >                        f.setAccessible(true);
6253 >                        Object x = f.get(null);
6254 >                        if (k.isInstance(x))
6255 >                            return k.cast(x);
6256 >                    }
6257 >                    throw new NoSuchFieldError("the Unsafe");
6258 >                }});
6259 >        } catch (java.security.PrivilegedActionException e) {
6260 >            throw new RuntimeException("Could not initialize intrinsics",
6261 >                                       e.getCause());
6262          }
6263      }
6264   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines