ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java
(Generate patch)

Comparing jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.143 by jsr166, Fri Nov 9 03:30:03 2012 UTC vs.
Revision 1.162 by dl, Wed Jan 16 15:04:03 2013 UTC

# Line 5 | Line 5
5   */
6  
7   package java.util.concurrent;
8 import java.util.concurrent.atomic.LongAdder;
8   import java.util.concurrent.ForkJoinPool;
9 < import java.util.concurrent.ForkJoinTask;
9 > import java.util.concurrent.CountedCompleter;
10 > import java.util.function.*;
11 > import java.util.Spliterator;
12 > import java.util.stream.Stream;
13 > import java.util.stream.Streams;
14  
15   import java.util.Comparator;
16   import java.util.Arrays;
# Line 24 | Line 27 | import java.util.Enumeration;
27   import java.util.ConcurrentModificationException;
28   import java.util.NoSuchElementException;
29   import java.util.concurrent.ConcurrentMap;
27 import java.util.concurrent.ThreadLocalRandom;
28 import java.util.concurrent.locks.LockSupport;
30   import java.util.concurrent.locks.AbstractQueuedSynchronizer;
31 + import java.util.concurrent.atomic.AtomicInteger;
32   import java.util.concurrent.atomic.AtomicReference;
31
33   import java.io.Serializable;
34  
35   /**
# Line 43 | Line 44 | import java.io.Serializable;
44   * interoperable with {@code Hashtable} in programs that rely on its
45   * thread safety but not on its synchronization details.
46   *
47 < * <p> Retrieval operations (including {@code get}) generally do not
47 > * <p>Retrieval operations (including {@code get}) generally do not
48   * block, so may overlap with update operations (including {@code put}
49   * and {@code remove}). Retrievals reflect the results of the most
50   * recently <em>completed</em> update operations holding upon their
# Line 64 | Line 65 | import java.io.Serializable;
65   * that may be adequate for monitoring or estimation purposes, but not
66   * for program control.
67   *
68 < * <p> The table is dynamically expanded when there are too many
68 > * <p>The table is dynamically expanded when there are too many
69   * collisions (i.e., keys that have distinct hash codes but fall into
70   * the same slot modulo the table size), with the expected average
71   * effect of maintaining roughly two bins per mapping (corresponding
# Line 85 | Line 86 | import java.io.Serializable;
86   * {@code hashCode()} is a sure way to slow down performance of any
87   * hash table.
88   *
89 < * <p> A {@link Set} projection of a ConcurrentHashMap may be created
89 > * <p>A {@link Set} projection of a ConcurrentHashMap may be created
90   * (using {@link #newKeySet()} or {@link #newKeySet(int)}), or viewed
91   * (using {@link #keySet(Object)} when only keys are of interest, and the
92   * mapped values are (perhaps transiently) not used or all take the
93   * same mapping value.
94   *
95 < * <p> A ConcurrentHashMap can be used as scalable frequency map (a
96 < * form of histogram or multiset) by using {@link LongAdder} values
97 < * and initializing via {@link #computeIfAbsent}. For example, to add
98 < * a count to a {@code ConcurrentHashMap<String,LongAdder> freqs}, you
99 < * can use {@code freqs.computeIfAbsent(k -> new
100 < * LongAdder()).increment();}
95 > * <p>A ConcurrentHashMap can be used as scalable frequency map (a
96 > * form of histogram or multiset) by using {@link
97 > * java.util.concurrent.atomic.LongAdder} values and initializing via
98 > * {@link #computeIfAbsent}. For example, to add a count to a {@code
99 > * ConcurrentHashMap<String,LongAdder> freqs}, you can use {@code
100 > * freqs.computeIfAbsent(k -> new LongAdder()).increment();}
101   *
102   * <p>This class and its views and iterators implement all of the
103   * <em>optional</em> methods of the {@link Map} and {@link Iterator}
104   * interfaces.
105   *
106 < * <p> Like {@link Hashtable} but unlike {@link HashMap}, this class
106 > * <p>Like {@link Hashtable} but unlike {@link HashMap}, this class
107   * does <em>not</em> allow {@code null} to be used as a key or value.
108   *
109 < * <p>ConcurrentHashMaps support parallel operations using the {@link
110 < * ForkJoinPool#commonPool}. (Tasks that may be used in other contexts
111 < * are available in class {@link ForkJoinTasks}). These operations are
112 < * designed to be safely, and often sensibly, applied even with maps
113 < * that are being concurrently updated by other threads; for example,
114 < * when computing a snapshot summary of the values in a shared
115 < * registry.  There are three kinds of operation, each with four
116 < * forms, accepting functions with Keys, Values, Entries, and (Key,
117 < * Value) arguments and/or return values. (The first three forms are
118 < * also available via the {@link #keySet()}, {@link #values()} and
119 < * {@link #entrySet()} views). Because the elements of a
120 < * ConcurrentHashMap are not ordered in any particular way, and may be
121 < * processed in different orders in different parallel executions, the
122 < * correctness of supplied functions should not depend on any
123 < * ordering, or on any other objects or values that may transiently
124 < * change while computation is in progress; and except for forEach
125 < * actions, should ideally be side-effect-free.
109 > * <p>ConcurrentHashMaps support sequential and parallel operations
110 > * bulk operations. (Parallel forms use the {@link
111 > * ForkJoinPool#commonPool()}). Tasks that may be used in other
112 > * contexts are available in class {@link ForkJoinTasks}. These
113 > * operations are designed to be safely, and often sensibly, applied
114 > * even with maps that are being concurrently updated by other
115 > * threads; for example, when computing a snapshot summary of the
116 > * values in a shared registry.  There are three kinds of operation,
117 > * each with four forms, accepting functions with Keys, Values,
118 > * Entries, and (Key, Value) arguments and/or return values. Because
119 > * the elements of a ConcurrentHashMap are not ordered in any
120 > * particular way, and may be processed in different orders in
121 > * different parallel executions, the correctness of supplied
122 > * functions should not depend on any ordering, or on any other
123 > * objects or values that may transiently change while computation is
124 > * in progress; and except for forEach actions, should ideally be
125 > * side-effect-free.
126   *
127   * <ul>
128   * <li> forEach: Perform a given action on each element.
# Line 187 | Line 188 | import java.io.Serializable;
188   * arguments can be supplied using {@code new
189   * AbstractMap.SimpleEntry(k,v)}.
190   *
191 < * <p> Bulk operations may complete abruptly, throwing an
191 > * <p>Bulk operations may complete abruptly, throwing an
192   * exception encountered in the application of a supplied
193   * function. Bear in mind when handling such exceptions that other
194   * concurrently executing functions could also have thrown
195   * exceptions, or would have done so if the first exception had
196   * not occurred.
197   *
198 < * <p>Parallel speedups for bulk operations compared to sequential
199 < * processing are common but not guaranteed.  Operations involving
200 < * brief functions on small maps may execute more slowly than
201 < * sequential loops if the underlying work to parallelize the
202 < * computation is more expensive than the computation itself.
203 < * Similarly, parallelization may not lead to much actual parallelism
204 < * if all processors are busy performing unrelated tasks.
204 < *
205 < * <p> All arguments to all task methods must be non-null.
198 > * <p>Speedups for parallel compared to sequential forms are common
199 > * but not guaranteed.  Parallel operations involving brief functions
200 > * on small maps may execute more slowly than sequential forms if the
201 > * underlying work to parallelize the computation is more expensive
202 > * than the computation itself.  Similarly, parallelization may not
203 > * lead to much actual parallelism if all processors are busy
204 > * performing unrelated tasks.
205   *
206 < * <p><em>jsr166e note: During transition, this class
208 < * uses nested functional interfaces with different names but the
209 < * same forms as those expected for JDK8.<em>
206 > * <p>All arguments to all task methods must be non-null.
207   *
208   * <p>This class is a member of the
209   * <a href="{@docRoot}/../technotes/guides/collections/index.html">
# Line 221 | Line 218 | public class ConcurrentHashMap<K, V>
218      implements ConcurrentMap<K, V>, Serializable {
219      private static final long serialVersionUID = 7249069246763182397L;
220  
224    /**
225     * A partitionable iterator. A Spliterator can be traversed
226     * directly, but can also be partitioned (before traversal) by
227     * creating another Spliterator that covers a non-overlapping
228     * portion of the elements, and so may be amenable to parallel
229     * execution.
230     *
231     * <p> This interface exports a subset of expected JDK8
232     * functionality.
233     *
234     * <p>Sample usage: Here is one (of the several) ways to compute
235     * the sum of the values held in a map using the ForkJoin
236     * framework. As illustrated here, Spliterators are well suited to
237     * designs in which a task repeatedly splits off half its work
238     * into forked subtasks until small enough to process directly,
239     * and then joins these subtasks. Variants of this style can also
240     * be used in completion-based designs.
241     *
242     * <pre>
243     * {@code ConcurrentHashMap<String, Long> m = ...
244     * // split as if have 8 * parallelism, for load balance
245     * int n = m.size();
246     * int p = aForkJoinPool.getParallelism() * 8;
247     * int split = (n < p)? n : p;
248     * long sum = aForkJoinPool.invoke(new SumValues(m.valueSpliterator(), split, null));
249     * // ...
250     * static class SumValues extends RecursiveTask<Long> {
251     *   final Spliterator<Long> s;
252     *   final int split;             // split while > 1
253     *   final SumValues nextJoin;    // records forked subtasks to join
254     *   SumValues(Spliterator<Long> s, int depth, SumValues nextJoin) {
255     *     this.s = s; this.depth = depth; this.nextJoin = nextJoin;
256     *   }
257     *   public Long compute() {
258     *     long sum = 0;
259     *     SumValues subtasks = null; // fork subtasks
260     *     for (int s = split >>> 1; s > 0; s >>>= 1)
261     *       (subtasks = new SumValues(s.split(), s, subtasks)).fork();
262     *     while (s.hasNext())        // directly process remaining elements
263     *       sum += s.next();
264     *     for (SumValues t = subtasks; t != null; t = t.nextJoin)
265     *       sum += t.join();         // collect subtask results
266     *     return sum;
267     *   }
268     * }
269     * }</pre>
270     */
271    public static interface Spliterator<T> extends Iterator<T> {
272        /**
273         * Returns a Spliterator covering approximately half of the
274         * elements, guaranteed not to overlap with those subsequently
275         * returned by this Spliterator.  After invoking this method,
276         * the current Spliterator will <em>not</em> produce any of
277         * the elements of the returned Spliterator, but the two
278         * Spliterators together will produce all of the elements that
279         * would have been produced by this Spliterator had this
280         * method not been called. The exact number of elements
281         * produced by the returned Spliterator is not guaranteed, and
282         * may be zero (i.e., with {@code hasNext()} reporting {@code
283         * false}) if this Spliterator cannot be further split.
284         *
285         * @return a Spliterator covering approximately half of the
286         * elements
287         * @throws IllegalStateException if this Spliterator has
288         * already commenced traversing elements
289         */
290        Spliterator<T> split();
291    }
292
293
221      /*
222       * Overview:
223       *
# Line 301 | Line 228 | public class ConcurrentHashMap<K, V>
228       * the same or better than java.util.HashMap, and to support high
229       * initial insertion rates on an empty table by many threads.
230       *
231 <     * Each key-value mapping is held in a Node.  Because Node fields
232 <     * can contain special values, they are defined using plain Object
233 <     * types. Similarly in turn, all internal methods that use them
234 <     * work off Object types. And similarly, so do the internal
235 <     * methods of auxiliary iterator and view classes.  All public
236 <     * generic typed methods relay in/out of these internal methods,
237 <     * supplying null-checks and casts as needed. This also allows
238 <     * many of the public methods to be factored into a smaller number
239 <     * of internal methods (although sadly not so for the five
313 <     * variants of put-related operations). The validation-based
314 <     * approach explained below leads to a lot of code sprawl because
231 >     * Each key-value mapping is held in a Node.  Because Node key
232 >     * fields can contain special values, they are defined using plain
233 >     * Object types (not type "K"). This leads to a lot of explicit
234 >     * casting (and many explicit warning suppressions to tell
235 >     * compilers not to complain about it). It also allows some of the
236 >     * public methods to be factored into a smaller number of internal
237 >     * methods (although sadly not so for the five variants of
238 >     * put-related operations). The validation-based approach
239 >     * explained below leads to a lot of code sprawl because
240       * retry-control precludes factoring into smaller methods.
241       *
242       * The table is lazily initialized to a power-of-two size upon the
# Line 325 | Line 250 | public class ConcurrentHashMap<K, V>
250       * as lookups check hash code and non-nullness of value before
251       * checking key equality.
252       *
253 <     * We use the top two bits of Node hash fields for control
254 <     * purposes -- they are available anyway because of addressing
255 <     * constraints.  As explained further below, these top bits are
256 <     * used as follows:
257 <     *  00 - Normal
258 <     *  01 - Locked
334 <     *  11 - Locked and may have a thread waiting for lock
335 <     *  10 - Node is a forwarding node
336 <     *
337 <     * The lower 30 bits of each Node's hash field contain a
338 <     * transformation of the key's hash code, except for forwarding
339 <     * nodes, for which the lower bits are zero (and so always have
340 <     * hash field == MOVED).
253 >     * We use the top (sign) bit of Node hash fields for control
254 >     * purposes -- it is available anyway because of addressing
255 >     * constraints.  Nodes with negative hash fields are forwarding
256 >     * nodes to either TreeBins or resized tables.  The lower 31 bits
257 >     * of each normal Node's hash field contain a transformation of
258 >     * the key's hash code.
259       *
260       * Insertion (via put or its variants) of the first node in an
261       * empty bin is performed by just CASing it to the bin.  This is
# Line 346 | Line 264 | public class ConcurrentHashMap<K, V>
264       * delete, and replace) require locks.  We do not want to waste
265       * the space required to associate a distinct lock object with
266       * each bin, so instead use the first node of a bin list itself as
267 <     * a lock. Blocking support for these locks relies on the builtin
268 <     * "synchronized" monitors.  However, we also need a tryLock
351 <     * construction, so we overlay these by using bits of the Node
352 <     * hash field for lock control (see above), and so normally use
353 <     * builtin monitors only for blocking and signalling using
354 <     * wait/notifyAll constructions. See Node.tryAwaitLock.
267 >     * a lock. Locking support for these locks relies on builtin
268 >     * "synchronized" monitors.
269       *
270       * Using the first node of a list as a lock does not by itself
271       * suffice though: When a node is locked, any update must first
# Line 413 | Line 327 | public class ConcurrentHashMap<K, V>
327       * iterators in the same way.
328       *
329       * The table is resized when occupancy exceeds a percentage
330 <     * threshold (nominally, 0.75, but see below).  Only a single
331 <     * thread performs the resize (using field "sizeCtl", to arrange
332 <     * exclusion), but the table otherwise remains usable for reads
333 <     * and updates. Resizing proceeds by transferring bins, one by
334 <     * one, from the table to the next table.  Because we are using
335 <     * power-of-two expansion, the elements from each bin must either
336 <     * stay at same index, or move with a power of two offset. We
337 <     * eliminate unnecessary node creation by catching cases where old
338 <     * nodes can be reused because their next fields won't change.  On
339 <     * average, only about one-sixth of them need cloning when a table
340 <     * doubles. The nodes they replace will be garbage collectable as
341 <     * soon as they are no longer referenced by any reader thread that
342 <     * may be in the midst of concurrently traversing table.  Upon
343 <     * transfer, the old table bin contains only a special forwarding
344 <     * node (with hash field "MOVED") that contains the next table as
345 <     * its key. On encountering a forwarding node, access and update
346 <     * operations restart, using the new table.
347 <     *
348 <     * Each bin transfer requires its bin lock. However, unlike other
349 <     * cases, a transfer can skip a bin if it fails to acquire its
350 <     * lock, and revisit it later (unless it is a TreeBin). Method
351 <     * rebuild maintains a buffer of TRANSFER_BUFFER_SIZE bins that
352 <     * have been skipped because of failure to acquire a lock, and
353 <     * blocks only if none are available (i.e., only very rarely).
354 <     * The transfer operation must also ensure that all accessible
355 <     * bins in both the old and new table are usable by any traversal.
356 <     * When there are no lock acquisition failures, this is arranged
357 <     * simply by proceeding from the last bin (table.length - 1) up
358 <     * towards the first.  Upon seeing a forwarding node, traversals
359 <     * (see class Iter) arrange to move to the new table
360 <     * without revisiting nodes.  However, when any node is skipped
361 <     * during a transfer, all earlier table bins may have become
362 <     * visible, so are initialized with a reverse-forwarding node back
363 <     * to the old table until the new ones are established. (This
364 <     * sometimes requires transiently locking a forwarding node, which
365 <     * is possible under the above encoding.) These more expensive
366 <     * mechanics trigger only when necessary.
330 >     * threshold (nominally, 0.75, but see below).  Any thread
331 >     * noticing an overfull bin may assist in resizing after the
332 >     * initiating thread allocates and sets up the replacement
333 >     * array. However, rather than stalling, these other threads may
334 >     * proceed with insertions etc.  The use of TreeBins shields us
335 >     * from the worst case effects of overfilling while resizes are in
336 >     * progress.  Resizing proceeds by transferring bins, one by one,
337 >     * from the table to the next table. To enable concurrency, the
338 >     * next table must be (incrementally) prefilled with place-holders
339 >     * serving as reverse forwarders to the old table.  Because we are
340 >     * using power-of-two expansion, the elements from each bin must
341 >     * either stay at same index, or move with a power of two
342 >     * offset. We eliminate unnecessary node creation by catching
343 >     * cases where old nodes can be reused because their next fields
344 >     * won't change.  On average, only about one-sixth of them need
345 >     * cloning when a table doubles. The nodes they replace will be
346 >     * garbage collectable as soon as they are no longer referenced by
347 >     * any reader thread that may be in the midst of concurrently
348 >     * traversing table.  Upon transfer, the old table bin contains
349 >     * only a special forwarding node (with hash field "MOVED") that
350 >     * contains the next table as its key. On encountering a
351 >     * forwarding node, access and update operations restart, using
352 >     * the new table.
353 >     *
354 >     * Each bin transfer requires its bin lock, which can stall
355 >     * waiting for locks while resizing. However, because other
356 >     * threads can join in and help resize rather than contend for
357 >     * locks, average aggregate waits become shorter as resizing
358 >     * progresses.  The transfer operation must also ensure that all
359 >     * accessible bins in both the old and new table are usable by any
360 >     * traversal.  This is arranged by proceeding from the last bin
361 >     * (table.length - 1) up towards the first.  Upon seeing a
362 >     * forwarding node, traversals (see class Traverser) arrange to
363 >     * move to the new table without revisiting nodes.  However, to
364 >     * ensure that no intervening nodes are skipped, bin splitting can
365 >     * only begin after the associated reverse-forwarders are in
366 >     * place.
367       *
368       * The traversal scheme also applies to partial traversals of
369       * ranges of bins (via an alternate Traverser constructor)
# Line 464 | Line 378 | public class ConcurrentHashMap<K, V>
378       * These cases attempt to override the initial capacity settings,
379       * but harmlessly fail to take effect in cases of races.
380       *
381 <     * The element count is maintained using a LongAdder, which avoids
382 <     * contention on updates but can encounter cache thrashing if read
383 <     * too frequently during concurrent access. To avoid reading so
384 <     * often, resizing is attempted either when a bin lock is
385 <     * contended, or upon adding to a bin already holding two or more
386 <     * nodes (checked before adding in the xIfAbsent methods, after
387 <     * adding in others). Under uniform hash distributions, the
388 <     * probability of this occurring at threshold is around 13%,
389 <     * meaning that only about 1 in 8 puts check threshold (and after
390 <     * resizing, many fewer do so). But this approximation has high
391 <     * variance for small table sizes, so we check on any collision
392 <     * for sizes <= 64. The bulk putAll operation further reduces
393 <     * contention by only committing count updates upon these size
394 <     * checks.
381 >     * The element count is maintained using a specialization of
382 >     * LongAdder. We need to incorporate a specialization rather than
383 >     * just use a LongAdder in order to access implicit
384 >     * contention-sensing that leads to creation of multiple
385 >     * Cells.  The counter mechanics avoid contention on
386 >     * updates but can encounter cache thrashing if read too
387 >     * frequently during concurrent access. To avoid reading so often,
388 >     * resizing under contention is attempted only upon adding to a
389 >     * bin already holding two or more nodes. Under uniform hash
390 >     * distributions, the probability of this occurring at threshold
391 >     * is around 13%, meaning that only about 1 in 8 puts check
392 >     * threshold (and after resizing, many fewer do so). The bulk
393 >     * putAll operation further reduces contention by only committing
394 >     * count updates upon these size checks.
395       *
396       * Maintaining API and serialization compatibility with previous
397       * versions of this class introduces several oddities. Mainly: We
# Line 528 | Line 442 | public class ConcurrentHashMap<K, V>
442      private static final float LOAD_FACTOR = 0.75f;
443  
444      /**
531     * The buffer size for skipped bins during transfers. The
532     * value is arbitrary but should be large enough to avoid
533     * most locking stalls during resizes.
534     */
535    private static final int TRANSFER_BUFFER_SIZE = 32;
536
537    /**
445       * The bin count threshold for using a tree rather than list for a
446       * bin.  The value reflects the approximate break-even point for
447       * using tree-based operations.
448       */
449      private static final int TREE_THRESHOLD = 8;
450  
451 +    /**
452 +     * Minimum number of rebinnings per transfer step. Ranges are
453 +     * subdivided to allow multiple resizer threads.  This value
454 +     * serves as a lower bound to avoid resizers encountering
455 +     * excessive memory contention.  The value should be at least
456 +     * DEFAULT_CAPACITY.
457 +     */
458 +    private static final int MIN_TRANSFER_STRIDE = 16;
459 +
460      /*
461 <     * Encodings for special uses of Node hash fields. See above for
546 <     * explanation.
461 >     * Encodings for Node hash fields. See above for explanation.
462       */
463      static final int MOVED     = 0x80000000; // hash field for forwarding nodes
464 <    static final int LOCKED    = 0x40000000; // set/tested only as a bit
465 <    static final int WAITING   = 0xc0000000; // both bits set/tested together
466 <    static final int HASH_BITS = 0x3fffffff; // usable bits of normal node hash
464 >    static final int HASH_BITS = 0x7fffffff; // usable bits of normal node hash
465 >
466 >    /** Number of CPUS, to place bounds on some sizings */
467 >    static final int NCPU = Runtime.getRuntime().availableProcessors();
468 >
469 >    /* ---------------- Counters -------------- */
470 >
471 >    // Adapted from LongAdder and Striped64.
472 >    // See their internal docs for explanation.
473 >
474 >    // A padded cell for distributing counts
475 >    static final class Cell {
476 >        volatile long p0, p1, p2, p3, p4, p5, p6;
477 >        volatile long value;
478 >        volatile long q0, q1, q2, q3, q4, q5, q6;
479 >        Cell(long x) { value = x; }
480 >    }
481  
482      /* ---------------- Fields -------------- */
483  
# Line 556 | Line 485 | public class ConcurrentHashMap<K, V>
485       * The array of bins. Lazily initialized upon first insertion.
486       * Size is always a power of two. Accessed directly by iterators.
487       */
488 <    transient volatile Node[] table;
488 >    transient volatile Node<V>[] table;
489  
490      /**
491 <     * The counter maintaining number of elements.
491 >     * The next table to use; non-null only while resizing.
492       */
493 <    private transient final LongAdder counter;
493 >    private transient volatile Node<V>[] nextTable;
494 >
495 >    /**
496 >     * Base counter value, used mainly when there is no contention,
497 >     * but also as a fallback during table initialization
498 >     * races. Updated via CAS.
499 >     */
500 >    private transient volatile long baseCount;
501  
502      /**
503       * Table initialization and resizing control.  When negative, the
504 <     * table is being initialized or resized. Otherwise, when table is
505 <     * null, holds the initial table size to use upon creation, or 0
506 <     * for default. After initialization, holds the next element count
507 <     * value upon which to resize the table.
504 >     * table is being initialized or resized: -1 for initialization,
505 >     * else -(1 + the number of active resizing threads).  Otherwise,
506 >     * when table is null, holds the initial table size to use upon
507 >     * creation, or 0 for default. After initialization, holds the
508 >     * next element count value upon which to resize the table.
509       */
510      private transient volatile int sizeCtl;
511  
512 +    /**
513 +     * The next table index (plus one) to split while resizing.
514 +     */
515 +    private transient volatile int transferIndex;
516 +
517 +    /**
518 +     * The least available table index to split while resizing.
519 +     */
520 +    private transient volatile int transferOrigin;
521 +
522 +    /**
523 +     * Spinlock (locked via CAS) used when resizing and/or creating Cells.
524 +     */
525 +    private transient volatile int cellsBusy;
526 +
527 +    /**
528 +     * Table of counter cells. When non-null, size is a power of 2.
529 +     */
530 +    private transient volatile Cell[] counterCells;
531 +
532      // views
533      private transient KeySetView<K,V> keySet;
534      private transient ValuesView<K,V> values;
# Line 594 | Line 551 | public class ConcurrentHashMap<K, V>
551       * inline assignments below.
552       */
553  
554 <    static final Node tabAt(Node[] tab, int i) { // used by Iter
555 <        return (Node)UNSAFE.getObjectVolatile(tab, ((long)i<<ASHIFT)+ABASE);
554 >    @SuppressWarnings("unchecked") static final <V> Node<V> tabAt
555 >        (Node<V>[] tab, int i) { // used by Traverser
556 >        return (Node<V>)U.getObjectVolatile(tab, ((long)i << ASHIFT) + ABASE);
557      }
558  
559 <    private static final boolean casTabAt(Node[] tab, int i, Node c, Node v) {
560 <        return UNSAFE.compareAndSwapObject(tab, ((long)i<<ASHIFT)+ABASE, c, v);
559 >    private static final <V> boolean casTabAt
560 >        (Node<V>[] tab, int i, Node<V> c, Node<V> v) {
561 >        return U.compareAndSwapObject(tab, ((long)i << ASHIFT) + ABASE, c, v);
562      }
563  
564 <    private static final void setTabAt(Node[] tab, int i, Node v) {
565 <        UNSAFE.putObjectVolatile(tab, ((long)i<<ASHIFT)+ABASE, v);
564 >    private static final <V> void setTabAt
565 >        (Node<V>[] tab, int i, Node<V> v) {
566 >        U.putObjectVolatile(tab, ((long)i << ASHIFT) + ABASE, v);
567      }
568  
569      /* ---------------- Nodes -------------- */
# Line 618 | Line 578 | public class ConcurrentHashMap<K, V>
578       * before a val, but can only be used after checking val to be
579       * non-null.
580       */
581 <    static class Node {
582 <        volatile int hash;
581 >    static class Node<V> {
582 >        final int hash;
583          final Object key;
584 <        volatile Object val;
585 <        volatile Node next;
584 >        volatile V val;
585 >        volatile Node<V> next;
586  
587 <        Node(int hash, Object key, Object val, Node next) {
587 >        Node(int hash, Object key, V val, Node<V> next) {
588              this.hash = hash;
589              this.key = key;
590              this.val = val;
591              this.next = next;
592          }
633
634        /** CompareAndSet the hash field */
635        final boolean casHash(int cmp, int val) {
636            return UNSAFE.compareAndSwapInt(this, hashOffset, cmp, val);
637        }
638
639        /** The number of spins before blocking for a lock */
640        static final int MAX_SPINS =
641            Runtime.getRuntime().availableProcessors() > 1 ? 64 : 1;
642
643        /**
644         * Spins a while if LOCKED bit set and this node is the first
645         * of its bin, and then sets WAITING bits on hash field and
646         * blocks (once) if they are still set.  It is OK for this
647         * method to return even if lock is not available upon exit,
648         * which enables these simple single-wait mechanics.
649         *
650         * The corresponding signalling operation is performed within
651         * callers: Upon detecting that WAITING has been set when
652         * unlocking lock (via a failed CAS from non-waiting LOCKED
653         * state), unlockers acquire the sync lock and perform a
654         * notifyAll.
655         *
656         * The initial sanity check on tab and bounds is not currently
657         * necessary in the only usages of this method, but enables
658         * use in other future contexts.
659         */
660        final void tryAwaitLock(Node[] tab, int i) {
661            if (tab != null && i >= 0 && i < tab.length) { // sanity check
662                int r = ThreadLocalRandom.current().nextInt(); // randomize spins
663                int spins = MAX_SPINS, h;
664                while (tabAt(tab, i) == this && ((h = hash) & LOCKED) != 0) {
665                    if (spins >= 0) {
666                        r ^= r << 1; r ^= r >>> 3; r ^= r << 10; // xorshift
667                        if (r >= 0 && --spins == 0)
668                            Thread.yield();  // yield before block
669                    }
670                    else if (casHash(h, h | WAITING)) {
671                        synchronized (this) {
672                            if (tabAt(tab, i) == this &&
673                                (hash & WAITING) == WAITING) {
674                                try {
675                                    wait();
676                                } catch (InterruptedException ie) {
677                                    try {
678                                        Thread.currentThread().interrupt();
679                                    } catch (SecurityException ignore) {
680                                    }
681                                }
682                            }
683                            else
684                                notifyAll(); // possibly won race vs signaller
685                        }
686                        break;
687                    }
688                }
689            }
690        }
691
692        // Unsafe mechanics for casHash
693        private static final sun.misc.Unsafe UNSAFE;
694        private static final long hashOffset;
695
696        static {
697            try {
698                UNSAFE = sun.misc.Unsafe.getUnsafe();
699                Class<?> k = Node.class;
700                hashOffset = UNSAFE.objectFieldOffset
701                    (k.getDeclaredField("hash"));
702            } catch (Exception e) {
703                throw new Error(e);
704            }
705        }
593      }
594  
595      /* ---------------- TreeBins -------------- */
# Line 710 | Line 597 | public class ConcurrentHashMap<K, V>
597      /**
598       * Nodes for use in TreeBins
599       */
600 <    static final class TreeNode extends Node {
601 <        TreeNode parent;  // red-black tree links
602 <        TreeNode left;
603 <        TreeNode right;
604 <        TreeNode prev;    // needed to unlink next upon deletion
600 >    static final class TreeNode<V> extends Node<V> {
601 >        TreeNode<V> parent;  // red-black tree links
602 >        TreeNode<V> left;
603 >        TreeNode<V> right;
604 >        TreeNode<V> prev;    // needed to unlink next upon deletion
605          boolean red;
606  
607 <        TreeNode(int hash, Object key, Object val, Node next, TreeNode parent) {
607 >        TreeNode(int hash, Object key, V val, Node<V> next, TreeNode<V> parent) {
608              super(hash, key, val, next);
609              this.parent = parent;
610          }
# Line 766 | Line 653 | public class ConcurrentHashMap<K, V>
653       * and writers. Since we don't need to export full Lock API, we
654       * just override the minimal AQS methods and use them directly.
655       */
656 <    static final class TreeBin extends AbstractQueuedSynchronizer {
656 >    static final class TreeBin<V> extends AbstractQueuedSynchronizer {
657          private static final long serialVersionUID = 2249069246763182397L;
658 <        transient TreeNode root;  // root of tree
659 <        transient TreeNode first; // head of next-pointer list
658 >        transient TreeNode<V> root;  // root of tree
659 >        transient TreeNode<V> first; // head of next-pointer list
660  
661          /* AQS overrides */
662          public final boolean isHeldExclusively() { return getState() > 0; }
# Line 800 | Line 687 | public class ConcurrentHashMap<K, V>
687          }
688  
689          /** From CLR */
690 <        private void rotateLeft(TreeNode p) {
690 >        private void rotateLeft(TreeNode<V> p) {
691              if (p != null) {
692 <                TreeNode r = p.right, pp, rl;
692 >                TreeNode<V> r = p.right, pp, rl;
693                  if ((rl = p.right = r.left) != null)
694                      rl.parent = p;
695                  if ((pp = r.parent = p.parent) == null)
# Line 817 | Line 704 | public class ConcurrentHashMap<K, V>
704          }
705  
706          /** From CLR */
707 <        private void rotateRight(TreeNode p) {
707 >        private void rotateRight(TreeNode<V> p) {
708              if (p != null) {
709 <                TreeNode l = p.left, pp, lr;
709 >                TreeNode<V> l = p.left, pp, lr;
710                  if ((lr = p.left = l.right) != null)
711                      lr.parent = p;
712                  if ((pp = l.parent = p.parent) == null)
# Line 837 | Line 724 | public class ConcurrentHashMap<K, V>
724           * Returns the TreeNode (or null if not found) for the given key
725           * starting at given root.
726           */
727 <        @SuppressWarnings("unchecked") final TreeNode getTreeNode
728 <            (int h, Object k, TreeNode p) {
727 >        @SuppressWarnings("unchecked") final TreeNode<V> getTreeNode
728 >            (int h, Object k, TreeNode<V> p) {
729              Class<?> c = k.getClass();
730              while (p != null) {
731                  int dir, ph;  Object pk; Class<?> pc;
# Line 848 | Line 735 | public class ConcurrentHashMap<K, V>
735                      if (c != (pc = pk.getClass()) ||
736                          !(k instanceof Comparable) ||
737                          (dir = ((Comparable)k).compareTo((Comparable)pk)) == 0) {
738 <                        dir = (c == pc) ? 0 : c.getName().compareTo(pc.getName());
739 <                        TreeNode r = null, s = null, pl, pr;
740 <                        if (dir >= 0) {
741 <                            if ((pl = p.left) != null && h <= pl.hash)
742 <                                s = pl;
738 >                        if ((dir = (c == pc) ? 0 :
739 >                             c.getName().compareTo(pc.getName())) == 0) {
740 >                            TreeNode<V> r = null, pl, pr; // check both sides
741 >                            if ((pr = p.right) != null && h >= pr.hash &&
742 >                                (r = getTreeNode(h, k, pr)) != null)
743 >                                return r;
744 >                            else if ((pl = p.left) != null && h <= pl.hash)
745 >                                dir = -1;
746 >                            else // nothing there
747 >                                return null;
748                          }
857                        else if ((pr = p.right) != null && h >= pr.hash)
858                            s = pr;
859                        if (s != null && (r = getTreeNode(h, k, s)) != null)
860                            return r;
749                      }
750                  }
751                  else
# Line 872 | Line 760 | public class ConcurrentHashMap<K, V>
760           * read-lock to call getTreeNode, but during failure to get
761           * lock, searches along next links.
762           */
763 <        final Object getValue(int h, Object k) {
764 <            Node r = null;
763 >        final V getValue(int h, Object k) {
764 >            Node<V> r = null;
765              int c = getState(); // Must read lock state first
766 <            for (Node e = first; e != null; e = e.next) {
766 >            for (Node<V> e = first; e != null; e = e.next) {
767                  if (c <= 0 && compareAndSetState(c, c - 1)) {
768                      try {
769                          r = getTreeNode(h, k, root);
# Line 884 | Line 772 | public class ConcurrentHashMap<K, V>
772                      }
773                      break;
774                  }
775 <                else if ((e.hash & HASH_BITS) == h && k.equals(e.key)) {
775 >                else if (e.hash == h && k.equals(e.key)) {
776                      r = e;
777                      break;
778                  }
# Line 898 | Line 786 | public class ConcurrentHashMap<K, V>
786           * Finds or adds a node.
787           * @return null if added
788           */
789 <        @SuppressWarnings("unchecked") final TreeNode putTreeNode
790 <            (int h, Object k, Object v) {
789 >        @SuppressWarnings("unchecked") final TreeNode<V> putTreeNode
790 >            (int h, Object k, V v) {
791              Class<?> c = k.getClass();
792 <            TreeNode pp = root, p = null;
792 >            TreeNode<V> pp = root, p = null;
793              int dir = 0;
794              while (pp != null) { // find existing node or leaf to insert at
795                  int ph;  Object pk; Class<?> pc;
# Line 912 | Line 800 | public class ConcurrentHashMap<K, V>
800                      if (c != (pc = pk.getClass()) ||
801                          !(k instanceof Comparable) ||
802                          (dir = ((Comparable)k).compareTo((Comparable)pk)) == 0) {
803 <                        dir = (c == pc) ? 0 : c.getName().compareTo(pc.getName());
804 <                        TreeNode r = null, s = null, pl, pr;
805 <                        if (dir >= 0) {
806 <                            if ((pl = p.left) != null && h <= pl.hash)
807 <                                s = pl;
803 >                        TreeNode<V> s = null, r = null, pr;
804 >                        if ((dir = (c == pc) ? 0 :
805 >                             c.getName().compareTo(pc.getName())) == 0) {
806 >                            if ((pr = p.right) != null && h >= pr.hash &&
807 >                                (r = getTreeNode(h, k, pr)) != null)
808 >                                return r;
809 >                            else // continue left
810 >                                dir = -1;
811                          }
812                          else if ((pr = p.right) != null && h >= pr.hash)
813                              s = pr;
# Line 929 | Line 820 | public class ConcurrentHashMap<K, V>
820                  pp = (dir > 0) ? p.right : p.left;
821              }
822  
823 <            TreeNode f = first;
824 <            TreeNode x = first = new TreeNode(h, k, v, f, p);
823 >            TreeNode<V> f = first;
824 >            TreeNode<V> x = first = new TreeNode<V>(h, k, v, f, p);
825              if (p == null)
826                  root = x;
827              else { // attach and rebalance; adapted from CLR
828 <                TreeNode xp, xpp;
828 >                TreeNode<V> xp, xpp;
829                  if (f != null)
830                      f.prev = x;
831                  if (dir <= 0)
# Line 944 | Line 835 | public class ConcurrentHashMap<K, V>
835                  x.red = true;
836                  while (x != null && (xp = x.parent) != null && xp.red &&
837                         (xpp = xp.parent) != null) {
838 <                    TreeNode xppl = xpp.left;
838 >                    TreeNode<V> xppl = xpp.left;
839                      if (xp == xppl) {
840 <                        TreeNode y = xpp.right;
840 >                        TreeNode<V> y = xpp.right;
841                          if (y != null && y.red) {
842                              y.red = false;
843                              xp.red = false;
# Line 968 | Line 859 | public class ConcurrentHashMap<K, V>
859                          }
860                      }
861                      else {
862 <                        TreeNode y = xppl;
862 >                        TreeNode<V> y = xppl;
863                          if (y != null && y.red) {
864                              y.red = false;
865                              xp.red = false;
# Line 990 | Line 881 | public class ConcurrentHashMap<K, V>
881                          }
882                      }
883                  }
884 <                TreeNode r = root;
884 >                TreeNode<V> r = root;
885                  if (r != null && r.red)
886                      r.red = false;
887              }
# Line 1005 | Line 896 | public class ConcurrentHashMap<K, V>
896           * that are accessible independently of lock. So instead we
897           * swap the tree linkages.
898           */
899 <        final void deleteTreeNode(TreeNode p) {
900 <            TreeNode next = (TreeNode)p.next; // unlink traversal pointers
901 <            TreeNode pred = p.prev;
899 >        final void deleteTreeNode(TreeNode<V> p) {
900 >            TreeNode<V> next = (TreeNode<V>)p.next; // unlink traversal pointers
901 >            TreeNode<V> pred = p.prev;
902              if (pred == null)
903                  first = next;
904              else
905                  pred.next = next;
906              if (next != null)
907                  next.prev = pred;
908 <            TreeNode replacement;
909 <            TreeNode pl = p.left;
910 <            TreeNode pr = p.right;
908 >            TreeNode<V> replacement;
909 >            TreeNode<V> pl = p.left;
910 >            TreeNode<V> pr = p.right;
911              if (pl != null && pr != null) {
912 <                TreeNode s = pr, sl;
912 >                TreeNode<V> s = pr, sl;
913                  while ((sl = s.left) != null) // find successor
914                      s = sl;
915                  boolean c = s.red; s.red = p.red; p.red = c; // swap colors
916 <                TreeNode sr = s.right;
917 <                TreeNode pp = p.parent;
916 >                TreeNode<V> sr = s.right;
917 >                TreeNode<V> pp = p.parent;
918                  if (s == pr) { // p was s's direct parent
919                      p.parent = s;
920                      s.right = p;
921                  }
922                  else {
923 <                    TreeNode sp = s.parent;
923 >                    TreeNode<V> sp = s.parent;
924                      if ((p.parent = sp) != null) {
925                          if (s == sp.left)
926                              sp.left = p;
# Line 1054 | Line 945 | public class ConcurrentHashMap<K, V>
945              }
946              else
947                  replacement = (pl != null) ? pl : pr;
948 <            TreeNode pp = p.parent;
948 >            TreeNode<V> pp = p.parent;
949              if (replacement == null) {
950                  if (pp == null) {
951                      root = null;
# Line 1073 | Line 964 | public class ConcurrentHashMap<K, V>
964                  p.left = p.right = p.parent = null;
965              }
966              if (!p.red) { // rebalance, from CLR
967 <                TreeNode x = replacement;
967 >                TreeNode<V> x = replacement;
968                  while (x != null) {
969 <                    TreeNode xp, xpl;
969 >                    TreeNode<V> xp, xpl;
970                      if (x.red || (xp = x.parent) == null) {
971                          x.red = false;
972                          break;
973                      }
974                      if (x == (xpl = xp.left)) {
975 <                        TreeNode sib = xp.right;
975 >                        TreeNode<V> sib = xp.right;
976                          if (sib != null && sib.red) {
977                              sib.red = false;
978                              xp.red = true;
# Line 1091 | Line 982 | public class ConcurrentHashMap<K, V>
982                          if (sib == null)
983                              x = xp;
984                          else {
985 <                            TreeNode sl = sib.left, sr = sib.right;
985 >                            TreeNode<V> sl = sib.left, sr = sib.right;
986                              if ((sr == null || !sr.red) &&
987                                  (sl == null || !sl.red)) {
988                                  sib.red = true;
# Line 1103 | Line 994 | public class ConcurrentHashMap<K, V>
994                                          sl.red = false;
995                                      sib.red = true;
996                                      rotateRight(sib);
997 <                                    sib = (xp = x.parent) == null ? null : xp.right;
997 >                                    sib = (xp = x.parent) == null ?
998 >                                        null : xp.right;
999                                  }
1000                                  if (sib != null) {
1001                                      sib.red = (xp == null) ? false : xp.red;
# Line 1119 | Line 1011 | public class ConcurrentHashMap<K, V>
1011                          }
1012                      }
1013                      else { // symmetric
1014 <                        TreeNode sib = xpl;
1014 >                        TreeNode<V> sib = xpl;
1015                          if (sib != null && sib.red) {
1016                              sib.red = false;
1017                              xp.red = true;
# Line 1129 | Line 1021 | public class ConcurrentHashMap<K, V>
1021                          if (sib == null)
1022                              x = xp;
1023                          else {
1024 <                            TreeNode sl = sib.left, sr = sib.right;
1024 >                            TreeNode<V> sl = sib.left, sr = sib.right;
1025                              if ((sl == null || !sl.red) &&
1026                                  (sr == null || !sr.red)) {
1027                                  sib.red = true;
# Line 1141 | Line 1033 | public class ConcurrentHashMap<K, V>
1033                                          sr.red = false;
1034                                      sib.red = true;
1035                                      rotateLeft(sib);
1036 <                                    sib = (xp = x.parent) == null ? null : xp.left;
1036 >                                    sib = (xp = x.parent) == null ?
1037 >                                        null : xp.left;
1038                                  }
1039                                  if (sib != null) {
1040                                      sib.red = (xp == null) ? false : xp.red;
# Line 1171 | Line 1064 | public class ConcurrentHashMap<K, V>
1064      /* ---------------- Collision reduction methods -------------- */
1065  
1066      /**
1067 <     * Spreads higher bits to lower, and also forces top 2 bits to 0.
1067 >     * Spreads higher bits to lower, and also forces top bit to 0.
1068       * Because the table uses power-of-two masking, sets of hashes
1069       * that vary only in bits above the current mask will always
1070       * collide. (Among known examples are sets of Float keys holding
# Line 1189 | Line 1082 | public class ConcurrentHashMap<K, V>
1082      }
1083  
1084      /**
1085 <     * Replaces a list bin with a tree bin. Call only when locked.
1086 <     * Fails to replace if the given key is non-comparable or table
1087 <     * is, or needs, resizing.
1088 <     */
1089 <    private final void replaceWithTreeBin(Node[] tab, int index, Object key) {
1090 <        if ((key instanceof Comparable) &&
1091 <            (tab.length >= MAXIMUM_CAPACITY || counter.sum() < (long)sizeCtl)) {
1092 <            TreeBin t = new TreeBin();
1093 <            for (Node e = tabAt(tab, index); e != null; e = e.next)
1201 <                t.putTreeNode(e.hash & HASH_BITS, e.key, e.val);
1202 <            setTabAt(tab, index, new Node(MOVED, t, null, null));
1085 >     * Replaces a list bin with a tree bin if key is comparable.  Call
1086 >     * only when locked.
1087 >     */
1088 >    private final void replaceWithTreeBin(Node<V>[] tab, int index, Object key) {
1089 >        if (key instanceof Comparable) {
1090 >            TreeBin<V> t = new TreeBin<V>();
1091 >            for (Node<V> e = tabAt(tab, index); e != null; e = e.next)
1092 >                t.putTreeNode(e.hash, e.key, e.val);
1093 >            setTabAt(tab, index, new Node<V>(MOVED, t, null, null));
1094          }
1095      }
1096  
1097      /* ---------------- Internal access and update methods -------------- */
1098  
1099      /** Implementation for get and containsKey */
1100 <    private final Object internalGet(Object k) {
1100 >    @SuppressWarnings("unchecked") private final V internalGet(Object k) {
1101          int h = spread(k.hashCode());
1102 <        retry: for (Node[] tab = table; tab != null;) {
1103 <            Node e, p; Object ek, ev; int eh;      // locals to read fields once
1102 >        retry: for (Node<V>[] tab = table; tab != null;) {
1103 >            Node<V> e; Object ek; V ev; int eh; // locals to read fields once
1104              for (e = tabAt(tab, (tab.length - 1) & h); e != null; e = e.next) {
1105 <                if ((eh = e.hash) == MOVED) {
1105 >                if ((eh = e.hash) < 0) {
1106                      if ((ek = e.key) instanceof TreeBin)  // search TreeBin
1107 <                        return ((TreeBin)ek).getValue(h, k);
1108 <                    else {                        // restart with new table
1109 <                        tab = (Node[])ek;
1107 >                        return ((TreeBin<V>)ek).getValue(h, k);
1108 >                    else {                      // restart with new table
1109 >                        tab = (Node<V>[])ek;
1110                          continue retry;
1111                      }
1112                  }
1113 <                else if ((eh & HASH_BITS) == h && (ev = e.val) != null &&
1113 >                else if (eh == h && (ev = e.val) != null &&
1114                           ((ek = e.key) == k || k.equals(ek)))
1115                      return ev;
1116              }
# Line 1233 | Line 1124 | public class ConcurrentHashMap<K, V>
1124       * Replaces node value with v, conditional upon match of cv if
1125       * non-null.  If resulting value is null, delete.
1126       */
1127 <    private final Object internalReplace(Object k, Object v, Object cv) {
1127 >    @SuppressWarnings("unchecked") private final V internalReplace
1128 >        (Object k, V v, Object cv) {
1129          int h = spread(k.hashCode());
1130 <        Object oldVal = null;
1131 <        for (Node[] tab = table;;) {
1132 <            Node f; int i, fh; Object fk;
1130 >        V oldVal = null;
1131 >        for (Node<V>[] tab = table;;) {
1132 >            Node<V> f; int i, fh; Object fk;
1133              if (tab == null ||
1134                  (f = tabAt(tab, i = (tab.length - 1) & h)) == null)
1135                  break;
1136 <            else if ((fh = f.hash) == MOVED) {
1136 >            else if ((fh = f.hash) < 0) {
1137                  if ((fk = f.key) instanceof TreeBin) {
1138 <                    TreeBin t = (TreeBin)fk;
1138 >                    TreeBin<V> t = (TreeBin<V>)fk;
1139                      boolean validated = false;
1140                      boolean deleted = false;
1141                      t.acquire(0);
1142                      try {
1143                          if (tabAt(tab, i) == f) {
1144                              validated = true;
1145 <                            TreeNode p = t.getTreeNode(h, k, t.root);
1145 >                            TreeNode<V> p = t.getTreeNode(h, k, t.root);
1146                              if (p != null) {
1147 <                                Object pv = p.val;
1147 >                                V pv = p.val;
1148                                  if (cv == null || cv == pv || cv.equals(pv)) {
1149                                      oldVal = pv;
1150                                      if ((p.val = v) == null) {
# Line 1267 | Line 1159 | public class ConcurrentHashMap<K, V>
1159                      }
1160                      if (validated) {
1161                          if (deleted)
1162 <                            counter.add(-1L);
1162 >                            addCount(-1L, -1);
1163                          break;
1164                      }
1165                  }
1166                  else
1167 <                    tab = (Node[])fk;
1167 >                    tab = (Node<V>[])fk;
1168              }
1169 <            else if ((fh & HASH_BITS) != h && f.next == null) // precheck
1169 >            else if (fh != h && f.next == null) // precheck
1170                  break;                          // rules out possible existence
1171 <            else if ((fh & LOCKED) != 0) {
1280 <                checkForResize();               // try resizing if can't get lock
1281 <                f.tryAwaitLock(tab, i);
1282 <            }
1283 <            else if (f.casHash(fh, fh | LOCKED)) {
1171 >            else {
1172                  boolean validated = false;
1173                  boolean deleted = false;
1174 <                try {
1174 >                synchronized (f) {
1175                      if (tabAt(tab, i) == f) {
1176                          validated = true;
1177 <                        for (Node e = f, pred = null;;) {
1178 <                            Object ek, ev;
1179 <                            if ((e.hash & HASH_BITS) == h &&
1177 >                        for (Node<V> e = f, pred = null;;) {
1178 >                            Object ek; V ev;
1179 >                            if (e.hash == h &&
1180                                  ((ev = e.val) != null) &&
1181                                  ((ek = e.key) == k || k.equals(ek))) {
1182                                  if (cv == null || cv == ev || cv.equals(ev)) {
1183                                      oldVal = ev;
1184                                      if ((e.val = v) == null) {
1185                                          deleted = true;
1186 <                                        Node en = e.next;
1186 >                                        Node<V> en = e.next;
1187                                          if (pred != null)
1188                                              pred.next = en;
1189                                          else
# Line 1309 | Line 1197 | public class ConcurrentHashMap<K, V>
1197                                  break;
1198                          }
1199                      }
1312                } finally {
1313                    if (!f.casHash(fh | LOCKED, fh)) {
1314                        f.hash = fh;
1315                        synchronized (f) { f.notifyAll(); };
1316                    }
1200                  }
1201                  if (validated) {
1202                      if (deleted)
1203 <                        counter.add(-1L);
1203 >                        addCount(-1L, -1);
1204                      break;
1205                  }
1206              }
# Line 1326 | Line 1209 | public class ConcurrentHashMap<K, V>
1209      }
1210  
1211      /*
1212 <     * Internal versions of the six insertion methods, each a
1213 <     * little more complicated than the last. All have
1331 <     * the same basic structure as the first (internalPut):
1212 >     * Internal versions of insertion methods
1213 >     * All have the same basic structure as the first (internalPut):
1214       *  1. If table uninitialized, create
1215       *  2. If bin empty, try to CAS new node
1216       *  3. If bin stale, use new table
1217       *  4. if bin converted to TreeBin, validate and relay to TreeBin methods
1218       *  5. Lock and validate; if valid, scan and add or update
1219       *
1220 <     * The others interweave other checks and/or alternative actions:
1221 <     *  * Plain put checks for and performs resize after insertion.
1222 <     *  * putIfAbsent prescans for mapping without lock (and fails to add
1223 <     *    if present), which also makes pre-emptive resize checks worthwhile.
1224 <     *  * computeIfAbsent extends form used in putIfAbsent with additional
1225 <     *    mechanics to deal with, calls, potential exceptions and null
1226 <     *    returns from function call.
1345 <     *  * compute uses the same function-call mechanics, but without
1346 <     *    the prescans
1347 <     *  * merge acts as putIfAbsent in the absent case, but invokes the
1348 <     *    update function if present
1349 <     *  * putAll attempts to pre-allocate enough table space
1350 <     *    and more lazily performs count updates and checks.
1351 <     *
1352 <     * Someday when details settle down a bit more, it might be worth
1353 <     * some factoring to reduce sprawl.
1220 >     * The putAll method differs mainly in attempting to pre-allocate
1221 >     * enough table space, and also more lazily performs count updates
1222 >     * and checks.
1223 >     *
1224 >     * Most of the function-accepting methods can't be factored nicely
1225 >     * because they require different functional forms, so instead
1226 >     * sprawl out similar mechanics.
1227       */
1228  
1229 <    /** Implementation for put */
1230 <    private final Object internalPut(Object k, Object v) {
1229 >    /** Implementation for put and putIfAbsent */
1230 >    @SuppressWarnings("unchecked") private final V internalPut
1231 >        (K k, V v, boolean onlyIfAbsent) {
1232 >        if (k == null || v == null) throw new NullPointerException();
1233          int h = spread(k.hashCode());
1234 <        int count = 0;
1235 <        for (Node[] tab = table;;) {
1236 <            int i; Node f; int fh; Object fk;
1234 >        int len = 0;
1235 >        for (Node<V>[] tab = table;;) {
1236 >            int i, fh; Node<V> f; Object fk; V fv;
1237              if (tab == null)
1238                  tab = initTable();
1239              else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1240 <                if (casTabAt(tab, i, null, new Node(h, k, v, null)))
1240 >                if (casTabAt(tab, i, null, new Node<V>(h, k, v, null)))
1241                      break;                   // no lock when adding to empty bin
1242              }
1243 <            else if ((fh = f.hash) == MOVED) {
1243 >            else if ((fh = f.hash) < 0) {
1244                  if ((fk = f.key) instanceof TreeBin) {
1245 <                    TreeBin t = (TreeBin)fk;
1246 <                    Object oldVal = null;
1245 >                    TreeBin<V> t = (TreeBin<V>)fk;
1246 >                    V oldVal = null;
1247                      t.acquire(0);
1248                      try {
1249                          if (tabAt(tab, i) == f) {
1250 <                            count = 2;
1251 <                            TreeNode p = t.putTreeNode(h, k, v);
1250 >                            len = 2;
1251 >                            TreeNode<V> p = t.putTreeNode(h, k, v);
1252                              if (p != null) {
1253                                  oldVal = p.val;
1254 <                                p.val = v;
1254 >                                if (!onlyIfAbsent)
1255 >                                    p.val = v;
1256                              }
1257                          }
1258                      } finally {
1259                          t.release(0);
1260                      }
1261 <                    if (count != 0) {
1261 >                    if (len != 0) {
1262                          if (oldVal != null)
1263                              return oldVal;
1264                          break;
1265                      }
1266                  }
1267                  else
1268 <                    tab = (Node[])fk;
1268 >                    tab = (Node<V>[])fk;
1269              }
1270 <            else if ((fh & LOCKED) != 0) {
1271 <                checkForResize();
1272 <                f.tryAwaitLock(tab, i);
1273 <            }
1274 <            else if (f.casHash(fh, fh | LOCKED)) {
1275 <                Object oldVal = null;
1400 <                try {                        // needed in case equals() throws
1270 >            else if (onlyIfAbsent && fh == h && (fv = f.val) != null &&
1271 >                     ((fk = f.key) == k || k.equals(fk))) // peek while nearby
1272 >                return fv;
1273 >            else {
1274 >                V oldVal = null;
1275 >                synchronized (f) {
1276                      if (tabAt(tab, i) == f) {
1277 <                        count = 1;
1278 <                        for (Node e = f;; ++count) {
1279 <                            Object ek, ev;
1280 <                            if ((e.hash & HASH_BITS) == h &&
1277 >                        len = 1;
1278 >                        for (Node<V> e = f;; ++len) {
1279 >                            Object ek; V ev;
1280 >                            if (e.hash == h &&
1281                                  (ev = e.val) != null &&
1282                                  ((ek = e.key) == k || k.equals(ek))) {
1283                                  oldVal = ev;
1284 <                                e.val = v;
1284 >                                if (!onlyIfAbsent)
1285 >                                    e.val = v;
1286                                  break;
1287                              }
1288 <                            Node last = e;
1288 >                            Node<V> last = e;
1289                              if ((e = e.next) == null) {
1290 <                                last.next = new Node(h, k, v, null);
1291 <                                if (count >= TREE_THRESHOLD)
1290 >                                last.next = new Node<V>(h, k, v, null);
1291 >                                if (len >= TREE_THRESHOLD)
1292                                      replaceWithTreeBin(tab, i, k);
1293                                  break;
1294                              }
1295                          }
1296                      }
1421                } finally {                  // unlock and signal if needed
1422                    if (!f.casHash(fh | LOCKED, fh)) {
1423                        f.hash = fh;
1424                        synchronized (f) { f.notifyAll(); };
1425                    }
1297                  }
1298 <                if (count != 0) {
1298 >                if (len != 0) {
1299                      if (oldVal != null)
1300                          return oldVal;
1430                    if (tab.length <= 64)
1431                        count = 2;
1432                    break;
1433                }
1434            }
1435        }
1436        counter.add(1L);
1437        if (count > 1)
1438            checkForResize();
1439        return null;
1440    }
1441
1442    /** Implementation for putIfAbsent */
1443    private final Object internalPutIfAbsent(Object k, Object v) {
1444        int h = spread(k.hashCode());
1445        int count = 0;
1446        for (Node[] tab = table;;) {
1447            int i; Node f; int fh; Object fk, fv;
1448            if (tab == null)
1449                tab = initTable();
1450            else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1451                if (casTabAt(tab, i, null, new Node(h, k, v, null)))
1301                      break;
1453            }
1454            else if ((fh = f.hash) == MOVED) {
1455                if ((fk = f.key) instanceof TreeBin) {
1456                    TreeBin t = (TreeBin)fk;
1457                    Object oldVal = null;
1458                    t.acquire(0);
1459                    try {
1460                        if (tabAt(tab, i) == f) {
1461                            count = 2;
1462                            TreeNode p = t.putTreeNode(h, k, v);
1463                            if (p != null)
1464                                oldVal = p.val;
1465                        }
1466                    } finally {
1467                        t.release(0);
1468                    }
1469                    if (count != 0) {
1470                        if (oldVal != null)
1471                            return oldVal;
1472                        break;
1473                    }
1474                }
1475                else
1476                    tab = (Node[])fk;
1477            }
1478            else if ((fh & HASH_BITS) == h && (fv = f.val) != null &&
1479                     ((fk = f.key) == k || k.equals(fk)))
1480                return fv;
1481            else {
1482                Node g = f.next;
1483                if (g != null) { // at least 2 nodes -- search and maybe resize
1484                    for (Node e = g;;) {
1485                        Object ek, ev;
1486                        if ((e.hash & HASH_BITS) == h && (ev = e.val) != null &&
1487                            ((ek = e.key) == k || k.equals(ek)))
1488                            return ev;
1489                        if ((e = e.next) == null) {
1490                            checkForResize();
1491                            break;
1492                        }
1493                    }
1494                }
1495                if (((fh = f.hash) & LOCKED) != 0) {
1496                    checkForResize();
1497                    f.tryAwaitLock(tab, i);
1498                }
1499                else if (tabAt(tab, i) == f && f.casHash(fh, fh | LOCKED)) {
1500                    Object oldVal = null;
1501                    try {
1502                        if (tabAt(tab, i) == f) {
1503                            count = 1;
1504                            for (Node e = f;; ++count) {
1505                                Object ek, ev;
1506                                if ((e.hash & HASH_BITS) == h &&
1507                                    (ev = e.val) != null &&
1508                                    ((ek = e.key) == k || k.equals(ek))) {
1509                                    oldVal = ev;
1510                                    break;
1511                                }
1512                                Node last = e;
1513                                if ((e = e.next) == null) {
1514                                    last.next = new Node(h, k, v, null);
1515                                    if (count >= TREE_THRESHOLD)
1516                                        replaceWithTreeBin(tab, i, k);
1517                                    break;
1518                                }
1519                            }
1520                        }
1521                    } finally {
1522                        if (!f.casHash(fh | LOCKED, fh)) {
1523                            f.hash = fh;
1524                            synchronized (f) { f.notifyAll(); };
1525                        }
1526                    }
1527                    if (count != 0) {
1528                        if (oldVal != null)
1529                            return oldVal;
1530                        if (tab.length <= 64)
1531                            count = 2;
1532                        break;
1533                    }
1302                  }
1303              }
1304          }
1305 <        counter.add(1L);
1538 <        if (count > 1)
1539 <            checkForResize();
1305 >        addCount(1L, len);
1306          return null;
1307      }
1308  
1309      /** Implementation for computeIfAbsent */
1310 <    private final Object internalComputeIfAbsent(K k,
1311 <                                                 Fun<? super K, ?> mf) {
1310 >    @SuppressWarnings("unchecked") private final V internalComputeIfAbsent
1311 >        (K k, Function<? super K, ? extends V> mf) {
1312 >        if (k == null || mf == null)
1313 >            throw new NullPointerException();
1314          int h = spread(k.hashCode());
1315 <        Object val = null;
1316 <        int count = 0;
1317 <        for (Node[] tab = table;;) {
1318 <            Node f; int i, fh; Object fk, fv;
1315 >        V val = null;
1316 >        int len = 0;
1317 >        for (Node<V>[] tab = table;;) {
1318 >            Node<V> f; int i; Object fk;
1319              if (tab == null)
1320                  tab = initTable();
1321              else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1322 <                Node node = new Node(fh = h | LOCKED, k, null, null);
1323 <                if (casTabAt(tab, i, null, node)) {
1324 <                    count = 1;
1325 <                    try {
1326 <                        if ((val = mf.apply(k)) != null)
1327 <                            node.val = val;
1328 <                    } finally {
1329 <                        if (val == null)
1330 <                            setTabAt(tab, i, null);
1331 <                        if (!node.casHash(fh, h)) {
1564 <                            node.hash = h;
1565 <                            synchronized (node) { node.notifyAll(); };
1322 >                Node<V> node = new Node<V>(h, k, null, null);
1323 >                synchronized (node) {
1324 >                    if (casTabAt(tab, i, null, node)) {
1325 >                        len = 1;
1326 >                        try {
1327 >                            if ((val = mf.apply(k)) != null)
1328 >                                node.val = val;
1329 >                        } finally {
1330 >                            if (val == null)
1331 >                                setTabAt(tab, i, null);
1332                          }
1333                      }
1334                  }
1335 <                if (count != 0)
1335 >                if (len != 0)
1336                      break;
1337              }
1338 <            else if ((fh = f.hash) == MOVED) {
1338 >            else if (f.hash < 0) {
1339                  if ((fk = f.key) instanceof TreeBin) {
1340 <                    TreeBin t = (TreeBin)fk;
1340 >                    TreeBin<V> t = (TreeBin<V>)fk;
1341                      boolean added = false;
1342                      t.acquire(0);
1343                      try {
1344                          if (tabAt(tab, i) == f) {
1345 <                            count = 1;
1346 <                            TreeNode p = t.getTreeNode(h, k, t.root);
1345 >                            len = 1;
1346 >                            TreeNode<V> p = t.getTreeNode(h, k, t.root);
1347                              if (p != null)
1348                                  val = p.val;
1349                              else if ((val = mf.apply(k)) != null) {
1350                                  added = true;
1351 <                                count = 2;
1351 >                                len = 2;
1352                                  t.putTreeNode(h, k, val);
1353                              }
1354                          }
1355                      } finally {
1356                          t.release(0);
1357                      }
1358 <                    if (count != 0) {
1358 >                    if (len != 0) {
1359                          if (!added)
1360                              return val;
1361                          break;
1362                      }
1363                  }
1364                  else
1365 <                    tab = (Node[])fk;
1365 >                    tab = (Node<V>[])fk;
1366              }
1601            else if ((fh & HASH_BITS) == h && (fv = f.val) != null &&
1602                     ((fk = f.key) == k || k.equals(fk)))
1603                return fv;
1367              else {
1368 <                Node g = f.next;
1369 <                if (g != null) {
1370 <                    for (Node e = g;;) {
1371 <                        Object ek, ev;
1372 <                        if ((e.hash & HASH_BITS) == h && (ev = e.val) != null &&
1610 <                            ((ek = e.key) == k || k.equals(ek)))
1611 <                            return ev;
1612 <                        if ((e = e.next) == null) {
1613 <                            checkForResize();
1614 <                            break;
1615 <                        }
1616 <                    }
1617 <                }
1618 <                if (((fh = f.hash) & LOCKED) != 0) {
1619 <                    checkForResize();
1620 <                    f.tryAwaitLock(tab, i);
1368 >                for (Node<V> e = f; e != null; e = e.next) { // prescan
1369 >                    Object ek; V ev;
1370 >                    if (e.hash == h && (ev = e.val) != null &&
1371 >                        ((ek = e.key) == k || k.equals(ek)))
1372 >                        return ev;
1373                  }
1374 <                else if (tabAt(tab, i) == f && f.casHash(fh, fh | LOCKED)) {
1375 <                    boolean added = false;
1376 <                    try {
1377 <                        if (tabAt(tab, i) == f) {
1378 <                            count = 1;
1379 <                            for (Node e = f;; ++count) {
1380 <                                Object ek, ev;
1381 <                                if ((e.hash & HASH_BITS) == h &&
1382 <                                    (ev = e.val) != null &&
1383 <                                    ((ek = e.key) == k || k.equals(ek))) {
1384 <                                    val = ev;
1385 <                                    break;
1386 <                                }
1387 <                                Node last = e;
1388 <                                if ((e = e.next) == null) {
1389 <                                    if ((val = mf.apply(k)) != null) {
1390 <                                        added = true;
1391 <                                        last.next = new Node(h, k, val, null);
1392 <                                        if (count >= TREE_THRESHOLD)
1641 <                                            replaceWithTreeBin(tab, i, k);
1642 <                                    }
1643 <                                    break;
1374 >                boolean added = false;
1375 >                synchronized (f) {
1376 >                    if (tabAt(tab, i) == f) {
1377 >                        len = 1;
1378 >                        for (Node<V> e = f;; ++len) {
1379 >                            Object ek; V ev;
1380 >                            if (e.hash == h &&
1381 >                                (ev = e.val) != null &&
1382 >                                ((ek = e.key) == k || k.equals(ek))) {
1383 >                                val = ev;
1384 >                                break;
1385 >                            }
1386 >                            Node<V> last = e;
1387 >                            if ((e = e.next) == null) {
1388 >                                if ((val = mf.apply(k)) != null) {
1389 >                                    added = true;
1390 >                                    last.next = new Node<V>(h, k, val, null);
1391 >                                    if (len >= TREE_THRESHOLD)
1392 >                                        replaceWithTreeBin(tab, i, k);
1393                                  }
1394 +                                break;
1395                              }
1396                          }
1647                    } finally {
1648                        if (!f.casHash(fh | LOCKED, fh)) {
1649                            f.hash = fh;
1650                            synchronized (f) { f.notifyAll(); };
1651                        }
1652                    }
1653                    if (count != 0) {
1654                        if (!added)
1655                            return val;
1656                        if (tab.length <= 64)
1657                            count = 2;
1658                        break;
1397                      }
1398                  }
1399 +                if (len != 0) {
1400 +                    if (!added)
1401 +                        return val;
1402 +                    break;
1403 +                }
1404              }
1405          }
1406 <        if (val != null) {
1407 <            counter.add(1L);
1665 <            if (count > 1)
1666 <                checkForResize();
1667 <        }
1406 >        if (val != null)
1407 >            addCount(1L, len);
1408          return val;
1409      }
1410  
1411      /** Implementation for compute */
1412 <    @SuppressWarnings("unchecked") private final Object internalCompute
1413 <        (K k, boolean onlyIfPresent, BiFun<? super K, ? super V, ? extends V> mf) {
1412 >    @SuppressWarnings("unchecked") private final V internalCompute
1413 >        (K k, boolean onlyIfPresent,
1414 >         BiFunction<? super K, ? super V, ? extends V> mf) {
1415 >        if (k == null || mf == null)
1416 >            throw new NullPointerException();
1417          int h = spread(k.hashCode());
1418 <        Object val = null;
1418 >        V val = null;
1419          int delta = 0;
1420 <        int count = 0;
1421 <        for (Node[] tab = table;;) {
1422 <            Node f; int i, fh; Object fk;
1420 >        int len = 0;
1421 >        for (Node<V>[] tab = table;;) {
1422 >            Node<V> f; int i, fh; Object fk;
1423              if (tab == null)
1424                  tab = initTable();
1425              else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1426                  if (onlyIfPresent)
1427                      break;
1428 <                Node node = new Node(fh = h | LOCKED, k, null, null);
1429 <                if (casTabAt(tab, i, null, node)) {
1430 <                    try {
1431 <                        count = 1;
1432 <                        if ((val = mf.apply(k, null)) != null) {
1433 <                            node.val = val;
1434 <                            delta = 1;
1435 <                        }
1436 <                    } finally {
1437 <                        if (delta == 0)
1438 <                            setTabAt(tab, i, null);
1439 <                        if (!node.casHash(fh, h)) {
1697 <                            node.hash = h;
1698 <                            synchronized (node) { node.notifyAll(); };
1428 >                Node<V> node = new Node<V>(h, k, null, null);
1429 >                synchronized (node) {
1430 >                    if (casTabAt(tab, i, null, node)) {
1431 >                        try {
1432 >                            len = 1;
1433 >                            if ((val = mf.apply(k, null)) != null) {
1434 >                                node.val = val;
1435 >                                delta = 1;
1436 >                            }
1437 >                        } finally {
1438 >                            if (delta == 0)
1439 >                                setTabAt(tab, i, null);
1440                          }
1441                      }
1442                  }
1443 <                if (count != 0)
1443 >                if (len != 0)
1444                      break;
1445              }
1446 <            else if ((fh = f.hash) == MOVED) {
1446 >            else if ((fh = f.hash) < 0) {
1447                  if ((fk = f.key) instanceof TreeBin) {
1448 <                    TreeBin t = (TreeBin)fk;
1448 >                    TreeBin<V> t = (TreeBin<V>)fk;
1449                      t.acquire(0);
1450                      try {
1451                          if (tabAt(tab, i) == f) {
1452 <                            count = 1;
1453 <                            TreeNode p = t.getTreeNode(h, k, t.root);
1454 <                            Object pv = (p == null) ? null : p.val;
1455 <                            if ((val = mf.apply(k, (V)pv)) != null) {
1452 >                            len = 1;
1453 >                            TreeNode<V> p = t.getTreeNode(h, k, t.root);
1454 >                            if (p == null && onlyIfPresent)
1455 >                                break;
1456 >                            V pv = (p == null) ? null : p.val;
1457 >                            if ((val = mf.apply(k, pv)) != null) {
1458                                  if (p != null)
1459                                      p.val = val;
1460                                  else {
1461 <                                    count = 2;
1461 >                                    len = 2;
1462                                      delta = 1;
1463                                      t.putTreeNode(h, k, val);
1464                                  }
# Line 1728 | Line 1471 | public class ConcurrentHashMap<K, V>
1471                      } finally {
1472                          t.release(0);
1473                      }
1474 <                    if (count != 0)
1474 >                    if (len != 0)
1475                          break;
1476                  }
1477                  else
1478 <                    tab = (Node[])fk;
1736 <            }
1737 <            else if ((fh & LOCKED) != 0) {
1738 <                checkForResize();
1739 <                f.tryAwaitLock(tab, i);
1478 >                    tab = (Node<V>[])fk;
1479              }
1480 <            else if (f.casHash(fh, fh | LOCKED)) {
1481 <                try {
1480 >            else {
1481 >                synchronized (f) {
1482                      if (tabAt(tab, i) == f) {
1483 <                        count = 1;
1484 <                        for (Node e = f, pred = null;; ++count) {
1485 <                            Object ek, ev;
1486 <                            if ((e.hash & HASH_BITS) == h &&
1483 >                        len = 1;
1484 >                        for (Node<V> e = f, pred = null;; ++len) {
1485 >                            Object ek; V ev;
1486 >                            if (e.hash == h &&
1487                                  (ev = e.val) != null &&
1488                                  ((ek = e.key) == k || k.equals(ek))) {
1489 <                                val = mf.apply(k, (V)ev);
1489 >                                val = mf.apply(k, ev);
1490                                  if (val != null)
1491                                      e.val = val;
1492                                  else {
1493                                      delta = -1;
1494 <                                    Node en = e.next;
1494 >                                    Node<V> en = e.next;
1495                                      if (pred != null)
1496                                          pred.next = en;
1497                                      else
# Line 1762 | Line 1501 | public class ConcurrentHashMap<K, V>
1501                              }
1502                              pred = e;
1503                              if ((e = e.next) == null) {
1504 <                                if (!onlyIfPresent && (val = mf.apply(k, null)) != null) {
1505 <                                    pred.next = new Node(h, k, val, null);
1504 >                                if (!onlyIfPresent &&
1505 >                                    (val = mf.apply(k, null)) != null) {
1506 >                                    pred.next = new Node<V>(h, k, val, null);
1507                                      delta = 1;
1508 <                                    if (count >= TREE_THRESHOLD)
1508 >                                    if (len >= TREE_THRESHOLD)
1509                                          replaceWithTreeBin(tab, i, k);
1510                                  }
1511                                  break;
1512                              }
1513                          }
1514                      }
1775                } finally {
1776                    if (!f.casHash(fh | LOCKED, fh)) {
1777                        f.hash = fh;
1778                        synchronized (f) { f.notifyAll(); };
1779                    }
1515                  }
1516 <                if (count != 0) {
1782 <                    if (tab.length <= 64)
1783 <                        count = 2;
1516 >                if (len != 0)
1517                      break;
1785                }
1518              }
1519          }
1520 <        if (delta != 0) {
1521 <            counter.add((long)delta);
1790 <            if (count > 1)
1791 <                checkForResize();
1792 <        }
1520 >        if (delta != 0)
1521 >            addCount((long)delta, len);
1522          return val;
1523      }
1524  
1525      /** Implementation for merge */
1526 <    @SuppressWarnings("unchecked") private final Object internalMerge
1527 <        (K k, V v, BiFun<? super V, ? super V, ? extends V> mf) {
1526 >    @SuppressWarnings("unchecked") private final V internalMerge
1527 >        (K k, V v, BiFunction<? super V, ? super V, ? extends V> mf) {
1528 >        if (k == null || v == null || mf == null)
1529 >            throw new NullPointerException();
1530          int h = spread(k.hashCode());
1531 <        Object val = null;
1531 >        V val = null;
1532          int delta = 0;
1533 <        int count = 0;
1534 <        for (Node[] tab = table;;) {
1535 <            int i; Node f; int fh; Object fk, fv;
1533 >        int len = 0;
1534 >        for (Node<V>[] tab = table;;) {
1535 >            int i; Node<V> f; Object fk; V fv;
1536              if (tab == null)
1537                  tab = initTable();
1538              else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1539 <                if (casTabAt(tab, i, null, new Node(h, k, v, null))) {
1539 >                if (casTabAt(tab, i, null, new Node<V>(h, k, v, null))) {
1540                      delta = 1;
1541                      val = v;
1542                      break;
1543                  }
1544              }
1545 <            else if ((fh = f.hash) == MOVED) {
1545 >            else if (f.hash < 0) {
1546                  if ((fk = f.key) instanceof TreeBin) {
1547 <                    TreeBin t = (TreeBin)fk;
1547 >                    TreeBin<V> t = (TreeBin<V>)fk;
1548                      t.acquire(0);
1549                      try {
1550                          if (tabAt(tab, i) == f) {
1551 <                            count = 1;
1552 <                            TreeNode p = t.getTreeNode(h, k, t.root);
1553 <                            val = (p == null) ? v : mf.apply((V)p.val, v);
1551 >                            len = 1;
1552 >                            TreeNode<V> p = t.getTreeNode(h, k, t.root);
1553 >                            val = (p == null) ? v : mf.apply(p.val, v);
1554                              if (val != null) {
1555                                  if (p != null)
1556                                      p.val = val;
1557                                  else {
1558 <                                    count = 2;
1558 >                                    len = 2;
1559                                      delta = 1;
1560                                      t.putTreeNode(h, k, val);
1561                                  }
# Line 1837 | Line 1568 | public class ConcurrentHashMap<K, V>
1568                      } finally {
1569                          t.release(0);
1570                      }
1571 <                    if (count != 0)
1571 >                    if (len != 0)
1572                          break;
1573                  }
1574                  else
1575 <                    tab = (Node[])fk;
1575 >                    tab = (Node<V>[])fk;
1576              }
1577 <            else if ((fh & LOCKED) != 0) {
1578 <                checkForResize();
1848 <                f.tryAwaitLock(tab, i);
1849 <            }
1850 <            else if (f.casHash(fh, fh | LOCKED)) {
1851 <                try {
1577 >            else {
1578 >                synchronized (f) {
1579                      if (tabAt(tab, i) == f) {
1580 <                        count = 1;
1581 <                        for (Node e = f, pred = null;; ++count) {
1582 <                            Object ek, ev;
1583 <                            if ((e.hash & HASH_BITS) == h &&
1580 >                        len = 1;
1581 >                        for (Node<V> e = f, pred = null;; ++len) {
1582 >                            Object ek; V ev;
1583 >                            if (e.hash == h &&
1584                                  (ev = e.val) != null &&
1585                                  ((ek = e.key) == k || k.equals(ek))) {
1586 <                                val = mf.apply(v, (V)ev);
1586 >                                val = mf.apply(ev, v);
1587                                  if (val != null)
1588                                      e.val = val;
1589                                  else {
1590                                      delta = -1;
1591 <                                    Node en = e.next;
1591 >                                    Node<V> en = e.next;
1592                                      if (pred != null)
1593                                          pred.next = en;
1594                                      else
# Line 1872 | Line 1599 | public class ConcurrentHashMap<K, V>
1599                              pred = e;
1600                              if ((e = e.next) == null) {
1601                                  val = v;
1602 <                                pred.next = new Node(h, k, val, null);
1602 >                                pred.next = new Node<V>(h, k, val, null);
1603                                  delta = 1;
1604 <                                if (count >= TREE_THRESHOLD)
1604 >                                if (len >= TREE_THRESHOLD)
1605                                      replaceWithTreeBin(tab, i, k);
1606                                  break;
1607                              }
1608                          }
1609                      }
1883                } finally {
1884                    if (!f.casHash(fh | LOCKED, fh)) {
1885                        f.hash = fh;
1886                        synchronized (f) { f.notifyAll(); };
1887                    }
1610                  }
1611 <                if (count != 0) {
1890 <                    if (tab.length <= 64)
1891 <                        count = 2;
1611 >                if (len != 0)
1612                      break;
1893                }
1613              }
1614          }
1615 <        if (delta != 0) {
1616 <            counter.add((long)delta);
1898 <            if (count > 1)
1899 <                checkForResize();
1900 <        }
1615 >        if (delta != 0)
1616 >            addCount((long)delta, len);
1617          return val;
1618      }
1619  
1620      /** Implementation for putAll */
1621 <    private final void internalPutAll(Map<?, ?> m) {
1621 >    @SuppressWarnings("unchecked") private final void internalPutAll
1622 >        (Map<? extends K, ? extends V> m) {
1623          tryPresize(m.size());
1624          long delta = 0L;     // number of uncommitted additions
1625          boolean npe = false; // to throw exception on exit for nulls
1626          try {                // to clean up counts on other exceptions
1627 <            for (Map.Entry<?, ?> entry : m.entrySet()) {
1628 <                Object k, v;
1627 >            for (Map.Entry<?, ? extends V> entry : m.entrySet()) {
1628 >                Object k; V v;
1629                  if (entry == null || (k = entry.getKey()) == null ||
1630                      (v = entry.getValue()) == null) {
1631                      npe = true;
1632                      break;
1633                  }
1634                  int h = spread(k.hashCode());
1635 <                for (Node[] tab = table;;) {
1636 <                    int i; Node f; int fh; Object fk;
1635 >                for (Node<V>[] tab = table;;) {
1636 >                    int i; Node<V> f; int fh; Object fk;
1637                      if (tab == null)
1638                          tab = initTable();
1639                      else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null){
1640 <                        if (casTabAt(tab, i, null, new Node(h, k, v, null))) {
1640 >                        if (casTabAt(tab, i, null, new Node<V>(h, k, v, null))) {
1641                              ++delta;
1642                              break;
1643                          }
1644                      }
1645 <                    else if ((fh = f.hash) == MOVED) {
1645 >                    else if ((fh = f.hash) < 0) {
1646                          if ((fk = f.key) instanceof TreeBin) {
1647 <                            TreeBin t = (TreeBin)fk;
1647 >                            TreeBin<V> t = (TreeBin<V>)fk;
1648                              boolean validated = false;
1649                              t.acquire(0);
1650                              try {
1651                                  if (tabAt(tab, i) == f) {
1652                                      validated = true;
1653 <                                    TreeNode p = t.getTreeNode(h, k, t.root);
1653 >                                    TreeNode<V> p = t.getTreeNode(h, k, t.root);
1654                                      if (p != null)
1655                                          p.val = v;
1656                                      else {
# Line 1948 | Line 1665 | public class ConcurrentHashMap<K, V>
1665                                  break;
1666                          }
1667                          else
1668 <                            tab = (Node[])fk;
1668 >                            tab = (Node<V>[])fk;
1669                      }
1670 <                    else if ((fh & LOCKED) != 0) {
1671 <                        counter.add(delta);
1672 <                        delta = 0L;
1956 <                        checkForResize();
1957 <                        f.tryAwaitLock(tab, i);
1958 <                    }
1959 <                    else if (f.casHash(fh, fh | LOCKED)) {
1960 <                        int count = 0;
1961 <                        try {
1670 >                    else {
1671 >                        int len = 0;
1672 >                        synchronized (f) {
1673                              if (tabAt(tab, i) == f) {
1674 <                                count = 1;
1675 <                                for (Node e = f;; ++count) {
1676 <                                    Object ek, ev;
1677 <                                    if ((e.hash & HASH_BITS) == h &&
1674 >                                len = 1;
1675 >                                for (Node<V> e = f;; ++len) {
1676 >                                    Object ek; V ev;
1677 >                                    if (e.hash == h &&
1678                                          (ev = e.val) != null &&
1679                                          ((ek = e.key) == k || k.equals(ek))) {
1680                                          e.val = v;
1681                                          break;
1682                                      }
1683 <                                    Node last = e;
1683 >                                    Node<V> last = e;
1684                                      if ((e = e.next) == null) {
1685                                          ++delta;
1686 <                                        last.next = new Node(h, k, v, null);
1687 <                                        if (count >= TREE_THRESHOLD)
1686 >                                        last.next = new Node<V>(h, k, v, null);
1687 >                                        if (len >= TREE_THRESHOLD)
1688                                              replaceWithTreeBin(tab, i, k);
1689                                          break;
1690                                      }
1691                                  }
1692                              }
1982                        } finally {
1983                            if (!f.casHash(fh | LOCKED, fh)) {
1984                                f.hash = fh;
1985                                synchronized (f) { f.notifyAll(); };
1986                            }
1693                          }
1694 <                        if (count != 0) {
1695 <                            if (count > 1) {
1696 <                                counter.add(delta);
1991 <                                delta = 0L;
1992 <                                checkForResize();
1993 <                            }
1694 >                        if (len != 0) {
1695 >                            if (len > 1)
1696 >                                addCount(delta, len);
1697                              break;
1698                          }
1699                      }
1700                  }
1701              }
1702          } finally {
1703 <            if (delta != 0)
1704 <                counter.add(delta);
1703 >            if (delta != 0L)
1704 >                addCount(delta, 2);
1705          }
1706          if (npe)
1707              throw new NullPointerException();
1708      }
1709  
1710 +    /**
1711 +     * Implementation for clear. Steps through each bin, removing all
1712 +     * nodes.
1713 +     */
1714 +    @SuppressWarnings("unchecked") private final void internalClear() {
1715 +        long delta = 0L; // negative number of deletions
1716 +        int i = 0;
1717 +        Node<V>[] tab = table;
1718 +        while (tab != null && i < tab.length) {
1719 +            Node<V> f = tabAt(tab, i);
1720 +            if (f == null)
1721 +                ++i;
1722 +            else if (f.hash < 0) {
1723 +                Object fk;
1724 +                if ((fk = f.key) instanceof TreeBin) {
1725 +                    TreeBin<V> t = (TreeBin<V>)fk;
1726 +                    t.acquire(0);
1727 +                    try {
1728 +                        if (tabAt(tab, i) == f) {
1729 +                            for (Node<V> p = t.first; p != null; p = p.next) {
1730 +                                if (p.val != null) { // (currently always true)
1731 +                                    p.val = null;
1732 +                                    --delta;
1733 +                                }
1734 +                            }
1735 +                            t.first = null;
1736 +                            t.root = null;
1737 +                            ++i;
1738 +                        }
1739 +                    } finally {
1740 +                        t.release(0);
1741 +                    }
1742 +                }
1743 +                else
1744 +                    tab = (Node<V>[])fk;
1745 +            }
1746 +            else {
1747 +                synchronized (f) {
1748 +                    if (tabAt(tab, i) == f) {
1749 +                        for (Node<V> e = f; e != null; e = e.next) {
1750 +                            if (e.val != null) {  // (currently always true)
1751 +                                e.val = null;
1752 +                                --delta;
1753 +                            }
1754 +                        }
1755 +                        setTabAt(tab, i, null);
1756 +                        ++i;
1757 +                    }
1758 +                }
1759 +            }
1760 +        }
1761 +        if (delta != 0L)
1762 +            addCount(delta, -1);
1763 +    }
1764 +
1765      /* ---------------- Table Initialization and Resizing -------------- */
1766  
1767      /**
# Line 2023 | Line 1781 | public class ConcurrentHashMap<K, V>
1781      /**
1782       * Initializes table, using the size recorded in sizeCtl.
1783       */
1784 <    private final Node[] initTable() {
1785 <        Node[] tab; int sc;
1784 >    @SuppressWarnings("unchecked") private final Node<V>[] initTable() {
1785 >        Node<V>[] tab; int sc;
1786          while ((tab = table) == null) {
1787              if ((sc = sizeCtl) < 0)
1788                  Thread.yield(); // lost initialization race; just spin
1789 <            else if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1789 >            else if (U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
1790                  try {
1791                      if ((tab = table) == null) {
1792                          int n = (sc > 0) ? sc : DEFAULT_CAPACITY;
1793 <                        tab = table = new Node[n];
1793 >                        @SuppressWarnings("rawtypes") Node[] tb = new Node[n];
1794 >                        table = tab = (Node<V>[])tb;
1795                          sc = n - (n >>> 2);
1796                      }
1797                  } finally {
# Line 2045 | Line 1804 | public class ConcurrentHashMap<K, V>
1804      }
1805  
1806      /**
1807 <     * If table is too small and not already resizing, creates next
1808 <     * table and transfers bins.  Rechecks occupancy after a transfer
1809 <     * to see if another resize is already needed because resizings
1810 <     * are lagging additions.
1811 <     */
1812 <    private final void checkForResize() {
1813 <        Node[] tab; int n, sc;
1814 <        while ((tab = table) != null &&
1815 <               (n = tab.length) < MAXIMUM_CAPACITY &&
1816 <               (sc = sizeCtl) >= 0 && counter.sum() >= (long)sc &&
1817 <               UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1818 <            try {
1819 <                if (tab == table) {
1820 <                    table = rebuild(tab);
1821 <                    sc = (n << 1) - (n >>> 1);
1807 >     * Adds to count, and if table is too small and not already
1808 >     * resizing, initiates transfer. If already resizing, helps
1809 >     * perform transfer if work is available.  Rechecks occupancy
1810 >     * after a transfer to see if another resize is already needed
1811 >     * because resizings are lagging additions.
1812 >     *
1813 >     * @param x the count to add
1814 >     * @param check if <0, don't check resize, if <= 1 only check if uncontended
1815 >     */
1816 >    private final void addCount(long x, int check) {
1817 >        Cell[] as; long b, s;
1818 >        if ((as = counterCells) != null ||
1819 >            !U.compareAndSwapLong(this, BASECOUNT, b = baseCount, s = b + x)) {
1820 >            Cell a; long v; int m;
1821 >            boolean uncontended = true;
1822 >            if (as == null || (m = as.length - 1) < 0 ||
1823 >                (a = as[ThreadLocalRandom.getProbe() & m]) == null ||
1824 >                !(uncontended =
1825 >                  U.compareAndSwapLong(a, CELLVALUE, v = a.value, v + x))) {
1826 >                fullAddCount(x, uncontended);
1827 >                return;
1828 >            }
1829 >            if (check <= 1)
1830 >                return;
1831 >            s = sumCount();
1832 >        }
1833 >        if (check >= 0) {
1834 >            Node<V>[] tab, nt; int sc;
1835 >            while (s >= (long)(sc = sizeCtl) && (tab = table) != null &&
1836 >                   tab.length < MAXIMUM_CAPACITY) {
1837 >                if (sc < 0) {
1838 >                    if (sc == -1 || transferIndex <= transferOrigin ||
1839 >                        (nt = nextTable) == null)
1840 >                        break;
1841 >                    if (U.compareAndSwapInt(this, SIZECTL, sc, sc - 1))
1842 >                        transfer(tab, nt);
1843                  }
1844 <            } finally {
1845 <                sizeCtl = sc;
1844 >                else if (U.compareAndSwapInt(this, SIZECTL, sc, -2))
1845 >                    transfer(tab, null);
1846 >                s = sumCount();
1847              }
1848          }
1849      }
# Line 2072 | Line 1853 | public class ConcurrentHashMap<K, V>
1853       *
1854       * @param size number of elements (doesn't need to be perfectly accurate)
1855       */
1856 <    private final void tryPresize(int size) {
1856 >    @SuppressWarnings("unchecked") private final void tryPresize(int size) {
1857          int c = (size >= (MAXIMUM_CAPACITY >>> 1)) ? MAXIMUM_CAPACITY :
1858              tableSizeFor(size + (size >>> 1) + 1);
1859          int sc;
1860          while ((sc = sizeCtl) >= 0) {
1861 <            Node[] tab = table; int n;
1861 >            Node<V>[] tab = table; int n;
1862              if (tab == null || (n = tab.length) == 0) {
1863                  n = (sc > c) ? sc : c;
1864 <                if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1864 >                if (U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
1865                      try {
1866                          if (table == tab) {
1867 <                            table = new Node[n];
1867 >                            @SuppressWarnings("rawtypes") Node[] tb = new Node[n];
1868 >                            table = (Node<V>[])tb;
1869                              sc = n - (n >>> 2);
1870                          }
1871                      } finally {
# Line 2093 | Line 1875 | public class ConcurrentHashMap<K, V>
1875              }
1876              else if (c <= sc || n >= MAXIMUM_CAPACITY)
1877                  break;
1878 <            else if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1879 <                try {
1880 <                    if (table == tab) {
2099 <                        table = rebuild(tab);
2100 <                        sc = (n << 1) - (n >>> 1);
2101 <                    }
2102 <                } finally {
2103 <                    sizeCtl = sc;
2104 <                }
2105 <            }
1878 >            else if (tab == table &&
1879 >                     U.compareAndSwapInt(this, SIZECTL, sc, -2))
1880 >                transfer(tab, null);
1881          }
1882      }
1883  
1884      /*
1885       * Moves and/or copies the nodes in each bin to new table. See
1886       * above for explanation.
2112     *
2113     * @return the new table
1887       */
1888 <    private static final Node[] rebuild(Node[] tab) {
1889 <        int n = tab.length;
1890 <        Node[] nextTab = new Node[n << 1];
1891 <        Node fwd = new Node(MOVED, nextTab, null, null);
1892 <        int[] buffer = null;       // holds bins to revisit; null until needed
1893 <        Node rev = null;           // reverse forwarder; null until needed
1894 <        int nbuffered = 0;         // the number of bins in buffer list
1895 <        int bufferIndex = 0;       // buffer index of current buffered bin
1896 <        int bin = n - 1;           // current non-buffered bin or -1 if none
1897 <
1898 <        for (int i = bin;;) {      // start upwards sweep
1899 <            int fh; Node f;
1900 <            if ((f = tabAt(tab, i)) == null) {
1901 <                if (bin >= 0) {    // Unbuffered; no lock needed (or available)
1902 <                    if (!casTabAt(tab, i, f, fwd))
1903 <                        continue;
1904 <                }
1905 <                else {             // transiently use a locked forwarding node
1906 <                    Node g = new Node(MOVED|LOCKED, nextTab, null, null);
1907 <                    if (!casTabAt(tab, i, f, g))
1908 <                        continue;
1888 >    @SuppressWarnings("unchecked") private final void transfer
1889 >        (Node<V>[] tab, Node<V>[] nextTab) {
1890 >        int n = tab.length, stride;
1891 >        if ((stride = (NCPU > 1) ? (n >>> 3) / NCPU : n) < MIN_TRANSFER_STRIDE)
1892 >            stride = MIN_TRANSFER_STRIDE; // subdivide range
1893 >        if (nextTab == null) {            // initiating
1894 >            try {
1895 >                @SuppressWarnings("rawtypes") Node[] tb = new Node[n << 1];
1896 >                nextTab = (Node<V>[])tb;
1897 >            } catch (Throwable ex) {      // try to cope with OOME
1898 >                sizeCtl = Integer.MAX_VALUE;
1899 >                return;
1900 >            }
1901 >            nextTable = nextTab;
1902 >            transferOrigin = n;
1903 >            transferIndex = n;
1904 >            Node<V> rev = new Node<V>(MOVED, tab, null, null);
1905 >            for (int k = n; k > 0;) {    // progressively reveal ready slots
1906 >                int nextk = (k > stride) ? k - stride : 0;
1907 >                for (int m = nextk; m < k; ++m)
1908 >                    nextTab[m] = rev;
1909 >                for (int m = n + nextk; m < n + k; ++m)
1910 >                    nextTab[m] = rev;
1911 >                U.putOrderedInt(this, TRANSFERORIGIN, k = nextk);
1912 >            }
1913 >        }
1914 >        int nextn = nextTab.length;
1915 >        Node<V> fwd = new Node<V>(MOVED, nextTab, null, null);
1916 >        boolean advance = true;
1917 >        for (int i = 0, bound = 0;;) {
1918 >            int nextIndex, nextBound; Node<V> f; Object fk;
1919 >            while (advance) {
1920 >                if (--i >= bound)
1921 >                    advance = false;
1922 >                else if ((nextIndex = transferIndex) <= transferOrigin) {
1923 >                    i = -1;
1924 >                    advance = false;
1925 >                }
1926 >                else if (U.compareAndSwapInt
1927 >                         (this, TRANSFERINDEX, nextIndex,
1928 >                          nextBound = (nextIndex > stride ?
1929 >                                       nextIndex - stride : 0))) {
1930 >                    bound = nextBound;
1931 >                    i = nextIndex - 1;
1932 >                    advance = false;
1933 >                }
1934 >            }
1935 >            if (i < 0 || i >= n || i + n >= nextn) {
1936 >                for (int sc;;) {
1937 >                    if (U.compareAndSwapInt(this, SIZECTL, sc = sizeCtl, ++sc)) {
1938 >                        if (sc == -1) {
1939 >                            nextTable = null;
1940 >                            table = nextTab;
1941 >                            sizeCtl = (n << 1) - (n >>> 1);
1942 >                        }
1943 >                        return;
1944 >                    }
1945 >                }
1946 >            }
1947 >            else if ((f = tabAt(tab, i)) == null) {
1948 >                if (casTabAt(tab, i, null, fwd)) {
1949                      setTabAt(nextTab, i, null);
1950                      setTabAt(nextTab, i + n, null);
1951 <                    setTabAt(tab, i, fwd);
2139 <                    if (!g.casHash(MOVED|LOCKED, MOVED)) {
2140 <                        g.hash = MOVED;
2141 <                        synchronized (g) { g.notifyAll(); }
2142 <                    }
1951 >                    advance = true;
1952                  }
1953              }
1954 <            else if ((fh = f.hash) == MOVED) {
1955 <                Object fk = f.key;
1956 <                if (fk instanceof TreeBin) {
1957 <                    TreeBin t = (TreeBin)fk;
1958 <                    boolean validated = false;
1959 <                    t.acquire(0);
1960 <                    try {
1961 <                        if (tabAt(tab, i) == f) {
1962 <                            validated = true;
1963 <                            splitTreeBin(nextTab, i, t);
1964 <                            setTabAt(tab, i, fwd);
1954 >            else if (f.hash >= 0) {
1955 >                synchronized (f) {
1956 >                    if (tabAt(tab, i) == f) {
1957 >                        int runBit = f.hash & n;
1958 >                        Node<V> lastRun = f, lo = null, hi = null;
1959 >                        for (Node<V> p = f.next; p != null; p = p.next) {
1960 >                            int b = p.hash & n;
1961 >                            if (b != runBit) {
1962 >                                runBit = b;
1963 >                                lastRun = p;
1964 >                            }
1965                          }
1966 <                    } finally {
1967 <                        t.release(0);
1966 >                        if (runBit == 0)
1967 >                            lo = lastRun;
1968 >                        else
1969 >                            hi = lastRun;
1970 >                        for (Node<V> p = f; p != lastRun; p = p.next) {
1971 >                            int ph = p.hash;
1972 >                            Object pk = p.key; V pv = p.val;
1973 >                            if ((ph & n) == 0)
1974 >                                lo = new Node<V>(ph, pk, pv, lo);
1975 >                            else
1976 >                                hi = new Node<V>(ph, pk, pv, hi);
1977 >                        }
1978 >                        setTabAt(nextTab, i, lo);
1979 >                        setTabAt(nextTab, i + n, hi);
1980 >                        setTabAt(tab, i, fwd);
1981 >                        advance = true;
1982                      }
2160                    if (!validated)
2161                        continue;
1983                  }
1984              }
1985 <            else if ((fh & LOCKED) == 0 && f.casHash(fh, fh|LOCKED)) {
1986 <                boolean validated = false;
1987 <                try {              // split to lo and hi lists; copying as needed
1985 >            else if ((fk = f.key) instanceof TreeBin) {
1986 >                TreeBin<V> t = (TreeBin<V>)fk;
1987 >                t.acquire(0);
1988 >                try {
1989                      if (tabAt(tab, i) == f) {
1990 <                        validated = true;
1991 <                        splitBin(nextTab, i, f);
1990 >                        TreeBin<V> lt = new TreeBin<V>();
1991 >                        TreeBin<V> ht = new TreeBin<V>();
1992 >                        int lc = 0, hc = 0;
1993 >                        for (Node<V> e = t.first; e != null; e = e.next) {
1994 >                            int h = e.hash;
1995 >                            Object k = e.key; V v = e.val;
1996 >                            if ((h & n) == 0) {
1997 >                                ++lc;
1998 >                                lt.putTreeNode(h, k, v);
1999 >                            }
2000 >                            else {
2001 >                                ++hc;
2002 >                                ht.putTreeNode(h, k, v);
2003 >                            }
2004 >                        }
2005 >                        Node<V> ln, hn; // throw away trees if too small
2006 >                        if (lc < TREE_THRESHOLD) {
2007 >                            ln = null;
2008 >                            for (Node<V> p = lt.first; p != null; p = p.next)
2009 >                                ln = new Node<V>(p.hash, p.key, p.val, ln);
2010 >                        }
2011 >                        else
2012 >                            ln = new Node<V>(MOVED, lt, null, null);
2013 >                        setTabAt(nextTab, i, ln);
2014 >                        if (hc < TREE_THRESHOLD) {
2015 >                            hn = null;
2016 >                            for (Node<V> p = ht.first; p != null; p = p.next)
2017 >                                hn = new Node<V>(p.hash, p.key, p.val, hn);
2018 >                        }
2019 >                        else
2020 >                            hn = new Node<V>(MOVED, ht, null, null);
2021 >                        setTabAt(nextTab, i + n, hn);
2022                          setTabAt(tab, i, fwd);
2023 +                        advance = true;
2024                      }
2025                  } finally {
2026 <                    if (!f.casHash(fh | LOCKED, fh)) {
2174 <                        f.hash = fh;
2175 <                        synchronized (f) { f.notifyAll(); };
2176 <                    }
2026 >                    t.release(0);
2027                  }
2178                if (!validated)
2179                    continue;
2180            }
2181            else {
2182                if (buffer == null) // initialize buffer for revisits
2183                    buffer = new int[TRANSFER_BUFFER_SIZE];
2184                if (bin < 0 && bufferIndex > 0) {
2185                    int j = buffer[--bufferIndex];
2186                    buffer[bufferIndex] = i;
2187                    i = j;         // swap with another bin
2188                    continue;
2189                }
2190                if (bin < 0 || nbuffered >= TRANSFER_BUFFER_SIZE) {
2191                    f.tryAwaitLock(tab, i);
2192                    continue;      // no other options -- block
2193                }
2194                if (rev == null)   // initialize reverse-forwarder
2195                    rev = new Node(MOVED, tab, null, null);
2196                if (tabAt(tab, i) != f || (f.hash & LOCKED) == 0)
2197                    continue;      // recheck before adding to list
2198                buffer[nbuffered++] = i;
2199                setTabAt(nextTab, i, rev);     // install place-holders
2200                setTabAt(nextTab, i + n, rev);
2201            }
2202
2203            if (bin > 0)
2204                i = --bin;
2205            else if (buffer != null && nbuffered > 0) {
2206                bin = -1;
2207                i = buffer[bufferIndex = --nbuffered];
2028              }
2029              else
2030 <                return nextTab;
2030 >                advance = true; // already processed
2031          }
2032      }
2033  
2034 <    /**
2215 <     * Splits a normal bin with list headed by e into lo and hi parts;
2216 <     * installs in given table.
2217 <     */
2218 <    private static void splitBin(Node[] nextTab, int i, Node e) {
2219 <        int bit = nextTab.length >>> 1; // bit to split on
2220 <        int runBit = e.hash & bit;
2221 <        Node lastRun = e, lo = null, hi = null;
2222 <        for (Node p = e.next; p != null; p = p.next) {
2223 <            int b = p.hash & bit;
2224 <            if (b != runBit) {
2225 <                runBit = b;
2226 <                lastRun = p;
2227 <            }
2228 <        }
2229 <        if (runBit == 0)
2230 <            lo = lastRun;
2231 <        else
2232 <            hi = lastRun;
2233 <        for (Node p = e; p != lastRun; p = p.next) {
2234 <            int ph = p.hash & HASH_BITS;
2235 <            Object pk = p.key, pv = p.val;
2236 <            if ((ph & bit) == 0)
2237 <                lo = new Node(ph, pk, pv, lo);
2238 <            else
2239 <                hi = new Node(ph, pk, pv, hi);
2240 <        }
2241 <        setTabAt(nextTab, i, lo);
2242 <        setTabAt(nextTab, i + bit, hi);
2243 <    }
2034 >    /* ---------------- Counter support -------------- */
2035  
2036 <    /**
2037 <     * Splits a tree bin into lo and hi parts; installs in given table.
2038 <     */
2039 <    private static void splitTreeBin(Node[] nextTab, int i, TreeBin t) {
2040 <        int bit = nextTab.length >>> 1;
2041 <        TreeBin lt = new TreeBin();
2042 <        TreeBin ht = new TreeBin();
2252 <        int lc = 0, hc = 0;
2253 <        for (Node e = t.first; e != null; e = e.next) {
2254 <            int h = e.hash & HASH_BITS;
2255 <            Object k = e.key, v = e.val;
2256 <            if ((h & bit) == 0) {
2257 <                ++lc;
2258 <                lt.putTreeNode(h, k, v);
2259 <            }
2260 <            else {
2261 <                ++hc;
2262 <                ht.putTreeNode(h, k, v);
2036 >    final long sumCount() {
2037 >        Cell[] as = counterCells; Cell a;
2038 >        long sum = baseCount;
2039 >        if (as != null) {
2040 >            for (int i = 0; i < as.length; ++i) {
2041 >                if ((a = as[i]) != null)
2042 >                    sum += a.value;
2043              }
2044          }
2045 <        Node ln, hn; // throw away trees if too small
2266 <        if (lc <= (TREE_THRESHOLD >>> 1)) {
2267 <            ln = null;
2268 <            for (Node p = lt.first; p != null; p = p.next)
2269 <                ln = new Node(p.hash, p.key, p.val, ln);
2270 <        }
2271 <        else
2272 <            ln = new Node(MOVED, lt, null, null);
2273 <        setTabAt(nextTab, i, ln);
2274 <        if (hc <= (TREE_THRESHOLD >>> 1)) {
2275 <            hn = null;
2276 <            for (Node p = ht.first; p != null; p = p.next)
2277 <                hn = new Node(p.hash, p.key, p.val, hn);
2278 <        }
2279 <        else
2280 <            hn = new Node(MOVED, ht, null, null);
2281 <        setTabAt(nextTab, i + bit, hn);
2045 >        return sum;
2046      }
2047  
2048 <    /**
2049 <     * Implementation for clear. Steps through each bin, removing all
2050 <     * nodes.
2051 <     */
2052 <    private final void internalClear() {
2053 <        long delta = 0L; // negative number of deletions
2054 <        int i = 0;
2055 <        Node[] tab = table;
2056 <        while (tab != null && i < tab.length) {
2057 <            int fh; Object fk;
2058 <            Node f = tabAt(tab, i);
2059 <            if (f == null)
2060 <                ++i;
2061 <            else if ((fh = f.hash) == MOVED) {
2062 <                if ((fk = f.key) instanceof TreeBin) {
2063 <                    TreeBin t = (TreeBin)fk;
2064 <                    t.acquire(0);
2065 <                    try {
2066 <                        if (tabAt(tab, i) == f) {
2067 <                            for (Node p = t.first; p != null; p = p.next) {
2068 <                                if (p.val != null) { // (currently always true)
2069 <                                    p.val = null;
2070 <                                    --delta;
2048 >    // See LongAdder version for explanation
2049 >    private final void fullAddCount(long x, boolean wasUncontended) {
2050 >        int h;
2051 >        if ((h = ThreadLocalRandom.getProbe()) == 0) {
2052 >            ThreadLocalRandom.localInit();      // force initialization
2053 >            h = ThreadLocalRandom.getProbe();
2054 >            wasUncontended = true;
2055 >        }
2056 >        boolean collide = false;                // True if last slot nonempty
2057 >        for (;;) {
2058 >            Cell[] as; Cell a; int n; long v;
2059 >            if ((as = counterCells) != null && (n = as.length) > 0) {
2060 >                if ((a = as[(n - 1) & h]) == null) {
2061 >                    if (cellsBusy == 0) {            // Try to attach new Cell
2062 >                        Cell r = new Cell(x); // Optimistic create
2063 >                        if (cellsBusy == 0 &&
2064 >                            U.compareAndSwapInt(this, CELLSBUSY, 0, 1)) {
2065 >                            boolean created = false;
2066 >                            try {               // Recheck under lock
2067 >                                Cell[] rs; int m, j;
2068 >                                if ((rs = counterCells) != null &&
2069 >                                    (m = rs.length) > 0 &&
2070 >                                    rs[j = (m - 1) & h] == null) {
2071 >                                    rs[j] = r;
2072 >                                    created = true;
2073                                  }
2074 +                            } finally {
2075 +                                cellsBusy = 0;
2076                              }
2077 <                            t.first = null;
2078 <                            t.root = null;
2079 <                            ++i;
2077 >                            if (created)
2078 >                                break;
2079 >                            continue;           // Slot is now non-empty
2080 >                        }
2081 >                    }
2082 >                    collide = false;
2083 >                }
2084 >                else if (!wasUncontended)       // CAS already known to fail
2085 >                    wasUncontended = true;      // Continue after rehash
2086 >                else if (U.compareAndSwapLong(a, CELLVALUE, v = a.value, v + x))
2087 >                    break;
2088 >                else if (counterCells != as || n >= NCPU)
2089 >                    collide = false;            // At max size or stale
2090 >                else if (!collide)
2091 >                    collide = true;
2092 >                else if (cellsBusy == 0 &&
2093 >                         U.compareAndSwapInt(this, CELLSBUSY, 0, 1)) {
2094 >                    try {
2095 >                        if (counterCells == as) {// Expand table unless stale
2096 >                            Cell[] rs = new Cell[n << 1];
2097 >                            for (int i = 0; i < n; ++i)
2098 >                                rs[i] = as[i];
2099 >                            counterCells = rs;
2100                          }
2101                      } finally {
2102 <                        t.release(0);
2102 >                        cellsBusy = 0;
2103                      }
2104 +                    collide = false;
2105 +                    continue;                   // Retry with expanded table
2106                  }
2107 <                else
2318 <                    tab = (Node[])fk;
2319 <            }
2320 <            else if ((fh & LOCKED) != 0) {
2321 <                counter.add(delta); // opportunistically update count
2322 <                delta = 0L;
2323 <                f.tryAwaitLock(tab, i);
2107 >                h = ThreadLocalRandom.advanceProbe(h);
2108              }
2109 <            else if (f.casHash(fh, fh | LOCKED)) {
2110 <                try {
2111 <                    if (tabAt(tab, i) == f) {
2112 <                        for (Node e = f; e != null; e = e.next) {
2113 <                            if (e.val != null) {  // (currently always true)
2114 <                                e.val = null;
2115 <                                --delta;
2116 <                            }
2117 <                        }
2334 <                        setTabAt(tab, i, null);
2335 <                        ++i;
2109 >            else if (cellsBusy == 0 && counterCells == as &&
2110 >                     U.compareAndSwapInt(this, CELLSBUSY, 0, 1)) {
2111 >                boolean init = false;
2112 >                try {                           // Initialize table
2113 >                    if (counterCells == as) {
2114 >                        Cell[] rs = new Cell[2];
2115 >                        rs[h & 1] = new Cell(x);
2116 >                        counterCells = rs;
2117 >                        init = true;
2118                      }
2119                  } finally {
2120 <                    if (!f.casHash(fh | LOCKED, fh)) {
2339 <                        f.hash = fh;
2340 <                        synchronized (f) { f.notifyAll(); };
2341 <                    }
2120 >                    cellsBusy = 0;
2121                  }
2122 +                if (init)
2123 +                    break;
2124              }
2125 +            else if (U.compareAndSwapLong(this, BASECOUNT, v = baseCount, v + x))
2126 +                break;                          // Fall back on using base
2127          }
2345        if (delta != 0)
2346            counter.add(delta);
2128      }
2129  
2130      /* ----------------Table Traversal -------------- */
# Line 2386 | Line 2167 | public class ConcurrentHashMap<K, V>
2167       * across threads, iteration terminates if a bounds checks fails
2168       * for a table read.
2169       *
2170 <     * This class extends ForkJoinTask to streamline parallel
2171 <     * iteration in bulk operations (see BulkTask). This adds only an
2172 <     * int of space overhead, which is close enough to negligible in
2173 <     * cases where it is not needed to not worry about it.  Because
2174 <     * ForkJoinTask is Serializable, but iterators need not be, we
2175 <     * need to add warning suppressions.
2170 >     * This class supports both Spliterator-based traversal and
2171 >     * CountedCompleter-based bulk tasks. The same "batch" field is
2172 >     * used, but in slightly different ways, in the two cases.  For
2173 >     * Spliterators, it is a saturating (at Integer.MAX_VALUE)
2174 >     * estimate of element coverage. For CHM tasks, it is a pre-scaled
2175 >     * size that halves down to zero for leaf tasks, that is only
2176 >     * computed upon execution of the task. (Tasks can be submitted to
2177 >     * any pool, of any size, so we don't know scale factors until
2178 >     * running.)
2179 >     *
2180 >     * This class extends CountedCompleter to streamline parallel
2181 >     * iteration in bulk operations. This adds only a few fields of
2182 >     * space overhead, which is small enough in cases where it is not
2183 >     * needed to not worry about it.  Because CountedCompleter is
2184 >     * Serializable, but iterators need not be, we need to add warning
2185 >     * suppressions.
2186       */
2187 <    @SuppressWarnings("serial") static class Traverser<K,V,R> extends ForkJoinTask<R> {
2187 >    @SuppressWarnings("serial") static class Traverser<K,V,R>
2188 >        extends CountedCompleter<R> {
2189          final ConcurrentHashMap<K, V> map;
2190 <        Node next;           // the next entry to use
2190 >        Node<V> next;        // the next entry to use
2191          Object nextKey;      // cached key field of next
2192 <        Object nextVal;      // cached val field of next
2193 <        Node[] tab;          // current table; updated if resized
2192 >        V nextVal;           // cached val field of next
2193 >        Node<V>[] tab;       // current table; updated if resized
2194          int index;           // index of bin to use next
2195          int baseIndex;       // current index of initial table
2196          int baseLimit;       // index bound for initial table
2197          int baseSize;        // initial table size
2198 <
2198 >        int batch;           // split control
2199          /** Creates iterator for all entries in the table. */
2200          Traverser(ConcurrentHashMap<K, V> map) {
2201              this.map = map;
2202 +            Node<V>[] t;
2203 +            if ((t = tab = map.table) != null)
2204 +                baseLimit = baseSize = t.length;
2205          }
2206  
2207 <        /** Creates iterator for split() methods */
2208 <        Traverser(Traverser<K,V,?> it) {
2209 <            ConcurrentHashMap<K, V> m; Node[] t;
2210 <            if ((m = this.map = it.map) == null)
2211 <                t = null;
2212 <            else if ((t = it.tab) == null && // force parent tab initialization
2213 <                     (t = it.tab = m.table) != null)
2214 <                it.baseLimit = it.baseSize = t.length;
2215 <            this.tab = t;
2216 <            this.baseSize = it.baseSize;
2217 <            it.baseLimit = this.index = this.baseIndex =
2218 <                ((this.baseLimit = it.baseLimit) + it.baseIndex + 1) >>> 1;
2207 >        /** Task constructor */
2208 >        Traverser(ConcurrentHashMap<K,V> map, Traverser<K,V,?> it, int batch) {
2209 >            super(it);
2210 >            this.map = map;
2211 >            this.batch = batch; // -1 if unknown
2212 >            if (it == null) {
2213 >                Node<V>[] t;
2214 >                if ((t = tab = map.table) != null)
2215 >                    baseLimit = baseSize = t.length;
2216 >            }
2217 >            else { // split parent
2218 >                this.tab = it.tab;
2219 >                this.baseSize = it.baseSize;
2220 >                int hi = this.baseLimit = it.baseLimit;
2221 >                it.baseLimit = this.index = this.baseIndex =
2222 >                    (hi + it.baseIndex + 1) >>> 1;
2223 >            }
2224 >        }
2225 >
2226 >        /** Spliterator constructor */
2227 >        Traverser(ConcurrentHashMap<K,V> map, Traverser<K,V,?> it) {
2228 >            super(it);
2229 >            this.map = map;
2230 >            if (it == null) {
2231 >                Node<V>[] t;
2232 >                if ((t = tab = map.table) != null)
2233 >                    baseLimit = baseSize = t.length;
2234 >                long n = map.sumCount();
2235 >                batch = ((n > (long)Integer.MAX_VALUE) ? Integer.MAX_VALUE :
2236 >                         (int)n);
2237 >            }
2238 >            else {
2239 >                this.tab = it.tab;
2240 >                this.baseSize = it.baseSize;
2241 >                int hi = this.baseLimit = it.baseLimit;
2242 >                it.baseLimit = this.index = this.baseIndex =
2243 >                    (hi + it.baseIndex + 1) >>> 1;
2244 >                this.batch = it.batch >>>= 1;
2245 >            }
2246          }
2247  
2248          /**
2249           * Advances next; returns nextVal or null if terminated.
2250           * See above for explanation.
2251           */
2252 <        final Object advance() {
2253 <            Node e = next;
2254 <            Object ev = null;
2252 >        @SuppressWarnings("unchecked") final V advance() {
2253 >            Node<V> e = next;
2254 >            V ev = null;
2255              outer: do {
2256                  if (e != null)                  // advance past used/skipped node
2257                      e = e.next;
2258                  while (e == null) {             // get to next non-null bin
2259                      ConcurrentHashMap<K, V> m;
2260 <                    Node[] t; int b, i, n; Object ek; // checks must use locals
2260 >                    Node<V>[] t; int b, i, n; Object ek; //  must use locals
2261                      if ((t = tab) != null)
2262                          n = t.length;
2263                      else if ((m = map) != null && (t = tab = m.table) != null)
# Line 2445 | Line 2267 | public class ConcurrentHashMap<K, V>
2267                      if ((b = baseIndex) >= baseLimit ||
2268                          (i = index) < 0 || i >= n)
2269                          break outer;
2270 <                    if ((e = tabAt(t, i)) != null && e.hash == MOVED) {
2270 >                    if ((e = tabAt(t, i)) != null && e.hash < 0) {
2271                          if ((ek = e.key) instanceof TreeBin)
2272 <                            e = ((TreeBin)ek).first;
2272 >                            e = ((TreeBin<V>)ek).first;
2273                          else {
2274 <                            tab = (Node[])ek;
2274 >                            tab = (Node<V>[])ek;
2275                              continue;           // restarts due to null val
2276                          }
2277                      }                           // visit upper slots if present
# Line 2473 | Line 2295 | public class ConcurrentHashMap<K, V>
2295          }
2296  
2297          public final boolean hasMoreElements() { return hasNext(); }
2298 <        public final void setRawResult(Object x) { }
2299 <        public R getRawResult() { return null; }
2300 <        public boolean exec() { return true; }
2298 >
2299 >        public void compute() { } // default no-op CountedCompleter body
2300 >
2301 >        /**
2302 >         * Returns a batch value > 0 if this task should (and must) be
2303 >         * split, if so, adding to pending count, and in any case
2304 >         * updating batch value. The initial batch value is approx
2305 >         * exp2 of the number of times (minus one) to split task by
2306 >         * two before executing leaf action. This value is faster to
2307 >         * compute and more convenient to use as a guide to splitting
2308 >         * than is the depth, since it is used while dividing by two
2309 >         * anyway.
2310 >         */
2311 >        final int preSplit() {
2312 >            int b;  ForkJoinPool pool;
2313 >            if ((b = batch) < 0) { // force initialization
2314 >                int sp = (((pool = getPool()) == null) ?
2315 >                          ForkJoinPool.getCommonPoolParallelism() :
2316 >                          pool.getParallelism()) << 3; // slack of 8
2317 >                long n = map.sumCount();
2318 >                b = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp;
2319 >            }
2320 >            b = (b <= 1 || baseIndex == baseLimit) ? 0 : (b >>> 1);
2321 >            if ((batch = b) > 0)
2322 >                addToPendingCount(1);
2323 >            return b;
2324 >        }
2325 >
2326 >        // spliterator support
2327 >
2328 >        public boolean hasExactSize() {
2329 >            return false;
2330 >        }
2331 >
2332 >        public boolean hasExactSplits() {
2333 >            return false;
2334 >        }
2335 >
2336 >        public long estimateSize() {
2337 >            return batch;
2338 >        }
2339      }
2340  
2341      /* ---------------- Public operations -------------- */
# Line 2484 | Line 2344 | public class ConcurrentHashMap<K, V>
2344       * Creates a new, empty map with the default initial table size (16).
2345       */
2346      public ConcurrentHashMap() {
2487        this.counter = new LongAdder();
2347      }
2348  
2349      /**
# Line 2503 | Line 2362 | public class ConcurrentHashMap<K, V>
2362          int cap = ((initialCapacity >= (MAXIMUM_CAPACITY >>> 1)) ?
2363                     MAXIMUM_CAPACITY :
2364                     tableSizeFor(initialCapacity + (initialCapacity >>> 1) + 1));
2506        this.counter = new LongAdder();
2365          this.sizeCtl = cap;
2366      }
2367  
# Line 2513 | Line 2371 | public class ConcurrentHashMap<K, V>
2371       * @param m the map
2372       */
2373      public ConcurrentHashMap(Map<? extends K, ? extends V> m) {
2516        this.counter = new LongAdder();
2374          this.sizeCtl = DEFAULT_CAPACITY;
2375          internalPutAll(m);
2376      }
# Line 2564 | Line 2421 | public class ConcurrentHashMap<K, V>
2421          long size = (long)(1.0 + (long)initialCapacity / loadFactor);
2422          int cap = (size >= (long)MAXIMUM_CAPACITY) ?
2423              MAXIMUM_CAPACITY : tableSizeFor((int)size);
2567        this.counter = new LongAdder();
2424          this.sizeCtl = cap;
2425      }
2426  
# Line 2590 | Line 2446 | public class ConcurrentHashMap<K, V>
2446       * @return the new set
2447       */
2448      public static <K> KeySetView<K,Boolean> newKeySet(int initialCapacity) {
2449 <        return new KeySetView<K,Boolean>(new ConcurrentHashMap<K,Boolean>(initialCapacity),
2450 <                                      Boolean.TRUE);
2449 >        return new KeySetView<K,Boolean>
2450 >            (new ConcurrentHashMap<K,Boolean>(initialCapacity), Boolean.TRUE);
2451      }
2452  
2453      /**
2454       * {@inheritDoc}
2455       */
2456      public boolean isEmpty() {
2457 <        return counter.sum() <= 0L; // ignore transient negative values
2457 >        return sumCount() <= 0L; // ignore transient negative values
2458      }
2459  
2460      /**
2461       * {@inheritDoc}
2462       */
2463      public int size() {
2464 <        long n = counter.sum();
2464 >        long n = sumCount();
2465          return ((n < 0L) ? 0 :
2466                  (n > (long)Integer.MAX_VALUE) ? Integer.MAX_VALUE :
2467                  (int)n);
# Line 2615 | Line 2471 | public class ConcurrentHashMap<K, V>
2471       * Returns the number of mappings. This method should be used
2472       * instead of {@link #size} because a ConcurrentHashMap may
2473       * contain more mappings than can be represented as an int. The
2474 <     * value returned is a snapshot; the actual count may differ if
2475 <     * there are ongoing concurrent insertions or removals.
2474 >     * value returned is an estimate; the actual count may differ if
2475 >     * there are concurrent insertions or removals.
2476       *
2477       * @return the number of mappings
2478       */
2479      public long mappingCount() {
2480 <        long n = counter.sum();
2480 >        long n = sumCount();
2481          return (n < 0L) ? 0L : n; // ignore transient negative values
2482      }
2483  
# Line 2636 | Line 2492 | public class ConcurrentHashMap<K, V>
2492       *
2493       * @throws NullPointerException if the specified key is null
2494       */
2495 <    @SuppressWarnings("unchecked") public V get(Object key) {
2496 <        if (key == null)
2641 <            throw new NullPointerException();
2642 <        return (V)internalGet(key);
2495 >    public V get(Object key) {
2496 >        return internalGet(key);
2497      }
2498  
2499      /**
# Line 2652 | Line 2506 | public class ConcurrentHashMap<K, V>
2506       * @return the mapping for the key, if present; else the defaultValue
2507       * @throws NullPointerException if the specified key is null
2508       */
2509 <    @SuppressWarnings("unchecked") public V getValueOrDefault(Object key, V defaultValue) {
2510 <        if (key == null)
2511 <            throw new NullPointerException();
2658 <        V v = (V) internalGet(key);
2659 <        return v == null ? defaultValue : v;
2509 >    public V getValueOrDefault(Object key, V defaultValue) {
2510 >        V v;
2511 >        return (v = internalGet(key)) == null ? defaultValue : v;
2512      }
2513  
2514      /**
# Line 2669 | Line 2521 | public class ConcurrentHashMap<K, V>
2521       * @throws NullPointerException if the specified key is null
2522       */
2523      public boolean containsKey(Object key) {
2672        if (key == null)
2673            throw new NullPointerException();
2524          return internalGet(key) != null;
2525      }
2526  
# Line 2687 | Line 2537 | public class ConcurrentHashMap<K, V>
2537      public boolean containsValue(Object value) {
2538          if (value == null)
2539              throw new NullPointerException();
2540 <        Object v;
2540 >        V v;
2541          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
2542          while ((v = it.advance()) != null) {
2543              if (v == value || value.equals(v))
# Line 2711 | Line 2561 | public class ConcurrentHashMap<K, V>
2561       *         {@code false} otherwise
2562       * @throws NullPointerException if the specified value is null
2563       */
2564 <    public boolean contains(Object value) {
2564 >    @Deprecated public boolean contains(Object value) {
2565          return containsValue(value);
2566      }
2567  
# Line 2719 | Line 2569 | public class ConcurrentHashMap<K, V>
2569       * Maps the specified key to the specified value in this table.
2570       * Neither the key nor the value can be null.
2571       *
2572 <     * <p> The value can be retrieved by calling the {@code get} method
2572 >     * <p>The value can be retrieved by calling the {@code get} method
2573       * with a key that is equal to the original key.
2574       *
2575       * @param key key with which the specified value is to be associated
# Line 2728 | Line 2578 | public class ConcurrentHashMap<K, V>
2578       *         {@code null} if there was no mapping for {@code key}
2579       * @throws NullPointerException if the specified key or value is null
2580       */
2581 <    @SuppressWarnings("unchecked") public V put(K key, V value) {
2582 <        if (key == null || value == null)
2733 <            throw new NullPointerException();
2734 <        return (V)internalPut(key, value);
2581 >    public V put(K key, V value) {
2582 >        return internalPut(key, value, false);
2583      }
2584  
2585      /**
# Line 2741 | Line 2589 | public class ConcurrentHashMap<K, V>
2589       *         or {@code null} if there was no mapping for the key
2590       * @throws NullPointerException if the specified key or value is null
2591       */
2592 <    @SuppressWarnings("unchecked") public V putIfAbsent(K key, V value) {
2593 <        if (key == null || value == null)
2746 <            throw new NullPointerException();
2747 <        return (V)internalPutIfAbsent(key, value);
2592 >    public V putIfAbsent(K key, V value) {
2593 >        return internalPut(key, value, true);
2594      }
2595  
2596      /**
# Line 2759 | Line 2605 | public class ConcurrentHashMap<K, V>
2605      }
2606  
2607      /**
2608 <     * If the specified key is not already associated with a value,
2609 <     * computes its value using the given mappingFunction and enters
2610 <     * it into the map unless null.  This is equivalent to
2611 <     * <pre> {@code
2612 <     * if (map.containsKey(key))
2613 <     *   return map.get(key);
2614 <     * value = mappingFunction.apply(key);
2615 <     * if (value != null)
2616 <     *   map.put(key, value);
2771 <     * return value;}</pre>
2772 <     *
2773 <     * except that the action is performed atomically.  If the
2774 <     * function returns {@code null} no mapping is recorded. If the
2775 <     * function itself throws an (unchecked) exception, the exception
2776 <     * is rethrown to its caller, and no mapping is recorded.  Some
2777 <     * attempted update operations on this map by other threads may be
2778 <     * blocked while computation is in progress, so the computation
2779 <     * should be short and simple, and must not attempt to update any
2780 <     * other mappings of this Map. The most appropriate usage is to
2781 <     * construct a new object serving as an initial mapped value, or
2782 <     * memoized result, as in:
2783 <     *
2784 <     *  <pre> {@code
2785 <     * map.computeIfAbsent(key, new Fun<K, V>() {
2786 <     *   public V map(K k) { return new Value(f(k)); }});}</pre>
2608 >     * If the specified key is not already associated with a value (or
2609 >     * is mapped to {@code null}), attempts to compute its value using
2610 >     * the given mapping function and enters it into this map unless
2611 >     * {@code null}. The entire method invocation is performed
2612 >     * atomically, so the function is applied at most once per key.
2613 >     * Some attempted update operations on this map by other threads
2614 >     * may be blocked while computation is in progress, so the
2615 >     * computation should be short and simple, and must not attempt to
2616 >     * update any other mappings of this Map.
2617       *
2618       * @param key key with which the specified value is to be associated
2619       * @param mappingFunction the function to compute a value
# Line 2797 | Line 2627 | public class ConcurrentHashMap<K, V>
2627       * @throws RuntimeException or Error if the mappingFunction does so,
2628       *         in which case the mapping is left unestablished
2629       */
2630 <    @SuppressWarnings("unchecked") public V computeIfAbsent
2631 <        (K key, Fun<? super K, ? extends V> mappingFunction) {
2632 <        if (key == null || mappingFunction == null)
2803 <            throw new NullPointerException();
2804 <        return (V)internalComputeIfAbsent(key, mappingFunction);
2630 >    public V computeIfAbsent
2631 >        (K key, Function<? super K, ? extends V> mappingFunction) {
2632 >        return internalComputeIfAbsent(key, mappingFunction);
2633      }
2634  
2635      /**
2636 <     * If the given key is present, computes a new mapping value given a key and
2637 <     * its current mapped value. This is equivalent to
2638 <     *  <pre> {@code
2639 <     *   if (map.containsKey(key)) {
2812 <     *     value = remappingFunction.apply(key, map.get(key));
2813 <     *     if (value != null)
2814 <     *       map.put(key, value);
2815 <     *     else
2816 <     *       map.remove(key);
2817 <     *   }
2818 <     * }</pre>
2819 <     *
2820 <     * except that the action is performed atomically.  If the
2821 <     * function returns {@code null}, the mapping is removed.  If the
2822 <     * function itself throws an (unchecked) exception, the exception
2823 <     * is rethrown to its caller, and the current mapping is left
2824 <     * unchanged.  Some attempted update operations on this map by
2636 >     * If the value for the specified key is present and non-null,
2637 >     * attempts to compute a new mapping given the key and its current
2638 >     * mapped value.  The entire method invocation is performed
2639 >     * atomically.  Some attempted update operations on this map by
2640       * other threads may be blocked while computation is in progress,
2641       * so the computation should be short and simple, and must not
2642 <     * attempt to update any other mappings of this Map. For example,
2828 <     * to either create or append new messages to a value mapping:
2642 >     * attempt to update any other mappings of this Map.
2643       *
2644       * @param key key with which the specified value is to be associated
2645       * @param remappingFunction the function to compute a value
# Line 2838 | Line 2652 | public class ConcurrentHashMap<K, V>
2652       * @throws RuntimeException or Error if the remappingFunction does so,
2653       *         in which case the mapping is unchanged
2654       */
2655 <    @SuppressWarnings("unchecked") public V computeIfPresent
2656 <        (K key, BiFun<? super K, ? super V, ? extends V> remappingFunction) {
2657 <        if (key == null || remappingFunction == null)
2844 <            throw new NullPointerException();
2845 <        return (V)internalCompute(key, true, remappingFunction);
2655 >    public V computeIfPresent
2656 >        (K key, BiFunction<? super K, ? super V, ? extends V> remappingFunction) {
2657 >        return internalCompute(key, true, remappingFunction);
2658      }
2659  
2660      /**
2661 <     * Computes a new mapping value given a key and
2662 <     * its current mapped value (or {@code null} if there is no current
2663 <     * mapping). This is equivalent to
2664 <     *  <pre> {@code
2665 <     *   value = remappingFunction.apply(key, map.get(key));
2666 <     *   if (value != null)
2667 <     *     map.put(key, value);
2856 <     *   else
2857 <     *     map.remove(key);
2858 <     * }</pre>
2859 <     *
2860 <     * except that the action is performed atomically.  If the
2861 <     * function returns {@code null}, the mapping is removed.  If the
2862 <     * function itself throws an (unchecked) exception, the exception
2863 <     * is rethrown to its caller, and the current mapping is left
2864 <     * unchanged.  Some attempted update operations on this map by
2865 <     * other threads may be blocked while computation is in progress,
2866 <     * so the computation should be short and simple, and must not
2867 <     * attempt to update any other mappings of this Map. For example,
2868 <     * to either create or append new messages to a value mapping:
2869 <     *
2870 <     * <pre> {@code
2871 <     * Map<Key, String> map = ...;
2872 <     * final String msg = ...;
2873 <     * map.compute(key, new BiFun<Key, String, String>() {
2874 <     *   public String apply(Key k, String v) {
2875 <     *    return (v == null) ? msg : v + msg;});}}</pre>
2661 >     * Attempts to compute a mapping for the specified key and its
2662 >     * current mapped value (or {@code null} if there is no current
2663 >     * mapping). The entire method invocation is performed atomically.
2664 >     * Some attempted update operations on this map by other threads
2665 >     * may be blocked while computation is in progress, so the
2666 >     * computation should be short and simple, and must not attempt to
2667 >     * update any other mappings of this Map.
2668       *
2669       * @param key key with which the specified value is to be associated
2670       * @param remappingFunction the function to compute a value
# Line 2885 | Line 2677 | public class ConcurrentHashMap<K, V>
2677       * @throws RuntimeException or Error if the remappingFunction does so,
2678       *         in which case the mapping is unchanged
2679       */
2680 <    @SuppressWarnings("unchecked") public V compute
2681 <        (K key, BiFun<? super K, ? super V, ? extends V> remappingFunction) {
2682 <        if (key == null || remappingFunction == null)
2891 <            throw new NullPointerException();
2892 <        return (V)internalCompute(key, false, remappingFunction);
2680 >    public V compute
2681 >        (K key, BiFunction<? super K, ? super V, ? extends V> remappingFunction) {
2682 >        return internalCompute(key, false, remappingFunction);
2683      }
2684  
2685      /**
2686 <     * If the specified key is not already associated
2687 <     * with a value, associate it with the given value.
2688 <     * Otherwise, replace the value with the results of
2689 <     * the given remapping function. This is equivalent to:
2690 <     *  <pre> {@code
2691 <     *   if (!map.containsKey(key))
2692 <     *     map.put(value);
2693 <     *   else {
2694 <     *     newValue = remappingFunction.apply(map.get(key), value);
2695 <     *     if (value != null)
2696 <     *       map.put(key, value);
2697 <     *     else
2698 <     *       map.remove(key);
2699 <     *   }
2700 <     * }</pre>
2701 <     * except that the action is performed atomically.  If the
2702 <     * function returns {@code null}, the mapping is removed.  If the
2703 <     * function itself throws an (unchecked) exception, the exception
2914 <     * is rethrown to its caller, and the current mapping is left
2915 <     * unchanged.  Some attempted update operations on this map by
2916 <     * other threads may be blocked while computation is in progress,
2917 <     * so the computation should be short and simple, and must not
2918 <     * attempt to update any other mappings of this Map.
2686 >     * If the specified key is not already associated with a
2687 >     * (non-null) value, associates it with the given value.
2688 >     * Otherwise, replaces the value with the results of the given
2689 >     * remapping function, or removes if {@code null}. The entire
2690 >     * method invocation is performed atomically.  Some attempted
2691 >     * update operations on this map by other threads may be blocked
2692 >     * while computation is in progress, so the computation should be
2693 >     * short and simple, and must not attempt to update any other
2694 >     * mappings of this Map.
2695 >     *
2696 >     * @param key key with which the specified value is to be associated
2697 >     * @param value the value to use if absent
2698 >     * @param remappingFunction the function to recompute a value if present
2699 >     * @return the new value associated with the specified key, or null if none
2700 >     * @throws NullPointerException if the specified key or the
2701 >     *         remappingFunction is null
2702 >     * @throws RuntimeException or Error if the remappingFunction does so,
2703 >     *         in which case the mapping is unchanged
2704       */
2705 <    @SuppressWarnings("unchecked") public V merge
2706 <        (K key, V value, BiFun<? super V, ? super V, ? extends V> remappingFunction) {
2707 <        if (key == null || value == null || remappingFunction == null)
2708 <            throw new NullPointerException();
2924 <        return (V)internalMerge(key, value, remappingFunction);
2705 >    public V merge
2706 >        (K key, V value,
2707 >         BiFunction<? super V, ? super V, ? extends V> remappingFunction) {
2708 >        return internalMerge(key, value, remappingFunction);
2709      }
2710  
2711      /**
# Line 2933 | Line 2717 | public class ConcurrentHashMap<K, V>
2717       *         {@code null} if there was no mapping for {@code key}
2718       * @throws NullPointerException if the specified key is null
2719       */
2720 <    @SuppressWarnings("unchecked") public V remove(Object key) {
2721 <        if (key == null)
2938 <            throw new NullPointerException();
2939 <        return (V)internalReplace(key, null, null);
2720 >    public V remove(Object key) {
2721 >        return internalReplace(key, null, null);
2722      }
2723  
2724      /**
# Line 2945 | Line 2727 | public class ConcurrentHashMap<K, V>
2727       * @throws NullPointerException if the specified key is null
2728       */
2729      public boolean remove(Object key, Object value) {
2730 <        if (key == null)
2949 <            throw new NullPointerException();
2950 <        if (value == null)
2951 <            return false;
2952 <        return internalReplace(key, null, value) != null;
2730 >        return value != null && internalReplace(key, null, value) != null;
2731      }
2732  
2733      /**
# Line 2970 | Line 2748 | public class ConcurrentHashMap<K, V>
2748       *         or {@code null} if there was no mapping for the key
2749       * @throws NullPointerException if the specified key or value is null
2750       */
2751 <    @SuppressWarnings("unchecked") public V replace(K key, V value) {
2751 >    public V replace(K key, V value) {
2752          if (key == null || value == null)
2753              throw new NullPointerException();
2754 <        return (V)internalReplace(key, value, null);
2754 >        return internalReplace(key, value, null);
2755      }
2756  
2757      /**
# Line 3065 | Line 2843 | public class ConcurrentHashMap<K, V>
2843      }
2844  
2845      /**
3068     * Returns a partitionable iterator of the keys in this map.
3069     *
3070     * @return a partitionable iterator of the keys in this map
3071     */
3072    public Spliterator<K> keySpliterator() {
3073        return new KeyIterator<K,V>(this);
3074    }
3075
3076    /**
3077     * Returns a partitionable iterator of the values in this map.
3078     *
3079     * @return a partitionable iterator of the values in this map
3080     */
3081    public Spliterator<V> valueSpliterator() {
3082        return new ValueIterator<K,V>(this);
3083    }
3084
3085    /**
3086     * Returns a partitionable iterator of the entries in this map.
3087     *
3088     * @return a partitionable iterator of the entries in this map
3089     */
3090    public Spliterator<Map.Entry<K,V>> entrySpliterator() {
3091        return new EntryIterator<K,V>(this);
3092    }
3093
3094    /**
2846       * Returns the hash code value for this {@link Map}, i.e.,
2847       * the sum of, for each key-value pair in the map,
2848       * {@code key.hashCode() ^ value.hashCode()}.
# Line 3101 | Line 2852 | public class ConcurrentHashMap<K, V>
2852      public int hashCode() {
2853          int h = 0;
2854          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
2855 <        Object v;
2855 >        V v;
2856          while ((v = it.advance()) != null) {
2857              h += it.nextKey.hashCode() ^ v.hashCode();
2858          }
# Line 3123 | Line 2874 | public class ConcurrentHashMap<K, V>
2874          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
2875          StringBuilder sb = new StringBuilder();
2876          sb.append('{');
2877 <        Object v;
2877 >        V v;
2878          if ((v = it.advance()) != null) {
2879              for (;;) {
2880                  Object k = it.nextKey;
# Line 3154 | Line 2905 | public class ConcurrentHashMap<K, V>
2905                  return false;
2906              Map<?,?> m = (Map<?,?>) o;
2907              Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
2908 <            Object val;
2908 >            V val;
2909              while ((val = it.advance()) != null) {
2910                  Object v = m.get(it.nextKey);
2911                  if (v == null || (v != val && !v.equals(val)))
# Line 3174 | Line 2925 | public class ConcurrentHashMap<K, V>
2925  
2926      /* ----------------Iterators -------------- */
2927  
2928 <    @SuppressWarnings("serial") static final class KeyIterator<K,V> extends Traverser<K,V,Object>
2929 <        implements Spliterator<K>, Enumeration<K> {
2928 >    @SuppressWarnings("serial") static final class KeyIterator<K,V>
2929 >        extends Traverser<K,V,Object>
2930 >        implements Spliterator<K>, Iterator<K>, Enumeration<K> {
2931          KeyIterator(ConcurrentHashMap<K, V> map) { super(map); }
2932 <        KeyIterator(Traverser<K,V,Object> it) {
2933 <            super(it);
2932 >        KeyIterator(ConcurrentHashMap<K, V> map, Traverser<K,V,Object> it) {
2933 >            super(map, it);
2934          }
2935 <        public KeyIterator<K,V> split() {
2936 <            if (nextKey != null)
2937 <                throw new IllegalStateException();
2938 <            return new KeyIterator<K,V>(this);
2935 >        public KeyIterator<K,V> trySplit() {
2936 >            if (tab != null && baseIndex == baseLimit)
2937 >                return null;
2938 >            return new KeyIterator<K,V>(map, this);
2939          }
2940          @SuppressWarnings("unchecked") public final K next() {
2941              if (nextVal == null && advance() == null)
# Line 3194 | Line 2946 | public class ConcurrentHashMap<K, V>
2946          }
2947  
2948          public final K nextElement() { return next(); }
2949 +
2950 +        public Iterator<K> iterator() { return this; }
2951 +
2952 +        public void forEach(Block<? super K> action) {
2953 +            if (action == null) throw new NullPointerException();
2954 +            while (advance() != null)
2955 +                action.accept((K)nextKey);
2956 +        }
2957 +
2958 +        public boolean tryAdvance(Block<? super K> block) {
2959 +            if (block == null) throw new NullPointerException();
2960 +            if (advance() == null)
2961 +                return false;
2962 +            block.accept((K)nextKey);
2963 +            return true;
2964 +        }
2965      }
2966  
2967 <    @SuppressWarnings("serial") static final class ValueIterator<K,V> extends Traverser<K,V,Object>
2968 <        implements Spliterator<V>, Enumeration<V> {
2967 >    @SuppressWarnings("serial") static final class ValueIterator<K,V>
2968 >        extends Traverser<K,V,Object>
2969 >        implements Spliterator<V>, Iterator<V>, Enumeration<V> {
2970          ValueIterator(ConcurrentHashMap<K, V> map) { super(map); }
2971 <        ValueIterator(Traverser<K,V,Object> it) {
2972 <            super(it);
2971 >        ValueIterator(ConcurrentHashMap<K, V> map, Traverser<K,V,Object> it) {
2972 >            super(map, it);
2973          }
2974 <        public ValueIterator<K,V> split() {
2975 <            if (nextKey != null)
2976 <                throw new IllegalStateException();
2977 <            return new ValueIterator<K,V>(this);
2974 >        public ValueIterator<K,V> trySplit() {
2975 >            if (tab != null && baseIndex == baseLimit)
2976 >                return null;
2977 >            return new ValueIterator<K,V>(map, this);
2978          }
2979  
2980 <        @SuppressWarnings("unchecked") public final V next() {
2981 <            Object v;
2980 >        public final V next() {
2981 >            V v;
2982              if ((v = nextVal) == null && (v = advance()) == null)
2983                  throw new NoSuchElementException();
2984              nextVal = null;
2985 <            return (V) v;
2985 >            return v;
2986          }
2987  
2988          public final V nextElement() { return next(); }
2989 +
2990 +        public Iterator<V> iterator() { return this; }
2991 +
2992 +        public void forEach(Block<? super V> action) {
2993 +            if (action == null) throw new NullPointerException();
2994 +            V v;
2995 +            while ((v = advance()) != null)
2996 +                action.accept(v);
2997 +        }
2998 +
2999 +        public boolean tryAdvance(Block<? super V> block) {
3000 +            V v;
3001 +            if (block == null) throw new NullPointerException();
3002 +            if ((v = advance()) == null)
3003 +                return false;
3004 +            block.accept(v);
3005 +            return true;
3006 +        }
3007 +
3008      }
3009  
3010 <    @SuppressWarnings("serial") static final class EntryIterator<K,V> extends Traverser<K,V,Object>
3011 <        implements Spliterator<Map.Entry<K,V>> {
3010 >    @SuppressWarnings("serial") static final class EntryIterator<K,V>
3011 >        extends Traverser<K,V,Object>
3012 >        implements Spliterator<Map.Entry<K,V>>, Iterator<Map.Entry<K,V>> {
3013          EntryIterator(ConcurrentHashMap<K, V> map) { super(map); }
3014 <        EntryIterator(Traverser<K,V,Object> it) {
3015 <            super(it);
3014 >        EntryIterator(ConcurrentHashMap<K, V> map, Traverser<K,V,Object> it) {
3015 >            super(map, it);
3016          }
3017 <        public EntryIterator<K,V> split() {
3018 <            if (nextKey != null)
3019 <                throw new IllegalStateException();
3020 <            return new EntryIterator<K,V>(this);
3017 >        public EntryIterator<K,V> trySplit() {
3018 >            if (tab != null && baseIndex == baseLimit)
3019 >                return null;
3020 >            return new EntryIterator<K,V>(map, this);
3021          }
3022  
3023          @SuppressWarnings("unchecked") public final Map.Entry<K,V> next() {
3024 <            Object v;
3024 >            V v;
3025              if ((v = nextVal) == null && (v = advance()) == null)
3026                  throw new NoSuchElementException();
3027              Object k = nextKey;
3028              nextVal = null;
3029 <            return new MapEntry<K,V>((K)k, (V)v, map);
3029 >            return new MapEntry<K,V>((K)k, v, map);
3030 >        }
3031 >
3032 >        public Iterator<Map.Entry<K,V>> iterator() { return this; }
3033 >
3034 >        public void forEach(Block<? super Map.Entry<K,V>> action) {
3035 >            if (action == null) throw new NullPointerException();
3036 >            V v;
3037 >            while ((v = advance()) != null)
3038 >                action.accept(entryFor((K)nextKey, v));
3039 >        }
3040 >
3041 >        public boolean tryAdvance(Block<? super Map.Entry<K,V>> block) {
3042 >            V v;
3043 >            if (block == null) throw new NullPointerException();
3044 >            if ((v = advance()) == null)
3045 >                return false;
3046 >            block.accept(entryFor((K)nextKey, v));
3047 >            return true;
3048          }
3049 +
3050      }
3051  
3052      /**
# Line 3284 | Line 3092 | public class ConcurrentHashMap<K, V>
3092          }
3093      }
3094  
3095 +    /**
3096 +     * Returns exportable snapshot entry for the given key and value
3097 +     * when write-through can't or shouldn't be used.
3098 +     */
3099 +    static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
3100 +        return new AbstractMap.SimpleEntry<K,V>(k, v);
3101 +    }
3102 +
3103      /* ---------------- Serialization Support -------------- */
3104  
3105      /**
# Line 3305 | Line 3121 | public class ConcurrentHashMap<K, V>
3121       * for each key-value mapping, followed by a null pair.
3122       * The key-value mappings are emitted in no particular order.
3123       */
3124 <    @SuppressWarnings("unchecked") private void writeObject(java.io.ObjectOutputStream s)
3124 >    @SuppressWarnings("unchecked") private void writeObject
3125 >        (java.io.ObjectOutputStream s)
3126          throws java.io.IOException {
3127          if (segments == null) { // for serialization compatibility
3128              segments = (Segment<K,V>[])
# Line 3315 | Line 3132 | public class ConcurrentHashMap<K, V>
3132          }
3133          s.defaultWriteObject();
3134          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3135 <        Object v;
3135 >        V v;
3136          while ((v = it.advance()) != null) {
3137              s.writeObject(it.nextKey);
3138              s.writeObject(v);
# Line 3329 | Line 3146 | public class ConcurrentHashMap<K, V>
3146       * Reconstitutes the instance from a stream (that is, deserializes it).
3147       * @param s the stream
3148       */
3149 <    @SuppressWarnings("unchecked") private void readObject(java.io.ObjectInputStream s)
3149 >    @SuppressWarnings("unchecked") private void readObject
3150 >        (java.io.ObjectInputStream s)
3151          throws java.io.IOException, ClassNotFoundException {
3152          s.defaultReadObject();
3153          this.segments = null; // unneeded
3336        // initialize transient final field
3337        UNSAFE.putObjectVolatile(this, counterOffset, new LongAdder());
3154  
3155          // Create all nodes, then place in table once size is known
3156          long size = 0L;
3157 <        Node p = null;
3157 >        Node<V> p = null;
3158          for (;;) {
3159              K k = (K) s.readObject();
3160              V v = (V) s.readObject();
3161              if (k != null && v != null) {
3162                  int h = spread(k.hashCode());
3163 <                p = new Node(h, k, v, p);
3163 >                p = new Node<V>(h, k, v, p);
3164                  ++size;
3165              }
3166              else
# Line 3362 | Line 3178 | public class ConcurrentHashMap<K, V>
3178              int sc = sizeCtl;
3179              boolean collide = false;
3180              if (n > sc &&
3181 <                UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
3181 >                U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
3182                  try {
3183                      if (table == null) {
3184                          init = true;
3185 <                        Node[] tab = new Node[n];
3185 >                        @SuppressWarnings("rawtypes") Node[] rt = new Node[n];
3186 >                        Node<V>[] tab = (Node<V>[])rt;
3187                          int mask = n - 1;
3188                          while (p != null) {
3189                              int j = p.hash & mask;
3190 <                            Node next = p.next;
3191 <                            Node q = p.next = tabAt(tab, j);
3190 >                            Node<V> next = p.next;
3191 >                            Node<V> q = p.next = tabAt(tab, j);
3192                              setTabAt(tab, j, p);
3193                              if (!collide && q != null && q.hash == p.hash)
3194                                  collide = true;
3195                              p = next;
3196                          }
3197                          table = tab;
3198 <                        counter.add(size);
3198 >                        addCount(size, -1);
3199                          sc = n - (n >>> 2);
3200                      }
3201                  } finally {
3202                      sizeCtl = sc;
3203                  }
3204                  if (collide) { // rescan and convert to TreeBins
3205 <                    Node[] tab = table;
3205 >                    Node<V>[] tab = table;
3206                      for (int i = 0; i < tab.length; ++i) {
3207                          int c = 0;
3208 <                        for (Node e = tabAt(tab, i); e != null; e = e.next) {
3208 >                        for (Node<V> e = tabAt(tab, i); e != null; e = e.next) {
3209                              if (++c > TREE_THRESHOLD &&
3210                                  (e.key instanceof Comparable)) {
3211                                  replaceWithTreeBin(tab, i, e.key);
# Line 3400 | Line 3217 | public class ConcurrentHashMap<K, V>
3217              }
3218              if (!init) { // Can only happen if unsafely published.
3219                  while (p != null) {
3220 <                    internalPut(p.key, p.val);
3220 >                    internalPut((K)p.key, p.val, false);
3221                      p = p.next;
3222                  }
3223              }
3224          }
3225      }
3226  
3410
3227      // -------------------------------------------------------
3228  
3229 <    // Sams
3414 <    /** Interface describing a void action of one argument */
3415 <    public interface Action<A> { void apply(A a); }
3416 <    /** Interface describing a void action of two arguments */
3417 <    public interface BiAction<A,B> { void apply(A a, B b); }
3418 <    /** Interface describing a function of one argument */
3419 <    public interface Fun<A,T> { T apply(A a); }
3420 <    /** Interface describing a function of two arguments */
3421 <    public interface BiFun<A,B,T> { T apply(A a, B b); }
3422 <    /** Interface describing a function of no arguments */
3423 <    public interface Generator<T> { T apply(); }
3424 <    /** Interface describing a function mapping its argument to a double */
3425 <    public interface ObjectToDouble<A> { double apply(A a); }
3426 <    /** Interface describing a function mapping its argument to a long */
3427 <    public interface ObjectToLong<A> { long apply(A a); }
3428 <    /** Interface describing a function mapping its argument to an int */
3429 <    public interface ObjectToInt<A> {int apply(A a); }
3430 <    /** Interface describing a function mapping two arguments to a double */
3431 <    public interface ObjectByObjectToDouble<A,B> { double apply(A a, B b); }
3432 <    /** Interface describing a function mapping two arguments to a long */
3433 <    public interface ObjectByObjectToLong<A,B> { long apply(A a, B b); }
3434 <    /** Interface describing a function mapping two arguments to an int */
3435 <    public interface ObjectByObjectToInt<A,B> {int apply(A a, B b); }
3436 <    /** Interface describing a function mapping a double to a double */
3437 <    public interface DoubleToDouble { double apply(double a); }
3438 <    /** Interface describing a function mapping a long to a long */
3439 <    public interface LongToLong { long apply(long a); }
3440 <    /** Interface describing a function mapping an int to an int */
3441 <    public interface IntToInt { int apply(int a); }
3442 <    /** Interface describing a function mapping two doubles to a double */
3443 <    public interface DoubleByDoubleToDouble { double apply(double a, double b); }
3444 <    /** Interface describing a function mapping two longs to a long */
3445 <    public interface LongByLongToLong { long apply(long a, long b); }
3446 <    /** Interface describing a function mapping two ints to an int */
3447 <    public interface IntByIntToInt { int apply(int a, int b); }
3229 >    // Sequential bulk operations
3230  
3231 +    /**
3232 +     * Performs the given action for each (key, value).
3233 +     *
3234 +     * @param action the action
3235 +     */
3236 +    @SuppressWarnings("unchecked") public void forEachSequentially
3237 +        (BiBlock<? super K, ? super V> action) {
3238 +        if (action == null) throw new NullPointerException();
3239 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3240 +        V v;
3241 +        while ((v = it.advance()) != null)
3242 +            action.accept((K)it.nextKey, v);
3243 +    }
3244  
3245 <    // -------------------------------------------------------
3245 >    /**
3246 >     * Performs the given action for each non-null transformation
3247 >     * of each (key, value).
3248 >     *
3249 >     * @param transformer a function returning the transformation
3250 >     * for an element, or null of there is no transformation (in
3251 >     * which case the action is not applied).
3252 >     * @param action the action
3253 >     */
3254 >    @SuppressWarnings("unchecked") public <U> void forEachSequentially
3255 >        (BiFunction<? super K, ? super V, ? extends U> transformer,
3256 >         Block<? super U> action) {
3257 >        if (transformer == null || action == null)
3258 >            throw new NullPointerException();
3259 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3260 >        V v; U u;
3261 >        while ((v = it.advance()) != null) {
3262 >            if ((u = transformer.apply((K)it.nextKey, v)) != null)
3263 >                action.accept(u);
3264 >        }
3265 >    }
3266 >
3267 >    /**
3268 >     * Returns a non-null result from applying the given search
3269 >     * function on each (key, value), or null if none.
3270 >     *
3271 >     * @param searchFunction a function returning a non-null
3272 >     * result on success, else null
3273 >     * @return a non-null result from applying the given search
3274 >     * function on each (key, value), or null if none
3275 >     */
3276 >    @SuppressWarnings("unchecked") public <U> U searchSequentially
3277 >        (BiFunction<? super K, ? super V, ? extends U> searchFunction) {
3278 >        if (searchFunction == null) throw new NullPointerException();
3279 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3280 >        V v; U u;
3281 >        while ((v = it.advance()) != null) {
3282 >            if ((u = searchFunction.apply((K)it.nextKey, v)) != null)
3283 >                return u;
3284 >        }
3285 >        return null;
3286 >    }
3287 >
3288 >    /**
3289 >     * Returns the result of accumulating the given transformation
3290 >     * of all (key, value) pairs using the given reducer to
3291 >     * combine values, or null if none.
3292 >     *
3293 >     * @param transformer a function returning the transformation
3294 >     * for an element, or null of there is no transformation (in
3295 >     * which case it is not combined).
3296 >     * @param reducer a commutative associative combining function
3297 >     * @return the result of accumulating the given transformation
3298 >     * of all (key, value) pairs
3299 >     */
3300 >    @SuppressWarnings("unchecked") public <U> U reduceSequentially
3301 >        (BiFunction<? super K, ? super V, ? extends U> transformer,
3302 >         BiFunction<? super U, ? super U, ? extends U> reducer) {
3303 >        if (transformer == null || reducer == null)
3304 >            throw new NullPointerException();
3305 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3306 >        U r = null, u; V v;
3307 >        while ((v = it.advance()) != null) {
3308 >            if ((u = transformer.apply((K)it.nextKey, v)) != null)
3309 >                r = (r == null) ? u : reducer.apply(r, u);
3310 >        }
3311 >        return r;
3312 >    }
3313 >
3314 >    /**
3315 >     * Returns the result of accumulating the given transformation
3316 >     * of all (key, value) pairs using the given reducer to
3317 >     * combine values, and the given basis as an identity value.
3318 >     *
3319 >     * @param transformer a function returning the transformation
3320 >     * for an element
3321 >     * @param basis the identity (initial default value) for the reduction
3322 >     * @param reducer a commutative associative combining function
3323 >     * @return the result of accumulating the given transformation
3324 >     * of all (key, value) pairs
3325 >     */
3326 >    @SuppressWarnings("unchecked") public double reduceToDoubleSequentially
3327 >        (DoubleBiFunction<? super K, ? super V> transformer,
3328 >         double basis,
3329 >         DoubleBinaryOperator reducer) {
3330 >        if (transformer == null || reducer == null)
3331 >            throw new NullPointerException();
3332 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3333 >        double r = basis; V v;
3334 >        while ((v = it.advance()) != null)
3335 >            r = reducer.applyAsDouble(r, transformer.applyAsDouble((K)it.nextKey, v));
3336 >        return r;
3337 >    }
3338 >
3339 >    /**
3340 >     * Returns the result of accumulating the given transformation
3341 >     * of all (key, value) pairs using the given reducer to
3342 >     * combine values, and the given basis as an identity value.
3343 >     *
3344 >     * @param transformer a function returning the transformation
3345 >     * for an element
3346 >     * @param basis the identity (initial default value) for the reduction
3347 >     * @param reducer a commutative associative combining function
3348 >     * @return the result of accumulating the given transformation
3349 >     * of all (key, value) pairs
3350 >     */
3351 >    @SuppressWarnings("unchecked") public long reduceToLongSequentially
3352 >        (LongBiFunction<? super K, ? super V> transformer,
3353 >         long basis,
3354 >         LongBinaryOperator reducer) {
3355 >        if (transformer == null || reducer == null)
3356 >            throw new NullPointerException();
3357 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3358 >        long r = basis; V v;
3359 >        while ((v = it.advance()) != null)
3360 >            r = reducer.applyAsLong(r, transformer.applyAsLong((K)it.nextKey, v));
3361 >        return r;
3362 >    }
3363 >
3364 >    /**
3365 >     * Returns the result of accumulating the given transformation
3366 >     * of all (key, value) pairs using the given reducer to
3367 >     * combine values, and the given basis as an identity value.
3368 >     *
3369 >     * @param transformer a function returning the transformation
3370 >     * for an element
3371 >     * @param basis the identity (initial default value) for the reduction
3372 >     * @param reducer a commutative associative combining function
3373 >     * @return the result of accumulating the given transformation
3374 >     * of all (key, value) pairs
3375 >     */
3376 >    @SuppressWarnings("unchecked") public int reduceToIntSequentially
3377 >        (IntBiFunction<? super K, ? super V> transformer,
3378 >         int basis,
3379 >         IntBinaryOperator reducer) {
3380 >        if (transformer == null || reducer == null)
3381 >            throw new NullPointerException();
3382 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3383 >        int r = basis; V v;
3384 >        while ((v = it.advance()) != null)
3385 >            r = reducer.applyAsInt(r, transformer.applyAsInt((K)it.nextKey, v));
3386 >        return r;
3387 >    }
3388 >
3389 >    /**
3390 >     * Performs the given action for each key.
3391 >     *
3392 >     * @param action the action
3393 >     */
3394 >    @SuppressWarnings("unchecked") public void forEachKeySequentially
3395 >        (Block<? super K> action) {
3396 >        if (action == null) throw new NullPointerException();
3397 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3398 >        while (it.advance() != null)
3399 >            action.accept((K)it.nextKey);
3400 >    }
3401 >
3402 >    /**
3403 >     * Performs the given action for each non-null transformation
3404 >     * of each key.
3405 >     *
3406 >     * @param transformer a function returning the transformation
3407 >     * for an element, or null of there is no transformation (in
3408 >     * which case the action is not applied).
3409 >     * @param action the action
3410 >     */
3411 >    @SuppressWarnings("unchecked") public <U> void forEachKeySequentially
3412 >        (Function<? super K, ? extends U> transformer,
3413 >         Block<? super U> action) {
3414 >        if (transformer == null || action == null)
3415 >            throw new NullPointerException();
3416 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3417 >        U u;
3418 >        while (it.advance() != null) {
3419 >            if ((u = transformer.apply((K)it.nextKey)) != null)
3420 >                action.accept(u);
3421 >        }
3422 >        ForkJoinTasks.forEachKey
3423 >            (this, transformer, action).invoke();
3424 >    }
3425 >
3426 >    /**
3427 >     * Returns a non-null result from applying the given search
3428 >     * function on each key, or null if none.
3429 >     *
3430 >     * @param searchFunction a function returning a non-null
3431 >     * result on success, else null
3432 >     * @return a non-null result from applying the given search
3433 >     * function on each key, or null if none
3434 >     */
3435 >    @SuppressWarnings("unchecked") public <U> U searchKeysSequentially
3436 >        (Function<? super K, ? extends U> searchFunction) {
3437 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3438 >        U u;
3439 >        while (it.advance() != null) {
3440 >            if ((u = searchFunction.apply((K)it.nextKey)) != null)
3441 >                return u;
3442 >        }
3443 >        return null;
3444 >    }
3445 >
3446 >    /**
3447 >     * Returns the result of accumulating all keys using the given
3448 >     * reducer to combine values, or null if none.
3449 >     *
3450 >     * @param reducer a commutative associative combining function
3451 >     * @return the result of accumulating all keys using the given
3452 >     * reducer to combine values, or null if none
3453 >     */
3454 >    @SuppressWarnings("unchecked") public K reduceKeysSequentially
3455 >        (BiFunction<? super K, ? super K, ? extends K> reducer) {
3456 >        if (reducer == null) throw new NullPointerException();
3457 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3458 >        K r = null;
3459 >        while (it.advance() != null) {
3460 >            K u = (K)it.nextKey;
3461 >            r = (r == null) ? u : reducer.apply(r, u);
3462 >        }
3463 >        return r;
3464 >    }
3465 >
3466 >    /**
3467 >     * Returns the result of accumulating the given transformation
3468 >     * of all keys using the given reducer to combine values, or
3469 >     * null if none.
3470 >     *
3471 >     * @param transformer a function returning the transformation
3472 >     * for an element, or null of there is no transformation (in
3473 >     * which case it is not combined).
3474 >     * @param reducer a commutative associative combining function
3475 >     * @return the result of accumulating the given transformation
3476 >     * of all keys
3477 >     */
3478 >    @SuppressWarnings("unchecked") public <U> U reduceKeysSequentially
3479 >        (Function<? super K, ? extends U> transformer,
3480 >         BiFunction<? super U, ? super U, ? extends U> reducer) {
3481 >        if (transformer == null || reducer == null)
3482 >            throw new NullPointerException();
3483 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3484 >        U r = null, u;
3485 >        while (it.advance() != null) {
3486 >            if ((u = transformer.apply((K)it.nextKey)) != null)
3487 >                r = (r == null) ? u : reducer.apply(r, u);
3488 >        }
3489 >        return r;
3490 >    }
3491 >
3492 >    /**
3493 >     * Returns the result of accumulating the given transformation
3494 >     * of all keys using the given reducer to combine values, and
3495 >     * the given basis as an identity value.
3496 >     *
3497 >     * @param transformer a function returning the transformation
3498 >     * for an element
3499 >     * @param basis the identity (initial default value) for the reduction
3500 >     * @param reducer a commutative associative combining function
3501 >     * @return the result of accumulating the given transformation
3502 >     * of all keys
3503 >     */
3504 >    @SuppressWarnings("unchecked") public double reduceKeysToDoubleSequentially
3505 >        (DoubleFunction<? super K> transformer,
3506 >         double basis,
3507 >         DoubleBinaryOperator reducer) {
3508 >        if (transformer == null || reducer == null)
3509 >            throw new NullPointerException();
3510 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3511 >        double r = basis;
3512 >        while (it.advance() != null)
3513 >            r = reducer.applyAsDouble(r, transformer.applyAsDouble((K)it.nextKey));
3514 >        return r;
3515 >    }
3516 >
3517 >    /**
3518 >     * Returns the result of accumulating the given transformation
3519 >     * of all keys using the given reducer to combine values, and
3520 >     * the given basis as an identity value.
3521 >     *
3522 >     * @param transformer a function returning the transformation
3523 >     * for an element
3524 >     * @param basis the identity (initial default value) for the reduction
3525 >     * @param reducer a commutative associative combining function
3526 >     * @return the result of accumulating the given transformation
3527 >     * of all keys
3528 >     */
3529 >    @SuppressWarnings("unchecked") public long reduceKeysToLongSequentially
3530 >        (LongFunction<? super K> transformer,
3531 >         long basis,
3532 >         LongBinaryOperator reducer) {
3533 >        if (transformer == null || reducer == null)
3534 >            throw new NullPointerException();
3535 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3536 >        long r = basis;
3537 >        while (it.advance() != null)
3538 >            r = reducer.applyAsLong(r, transformer.applyAsLong((K)it.nextKey));
3539 >        return r;
3540 >    }
3541 >
3542 >    /**
3543 >     * Returns the result of accumulating the given transformation
3544 >     * of all keys using the given reducer to combine values, and
3545 >     * the given basis as an identity value.
3546 >     *
3547 >     * @param transformer a function returning the transformation
3548 >     * for an element
3549 >     * @param basis the identity (initial default value) for the reduction
3550 >     * @param reducer a commutative associative combining function
3551 >     * @return the result of accumulating the given transformation
3552 >     * of all keys
3553 >     */
3554 >    @SuppressWarnings("unchecked") public int reduceKeysToIntSequentially
3555 >        (IntFunction<? super K> transformer,
3556 >         int basis,
3557 >         IntBinaryOperator reducer) {
3558 >        if (transformer == null || reducer == null)
3559 >            throw new NullPointerException();
3560 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3561 >        int r = basis;
3562 >        while (it.advance() != null)
3563 >            r = reducer.applyAsInt(r, transformer.applyAsInt((K)it.nextKey));
3564 >        return r;
3565 >    }
3566 >
3567 >    /**
3568 >     * Performs the given action for each value.
3569 >     *
3570 >     * @param action the action
3571 >     */
3572 >    public void forEachValueSequentially(Block<? super V> action) {
3573 >        if (action == null) throw new NullPointerException();
3574 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3575 >        V v;
3576 >        while ((v = it.advance()) != null)
3577 >            action.accept(v);
3578 >    }
3579 >
3580 >    /**
3581 >     * Performs the given action for each non-null transformation
3582 >     * of each value.
3583 >     *
3584 >     * @param transformer a function returning the transformation
3585 >     * for an element, or null of there is no transformation (in
3586 >     * which case the action is not applied).
3587 >     */
3588 >    public <U> void forEachValueSequentially
3589 >        (Function<? super V, ? extends U> transformer,
3590 >         Block<? super U> action) {
3591 >        if (transformer == null || action == null)
3592 >            throw new NullPointerException();
3593 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3594 >        V v; U u;
3595 >        while ((v = it.advance()) != null) {
3596 >            if ((u = transformer.apply(v)) != null)
3597 >                action.accept(u);
3598 >        }
3599 >    }
3600 >
3601 >    /**
3602 >     * Returns a non-null result from applying the given search
3603 >     * function on each value, or null if none.
3604 >     *
3605 >     * @param searchFunction a function returning a non-null
3606 >     * result on success, else null
3607 >     * @return a non-null result from applying the given search
3608 >     * function on each value, or null if none
3609 >     */
3610 >    public <U> U searchValuesSequentially
3611 >        (Function<? super V, ? extends U> searchFunction) {
3612 >        if (searchFunction == null) throw new NullPointerException();
3613 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3614 >        V v; U u;
3615 >        while ((v = it.advance()) != null) {
3616 >            if ((u = searchFunction.apply(v)) != null)
3617 >                return u;
3618 >        }
3619 >        return null;
3620 >    }
3621 >
3622 >    /**
3623 >     * Returns the result of accumulating all values using the
3624 >     * given reducer to combine values, or null if none.
3625 >     *
3626 >     * @param reducer a commutative associative combining function
3627 >     * @return the result of accumulating all values
3628 >     */
3629 >    public V reduceValuesSequentially
3630 >        (BiFunction<? super V, ? super V, ? extends V> reducer) {
3631 >        if (reducer == null) throw new NullPointerException();
3632 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3633 >        V r = null; V v;
3634 >        while ((v = it.advance()) != null)
3635 >            r = (r == null) ? v : reducer.apply(r, v);
3636 >        return r;
3637 >    }
3638 >
3639 >    /**
3640 >     * Returns the result of accumulating the given transformation
3641 >     * of all values using the given reducer to combine values, or
3642 >     * null if none.
3643 >     *
3644 >     * @param transformer a function returning the transformation
3645 >     * for an element, or null of there is no transformation (in
3646 >     * which case it is not combined).
3647 >     * @param reducer a commutative associative combining function
3648 >     * @return the result of accumulating the given transformation
3649 >     * of all values
3650 >     */
3651 >    public <U> U reduceValuesSequentially
3652 >        (Function<? super V, ? extends U> transformer,
3653 >         BiFunction<? super U, ? super U, ? extends U> reducer) {
3654 >        if (transformer == null || reducer == null)
3655 >            throw new NullPointerException();
3656 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3657 >        U r = null, u; V v;
3658 >        while ((v = it.advance()) != null) {
3659 >            if ((u = transformer.apply(v)) != null)
3660 >                r = (r == null) ? u : reducer.apply(r, u);
3661 >        }
3662 >        return r;
3663 >    }
3664 >
3665 >    /**
3666 >     * Returns the result of accumulating the given transformation
3667 >     * of all values using the given reducer to combine values,
3668 >     * and the given basis as an identity value.
3669 >     *
3670 >     * @param transformer a function returning the transformation
3671 >     * for an element
3672 >     * @param basis the identity (initial default value) for the reduction
3673 >     * @param reducer a commutative associative combining function
3674 >     * @return the result of accumulating the given transformation
3675 >     * of all values
3676 >     */
3677 >    public double reduceValuesToDoubleSequentially
3678 >        (DoubleFunction<? super V> transformer,
3679 >         double basis,
3680 >         DoubleBinaryOperator reducer) {
3681 >        if (transformer == null || reducer == null)
3682 >            throw new NullPointerException();
3683 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3684 >        double r = basis; V v;
3685 >        while ((v = it.advance()) != null)
3686 >            r = reducer.applyAsDouble(r, transformer.applyAsDouble(v));
3687 >        return r;
3688 >    }
3689 >
3690 >    /**
3691 >     * Returns the result of accumulating the given transformation
3692 >     * of all values using the given reducer to combine values,
3693 >     * and the given basis as an identity value.
3694 >     *
3695 >     * @param transformer a function returning the transformation
3696 >     * for an element
3697 >     * @param basis the identity (initial default value) for the reduction
3698 >     * @param reducer a commutative associative combining function
3699 >     * @return the result of accumulating the given transformation
3700 >     * of all values
3701 >     */
3702 >    public long reduceValuesToLongSequentially
3703 >        (LongFunction<? super V> transformer,
3704 >         long basis,
3705 >         LongBinaryOperator reducer) {
3706 >        if (transformer == null || reducer == null)
3707 >            throw new NullPointerException();
3708 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3709 >        long r = basis; V v;
3710 >        while ((v = it.advance()) != null)
3711 >            r = reducer.applyAsLong(r, transformer.applyAsLong(v));
3712 >        return r;
3713 >    }
3714 >
3715 >    /**
3716 >     * Returns the result of accumulating the given transformation
3717 >     * of all values using the given reducer to combine values,
3718 >     * and the given basis as an identity value.
3719 >     *
3720 >     * @param transformer a function returning the transformation
3721 >     * for an element
3722 >     * @param basis the identity (initial default value) for the reduction
3723 >     * @param reducer a commutative associative combining function
3724 >     * @return the result of accumulating the given transformation
3725 >     * of all values
3726 >     */
3727 >    public int reduceValuesToIntSequentially
3728 >        (IntFunction<? super V> transformer,
3729 >         int basis,
3730 >         IntBinaryOperator reducer) {
3731 >        if (transformer == null || reducer == null)
3732 >            throw new NullPointerException();
3733 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3734 >        int r = basis; V v;
3735 >        while ((v = it.advance()) != null)
3736 >            r = reducer.applyAsInt(r, transformer.applyAsInt(v));
3737 >        return r;
3738 >    }
3739 >
3740 >    /**
3741 >     * Performs the given action for each entry.
3742 >     *
3743 >     * @param action the action
3744 >     */
3745 >    @SuppressWarnings("unchecked") public void forEachEntrySequentially
3746 >        (Block<? super Map.Entry<K,V>> action) {
3747 >        if (action == null) throw new NullPointerException();
3748 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3749 >        V v;
3750 >        while ((v = it.advance()) != null)
3751 >            action.accept(entryFor((K)it.nextKey, v));
3752 >    }
3753 >
3754 >    /**
3755 >     * Performs the given action for each non-null transformation
3756 >     * of each entry.
3757 >     *
3758 >     * @param transformer a function returning the transformation
3759 >     * for an element, or null of there is no transformation (in
3760 >     * which case the action is not applied).
3761 >     * @param action the action
3762 >     */
3763 >    @SuppressWarnings("unchecked") public <U> void forEachEntrySequentially
3764 >        (Function<Map.Entry<K,V>, ? extends U> transformer,
3765 >         Block<? super U> action) {
3766 >        if (transformer == null || action == null)
3767 >            throw new NullPointerException();
3768 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3769 >        V v; U u;
3770 >        while ((v = it.advance()) != null) {
3771 >            if ((u = transformer.apply(entryFor((K)it.nextKey, v))) != null)
3772 >                action.accept(u);
3773 >        }
3774 >    }
3775 >
3776 >    /**
3777 >     * Returns a non-null result from applying the given search
3778 >     * function on each entry, or null if none.
3779 >     *
3780 >     * @param searchFunction a function returning a non-null
3781 >     * result on success, else null
3782 >     * @return a non-null result from applying the given search
3783 >     * function on each entry, or null if none
3784 >     */
3785 >    @SuppressWarnings("unchecked") public <U> U searchEntriesSequentially
3786 >        (Function<Map.Entry<K,V>, ? extends U> searchFunction) {
3787 >        if (searchFunction == null) throw new NullPointerException();
3788 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3789 >        V v; U u;
3790 >        while ((v = it.advance()) != null) {
3791 >            if ((u = searchFunction.apply(entryFor((K)it.nextKey, v))) != null)
3792 >                return u;
3793 >        }
3794 >        return null;
3795 >    }
3796 >
3797 >    /**
3798 >     * Returns the result of accumulating all entries using the
3799 >     * given reducer to combine values, or null if none.
3800 >     *
3801 >     * @param reducer a commutative associative combining function
3802 >     * @return the result of accumulating all entries
3803 >     */
3804 >    @SuppressWarnings("unchecked") public Map.Entry<K,V> reduceEntriesSequentially
3805 >        (BiFunction<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
3806 >        if (reducer == null) throw new NullPointerException();
3807 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3808 >        Map.Entry<K,V> r = null; V v;
3809 >        while ((v = it.advance()) != null) {
3810 >            Map.Entry<K,V> u = entryFor((K)it.nextKey, v);
3811 >            r = (r == null) ? u : reducer.apply(r, u);
3812 >        }
3813 >        return r;
3814 >    }
3815 >
3816 >    /**
3817 >     * Returns the result of accumulating the given transformation
3818 >     * of all entries using the given reducer to combine values,
3819 >     * or null if none.
3820 >     *
3821 >     * @param transformer a function returning the transformation
3822 >     * for an element, or null of there is no transformation (in
3823 >     * which case it is not combined).
3824 >     * @param reducer a commutative associative combining function
3825 >     * @return the result of accumulating the given transformation
3826 >     * of all entries
3827 >     */
3828 >    @SuppressWarnings("unchecked") public <U> U reduceEntriesSequentially
3829 >        (Function<Map.Entry<K,V>, ? extends U> transformer,
3830 >         BiFunction<? super U, ? super U, ? extends U> reducer) {
3831 >        if (transformer == null || reducer == null)
3832 >            throw new NullPointerException();
3833 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3834 >        U r = null, u; V v;
3835 >        while ((v = it.advance()) != null) {
3836 >            if ((u = transformer.apply(entryFor((K)it.nextKey, v))) != null)
3837 >                r = (r == null) ? u : reducer.apply(r, u);
3838 >        }
3839 >        return r;
3840 >    }
3841 >
3842 >    /**
3843 >     * Returns the result of accumulating the given transformation
3844 >     * of all entries using the given reducer to combine values,
3845 >     * and the given basis as an identity value.
3846 >     *
3847 >     * @param transformer a function returning the transformation
3848 >     * for an element
3849 >     * @param basis the identity (initial default value) for the reduction
3850 >     * @param reducer a commutative associative combining function
3851 >     * @return the result of accumulating the given transformation
3852 >     * of all entries
3853 >     */
3854 >    @SuppressWarnings("unchecked") public double reduceEntriesToDoubleSequentially
3855 >        (DoubleFunction<Map.Entry<K,V>> transformer,
3856 >         double basis,
3857 >         DoubleBinaryOperator reducer) {
3858 >        if (transformer == null || reducer == null)
3859 >            throw new NullPointerException();
3860 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3861 >        double r = basis; V v;
3862 >        while ((v = it.advance()) != null)
3863 >            r = reducer.applyAsDouble(r, transformer.applyAsDouble(entryFor((K)it.nextKey, v)));
3864 >        return r;
3865 >    }
3866 >
3867 >    /**
3868 >     * Returns the result of accumulating the given transformation
3869 >     * of all entries using the given reducer to combine values,
3870 >     * and the given basis as an identity value.
3871 >     *
3872 >     * @param transformer a function returning the transformation
3873 >     * for an element
3874 >     * @param basis the identity (initial default value) for the reduction
3875 >     * @param reducer a commutative associative combining function
3876 >     * @return the result of accumulating the given transformation
3877 >     * of all entries
3878 >     */
3879 >    @SuppressWarnings("unchecked") public long reduceEntriesToLongSequentially
3880 >        (LongFunction<Map.Entry<K,V>> transformer,
3881 >         long basis,
3882 >         LongBinaryOperator reducer) {
3883 >        if (transformer == null || reducer == null)
3884 >            throw new NullPointerException();
3885 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3886 >        long r = basis; V v;
3887 >        while ((v = it.advance()) != null)
3888 >            r = reducer.applyAsLong(r, transformer.applyAsLong(entryFor((K)it.nextKey, v)));
3889 >        return r;
3890 >    }
3891 >
3892 >    /**
3893 >     * Returns the result of accumulating the given transformation
3894 >     * of all entries using the given reducer to combine values,
3895 >     * and the given basis as an identity value.
3896 >     *
3897 >     * @param transformer a function returning the transformation
3898 >     * for an element
3899 >     * @param basis the identity (initial default value) for the reduction
3900 >     * @param reducer a commutative associative combining function
3901 >     * @return the result of accumulating the given transformation
3902 >     * of all entries
3903 >     */
3904 >    @SuppressWarnings("unchecked") public int reduceEntriesToIntSequentially
3905 >        (IntFunction<Map.Entry<K,V>> transformer,
3906 >         int basis,
3907 >         IntBinaryOperator reducer) {
3908 >        if (transformer == null || reducer == null)
3909 >            throw new NullPointerException();
3910 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3911 >        int r = basis; V v;
3912 >        while ((v = it.advance()) != null)
3913 >            r = reducer.applyAsInt(r, transformer.applyAsInt(entryFor((K)it.nextKey, v)));
3914 >        return r;
3915 >    }
3916 >
3917 >    // Parallel bulk operations
3918  
3919      /**
3920       * Performs the given action for each (key, value).
3921       *
3922       * @param action the action
3923       */
3924 <    public void forEach(BiAction<K,V> action) {
3924 >    public void forEachInParallel(BiBlock<? super K,? super V> action) {
3925          ForkJoinTasks.forEach
3926              (this, action).invoke();
3927      }
# Line 3468 | Line 3935 | public class ConcurrentHashMap<K, V>
3935       * which case the action is not applied).
3936       * @param action the action
3937       */
3938 <    public <U> void forEach(BiFun<? super K, ? super V, ? extends U> transformer,
3939 <                            Action<U> action) {
3938 >    public <U> void forEachInParallel
3939 >        (BiFunction<? super K, ? super V, ? extends U> transformer,
3940 >                            Block<? super U> action) {
3941          ForkJoinTasks.forEach
3942              (this, transformer, action).invoke();
3943      }
# Line 3486 | Line 3954 | public class ConcurrentHashMap<K, V>
3954       * @return a non-null result from applying the given search
3955       * function on each (key, value), or null if none
3956       */
3957 <    public <U> U search(BiFun<? super K, ? super V, ? extends U> searchFunction) {
3957 >    public <U> U searchInParallel
3958 >        (BiFunction<? super K, ? super V, ? extends U> searchFunction) {
3959          return ForkJoinTasks.search
3960              (this, searchFunction).invoke();
3961      }
# Line 3503 | Line 3972 | public class ConcurrentHashMap<K, V>
3972       * @return the result of accumulating the given transformation
3973       * of all (key, value) pairs
3974       */
3975 <    public <U> U reduce(BiFun<? super K, ? super V, ? extends U> transformer,
3976 <                        BiFun<? super U, ? super U, ? extends U> reducer) {
3975 >    public <U> U reduceInParallel
3976 >        (BiFunction<? super K, ? super V, ? extends U> transformer,
3977 >         BiFunction<? super U, ? super U, ? extends U> reducer) {
3978          return ForkJoinTasks.reduce
3979              (this, transformer, reducer).invoke();
3980      }
# Line 3521 | Line 3991 | public class ConcurrentHashMap<K, V>
3991       * @return the result of accumulating the given transformation
3992       * of all (key, value) pairs
3993       */
3994 <    public double reduceToDouble(ObjectByObjectToDouble<? super K, ? super V> transformer,
3995 <                                 double basis,
3996 <                                 DoubleByDoubleToDouble reducer) {
3994 >    public double reduceToDoubleInParallel
3995 >        (DoubleBiFunction<? super K, ? super V> transformer,
3996 >         double basis,
3997 >         DoubleBinaryOperator reducer) {
3998          return ForkJoinTasks.reduceToDouble
3999              (this, transformer, basis, reducer).invoke();
4000      }
# Line 3540 | Line 4011 | public class ConcurrentHashMap<K, V>
4011       * @return the result of accumulating the given transformation
4012       * of all (key, value) pairs
4013       */
4014 <    public long reduceToLong(ObjectByObjectToLong<? super K, ? super V> transformer,
4015 <                             long basis,
4016 <                             LongByLongToLong reducer) {
4014 >    public long reduceToLongInParallel
4015 >        (LongBiFunction<? super K, ? super V> transformer,
4016 >         long basis,
4017 >         LongBinaryOperator reducer) {
4018          return ForkJoinTasks.reduceToLong
4019              (this, transformer, basis, reducer).invoke();
4020      }
# Line 3559 | Line 4031 | public class ConcurrentHashMap<K, V>
4031       * @return the result of accumulating the given transformation
4032       * of all (key, value) pairs
4033       */
4034 <    public int reduceToInt(ObjectByObjectToInt<? super K, ? super V> transformer,
4035 <                           int basis,
4036 <                           IntByIntToInt reducer) {
4034 >    public int reduceToIntInParallel
4035 >        (IntBiFunction<? super K, ? super V> transformer,
4036 >         int basis,
4037 >         IntBinaryOperator reducer) {
4038          return ForkJoinTasks.reduceToInt
4039              (this, transformer, basis, reducer).invoke();
4040      }
# Line 3571 | Line 4044 | public class ConcurrentHashMap<K, V>
4044       *
4045       * @param action the action
4046       */
4047 <    public void forEachKey(Action<K> action) {
4047 >    public void forEachKeyInParallel(Block<? super K> action) {
4048          ForkJoinTasks.forEachKey
4049              (this, action).invoke();
4050      }
# Line 3585 | Line 4058 | public class ConcurrentHashMap<K, V>
4058       * which case the action is not applied).
4059       * @param action the action
4060       */
4061 <    public <U> void forEachKey(Fun<? super K, ? extends U> transformer,
4062 <                               Action<U> action) {
4061 >    public <U> void forEachKeyInParallel
4062 >        (Function<? super K, ? extends U> transformer,
4063 >         Block<? super U> action) {
4064          ForkJoinTasks.forEachKey
4065              (this, transformer, action).invoke();
4066      }
# Line 3603 | Line 4077 | public class ConcurrentHashMap<K, V>
4077       * @return a non-null result from applying the given search
4078       * function on each key, or null if none
4079       */
4080 <    public <U> U searchKeys(Fun<? super K, ? extends U> searchFunction) {
4080 >    public <U> U searchKeysInParallel
4081 >        (Function<? super K, ? extends U> searchFunction) {
4082          return ForkJoinTasks.searchKeys
4083              (this, searchFunction).invoke();
4084      }
# Line 3616 | Line 4091 | public class ConcurrentHashMap<K, V>
4091       * @return the result of accumulating all keys using the given
4092       * reducer to combine values, or null if none
4093       */
4094 <    public K reduceKeys(BiFun<? super K, ? super K, ? extends K> reducer) {
4094 >    public K reduceKeysInParallel
4095 >        (BiFunction<? super K, ? super K, ? extends K> reducer) {
4096          return ForkJoinTasks.reduceKeys
4097              (this, reducer).invoke();
4098      }
# Line 3633 | Line 4109 | public class ConcurrentHashMap<K, V>
4109       * @return the result of accumulating the given transformation
4110       * of all keys
4111       */
4112 <    public <U> U reduceKeys(Fun<? super K, ? extends U> transformer,
4113 <                            BiFun<? super U, ? super U, ? extends U> reducer) {
4112 >    public <U> U reduceKeysInParallel
4113 >        (Function<? super K, ? extends U> transformer,
4114 >         BiFunction<? super U, ? super U, ? extends U> reducer) {
4115          return ForkJoinTasks.reduceKeys
4116              (this, transformer, reducer).invoke();
4117      }
# Line 3648 | Line 4125 | public class ConcurrentHashMap<K, V>
4125       * for an element
4126       * @param basis the identity (initial default value) for the reduction
4127       * @param reducer a commutative associative combining function
4128 <     * @return  the result of accumulating the given transformation
4128 >     * @return the result of accumulating the given transformation
4129       * of all keys
4130       */
4131 <    public double reduceKeysToDouble(ObjectToDouble<? super K> transformer,
4132 <                                     double basis,
4133 <                                     DoubleByDoubleToDouble reducer) {
4131 >    public double reduceKeysToDoubleInParallel
4132 >        (DoubleFunction<? super K> transformer,
4133 >         double basis,
4134 >         DoubleBinaryOperator reducer) {
4135          return ForkJoinTasks.reduceKeysToDouble
4136              (this, transformer, basis, reducer).invoke();
4137      }
# Line 3670 | Line 4148 | public class ConcurrentHashMap<K, V>
4148       * @return the result of accumulating the given transformation
4149       * of all keys
4150       */
4151 <    public long reduceKeysToLong(ObjectToLong<? super K> transformer,
4152 <                                 long basis,
4153 <                                 LongByLongToLong reducer) {
4151 >    public long reduceKeysToLongInParallel
4152 >        (LongFunction<? super K> transformer,
4153 >         long basis,
4154 >         LongBinaryOperator reducer) {
4155          return ForkJoinTasks.reduceKeysToLong
4156              (this, transformer, basis, reducer).invoke();
4157      }
# Line 3689 | Line 4168 | public class ConcurrentHashMap<K, V>
4168       * @return the result of accumulating the given transformation
4169       * of all keys
4170       */
4171 <    public int reduceKeysToInt(ObjectToInt<? super K> transformer,
4172 <                               int basis,
4173 <                               IntByIntToInt reducer) {
4171 >    public int reduceKeysToIntInParallel
4172 >        (IntFunction<? super K> transformer,
4173 >         int basis,
4174 >         IntBinaryOperator reducer) {
4175          return ForkJoinTasks.reduceKeysToInt
4176              (this, transformer, basis, reducer).invoke();
4177      }
# Line 3701 | Line 4181 | public class ConcurrentHashMap<K, V>
4181       *
4182       * @param action the action
4183       */
4184 <    public void forEachValue(Action<V> action) {
4184 >    public void forEachValueInParallel(Block<? super V> action) {
4185          ForkJoinTasks.forEachValue
4186              (this, action).invoke();
4187      }
# Line 3714 | Line 4194 | public class ConcurrentHashMap<K, V>
4194       * for an element, or null of there is no transformation (in
4195       * which case the action is not applied).
4196       */
4197 <    public <U> void forEachValue(Fun<? super V, ? extends U> transformer,
4198 <                                 Action<U> action) {
4197 >    public <U> void forEachValueInParallel
4198 >        (Function<? super V, ? extends U> transformer,
4199 >         Block<? super U> action) {
4200          ForkJoinTasks.forEachValue
4201              (this, transformer, action).invoke();
4202      }
# Line 3731 | Line 4212 | public class ConcurrentHashMap<K, V>
4212       * result on success, else null
4213       * @return a non-null result from applying the given search
4214       * function on each value, or null if none
3734     *
4215       */
4216 <    public <U> U searchValues(Fun<? super V, ? extends U> searchFunction) {
4216 >    public <U> U searchValuesInParallel
4217 >        (Function<? super V, ? extends U> searchFunction) {
4218          return ForkJoinTasks.searchValues
4219              (this, searchFunction).invoke();
4220      }
# Line 3743 | Line 4224 | public class ConcurrentHashMap<K, V>
4224       * given reducer to combine values, or null if none.
4225       *
4226       * @param reducer a commutative associative combining function
4227 <     * @return  the result of accumulating all values
4227 >     * @return the result of accumulating all values
4228       */
4229 <    public V reduceValues(BiFun<? super V, ? super V, ? extends V> reducer) {
4229 >    public V reduceValuesInParallel
4230 >        (BiFunction<? super V, ? super V, ? extends V> reducer) {
4231          return ForkJoinTasks.reduceValues
4232              (this, reducer).invoke();
4233      }
# Line 3762 | Line 4244 | public class ConcurrentHashMap<K, V>
4244       * @return the result of accumulating the given transformation
4245       * of all values
4246       */
4247 <    public <U> U reduceValues(Fun<? super V, ? extends U> transformer,
4248 <                              BiFun<? super U, ? super U, ? extends U> reducer) {
4247 >    public <U> U reduceValuesInParallel
4248 >        (Function<? super V, ? extends U> transformer,
4249 >         BiFunction<? super U, ? super U, ? extends U> reducer) {
4250          return ForkJoinTasks.reduceValues
4251              (this, transformer, reducer).invoke();
4252      }
# Line 3780 | Line 4263 | public class ConcurrentHashMap<K, V>
4263       * @return the result of accumulating the given transformation
4264       * of all values
4265       */
4266 <    public double reduceValuesToDouble(ObjectToDouble<? super V> transformer,
4267 <                                       double basis,
4268 <                                       DoubleByDoubleToDouble reducer) {
4266 >    public double reduceValuesToDoubleInParallel
4267 >        (DoubleFunction<? super V> transformer,
4268 >         double basis,
4269 >         DoubleBinaryOperator reducer) {
4270          return ForkJoinTasks.reduceValuesToDouble
4271              (this, transformer, basis, reducer).invoke();
4272      }
# Line 3799 | Line 4283 | public class ConcurrentHashMap<K, V>
4283       * @return the result of accumulating the given transformation
4284       * of all values
4285       */
4286 <    public long reduceValuesToLong(ObjectToLong<? super V> transformer,
4287 <                                   long basis,
4288 <                                   LongByLongToLong reducer) {
4286 >    public long reduceValuesToLongInParallel
4287 >        (LongFunction<? super V> transformer,
4288 >         long basis,
4289 >         LongBinaryOperator reducer) {
4290          return ForkJoinTasks.reduceValuesToLong
4291              (this, transformer, basis, reducer).invoke();
4292      }
# Line 3818 | Line 4303 | public class ConcurrentHashMap<K, V>
4303       * @return the result of accumulating the given transformation
4304       * of all values
4305       */
4306 <    public int reduceValuesToInt(ObjectToInt<? super V> transformer,
4307 <                                 int basis,
4308 <                                 IntByIntToInt reducer) {
4306 >    public int reduceValuesToIntInParallel
4307 >        (IntFunction<? super V> transformer,
4308 >         int basis,
4309 >         IntBinaryOperator reducer) {
4310          return ForkJoinTasks.reduceValuesToInt
4311              (this, transformer, basis, reducer).invoke();
4312      }
# Line 3830 | Line 4316 | public class ConcurrentHashMap<K, V>
4316       *
4317       * @param action the action
4318       */
4319 <    public void forEachEntry(Action<Map.Entry<K,V>> action) {
4319 >    public void forEachEntryInParallel(Block<? super Map.Entry<K,V>> action) {
4320          ForkJoinTasks.forEachEntry
4321              (this, action).invoke();
4322      }
# Line 3844 | Line 4330 | public class ConcurrentHashMap<K, V>
4330       * which case the action is not applied).
4331       * @param action the action
4332       */
4333 <    public <U> void forEachEntry(Fun<Map.Entry<K,V>, ? extends U> transformer,
4334 <                                 Action<U> action) {
4333 >    public <U> void forEachEntryInParallel
4334 >        (Function<Map.Entry<K,V>, ? extends U> transformer,
4335 >         Block<? super U> action) {
4336          ForkJoinTasks.forEachEntry
4337              (this, transformer, action).invoke();
4338      }
# Line 3862 | Line 4349 | public class ConcurrentHashMap<K, V>
4349       * @return a non-null result from applying the given search
4350       * function on each entry, or null if none
4351       */
4352 <    public <U> U searchEntries(Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4352 >    public <U> U searchEntriesInParallel
4353 >        (Function<Map.Entry<K,V>, ? extends U> searchFunction) {
4354          return ForkJoinTasks.searchEntries
4355              (this, searchFunction).invoke();
4356      }
# Line 3874 | Line 4362 | public class ConcurrentHashMap<K, V>
4362       * @param reducer a commutative associative combining function
4363       * @return the result of accumulating all entries
4364       */
4365 <    public Map.Entry<K,V> reduceEntries(BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4365 >    public Map.Entry<K,V> reduceEntriesInParallel
4366 >        (BiFunction<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4367          return ForkJoinTasks.reduceEntries
4368              (this, reducer).invoke();
4369      }
# Line 3891 | Line 4380 | public class ConcurrentHashMap<K, V>
4380       * @return the result of accumulating the given transformation
4381       * of all entries
4382       */
4383 <    public <U> U reduceEntries(Fun<Map.Entry<K,V>, ? extends U> transformer,
4384 <                               BiFun<? super U, ? super U, ? extends U> reducer) {
4383 >    public <U> U reduceEntriesInParallel
4384 >        (Function<Map.Entry<K,V>, ? extends U> transformer,
4385 >         BiFunction<? super U, ? super U, ? extends U> reducer) {
4386          return ForkJoinTasks.reduceEntries
4387              (this, transformer, reducer).invoke();
4388      }
# Line 3909 | Line 4399 | public class ConcurrentHashMap<K, V>
4399       * @return the result of accumulating the given transformation
4400       * of all entries
4401       */
4402 <    public double reduceEntriesToDouble(ObjectToDouble<Map.Entry<K,V>> transformer,
4403 <                                        double basis,
4404 <                                        DoubleByDoubleToDouble reducer) {
4402 >    public double reduceEntriesToDoubleInParallel
4403 >        (DoubleFunction<Map.Entry<K,V>> transformer,
4404 >         double basis,
4405 >         DoubleBinaryOperator reducer) {
4406          return ForkJoinTasks.reduceEntriesToDouble
4407              (this, transformer, basis, reducer).invoke();
4408      }
# Line 3925 | Line 4416 | public class ConcurrentHashMap<K, V>
4416       * for an element
4417       * @param basis the identity (initial default value) for the reduction
4418       * @param reducer a commutative associative combining function
4419 <     * @return  the result of accumulating the given transformation
4419 >     * @return the result of accumulating the given transformation
4420       * of all entries
4421       */
4422 <    public long reduceEntriesToLong(ObjectToLong<Map.Entry<K,V>> transformer,
4423 <                                    long basis,
4424 <                                    LongByLongToLong reducer) {
4422 >    public long reduceEntriesToLongInParallel
4423 >        (LongFunction<Map.Entry<K,V>> transformer,
4424 >         long basis,
4425 >         LongBinaryOperator reducer) {
4426          return ForkJoinTasks.reduceEntriesToLong
4427              (this, transformer, basis, reducer).invoke();
4428      }
# Line 3947 | Line 4439 | public class ConcurrentHashMap<K, V>
4439       * @return the result of accumulating the given transformation
4440       * of all entries
4441       */
4442 <    public int reduceEntriesToInt(ObjectToInt<Map.Entry<K,V>> transformer,
4443 <                                  int basis,
4444 <                                  IntByIntToInt reducer) {
4442 >    public int reduceEntriesToIntInParallel
4443 >        (IntFunction<Map.Entry<K,V>> transformer,
4444 >         int basis,
4445 >         IntBinaryOperator reducer) {
4446          return ForkJoinTasks.reduceEntriesToInt
4447              (this, transformer, basis, reducer).invoke();
4448      }
4449  
4450 +
4451      /* ----------------Views -------------- */
4452  
4453      /**
# Line 4099 | Line 4593 | public class ConcurrentHashMap<K, V>
4593       * {@link #keySet}, {@link #keySet(Object)}, {@link #newKeySet()},
4594       * {@link #newKeySet(int)}.
4595       */
4596 <    public static class KeySetView<K,V> extends CHMView<K,V> implements Set<K>, java.io.Serializable {
4596 >    public static class KeySetView<K,V> extends CHMView<K,V>
4597 >        implements Set<K>, java.io.Serializable {
4598          private static final long serialVersionUID = 7249069246763182397L;
4599          private final V value;
4600          KeySetView(ConcurrentHashMap<K, V> map, V value) {  // non-public
# Line 4138 | Line 4633 | public class ConcurrentHashMap<K, V>
4633                  throw new UnsupportedOperationException();
4634              if (e == null)
4635                  throw new NullPointerException();
4636 <            return map.internalPutIfAbsent(e, v) == null;
4636 >            return map.internalPut(e, v, true) == null;
4637          }
4638          public boolean addAll(Collection<? extends K> c) {
4639              boolean added = false;
# Line 4148 | Line 4643 | public class ConcurrentHashMap<K, V>
4643              for (K e : c) {
4644                  if (e == null)
4645                      throw new NullPointerException();
4646 <                if (map.internalPutIfAbsent(e, v) == null)
4646 >                if (map.internalPut(e, v, true) == null)
4647                      added = true;
4648              }
4649              return added;
# Line 4160 | Line 4655 | public class ConcurrentHashMap<K, V>
4655                       (containsAll(c) && c.containsAll(this))));
4656          }
4657  
4658 <        /**
4659 <         * Performs the given action for each key.
4165 <         *
4166 <         * @param action the action
4167 <         */
4168 <        public void forEach(Action<K> action) {
4169 <            ForkJoinTasks.forEachKey
4170 <                (map, action).invoke();
4171 <        }
4172 <
4173 <        /**
4174 <         * Performs the given action for each non-null transformation
4175 <         * of each key.
4176 <         *
4177 <         * @param transformer a function returning the transformation
4178 <         * for an element, or null of there is no transformation (in
4179 <         * which case the action is not applied).
4180 <         * @param action the action
4181 <         */
4182 <        public <U> void forEach(Fun<? super K, ? extends U> transformer,
4183 <                                Action<U> action) {
4184 <            ForkJoinTasks.forEachKey
4185 <                (map, transformer, action).invoke();
4186 <        }
4187 <
4188 <        /**
4189 <         * Returns a non-null result from applying the given search
4190 <         * function on each key, or null if none. Upon success,
4191 <         * further element processing is suppressed and the results of
4192 <         * any other parallel invocations of the search function are
4193 <         * ignored.
4194 <         *
4195 <         * @param searchFunction a function returning a non-null
4196 <         * result on success, else null
4197 <         * @return a non-null result from applying the given search
4198 <         * function on each key, or null if none
4199 <         */
4200 <        public <U> U search(Fun<? super K, ? extends U> searchFunction) {
4201 <            return ForkJoinTasks.searchKeys
4202 <                (map, searchFunction).invoke();
4203 <        }
4204 <
4205 <        /**
4206 <         * Returns the result of accumulating all keys using the given
4207 <         * reducer to combine values, or null if none.
4208 <         *
4209 <         * @param reducer a commutative associative combining function
4210 <         * @return the result of accumulating all keys using the given
4211 <         * reducer to combine values, or null if none
4212 <         */
4213 <        public K reduce(BiFun<? super K, ? super K, ? extends K> reducer) {
4214 <            return ForkJoinTasks.reduceKeys
4215 <                (map, reducer).invoke();
4216 <        }
4217 <
4218 <        /**
4219 <         * Returns the result of accumulating the given transformation
4220 <         * of all keys using the given reducer to combine values, and
4221 <         * the given basis as an identity value.
4222 <         *
4223 <         * @param transformer a function returning the transformation
4224 <         * for an element
4225 <         * @param basis the identity (initial default value) for the reduction
4226 <         * @param reducer a commutative associative combining function
4227 <         * @return  the result of accumulating the given transformation
4228 <         * of all keys
4229 <         */
4230 <        public double reduceToDouble(ObjectToDouble<? super K> transformer,
4231 <                                     double basis,
4232 <                                     DoubleByDoubleToDouble reducer) {
4233 <            return ForkJoinTasks.reduceKeysToDouble
4234 <                (map, transformer, basis, reducer).invoke();
4235 <        }
4236 <
4237 <
4238 <        /**
4239 <         * Returns the result of accumulating the given transformation
4240 <         * of all keys using the given reducer to combine values, and
4241 <         * the given basis as an identity value.
4242 <         *
4243 <         * @param transformer a function returning the transformation
4244 <         * for an element
4245 <         * @param basis the identity (initial default value) for the reduction
4246 <         * @param reducer a commutative associative combining function
4247 <         * @return the result of accumulating the given transformation
4248 <         * of all keys
4249 <         */
4250 <        public long reduceToLong(ObjectToLong<? super K> transformer,
4251 <                                 long basis,
4252 <                                 LongByLongToLong reducer) {
4253 <            return ForkJoinTasks.reduceKeysToLong
4254 <                (map, transformer, basis, reducer).invoke();
4658 >        public Stream<K> stream() {
4659 >            return Streams.stream(() -> new KeyIterator<K,V>(map), 0);
4660          }
4661 <
4662 <        /**
4663 <         * Returns the result of accumulating the given transformation
4259 <         * of all keys using the given reducer to combine values, and
4260 <         * the given basis as an identity value.
4261 <         *
4262 <         * @param transformer a function returning the transformation
4263 <         * for an element
4264 <         * @param basis the identity (initial default value) for the reduction
4265 <         * @param reducer a commutative associative combining function
4266 <         * @return the result of accumulating the given transformation
4267 <         * of all keys
4268 <         */
4269 <        public int reduceToInt(ObjectToInt<? super K> transformer,
4270 <                               int basis,
4271 <                               IntByIntToInt reducer) {
4272 <            return ForkJoinTasks.reduceKeysToInt
4273 <                (map, transformer, basis, reducer).invoke();
4661 >        public Stream<K> parallelStream() {
4662 >            return Streams.parallelStream(() -> new KeyIterator<K,V>(map, null),
4663 >                                          0);
4664          }
4275
4665      }
4666  
4667      /**
# Line 4323 | Line 4712 | public class ConcurrentHashMap<K, V>
4712              throw new UnsupportedOperationException();
4713          }
4714  
4715 <        /**
4716 <         * Performs the given action for each value.
4328 <         *
4329 <         * @param action the action
4330 <         */
4331 <        public void forEach(Action<V> action) {
4332 <            ForkJoinTasks.forEachValue
4333 <                (map, action).invoke();
4334 <        }
4335 <
4336 <        /**
4337 <         * Performs the given action for each non-null transformation
4338 <         * of each value.
4339 <         *
4340 <         * @param transformer a function returning the transformation
4341 <         * for an element, or null of there is no transformation (in
4342 <         * which case the action is not applied).
4343 <         */
4344 <        public <U> void forEach(Fun<? super V, ? extends U> transformer,
4345 <                                     Action<U> action) {
4346 <            ForkJoinTasks.forEachValue
4347 <                (map, transformer, action).invoke();
4348 <        }
4349 <
4350 <        /**
4351 <         * Returns a non-null result from applying the given search
4352 <         * function on each value, or null if none.  Upon success,
4353 <         * further element processing is suppressed and the results of
4354 <         * any other parallel invocations of the search function are
4355 <         * ignored.
4356 <         *
4357 <         * @param searchFunction a function returning a non-null
4358 <         * result on success, else null
4359 <         * @return a non-null result from applying the given search
4360 <         * function on each value, or null if none
4361 <         *
4362 <         */
4363 <        public <U> U search(Fun<? super V, ? extends U> searchFunction) {
4364 <            return ForkJoinTasks.searchValues
4365 <                (map, searchFunction).invoke();
4715 >        public Stream<V> stream() {
4716 >            return Streams.stream(() -> new ValueIterator<K,V>(map), 0);
4717          }
4718  
4719 <        /**
4720 <         * Returns the result of accumulating all values using the
4721 <         * given reducer to combine values, or null if none.
4371 <         *
4372 <         * @param reducer a commutative associative combining function
4373 <         * @return  the result of accumulating all values
4374 <         */
4375 <        public V reduce(BiFun<? super V, ? super V, ? extends V> reducer) {
4376 <            return ForkJoinTasks.reduceValues
4377 <                (map, reducer).invoke();
4378 <        }
4379 <
4380 <        /**
4381 <         * Returns the result of accumulating the given transformation
4382 <         * of all values using the given reducer to combine values, or
4383 <         * null if none.
4384 <         *
4385 <         * @param transformer a function returning the transformation
4386 <         * for an element, or null of there is no transformation (in
4387 <         * which case it is not combined).
4388 <         * @param reducer a commutative associative combining function
4389 <         * @return the result of accumulating the given transformation
4390 <         * of all values
4391 <         */
4392 <        public <U> U reduce(Fun<? super V, ? extends U> transformer,
4393 <                            BiFun<? super U, ? super U, ? extends U> reducer) {
4394 <            return ForkJoinTasks.reduceValues
4395 <                (map, transformer, reducer).invoke();
4396 <        }
4397 <
4398 <        /**
4399 <         * Returns the result of accumulating the given transformation
4400 <         * of all values using the given reducer to combine values,
4401 <         * and the given basis as an identity value.
4402 <         *
4403 <         * @param transformer a function returning the transformation
4404 <         * for an element
4405 <         * @param basis the identity (initial default value) for the reduction
4406 <         * @param reducer a commutative associative combining function
4407 <         * @return the result of accumulating the given transformation
4408 <         * of all values
4409 <         */
4410 <        public double reduceToDouble(ObjectToDouble<? super V> transformer,
4411 <                                     double basis,
4412 <                                     DoubleByDoubleToDouble reducer) {
4413 <            return ForkJoinTasks.reduceValuesToDouble
4414 <                (map, transformer, basis, reducer).invoke();
4415 <        }
4416 <
4417 <        /**
4418 <         * Returns the result of accumulating the given transformation
4419 <         * of all values using the given reducer to combine values,
4420 <         * and the given basis as an identity value.
4421 <         *
4422 <         * @param transformer a function returning the transformation
4423 <         * for an element
4424 <         * @param basis the identity (initial default value) for the reduction
4425 <         * @param reducer a commutative associative combining function
4426 <         * @return the result of accumulating the given transformation
4427 <         * of all values
4428 <         */
4429 <        public long reduceToLong(ObjectToLong<? super V> transformer,
4430 <                                 long basis,
4431 <                                 LongByLongToLong reducer) {
4432 <            return ForkJoinTasks.reduceValuesToLong
4433 <                (map, transformer, basis, reducer).invoke();
4434 <        }
4435 <
4436 <        /**
4437 <         * Returns the result of accumulating the given transformation
4438 <         * of all values using the given reducer to combine values,
4439 <         * and the given basis as an identity value.
4440 <         *
4441 <         * @param transformer a function returning the transformation
4442 <         * for an element
4443 <         * @param basis the identity (initial default value) for the reduction
4444 <         * @param reducer a commutative associative combining function
4445 <         * @return the result of accumulating the given transformation
4446 <         * of all values
4447 <         */
4448 <        public int reduceToInt(ObjectToInt<? super V> transformer,
4449 <                               int basis,
4450 <                               IntByIntToInt reducer) {
4451 <            return ForkJoinTasks.reduceValuesToInt
4452 <                (map, transformer, basis, reducer).invoke();
4719 >        public Stream<V> parallelStream() {
4720 >            return Streams.parallelStream(() -> new ValueIterator<K,V>(map, null),
4721 >                                          0);
4722          }
4723  
4724      }
# Line 4497 | Line 4766 | public class ConcurrentHashMap<K, V>
4766              V value = e.getValue();
4767              if (key == null || value == null)
4768                  throw new NullPointerException();
4769 <            return map.internalPut(key, value) == null;
4769 >            return map.internalPut(key, value, false) == null;
4770          }
4771          public final boolean addAll(Collection<? extends Entry<K,V>> c) {
4772              boolean added = false;
# Line 4514 | Line 4783 | public class ConcurrentHashMap<K, V>
4783                       (containsAll(c) && c.containsAll(this))));
4784          }
4785  
4786 <        /**
4787 <         * Performs the given action for each entry.
4519 <         *
4520 <         * @param action the action
4521 <         */
4522 <        public void forEach(Action<Map.Entry<K,V>> action) {
4523 <            ForkJoinTasks.forEachEntry
4524 <                (map, action).invoke();
4525 <        }
4526 <
4527 <        /**
4528 <         * Performs the given action for each non-null transformation
4529 <         * of each entry.
4530 <         *
4531 <         * @param transformer a function returning the transformation
4532 <         * for an element, or null of there is no transformation (in
4533 <         * which case the action is not applied).
4534 <         * @param action the action
4535 <         */
4536 <        public <U> void forEach(Fun<Map.Entry<K,V>, ? extends U> transformer,
4537 <                                Action<U> action) {
4538 <            ForkJoinTasks.forEachEntry
4539 <                (map, transformer, action).invoke();
4786 >        public Stream<Map.Entry<K,V>> stream() {
4787 >            return Streams.stream(() -> new EntryIterator<K,V>(map), 0);
4788          }
4789  
4790 <        /**
4791 <         * Returns a non-null result from applying the given search
4792 <         * function on each entry, or null if none.  Upon success,
4545 <         * further element processing is suppressed and the results of
4546 <         * any other parallel invocations of the search function are
4547 <         * ignored.
4548 <         *
4549 <         * @param searchFunction a function returning a non-null
4550 <         * result on success, else null
4551 <         * @return a non-null result from applying the given search
4552 <         * function on each entry, or null if none
4553 <         */
4554 <        public <U> U search(Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4555 <            return ForkJoinTasks.searchEntries
4556 <                (map, searchFunction).invoke();
4557 <        }
4558 <
4559 <        /**
4560 <         * Returns the result of accumulating all entries using the
4561 <         * given reducer to combine values, or null if none.
4562 <         *
4563 <         * @param reducer a commutative associative combining function
4564 <         * @return the result of accumulating all entries
4565 <         */
4566 <        public Map.Entry<K,V> reduce(BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4567 <            return ForkJoinTasks.reduceEntries
4568 <                (map, reducer).invoke();
4569 <        }
4570 <
4571 <        /**
4572 <         * Returns the result of accumulating the given transformation
4573 <         * of all entries using the given reducer to combine values,
4574 <         * or null if none.
4575 <         *
4576 <         * @param transformer a function returning the transformation
4577 <         * for an element, or null of there is no transformation (in
4578 <         * which case it is not combined).
4579 <         * @param reducer a commutative associative combining function
4580 <         * @return the result of accumulating the given transformation
4581 <         * of all entries
4582 <         */
4583 <        public <U> U reduce(Fun<Map.Entry<K,V>, ? extends U> transformer,
4584 <                            BiFun<? super U, ? super U, ? extends U> reducer) {
4585 <            return ForkJoinTasks.reduceEntries
4586 <                (map, transformer, reducer).invoke();
4587 <        }
4588 <
4589 <        /**
4590 <         * Returns the result of accumulating the given transformation
4591 <         * of all entries using the given reducer to combine values,
4592 <         * and the given basis as an identity value.
4593 <         *
4594 <         * @param transformer a function returning the transformation
4595 <         * for an element
4596 <         * @param basis the identity (initial default value) for the reduction
4597 <         * @param reducer a commutative associative combining function
4598 <         * @return the result of accumulating the given transformation
4599 <         * of all entries
4600 <         */
4601 <        public double reduceToDouble(ObjectToDouble<Map.Entry<K,V>> transformer,
4602 <                                     double basis,
4603 <                                     DoubleByDoubleToDouble reducer) {
4604 <            return ForkJoinTasks.reduceEntriesToDouble
4605 <                (map, transformer, basis, reducer).invoke();
4606 <        }
4607 <
4608 <        /**
4609 <         * Returns the result of accumulating the given transformation
4610 <         * of all entries using the given reducer to combine values,
4611 <         * and the given basis as an identity value.
4612 <         *
4613 <         * @param transformer a function returning the transformation
4614 <         * for an element
4615 <         * @param basis the identity (initial default value) for the reduction
4616 <         * @param reducer a commutative associative combining function
4617 <         * @return  the result of accumulating the given transformation
4618 <         * of all entries
4619 <         */
4620 <        public long reduceToLong(ObjectToLong<Map.Entry<K,V>> transformer,
4621 <                                 long basis,
4622 <                                 LongByLongToLong reducer) {
4623 <            return ForkJoinTasks.reduceEntriesToLong
4624 <                (map, transformer, basis, reducer).invoke();
4625 <        }
4626 <
4627 <        /**
4628 <         * Returns the result of accumulating the given transformation
4629 <         * of all entries using the given reducer to combine values,
4630 <         * and the given basis as an identity value.
4631 <         *
4632 <         * @param transformer a function returning the transformation
4633 <         * for an element
4634 <         * @param basis the identity (initial default value) for the reduction
4635 <         * @param reducer a commutative associative combining function
4636 <         * @return the result of accumulating the given transformation
4637 <         * of all entries
4638 <         */
4639 <        public int reduceToInt(ObjectToInt<Map.Entry<K,V>> transformer,
4640 <                               int basis,
4641 <                               IntByIntToInt reducer) {
4642 <            return ForkJoinTasks.reduceEntriesToInt
4643 <                (map, transformer, basis, reducer).invoke();
4790 >        public Stream<Map.Entry<K,V>> parallelStream() {
4791 >            return Streams.parallelStream(() -> new EntryIterator<K,V>(map, null),
4792 >                                          0);
4793          }
4645
4794      }
4795  
4796      // ---------------------------------------------------------------------
# Line 4669 | Line 4817 | public class ConcurrentHashMap<K, V>
4817           */
4818          public static <K,V> ForkJoinTask<Void> forEach
4819              (ConcurrentHashMap<K,V> map,
4820 <             BiAction<K,V> action) {
4820 >             BiBlock<? super K, ? super V> action) {
4821              if (action == null) throw new NullPointerException();
4822 <            return new ForEachMappingTask<K,V>(map, null, -1, null, action);
4822 >            return new ForEachMappingTask<K,V>(map, null, -1, action);
4823          }
4824  
4825          /**
# Line 4687 | Line 4835 | public class ConcurrentHashMap<K, V>
4835           */
4836          public static <K,V,U> ForkJoinTask<Void> forEach
4837              (ConcurrentHashMap<K,V> map,
4838 <             BiFun<? super K, ? super V, ? extends U> transformer,
4839 <             Action<U> action) {
4838 >             BiFunction<? super K, ? super V, ? extends U> transformer,
4839 >             Block<? super U> action) {
4840              if (transformer == null || action == null)
4841                  throw new NullPointerException();
4842              return new ForEachTransformedMappingTask<K,V,U>
4843 <                (map, null, -1, null, transformer, action);
4843 >                (map, null, -1, transformer, action);
4844          }
4845  
4846          /**
# Line 4709 | Line 4857 | public class ConcurrentHashMap<K, V>
4857           */
4858          public static <K,V,U> ForkJoinTask<U> search
4859              (ConcurrentHashMap<K,V> map,
4860 <             BiFun<? super K, ? super V, ? extends U> searchFunction) {
4860 >             BiFunction<? super K, ? super V, ? extends U> searchFunction) {
4861              if (searchFunction == null) throw new NullPointerException();
4862              return new SearchMappingsTask<K,V,U>
4863 <                (map, null, -1, null, searchFunction,
4863 >                (map, null, -1, searchFunction,
4864                   new AtomicReference<U>());
4865          }
4866  
# Line 4730 | Line 4878 | public class ConcurrentHashMap<K, V>
4878           */
4879          public static <K,V,U> ForkJoinTask<U> reduce
4880              (ConcurrentHashMap<K,V> map,
4881 <             BiFun<? super K, ? super V, ? extends U> transformer,
4882 <             BiFun<? super U, ? super U, ? extends U> reducer) {
4881 >             BiFunction<? super K, ? super V, ? extends U> transformer,
4882 >             BiFunction<? super U, ? super U, ? extends U> reducer) {
4883              if (transformer == null || reducer == null)
4884                  throw new NullPointerException();
4885              return new MapReduceMappingsTask<K,V,U>
# Line 4753 | Line 4901 | public class ConcurrentHashMap<K, V>
4901           */
4902          public static <K,V> ForkJoinTask<Double> reduceToDouble
4903              (ConcurrentHashMap<K,V> map,
4904 <             ObjectByObjectToDouble<? super K, ? super V> transformer,
4904 >             DoubleBiFunction<? super K, ? super V> transformer,
4905               double basis,
4906 <             DoubleByDoubleToDouble reducer) {
4906 >             DoubleBinaryOperator reducer) {
4907              if (transformer == null || reducer == null)
4908                  throw new NullPointerException();
4909              return new MapReduceMappingsToDoubleTask<K,V>
# Line 4777 | Line 4925 | public class ConcurrentHashMap<K, V>
4925           */
4926          public static <K,V> ForkJoinTask<Long> reduceToLong
4927              (ConcurrentHashMap<K,V> map,
4928 <             ObjectByObjectToLong<? super K, ? super V> transformer,
4928 >             LongBiFunction<? super K, ? super V> transformer,
4929               long basis,
4930 <             LongByLongToLong reducer) {
4930 >             LongBinaryOperator reducer) {
4931              if (transformer == null || reducer == null)
4932                  throw new NullPointerException();
4933              return new MapReduceMappingsToLongTask<K,V>
# Line 4800 | Line 4948 | public class ConcurrentHashMap<K, V>
4948           */
4949          public static <K,V> ForkJoinTask<Integer> reduceToInt
4950              (ConcurrentHashMap<K,V> map,
4951 <             ObjectByObjectToInt<? super K, ? super V> transformer,
4951 >             IntBiFunction<? super K, ? super V> transformer,
4952               int basis,
4953 <             IntByIntToInt reducer) {
4953 >             IntBinaryOperator reducer) {
4954              if (transformer == null || reducer == null)
4955                  throw new NullPointerException();
4956              return new MapReduceMappingsToIntTask<K,V>
# Line 4819 | Line 4967 | public class ConcurrentHashMap<K, V>
4967           */
4968          public static <K,V> ForkJoinTask<Void> forEachKey
4969              (ConcurrentHashMap<K,V> map,
4970 <             Action<K> action) {
4970 >             Block<? super K> action) {
4971              if (action == null) throw new NullPointerException();
4972 <            return new ForEachKeyTask<K,V>(map, null, -1, null, action);
4972 >            return new ForEachKeyTask<K,V>(map, null, -1, action);
4973          }
4974  
4975          /**
# Line 4837 | Line 4985 | public class ConcurrentHashMap<K, V>
4985           */
4986          public static <K,V,U> ForkJoinTask<Void> forEachKey
4987              (ConcurrentHashMap<K,V> map,
4988 <             Fun<? super K, ? extends U> transformer,
4989 <             Action<U> action) {
4988 >             Function<? super K, ? extends U> transformer,
4989 >             Block<? super U> action) {
4990              if (transformer == null || action == null)
4991                  throw new NullPointerException();
4992              return new ForEachTransformedKeyTask<K,V,U>
4993 <                (map, null, -1, null, transformer, action);
4993 >                (map, null, -1, transformer, action);
4994          }
4995  
4996          /**
# Line 4859 | Line 5007 | public class ConcurrentHashMap<K, V>
5007           */
5008          public static <K,V,U> ForkJoinTask<U> searchKeys
5009              (ConcurrentHashMap<K,V> map,
5010 <             Fun<? super K, ? extends U> searchFunction) {
5010 >             Function<? super K, ? extends U> searchFunction) {
5011              if (searchFunction == null) throw new NullPointerException();
5012              return new SearchKeysTask<K,V,U>
5013 <                (map, null, -1, null, searchFunction,
5013 >                (map, null, -1, searchFunction,
5014                   new AtomicReference<U>());
5015          }
5016  
# Line 4877 | Line 5025 | public class ConcurrentHashMap<K, V>
5025           */
5026          public static <K,V> ForkJoinTask<K> reduceKeys
5027              (ConcurrentHashMap<K,V> map,
5028 <             BiFun<? super K, ? super K, ? extends K> reducer) {
5028 >             BiFunction<? super K, ? super K, ? extends K> reducer) {
5029              if (reducer == null) throw new NullPointerException();
5030              return new ReduceKeysTask<K,V>
5031                  (map, null, -1, null, reducer);
# Line 4897 | Line 5045 | public class ConcurrentHashMap<K, V>
5045           */
5046          public static <K,V,U> ForkJoinTask<U> reduceKeys
5047              (ConcurrentHashMap<K,V> map,
5048 <             Fun<? super K, ? extends U> transformer,
5049 <             BiFun<? super U, ? super U, ? extends U> reducer) {
5048 >             Function<? super K, ? extends U> transformer,
5049 >             BiFunction<? super U, ? super U, ? extends U> reducer) {
5050              if (transformer == null || reducer == null)
5051                  throw new NullPointerException();
5052              return new MapReduceKeysTask<K,V,U>
# Line 4920 | Line 5068 | public class ConcurrentHashMap<K, V>
5068           */
5069          public static <K,V> ForkJoinTask<Double> reduceKeysToDouble
5070              (ConcurrentHashMap<K,V> map,
5071 <             ObjectToDouble<? super K> transformer,
5071 >             DoubleFunction<? super K> transformer,
5072               double basis,
5073 <             DoubleByDoubleToDouble reducer) {
5073 >             DoubleBinaryOperator reducer) {
5074              if (transformer == null || reducer == null)
5075                  throw new NullPointerException();
5076              return new MapReduceKeysToDoubleTask<K,V>
# Line 4944 | Line 5092 | public class ConcurrentHashMap<K, V>
5092           */
5093          public static <K,V> ForkJoinTask<Long> reduceKeysToLong
5094              (ConcurrentHashMap<K,V> map,
5095 <             ObjectToLong<? super K> transformer,
5095 >             LongFunction<? super K> transformer,
5096               long basis,
5097 <             LongByLongToLong reducer) {
5097 >             LongBinaryOperator reducer) {
5098              if (transformer == null || reducer == null)
5099                  throw new NullPointerException();
5100              return new MapReduceKeysToLongTask<K,V>
# Line 4968 | Line 5116 | public class ConcurrentHashMap<K, V>
5116           */
5117          public static <K,V> ForkJoinTask<Integer> reduceKeysToInt
5118              (ConcurrentHashMap<K,V> map,
5119 <             ObjectToInt<? super K> transformer,
5119 >             IntFunction<? super K> transformer,
5120               int basis,
5121 <             IntByIntToInt reducer) {
5121 >             IntBinaryOperator reducer) {
5122              if (transformer == null || reducer == null)
5123                  throw new NullPointerException();
5124              return new MapReduceKeysToIntTask<K,V>
# Line 4986 | Line 5134 | public class ConcurrentHashMap<K, V>
5134           */
5135          public static <K,V> ForkJoinTask<Void> forEachValue
5136              (ConcurrentHashMap<K,V> map,
5137 <             Action<V> action) {
5137 >             Block<? super V> action) {
5138              if (action == null) throw new NullPointerException();
5139 <            return new ForEachValueTask<K,V>(map, null, -1, null, action);
5139 >            return new ForEachValueTask<K,V>(map, null, -1, action);
5140          }
5141  
5142          /**
# Line 5003 | Line 5151 | public class ConcurrentHashMap<K, V>
5151           */
5152          public static <K,V,U> ForkJoinTask<Void> forEachValue
5153              (ConcurrentHashMap<K,V> map,
5154 <             Fun<? super V, ? extends U> transformer,
5155 <             Action<U> action) {
5154 >             Function<? super V, ? extends U> transformer,
5155 >             Block<? super U> action) {
5156              if (transformer == null || action == null)
5157                  throw new NullPointerException();
5158              return new ForEachTransformedValueTask<K,V,U>
5159 <                (map, null, -1, null, transformer, action);
5159 >                (map, null, -1, transformer, action);
5160          }
5161  
5162          /**
# Line 5025 | Line 5173 | public class ConcurrentHashMap<K, V>
5173           */
5174          public static <K,V,U> ForkJoinTask<U> searchValues
5175              (ConcurrentHashMap<K,V> map,
5176 <             Fun<? super V, ? extends U> searchFunction) {
5176 >             Function<? super V, ? extends U> searchFunction) {
5177              if (searchFunction == null) throw new NullPointerException();
5178              return new SearchValuesTask<K,V,U>
5179 <                (map, null, -1, null, searchFunction,
5179 >                (map, null, -1, searchFunction,
5180                   new AtomicReference<U>());
5181          }
5182  
# Line 5043 | Line 5191 | public class ConcurrentHashMap<K, V>
5191           */
5192          public static <K,V> ForkJoinTask<V> reduceValues
5193              (ConcurrentHashMap<K,V> map,
5194 <             BiFun<? super V, ? super V, ? extends V> reducer) {
5194 >             BiFunction<? super V, ? super V, ? extends V> reducer) {
5195              if (reducer == null) throw new NullPointerException();
5196              return new ReduceValuesTask<K,V>
5197                  (map, null, -1, null, reducer);
# Line 5063 | Line 5211 | public class ConcurrentHashMap<K, V>
5211           */
5212          public static <K,V,U> ForkJoinTask<U> reduceValues
5213              (ConcurrentHashMap<K,V> map,
5214 <             Fun<? super V, ? extends U> transformer,
5215 <             BiFun<? super U, ? super U, ? extends U> reducer) {
5214 >             Function<? super V, ? extends U> transformer,
5215 >             BiFunction<? super U, ? super U, ? extends U> reducer) {
5216              if (transformer == null || reducer == null)
5217                  throw new NullPointerException();
5218              return new MapReduceValuesTask<K,V,U>
# Line 5086 | Line 5234 | public class ConcurrentHashMap<K, V>
5234           */
5235          public static <K,V> ForkJoinTask<Double> reduceValuesToDouble
5236              (ConcurrentHashMap<K,V> map,
5237 <             ObjectToDouble<? super V> transformer,
5237 >             DoubleFunction<? super V> transformer,
5238               double basis,
5239 <             DoubleByDoubleToDouble reducer) {
5239 >             DoubleBinaryOperator reducer) {
5240              if (transformer == null || reducer == null)
5241                  throw new NullPointerException();
5242              return new MapReduceValuesToDoubleTask<K,V>
# Line 5110 | Line 5258 | public class ConcurrentHashMap<K, V>
5258           */
5259          public static <K,V> ForkJoinTask<Long> reduceValuesToLong
5260              (ConcurrentHashMap<K,V> map,
5261 <             ObjectToLong<? super V> transformer,
5261 >             LongFunction<? super V> transformer,
5262               long basis,
5263 <             LongByLongToLong reducer) {
5263 >             LongBinaryOperator reducer) {
5264              if (transformer == null || reducer == null)
5265                  throw new NullPointerException();
5266              return new MapReduceValuesToLongTask<K,V>
# Line 5134 | Line 5282 | public class ConcurrentHashMap<K, V>
5282           */
5283          public static <K,V> ForkJoinTask<Integer> reduceValuesToInt
5284              (ConcurrentHashMap<K,V> map,
5285 <             ObjectToInt<? super V> transformer,
5285 >             IntFunction<? super V> transformer,
5286               int basis,
5287 <             IntByIntToInt reducer) {
5287 >             IntBinaryOperator reducer) {
5288              if (transformer == null || reducer == null)
5289                  throw new NullPointerException();
5290              return new MapReduceValuesToIntTask<K,V>
# Line 5152 | Line 5300 | public class ConcurrentHashMap<K, V>
5300           */
5301          public static <K,V> ForkJoinTask<Void> forEachEntry
5302              (ConcurrentHashMap<K,V> map,
5303 <             Action<Map.Entry<K,V>> action) {
5303 >             Block<? super Map.Entry<K,V>> action) {
5304              if (action == null) throw new NullPointerException();
5305 <            return new ForEachEntryTask<K,V>(map, null, -1, null, action);
5305 >            return new ForEachEntryTask<K,V>(map, null, -1, action);
5306          }
5307  
5308          /**
# Line 5169 | Line 5317 | public class ConcurrentHashMap<K, V>
5317           */
5318          public static <K,V,U> ForkJoinTask<Void> forEachEntry
5319              (ConcurrentHashMap<K,V> map,
5320 <             Fun<Map.Entry<K,V>, ? extends U> transformer,
5321 <             Action<U> action) {
5320 >             Function<Map.Entry<K,V>, ? extends U> transformer,
5321 >             Block<? super U> action) {
5322              if (transformer == null || action == null)
5323                  throw new NullPointerException();
5324              return new ForEachTransformedEntryTask<K,V,U>
5325 <                (map, null, -1, null, transformer, action);
5325 >                (map, null, -1, transformer, action);
5326          }
5327  
5328          /**
# Line 5191 | Line 5339 | public class ConcurrentHashMap<K, V>
5339           */
5340          public static <K,V,U> ForkJoinTask<U> searchEntries
5341              (ConcurrentHashMap<K,V> map,
5342 <             Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
5342 >             Function<Map.Entry<K,V>, ? extends U> searchFunction) {
5343              if (searchFunction == null) throw new NullPointerException();
5344              return new SearchEntriesTask<K,V,U>
5345 <                (map, null, -1, null, searchFunction,
5345 >                (map, null, -1, searchFunction,
5346                   new AtomicReference<U>());
5347          }
5348  
# Line 5209 | Line 5357 | public class ConcurrentHashMap<K, V>
5357           */
5358          public static <K,V> ForkJoinTask<Map.Entry<K,V>> reduceEntries
5359              (ConcurrentHashMap<K,V> map,
5360 <             BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
5360 >             BiFunction<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
5361              if (reducer == null) throw new NullPointerException();
5362              return new ReduceEntriesTask<K,V>
5363                  (map, null, -1, null, reducer);
# Line 5229 | Line 5377 | public class ConcurrentHashMap<K, V>
5377           */
5378          public static <K,V,U> ForkJoinTask<U> reduceEntries
5379              (ConcurrentHashMap<K,V> map,
5380 <             Fun<Map.Entry<K,V>, ? extends U> transformer,
5381 <             BiFun<? super U, ? super U, ? extends U> reducer) {
5380 >             Function<Map.Entry<K,V>, ? extends U> transformer,
5381 >             BiFunction<? super U, ? super U, ? extends U> reducer) {
5382              if (transformer == null || reducer == null)
5383                  throw new NullPointerException();
5384              return new MapReduceEntriesTask<K,V,U>
# Line 5252 | Line 5400 | public class ConcurrentHashMap<K, V>
5400           */
5401          public static <K,V> ForkJoinTask<Double> reduceEntriesToDouble
5402              (ConcurrentHashMap<K,V> map,
5403 <             ObjectToDouble<Map.Entry<K,V>> transformer,
5403 >             DoubleFunction<Map.Entry<K,V>> transformer,
5404               double basis,
5405 <             DoubleByDoubleToDouble reducer) {
5405 >             DoubleBinaryOperator reducer) {
5406              if (transformer == null || reducer == null)
5407                  throw new NullPointerException();
5408              return new MapReduceEntriesToDoubleTask<K,V>
# Line 5276 | Line 5424 | public class ConcurrentHashMap<K, V>
5424           */
5425          public static <K,V> ForkJoinTask<Long> reduceEntriesToLong
5426              (ConcurrentHashMap<K,V> map,
5427 <             ObjectToLong<Map.Entry<K,V>> transformer,
5427 >             LongFunction<Map.Entry<K,V>> transformer,
5428               long basis,
5429 <             LongByLongToLong reducer) {
5429 >             LongBinaryOperator reducer) {
5430              if (transformer == null || reducer == null)
5431                  throw new NullPointerException();
5432              return new MapReduceEntriesToLongTask<K,V>
# Line 5300 | Line 5448 | public class ConcurrentHashMap<K, V>
5448           */
5449          public static <K,V> ForkJoinTask<Integer> reduceEntriesToInt
5450              (ConcurrentHashMap<K,V> map,
5451 <             ObjectToInt<Map.Entry<K,V>> transformer,
5451 >             IntFunction<Map.Entry<K,V>> transformer,
5452               int basis,
5453 <             IntByIntToInt reducer) {
5453 >             IntBinaryOperator reducer) {
5454              if (transformer == null || reducer == null)
5455                  throw new NullPointerException();
5456              return new MapReduceEntriesToIntTask<K,V>
# Line 5312 | Line 5460 | public class ConcurrentHashMap<K, V>
5460  
5461      // -------------------------------------------------------
5462  
5315    /**
5316     * Base for FJ tasks for bulk operations. This adds a variant of
5317     * CountedCompleters and some split and merge bookkeeping to
5318     * iterator functionality. The forEach and reduce methods are
5319     * similar to those illustrated in CountedCompleter documentation,
5320     * except that bottom-up reduction completions perform them within
5321     * their compute methods. The search methods are like forEach
5322     * except they continually poll for success and exit early.  Also,
5323     * exceptions are handled in a simpler manner, by just trying to
5324     * complete root task exceptionally.
5325     */
5326    @SuppressWarnings("serial") static abstract class BulkTask<K,V,R> extends Traverser<K,V,R> {
5327        final BulkTask<K,V,?> parent;  // completion target
5328        int batch;                     // split control; -1 for unknown
5329        int pending;                   // completion control
5330
5331        BulkTask(ConcurrentHashMap<K,V> map, BulkTask<K,V,?> parent,
5332                 int batch) {
5333            super(map);
5334            this.parent = parent;
5335            this.batch = batch;
5336            if (parent != null && map != null) { // split parent
5337                Node[] t;
5338                if ((t = parent.tab) == null &&
5339                    (t = parent.tab = map.table) != null)
5340                    parent.baseLimit = parent.baseSize = t.length;
5341                this.tab = t;
5342                this.baseSize = parent.baseSize;
5343                int hi = this.baseLimit = parent.baseLimit;
5344                parent.baseLimit = this.index = this.baseIndex =
5345                    (hi + parent.baseIndex + 1) >>> 1;
5346            }
5347        }
5348
5349        /**
5350         * Forces root task to complete.
5351         * @param ex if null, complete normally, else exceptionally
5352         * @return false to simplify use
5353         */
5354        final boolean tryCompleteComputation(Throwable ex) {
5355            for (BulkTask<K,V,?> a = this;;) {
5356                BulkTask<K,V,?> p = a.parent;
5357                if (p == null) {
5358                    if (ex != null)
5359                        a.completeExceptionally(ex);
5360                    else
5361                        a.quietlyComplete();
5362                    return false;
5363                }
5364                a = p;
5365            }
5366        }
5367
5368        /**
5369         * Version of tryCompleteComputation for function screening checks
5370         */
5371        final boolean abortOnNullFunction() {
5372            return tryCompleteComputation(new Error("Unexpected null function"));
5373        }
5374
5375        // utilities
5376
5377        /** CompareAndSet pending count */
5378        final boolean casPending(int cmp, int val) {
5379            return U.compareAndSwapInt(this, PENDING, cmp, val);
5380        }
5381
5382        /**
5383         * Returns approx exp2 of the number of times (minus one) to
5384         * split task by two before executing leaf action. This value
5385         * is faster to compute and more convenient to use as a guide
5386         * to splitting than is the depth, since it is used while
5387         * dividing by two anyway.
5388         */
5389        final int batch() {
5390            ConcurrentHashMap<K, V> m; int b; Node[] t;  ForkJoinPool pool;
5391            if ((b = batch) < 0 && (m = map) != null) { // force initialization
5392                if ((t = tab) == null && (t = tab = m.table) != null)
5393                    baseLimit = baseSize = t.length;
5394                if (t != null) {
5395                    long n = m.counter.sum();
5396                    int par = ((pool = getPool()) == null) ?
5397                        ForkJoinPool.getCommonPoolParallelism() :
5398                        pool.getParallelism();
5399                    int sp = par << 3; // slack of 8
5400                    b = batch = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp;
5401                }
5402            }
5403            return b;
5404        }
5405
5406        /**
5407         * Returns exportable snapshot entry.
5408         */
5409        static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
5410            return new AbstractMap.SimpleEntry<K,V>(k, v);
5411        }
5412
5413        // Unsafe mechanics
5414        private static final sun.misc.Unsafe U;
5415        private static final long PENDING;
5416        static {
5417            try {
5418                U = sun.misc.Unsafe.getUnsafe();
5419                PENDING = U.objectFieldOffset
5420                    (BulkTask.class.getDeclaredField("pending"));
5421            } catch (Exception e) {
5422                throw new Error(e);
5423            }
5424        }
5425    }
5426
5427    /**
5428     * Base class for non-reductive actions
5429     */
5430    @SuppressWarnings("serial") static abstract class BulkAction<K,V,R> extends BulkTask<K,V,R> {
5431        BulkAction<K,V,?> nextTask;
5432        BulkAction(ConcurrentHashMap<K,V> map, BulkTask<K,V,?> parent,
5433                   int batch, BulkAction<K,V,?> nextTask) {
5434            super(map, parent, batch);
5435            this.nextTask = nextTask;
5436        }
5437
5438        /**
5439         * Try to complete task and upward parents. Upon hitting
5440         * non-completed parent, if a non-FJ task, try to help out the
5441         * computation.
5442         */
5443        final void tryComplete(BulkAction<K,V,?> subtasks) {
5444            BulkTask<K,V,?> a = this, s = a;
5445            for (int c;;) {
5446                if ((c = a.pending) == 0) {
5447                    if ((a = (s = a).parent) == null) {
5448                        s.quietlyComplete();
5449                        break;
5450                    }
5451                }
5452                else if (a.casPending(c, c - 1)) {
5453                    if (subtasks != null && !inForkJoinPool()) {
5454                        while ((s = a.parent) != null)
5455                            a = s;
5456                        while (!a.isDone()) {
5457                            BulkAction<K,V,?> next = subtasks.nextTask;
5458                            if (subtasks.tryUnfork())
5459                                subtasks.exec();
5460                            if ((subtasks = next) == null)
5461                                break;
5462                        }
5463                    }
5464                    break;
5465                }
5466            }
5467        }
5468
5469    }
5470
5463      /*
5464       * Task classes. Coded in a regular but ugly format/style to
5465       * simplify checks that each variant differs in the right way from
5466 <     * others.
5466 >     * others. The null screenings exist because compilers cannot tell
5467 >     * that we've already null-checked task arguments, so we force
5468 >     * simplest hoisted bypass to help avoid convoluted traps.
5469       */
5470  
5471      @SuppressWarnings("serial") static final class ForEachKeyTask<K,V>
5472 <        extends BulkAction<K,V,Void> {
5473 <        final Action<K> action;
5472 >        extends Traverser<K,V,Void> {
5473 >        final Block<? super K> action;
5474          ForEachKeyTask
5475 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5476 <             ForEachKeyTask<K,V> nextTask,
5477 <             Action<K> action) {
5484 <            super(m, p, b, nextTask);
5475 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5476 >             Block<? super K> action) {
5477 >            super(m, p, b);
5478              this.action = action;
5479          }
5480 <        @SuppressWarnings("unchecked") public final boolean exec() {
5481 <            final Action<K> action = this.action;
5482 <            if (action == null)
5483 <                return abortOnNullFunction();
5484 <            ForEachKeyTask<K,V> subtasks = null;
5492 <            try {
5493 <                int b = batch(), c;
5494 <                while (b > 1 && baseIndex != baseLimit) {
5495 <                    do {} while (!casPending(c = pending, c+1));
5496 <                    (subtasks = new ForEachKeyTask<K,V>
5497 <                     (map, this, b >>>= 1, subtasks, action)).fork();
5498 <                }
5480 >        @SuppressWarnings("unchecked") public final void compute() {
5481 >            final Block<? super K> action;
5482 >            if ((action = this.action) != null) {
5483 >                for (int b; (b = preSplit()) > 0;)
5484 >                    new ForEachKeyTask<K,V>(map, this, b, action).fork();
5485                  while (advance() != null)
5486 <                    action.apply((K)nextKey);
5487 <            } catch (Throwable ex) {
5502 <                return tryCompleteComputation(ex);
5486 >                    action.accept((K)nextKey);
5487 >                propagateCompletion();
5488              }
5504            tryComplete(subtasks);
5505            return false;
5489          }
5490      }
5491  
5492      @SuppressWarnings("serial") static final class ForEachValueTask<K,V>
5493 <        extends BulkAction<K,V,Void> {
5494 <        final Action<V> action;
5493 >        extends Traverser<K,V,Void> {
5494 >        final Block<? super V> action;
5495          ForEachValueTask
5496 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5497 <             ForEachValueTask<K,V> nextTask,
5498 <             Action<V> action) {
5516 <            super(m, p, b, nextTask);
5496 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5497 >             Block<? super V> action) {
5498 >            super(m, p, b);
5499              this.action = action;
5500          }
5501 <        @SuppressWarnings("unchecked") public final boolean exec() {
5502 <            final Action<V> action = this.action;
5503 <            if (action == null)
5504 <                return abortOnNullFunction();
5505 <            ForEachValueTask<K,V> subtasks = null;
5506 <            try {
5525 <                int b = batch(), c;
5526 <                while (b > 1 && baseIndex != baseLimit) {
5527 <                    do {} while (!casPending(c = pending, c+1));
5528 <                    (subtasks = new ForEachValueTask<K,V>
5529 <                     (map, this, b >>>= 1, subtasks, action)).fork();
5530 <                }
5531 <                Object v;
5501 >        @SuppressWarnings("unchecked") public final void compute() {
5502 >            final Block<? super V> action;
5503 >            if ((action = this.action) != null) {
5504 >                for (int b; (b = preSplit()) > 0;)
5505 >                    new ForEachValueTask<K,V>(map, this, b, action).fork();
5506 >                V v;
5507                  while ((v = advance()) != null)
5508 <                    action.apply((V)v);
5509 <            } catch (Throwable ex) {
5535 <                return tryCompleteComputation(ex);
5508 >                    action.accept(v);
5509 >                propagateCompletion();
5510              }
5537            tryComplete(subtasks);
5538            return false;
5511          }
5512      }
5513  
5514      @SuppressWarnings("serial") static final class ForEachEntryTask<K,V>
5515 <        extends BulkAction<K,V,Void> {
5516 <        final Action<Entry<K,V>> action;
5515 >        extends Traverser<K,V,Void> {
5516 >        final Block<? super Entry<K,V>> action;
5517          ForEachEntryTask
5518 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5519 <             ForEachEntryTask<K,V> nextTask,
5520 <             Action<Entry<K,V>> action) {
5549 <            super(m, p, b, nextTask);
5518 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5519 >             Block<? super Entry<K,V>> action) {
5520 >            super(m, p, b);
5521              this.action = action;
5522          }
5523 <        @SuppressWarnings("unchecked") public final boolean exec() {
5524 <            final Action<Entry<K,V>> action = this.action;
5525 <            if (action == null)
5526 <                return abortOnNullFunction();
5527 <            ForEachEntryTask<K,V> subtasks = null;
5528 <            try {
5558 <                int b = batch(), c;
5559 <                while (b > 1 && baseIndex != baseLimit) {
5560 <                    do {} while (!casPending(c = pending, c+1));
5561 <                    (subtasks = new ForEachEntryTask<K,V>
5562 <                     (map, this, b >>>= 1, subtasks, action)).fork();
5563 <                }
5564 <                Object v;
5523 >        @SuppressWarnings("unchecked") public final void compute() {
5524 >            final Block<? super Entry<K,V>> action;
5525 >            if ((action = this.action) != null) {
5526 >                for (int b; (b = preSplit()) > 0;)
5527 >                    new ForEachEntryTask<K,V>(map, this, b, action).fork();
5528 >                V v;
5529                  while ((v = advance()) != null)
5530 <                    action.apply(entryFor((K)nextKey, (V)v));
5531 <            } catch (Throwable ex) {
5568 <                return tryCompleteComputation(ex);
5530 >                    action.accept(entryFor((K)nextKey, v));
5531 >                propagateCompletion();
5532              }
5570            tryComplete(subtasks);
5571            return false;
5533          }
5534      }
5535  
5536      @SuppressWarnings("serial") static final class ForEachMappingTask<K,V>
5537 <        extends BulkAction<K,V,Void> {
5538 <        final BiAction<K,V> action;
5537 >        extends Traverser<K,V,Void> {
5538 >        final BiBlock<? super K, ? super V> action;
5539          ForEachMappingTask
5540 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5541 <             ForEachMappingTask<K,V> nextTask,
5542 <             BiAction<K,V> action) {
5582 <            super(m, p, b, nextTask);
5540 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5541 >             BiBlock<? super K,? super V> action) {
5542 >            super(m, p, b);
5543              this.action = action;
5544          }
5545 <        @SuppressWarnings("unchecked") public final boolean exec() {
5546 <            final BiAction<K,V> action = this.action;
5547 <            if (action == null)
5548 <                return abortOnNullFunction();
5549 <            ForEachMappingTask<K,V> subtasks = null;
5550 <            try {
5591 <                int b = batch(), c;
5592 <                while (b > 1 && baseIndex != baseLimit) {
5593 <                    do {} while (!casPending(c = pending, c+1));
5594 <                    (subtasks = new ForEachMappingTask<K,V>
5595 <                     (map, this, b >>>= 1, subtasks, action)).fork();
5596 <                }
5597 <                Object v;
5545 >        @SuppressWarnings("unchecked") public final void compute() {
5546 >            final BiBlock<? super K, ? super V> action;
5547 >            if ((action = this.action) != null) {
5548 >                for (int b; (b = preSplit()) > 0;)
5549 >                    new ForEachMappingTask<K,V>(map, this, b, action).fork();
5550 >                V v;
5551                  while ((v = advance()) != null)
5552 <                    action.apply((K)nextKey, (V)v);
5553 <            } catch (Throwable ex) {
5601 <                return tryCompleteComputation(ex);
5552 >                    action.accept((K)nextKey, v);
5553 >                propagateCompletion();
5554              }
5603            tryComplete(subtasks);
5604            return false;
5555          }
5556      }
5557  
5558      @SuppressWarnings("serial") static final class ForEachTransformedKeyTask<K,V,U>
5559 <        extends BulkAction<K,V,Void> {
5560 <        final Fun<? super K, ? extends U> transformer;
5561 <        final Action<U> action;
5559 >        extends Traverser<K,V,Void> {
5560 >        final Function<? super K, ? extends U> transformer;
5561 >        final Block<? super U> action;
5562          ForEachTransformedKeyTask
5563 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5564 <             ForEachTransformedKeyTask<K,V,U> nextTask,
5565 <             Fun<? super K, ? extends U> transformer,
5566 <             Action<U> action) {
5567 <            super(m, p, b, nextTask);
5568 <            this.transformer = transformer;
5569 <            this.action = action;
5570 <
5571 <        }
5572 <        @SuppressWarnings("unchecked") public final boolean exec() {
5573 <            final Fun<? super K, ? extends U> transformer =
5574 <                this.transformer;
5575 <            final Action<U> action = this.action;
5626 <            if (transformer == null || action == null)
5627 <                return abortOnNullFunction();
5628 <            ForEachTransformedKeyTask<K,V,U> subtasks = null;
5629 <            try {
5630 <                int b = batch(), c;
5631 <                while (b > 1 && baseIndex != baseLimit) {
5632 <                    do {} while (!casPending(c = pending, c+1));
5633 <                    (subtasks = new ForEachTransformedKeyTask<K,V,U>
5634 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5635 <                }
5563 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5564 >             Function<? super K, ? extends U> transformer, Block<? super U> action) {
5565 >            super(m, p, b);
5566 >            this.transformer = transformer; this.action = action;
5567 >        }
5568 >        @SuppressWarnings("unchecked") public final void compute() {
5569 >            final Function<? super K, ? extends U> transformer;
5570 >            final Block<? super U> action;
5571 >            if ((transformer = this.transformer) != null &&
5572 >                (action = this.action) != null) {
5573 >                for (int b; (b = preSplit()) > 0;)
5574 >                    new ForEachTransformedKeyTask<K,V,U>
5575 >                        (map, this, b, transformer, action).fork();
5576                  U u;
5577                  while (advance() != null) {
5578                      if ((u = transformer.apply((K)nextKey)) != null)
5579 <                        action.apply(u);
5579 >                        action.accept(u);
5580                  }
5581 <            } catch (Throwable ex) {
5642 <                return tryCompleteComputation(ex);
5581 >                propagateCompletion();
5582              }
5644            tryComplete(subtasks);
5645            return false;
5583          }
5584      }
5585  
5586      @SuppressWarnings("serial") static final class ForEachTransformedValueTask<K,V,U>
5587 <        extends BulkAction<K,V,Void> {
5588 <        final Fun<? super V, ? extends U> transformer;
5589 <        final Action<U> action;
5587 >        extends Traverser<K,V,Void> {
5588 >        final Function<? super V, ? extends U> transformer;
5589 >        final Block<? super U> action;
5590          ForEachTransformedValueTask
5591 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5592 <             ForEachTransformedValueTask<K,V,U> nextTask,
5593 <             Fun<? super V, ? extends U> transformer,
5594 <             Action<U> action) {
5595 <            super(m, p, b, nextTask);
5596 <            this.transformer = transformer;
5597 <            this.action = action;
5598 <
5599 <        }
5600 <        @SuppressWarnings("unchecked") public final boolean exec() {
5601 <            final Fun<? super V, ? extends U> transformer =
5602 <                this.transformer;
5603 <            final Action<U> action = this.action;
5604 <            if (transformer == null || action == null)
5668 <                return abortOnNullFunction();
5669 <            ForEachTransformedValueTask<K,V,U> subtasks = null;
5670 <            try {
5671 <                int b = batch(), c;
5672 <                while (b > 1 && baseIndex != baseLimit) {
5673 <                    do {} while (!casPending(c = pending, c+1));
5674 <                    (subtasks = new ForEachTransformedValueTask<K,V,U>
5675 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5676 <                }
5677 <                Object v; U u;
5591 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5592 >             Function<? super V, ? extends U> transformer, Block<? super U> action) {
5593 >            super(m, p, b);
5594 >            this.transformer = transformer; this.action = action;
5595 >        }
5596 >        @SuppressWarnings("unchecked") public final void compute() {
5597 >            final Function<? super V, ? extends U> transformer;
5598 >            final Block<? super U> action;
5599 >            if ((transformer = this.transformer) != null &&
5600 >                (action = this.action) != null) {
5601 >                for (int b; (b = preSplit()) > 0;)
5602 >                    new ForEachTransformedValueTask<K,V,U>
5603 >                        (map, this, b, transformer, action).fork();
5604 >                V v; U u;
5605                  while ((v = advance()) != null) {
5606 <                    if ((u = transformer.apply((V)v)) != null)
5607 <                        action.apply(u);
5606 >                    if ((u = transformer.apply(v)) != null)
5607 >                        action.accept(u);
5608                  }
5609 <            } catch (Throwable ex) {
5683 <                return tryCompleteComputation(ex);
5609 >                propagateCompletion();
5610              }
5685            tryComplete(subtasks);
5686            return false;
5611          }
5612      }
5613  
5614      @SuppressWarnings("serial") static final class ForEachTransformedEntryTask<K,V,U>
5615 <        extends BulkAction<K,V,Void> {
5616 <        final Fun<Map.Entry<K,V>, ? extends U> transformer;
5617 <        final Action<U> action;
5615 >        extends Traverser<K,V,Void> {
5616 >        final Function<Map.Entry<K,V>, ? extends U> transformer;
5617 >        final Block<? super U> action;
5618          ForEachTransformedEntryTask
5619 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5620 <             ForEachTransformedEntryTask<K,V,U> nextTask,
5621 <             Fun<Map.Entry<K,V>, ? extends U> transformer,
5622 <             Action<U> action) {
5623 <            super(m, p, b, nextTask);
5624 <            this.transformer = transformer;
5625 <            this.action = action;
5626 <
5627 <        }
5628 <        @SuppressWarnings("unchecked") public final boolean exec() {
5629 <            final Fun<Map.Entry<K,V>, ? extends U> transformer =
5630 <                this.transformer;
5631 <            final Action<U> action = this.action;
5632 <            if (transformer == null || action == null)
5709 <                return abortOnNullFunction();
5710 <            ForEachTransformedEntryTask<K,V,U> subtasks = null;
5711 <            try {
5712 <                int b = batch(), c;
5713 <                while (b > 1 && baseIndex != baseLimit) {
5714 <                    do {} while (!casPending(c = pending, c+1));
5715 <                    (subtasks = new ForEachTransformedEntryTask<K,V,U>
5716 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5717 <                }
5718 <                Object v; U u;
5619 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5620 >             Function<Map.Entry<K,V>, ? extends U> transformer, Block<? super U> action) {
5621 >            super(m, p, b);
5622 >            this.transformer = transformer; this.action = action;
5623 >        }
5624 >        @SuppressWarnings("unchecked") public final void compute() {
5625 >            final Function<Map.Entry<K,V>, ? extends U> transformer;
5626 >            final Block<? super U> action;
5627 >            if ((transformer = this.transformer) != null &&
5628 >                (action = this.action) != null) {
5629 >                for (int b; (b = preSplit()) > 0;)
5630 >                    new ForEachTransformedEntryTask<K,V,U>
5631 >                        (map, this, b, transformer, action).fork();
5632 >                V v; U u;
5633                  while ((v = advance()) != null) {
5634 <                    if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
5635 <                        action.apply(u);
5634 >                    if ((u = transformer.apply(entryFor((K)nextKey,
5635 >                                                        v))) != null)
5636 >                        action.accept(u);
5637                  }
5638 <            } catch (Throwable ex) {
5724 <                return tryCompleteComputation(ex);
5638 >                propagateCompletion();
5639              }
5726            tryComplete(subtasks);
5727            return false;
5640          }
5641      }
5642  
5643      @SuppressWarnings("serial") static final class ForEachTransformedMappingTask<K,V,U>
5644 <        extends BulkAction<K,V,Void> {
5645 <        final BiFun<? super K, ? super V, ? extends U> transformer;
5646 <        final Action<U> action;
5644 >        extends Traverser<K,V,Void> {
5645 >        final BiFunction<? super K, ? super V, ? extends U> transformer;
5646 >        final Block<? super U> action;
5647          ForEachTransformedMappingTask
5648 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5649 <             ForEachTransformedMappingTask<K,V,U> nextTask,
5650 <             BiFun<? super K, ? super V, ? extends U> transformer,
5651 <             Action<U> action) {
5652 <            super(m, p, b, nextTask);
5653 <            this.transformer = transformer;
5654 <            this.action = action;
5655 <
5656 <        }
5657 <        @SuppressWarnings("unchecked") public final boolean exec() {
5658 <            final BiFun<? super K, ? super V, ? extends U> transformer =
5659 <                this.transformer;
5660 <            final Action<U> action = this.action;
5661 <            if (transformer == null || action == null)
5662 <                return abortOnNullFunction();
5751 <            ForEachTransformedMappingTask<K,V,U> subtasks = null;
5752 <            try {
5753 <                int b = batch(), c;
5754 <                while (b > 1 && baseIndex != baseLimit) {
5755 <                    do {} while (!casPending(c = pending, c+1));
5756 <                    (subtasks = new ForEachTransformedMappingTask<K,V,U>
5757 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5758 <                }
5759 <                Object v; U u;
5648 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5649 >             BiFunction<? super K, ? super V, ? extends U> transformer,
5650 >             Block<? super U> action) {
5651 >            super(m, p, b);
5652 >            this.transformer = transformer; this.action = action;
5653 >        }
5654 >        @SuppressWarnings("unchecked") public final void compute() {
5655 >            final BiFunction<? super K, ? super V, ? extends U> transformer;
5656 >            final Block<? super U> action;
5657 >            if ((transformer = this.transformer) != null &&
5658 >                (action = this.action) != null) {
5659 >                for (int b; (b = preSplit()) > 0;)
5660 >                    new ForEachTransformedMappingTask<K,V,U>
5661 >                        (map, this, b, transformer, action).fork();
5662 >                V v; U u;
5663                  while ((v = advance()) != null) {
5664 <                    if ((u = transformer.apply((K)nextKey, (V)v)) != null)
5665 <                        action.apply(u);
5664 >                    if ((u = transformer.apply((K)nextKey, v)) != null)
5665 >                        action.accept(u);
5666                  }
5667 <            } catch (Throwable ex) {
5765 <                return tryCompleteComputation(ex);
5667 >                propagateCompletion();
5668              }
5767            tryComplete(subtasks);
5768            return false;
5669          }
5670      }
5671  
5672      @SuppressWarnings("serial") static final class SearchKeysTask<K,V,U>
5673 <        extends BulkAction<K,V,U> {
5674 <        final Fun<? super K, ? extends U> searchFunction;
5673 >        extends Traverser<K,V,U> {
5674 >        final Function<? super K, ? extends U> searchFunction;
5675          final AtomicReference<U> result;
5676          SearchKeysTask
5677 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5678 <             SearchKeysTask<K,V,U> nextTask,
5779 <             Fun<? super K, ? extends U> searchFunction,
5677 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5678 >             Function<? super K, ? extends U> searchFunction,
5679               AtomicReference<U> result) {
5680 <            super(m, p, b, nextTask);
5680 >            super(m, p, b);
5681              this.searchFunction = searchFunction; this.result = result;
5682          }
5683 <        @SuppressWarnings("unchecked") public final boolean exec() {
5684 <            AtomicReference<U> result = this.result;
5685 <            final Fun<? super K, ? extends U> searchFunction =
5686 <                this.searchFunction;
5687 <            if (searchFunction == null || result == null)
5688 <                return abortOnNullFunction();
5689 <            SearchKeysTask<K,V,U> subtasks = null;
5690 <            try {
5691 <                int b = batch(), c;
5692 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5693 <                    do {} while (!casPending(c = pending, c+1));
5694 <                    (subtasks = new SearchKeysTask<K,V,U>
5695 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5683 >        public final U getRawResult() { return result.get(); }
5684 >        @SuppressWarnings("unchecked") public final void compute() {
5685 >            final Function<? super K, ? extends U> searchFunction;
5686 >            final AtomicReference<U> result;
5687 >            if ((searchFunction = this.searchFunction) != null &&
5688 >                (result = this.result) != null) {
5689 >                for (int b;;) {
5690 >                    if (result.get() != null)
5691 >                        return;
5692 >                    if ((b = preSplit()) <= 0)
5693 >                        break;
5694 >                    new SearchKeysTask<K,V,U>
5695 >                        (map, this, b, searchFunction, result).fork();
5696                  }
5697 <                U u;
5698 <                while (result.get() == null && advance() != null) {
5697 >                while (result.get() == null) {
5698 >                    U u;
5699 >                    if (advance() == null) {
5700 >                        propagateCompletion();
5701 >                        break;
5702 >                    }
5703                      if ((u = searchFunction.apply((K)nextKey)) != null) {
5704                          if (result.compareAndSet(null, u))
5705 <                            tryCompleteComputation(null);
5705 >                            quietlyCompleteRoot();
5706                          break;
5707                      }
5708                  }
5806            } catch (Throwable ex) {
5807                return tryCompleteComputation(ex);
5709              }
5809            tryComplete(subtasks);
5810            return false;
5710          }
5812        public final U getRawResult() { return result.get(); }
5711      }
5712  
5713      @SuppressWarnings("serial") static final class SearchValuesTask<K,V,U>
5714 <        extends BulkAction<K,V,U> {
5715 <        final Fun<? super V, ? extends U> searchFunction;
5714 >        extends Traverser<K,V,U> {
5715 >        final Function<? super V, ? extends U> searchFunction;
5716          final AtomicReference<U> result;
5717          SearchValuesTask
5718 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5719 <             SearchValuesTask<K,V,U> nextTask,
5822 <             Fun<? super V, ? extends U> searchFunction,
5718 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5719 >             Function<? super V, ? extends U> searchFunction,
5720               AtomicReference<U> result) {
5721 <            super(m, p, b, nextTask);
5721 >            super(m, p, b);
5722              this.searchFunction = searchFunction; this.result = result;
5723          }
5724 <        @SuppressWarnings("unchecked") public final boolean exec() {
5725 <            AtomicReference<U> result = this.result;
5726 <            final Fun<? super V, ? extends U> searchFunction =
5727 <                this.searchFunction;
5728 <            if (searchFunction == null || result == null)
5729 <                return abortOnNullFunction();
5730 <            SearchValuesTask<K,V,U> subtasks = null;
5731 <            try {
5732 <                int b = batch(), c;
5733 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5734 <                    do {} while (!casPending(c = pending, c+1));
5735 <                    (subtasks = new SearchValuesTask<K,V,U>
5736 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5737 <                }
5738 <                Object v; U u;
5739 <                while (result.get() == null && (v = advance()) != null) {
5740 <                    if ((u = searchFunction.apply((V)v)) != null) {
5724 >        public final U getRawResult() { return result.get(); }
5725 >        @SuppressWarnings("unchecked") public final void compute() {
5726 >            final Function<? super V, ? extends U> searchFunction;
5727 >            final AtomicReference<U> result;
5728 >            if ((searchFunction = this.searchFunction) != null &&
5729 >                (result = this.result) != null) {
5730 >                for (int b;;) {
5731 >                    if (result.get() != null)
5732 >                        return;
5733 >                    if ((b = preSplit()) <= 0)
5734 >                        break;
5735 >                    new SearchValuesTask<K,V,U>
5736 >                        (map, this, b, searchFunction, result).fork();
5737 >                }
5738 >                while (result.get() == null) {
5739 >                    V v; U u;
5740 >                    if ((v = advance()) == null) {
5741 >                        propagateCompletion();
5742 >                        break;
5743 >                    }
5744 >                    if ((u = searchFunction.apply(v)) != null) {
5745                          if (result.compareAndSet(null, u))
5746 <                            tryCompleteComputation(null);
5746 >                            quietlyCompleteRoot();
5747                          break;
5748                      }
5749                  }
5849            } catch (Throwable ex) {
5850                return tryCompleteComputation(ex);
5750              }
5852            tryComplete(subtasks);
5853            return false;
5751          }
5855        public final U getRawResult() { return result.get(); }
5752      }
5753  
5754      @SuppressWarnings("serial") static final class SearchEntriesTask<K,V,U>
5755 <        extends BulkAction<K,V,U> {
5756 <        final Fun<Entry<K,V>, ? extends U> searchFunction;
5755 >        extends Traverser<K,V,U> {
5756 >        final Function<Entry<K,V>, ? extends U> searchFunction;
5757          final AtomicReference<U> result;
5758          SearchEntriesTask
5759 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5760 <             SearchEntriesTask<K,V,U> nextTask,
5865 <             Fun<Entry<K,V>, ? extends U> searchFunction,
5759 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5760 >             Function<Entry<K,V>, ? extends U> searchFunction,
5761               AtomicReference<U> result) {
5762 <            super(m, p, b, nextTask);
5762 >            super(m, p, b);
5763              this.searchFunction = searchFunction; this.result = result;
5764          }
5765 <        @SuppressWarnings("unchecked") public final boolean exec() {
5766 <            AtomicReference<U> result = this.result;
5767 <            final Fun<Entry<K,V>, ? extends U> searchFunction =
5768 <                this.searchFunction;
5769 <            if (searchFunction == null || result == null)
5770 <                return abortOnNullFunction();
5771 <            SearchEntriesTask<K,V,U> subtasks = null;
5772 <            try {
5773 <                int b = batch(), c;
5774 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5775 <                    do {} while (!casPending(c = pending, c+1));
5776 <                    (subtasks = new SearchEntriesTask<K,V,U>
5777 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5778 <                }
5779 <                Object v; U u;
5780 <                while (result.get() == null && (v = advance()) != null) {
5781 <                    if ((u = searchFunction.apply(entryFor((K)nextKey, (V)v))) != null) {
5782 <                        if (result.compareAndSet(null, u))
5888 <                            tryCompleteComputation(null);
5765 >        public final U getRawResult() { return result.get(); }
5766 >        @SuppressWarnings("unchecked") public final void compute() {
5767 >            final Function<Entry<K,V>, ? extends U> searchFunction;
5768 >            final AtomicReference<U> result;
5769 >            if ((searchFunction = this.searchFunction) != null &&
5770 >                (result = this.result) != null) {
5771 >                for (int b;;) {
5772 >                    if (result.get() != null)
5773 >                        return;
5774 >                    if ((b = preSplit()) <= 0)
5775 >                        break;
5776 >                    new SearchEntriesTask<K,V,U>
5777 >                        (map, this, b, searchFunction, result).fork();
5778 >                }
5779 >                while (result.get() == null) {
5780 >                    V v; U u;
5781 >                    if ((v = advance()) == null) {
5782 >                        propagateCompletion();
5783                          break;
5784                      }
5785 +                    if ((u = searchFunction.apply(entryFor((K)nextKey,
5786 +                                                           v))) != null) {
5787 +                        if (result.compareAndSet(null, u))
5788 +                            quietlyCompleteRoot();
5789 +                        return;
5790 +                    }
5791                  }
5892            } catch (Throwable ex) {
5893                return tryCompleteComputation(ex);
5792              }
5895            tryComplete(subtasks);
5896            return false;
5793          }
5898        public final U getRawResult() { return result.get(); }
5794      }
5795  
5796      @SuppressWarnings("serial") static final class SearchMappingsTask<K,V,U>
5797 <        extends BulkAction<K,V,U> {
5798 <        final BiFun<? super K, ? super V, ? extends U> searchFunction;
5797 >        extends Traverser<K,V,U> {
5798 >        final BiFunction<? super K, ? super V, ? extends U> searchFunction;
5799          final AtomicReference<U> result;
5800          SearchMappingsTask
5801 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5802 <             SearchMappingsTask<K,V,U> nextTask,
5908 <             BiFun<? super K, ? super V, ? extends U> searchFunction,
5801 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5802 >             BiFunction<? super K, ? super V, ? extends U> searchFunction,
5803               AtomicReference<U> result) {
5804 <            super(m, p, b, nextTask);
5804 >            super(m, p, b);
5805              this.searchFunction = searchFunction; this.result = result;
5806          }
5807 <        @SuppressWarnings("unchecked") public final boolean exec() {
5808 <            AtomicReference<U> result = this.result;
5809 <            final BiFun<? super K, ? super V, ? extends U> searchFunction =
5810 <                this.searchFunction;
5811 <            if (searchFunction == null || result == null)
5812 <                return abortOnNullFunction();
5813 <            SearchMappingsTask<K,V,U> subtasks = null;
5814 <            try {
5815 <                int b = batch(), c;
5816 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5817 <                    do {} while (!casPending(c = pending, c+1));
5818 <                    (subtasks = new SearchMappingsTask<K,V,U>
5819 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5820 <                }
5821 <                Object v; U u;
5822 <                while (result.get() == null && (v = advance()) != null) {
5823 <                    if ((u = searchFunction.apply((K)nextKey, (V)v)) != null) {
5807 >        public final U getRawResult() { return result.get(); }
5808 >        @SuppressWarnings("unchecked") public final void compute() {
5809 >            final BiFunction<? super K, ? super V, ? extends U> searchFunction;
5810 >            final AtomicReference<U> result;
5811 >            if ((searchFunction = this.searchFunction) != null &&
5812 >                (result = this.result) != null) {
5813 >                for (int b;;) {
5814 >                    if (result.get() != null)
5815 >                        return;
5816 >                    if ((b = preSplit()) <= 0)
5817 >                        break;
5818 >                    new SearchMappingsTask<K,V,U>
5819 >                        (map, this, b, searchFunction, result).fork();
5820 >                }
5821 >                while (result.get() == null) {
5822 >                    V v; U u;
5823 >                    if ((v = advance()) == null) {
5824 >                        propagateCompletion();
5825 >                        break;
5826 >                    }
5827 >                    if ((u = searchFunction.apply((K)nextKey, v)) != null) {
5828                          if (result.compareAndSet(null, u))
5829 <                            tryCompleteComputation(null);
5829 >                            quietlyCompleteRoot();
5830                          break;
5831                      }
5832                  }
5935            } catch (Throwable ex) {
5936                return tryCompleteComputation(ex);
5833              }
5938            tryComplete(subtasks);
5939            return false;
5834          }
5941        public final U getRawResult() { return result.get(); }
5835      }
5836  
5837      @SuppressWarnings("serial") static final class ReduceKeysTask<K,V>
5838 <        extends BulkTask<K,V,K> {
5839 <        final BiFun<? super K, ? super K, ? extends K> reducer;
5838 >        extends Traverser<K,V,K> {
5839 >        final BiFunction<? super K, ? super K, ? extends K> reducer;
5840          K result;
5841          ReduceKeysTask<K,V> rights, nextRight;
5842          ReduceKeysTask
5843 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5843 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5844               ReduceKeysTask<K,V> nextRight,
5845 <             BiFun<? super K, ? super K, ? extends K> reducer) {
5845 >             BiFunction<? super K, ? super K, ? extends K> reducer) {
5846              super(m, p, b); this.nextRight = nextRight;
5847              this.reducer = reducer;
5848          }
5849 <        @SuppressWarnings("unchecked") public final boolean exec() {
5850 <            final BiFun<? super K, ? super K, ? extends K> reducer =
5851 <                this.reducer;
5852 <            if (reducer == null)
5853 <                return abortOnNullFunction();
5961 <            try {
5962 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5963 <                    do {} while (!casPending(c = pending, c+1));
5849 >        public final K getRawResult() { return result; }
5850 >        @SuppressWarnings("unchecked") public final void compute() {
5851 >            final BiFunction<? super K, ? super K, ? extends K> reducer;
5852 >            if ((reducer = this.reducer) != null) {
5853 >                for (int b; (b = preSplit()) > 0;)
5854                      (rights = new ReduceKeysTask<K,V>
5855 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5966 <                }
5855 >                     (map, this, b, rights, reducer)).fork();
5856                  K r = null;
5857                  while (advance() != null) {
5858                      K u = (K)nextKey;
5859 <                    r = (r == null) ? u : reducer.apply(r, u);
5859 >                    r = (r == null) ? u : u == null ? r : reducer.apply(r, u);
5860                  }
5861                  result = r;
5862 <                for (ReduceKeysTask<K,V> t = this, s;;) {
5863 <                    int c; BulkTask<K,V,?> par; K tr, sr;
5864 <                    if ((c = t.pending) == 0) {
5865 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5866 <                            if ((sr = s.result) != null)
5867 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5868 <                        }
5869 <                        if ((par = t.parent) == null ||
5870 <                            !(par instanceof ReduceKeysTask)) {
5871 <                            t.quietlyComplete();
5872 <                            break;
5984 <                        }
5985 <                        t = (ReduceKeysTask<K,V>)par;
5862 >                CountedCompleter<?> c;
5863 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5864 >                    ReduceKeysTask<K,V>
5865 >                        t = (ReduceKeysTask<K,V>)c,
5866 >                        s = t.rights;
5867 >                    while (s != null) {
5868 >                        K tr, sr;
5869 >                        if ((sr = s.result) != null)
5870 >                            t.result = (((tr = t.result) == null) ? sr :
5871 >                                        reducer.apply(tr, sr));
5872 >                        s = t.rights = s.nextRight;
5873                      }
5987                    else if (t.casPending(c, c - 1))
5988                        break;
5874                  }
5990            } catch (Throwable ex) {
5991                return tryCompleteComputation(ex);
5992            }
5993            ReduceKeysTask<K,V> s = rights;
5994            if (s != null && !inForkJoinPool()) {
5995                do  {
5996                    if (s.tryUnfork())
5997                        s.exec();
5998                } while ((s = s.nextRight) != null);
5875              }
6000            return false;
5876          }
6002        public final K getRawResult() { return result; }
5877      }
5878  
5879      @SuppressWarnings("serial") static final class ReduceValuesTask<K,V>
5880 <        extends BulkTask<K,V,V> {
5881 <        final BiFun<? super V, ? super V, ? extends V> reducer;
5880 >        extends Traverser<K,V,V> {
5881 >        final BiFunction<? super V, ? super V, ? extends V> reducer;
5882          V result;
5883          ReduceValuesTask<K,V> rights, nextRight;
5884          ReduceValuesTask
5885 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5885 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5886               ReduceValuesTask<K,V> nextRight,
5887 <             BiFun<? super V, ? super V, ? extends V> reducer) {
5887 >             BiFunction<? super V, ? super V, ? extends V> reducer) {
5888              super(m, p, b); this.nextRight = nextRight;
5889              this.reducer = reducer;
5890          }
5891 <        @SuppressWarnings("unchecked") public final boolean exec() {
5892 <            final BiFun<? super V, ? super V, ? extends V> reducer =
5893 <                this.reducer;
5894 <            if (reducer == null)
5895 <                return abortOnNullFunction();
6022 <            try {
6023 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6024 <                    do {} while (!casPending(c = pending, c+1));
5891 >        public final V getRawResult() { return result; }
5892 >        @SuppressWarnings("unchecked") public final void compute() {
5893 >            final BiFunction<? super V, ? super V, ? extends V> reducer;
5894 >            if ((reducer = this.reducer) != null) {
5895 >                for (int b; (b = preSplit()) > 0;)
5896                      (rights = new ReduceValuesTask<K,V>
5897 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5898 <                }
5899 <                V r = null;
5900 <                Object v;
6030 <                while ((v = advance()) != null) {
6031 <                    V u = (V)v;
6032 <                    r = (r == null) ? u : reducer.apply(r, u);
6033 <                }
5897 >                     (map, this, b, rights, reducer)).fork();
5898 >                V r = null, v;
5899 >                while ((v = advance()) != null)
5900 >                    r = (r == null) ? v : reducer.apply(r, v);
5901                  result = r;
5902 <                for (ReduceValuesTask<K,V> t = this, s;;) {
5903 <                    int c; BulkTask<K,V,?> par; V tr, sr;
5904 <                    if ((c = t.pending) == 0) {
5905 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5906 <                            if ((sr = s.result) != null)
5907 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5908 <                        }
5909 <                        if ((par = t.parent) == null ||
5910 <                            !(par instanceof ReduceValuesTask)) {
5911 <                            t.quietlyComplete();
5912 <                            break;
6046 <                        }
6047 <                        t = (ReduceValuesTask<K,V>)par;
5902 >                CountedCompleter<?> c;
5903 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5904 >                    ReduceValuesTask<K,V>
5905 >                        t = (ReduceValuesTask<K,V>)c,
5906 >                        s = t.rights;
5907 >                    while (s != null) {
5908 >                        V tr, sr;
5909 >                        if ((sr = s.result) != null)
5910 >                            t.result = (((tr = t.result) == null) ? sr :
5911 >                                        reducer.apply(tr, sr));
5912 >                        s = t.rights = s.nextRight;
5913                      }
6049                    else if (t.casPending(c, c - 1))
6050                        break;
5914                  }
6052            } catch (Throwable ex) {
6053                return tryCompleteComputation(ex);
6054            }
6055            ReduceValuesTask<K,V> s = rights;
6056            if (s != null && !inForkJoinPool()) {
6057                do  {
6058                    if (s.tryUnfork())
6059                        s.exec();
6060                } while ((s = s.nextRight) != null);
5915              }
6062            return false;
5916          }
6064        public final V getRawResult() { return result; }
5917      }
5918  
5919      @SuppressWarnings("serial") static final class ReduceEntriesTask<K,V>
5920 <        extends BulkTask<K,V,Map.Entry<K,V>> {
5921 <        final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer;
5920 >        extends Traverser<K,V,Map.Entry<K,V>> {
5921 >        final BiFunction<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer;
5922          Map.Entry<K,V> result;
5923          ReduceEntriesTask<K,V> rights, nextRight;
5924          ReduceEntriesTask
5925 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5925 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5926               ReduceEntriesTask<K,V> nextRight,
5927 <             BiFun<Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
5927 >             BiFunction<Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
5928              super(m, p, b); this.nextRight = nextRight;
5929              this.reducer = reducer;
5930          }
5931 <        @SuppressWarnings("unchecked") public final boolean exec() {
5932 <            final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer =
5933 <                this.reducer;
5934 <            if (reducer == null)
5935 <                return abortOnNullFunction();
6084 <            try {
6085 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6086 <                    do {} while (!casPending(c = pending, c+1));
5931 >        public final Map.Entry<K,V> getRawResult() { return result; }
5932 >        @SuppressWarnings("unchecked") public final void compute() {
5933 >            final BiFunction<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer;
5934 >            if ((reducer = this.reducer) != null) {
5935 >                for (int b; (b = preSplit()) > 0;)
5936                      (rights = new ReduceEntriesTask<K,V>
5937 <                     (map, this, b >>>= 1, rights, reducer)).fork();
6089 <                }
5937 >                     (map, this, b, rights, reducer)).fork();
5938                  Map.Entry<K,V> r = null;
5939 <                Object v;
5939 >                V v;
5940                  while ((v = advance()) != null) {
5941 <                    Map.Entry<K,V> u = entryFor((K)nextKey, (V)v);
5941 >                    Map.Entry<K,V> u = entryFor((K)nextKey, v);
5942                      r = (r == null) ? u : reducer.apply(r, u);
5943                  }
5944                  result = r;
5945 <                for (ReduceEntriesTask<K,V> t = this, s;;) {
5946 <                    int c; BulkTask<K,V,?> par; Map.Entry<K,V> tr, sr;
5947 <                    if ((c = t.pending) == 0) {
5948 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5949 <                            if ((sr = s.result) != null)
5950 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5951 <                        }
5952 <                        if ((par = t.parent) == null ||
5953 <                            !(par instanceof ReduceEntriesTask)) {
5954 <                            t.quietlyComplete();
5955 <                            break;
6108 <                        }
6109 <                        t = (ReduceEntriesTask<K,V>)par;
5945 >                CountedCompleter<?> c;
5946 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5947 >                    ReduceEntriesTask<K,V>
5948 >                        t = (ReduceEntriesTask<K,V>)c,
5949 >                        s = t.rights;
5950 >                    while (s != null) {
5951 >                        Map.Entry<K,V> tr, sr;
5952 >                        if ((sr = s.result) != null)
5953 >                            t.result = (((tr = t.result) == null) ? sr :
5954 >                                        reducer.apply(tr, sr));
5955 >                        s = t.rights = s.nextRight;
5956                      }
6111                    else if (t.casPending(c, c - 1))
6112                        break;
5957                  }
6114            } catch (Throwable ex) {
6115                return tryCompleteComputation(ex);
5958              }
6117            ReduceEntriesTask<K,V> s = rights;
6118            if (s != null && !inForkJoinPool()) {
6119                do  {
6120                    if (s.tryUnfork())
6121                        s.exec();
6122                } while ((s = s.nextRight) != null);
6123            }
6124            return false;
5959          }
6126        public final Map.Entry<K,V> getRawResult() { return result; }
5960      }
5961  
5962      @SuppressWarnings("serial") static final class MapReduceKeysTask<K,V,U>
5963 <        extends BulkTask<K,V,U> {
5964 <        final Fun<? super K, ? extends U> transformer;
5965 <        final BiFun<? super U, ? super U, ? extends U> reducer;
5963 >        extends Traverser<K,V,U> {
5964 >        final Function<? super K, ? extends U> transformer;
5965 >        final BiFunction<? super U, ? super U, ? extends U> reducer;
5966          U result;
5967          MapReduceKeysTask<K,V,U> rights, nextRight;
5968          MapReduceKeysTask
5969 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
5969 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
5970               MapReduceKeysTask<K,V,U> nextRight,
5971 <             Fun<? super K, ? extends U> transformer,
5972 <             BiFun<? super U, ? super U, ? extends U> reducer) {
5971 >             Function<? super K, ? extends U> transformer,
5972 >             BiFunction<? super U, ? super U, ? extends U> reducer) {
5973              super(m, p, b); this.nextRight = nextRight;
5974              this.transformer = transformer;
5975              this.reducer = reducer;
5976          }
5977 <        @SuppressWarnings("unchecked") public final boolean exec() {
5978 <            final Fun<? super K, ? extends U> transformer =
5979 <                this.transformer;
5980 <            final BiFun<? super U, ? super U, ? extends U> reducer =
5981 <                this.reducer;
5982 <            if (transformer == null || reducer == null)
5983 <                return abortOnNullFunction();
6151 <            try {
6152 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6153 <                    do {} while (!casPending(c = pending, c+1));
5977 >        public final U getRawResult() { return result; }
5978 >        @SuppressWarnings("unchecked") public final void compute() {
5979 >            final Function<? super K, ? extends U> transformer;
5980 >            final BiFunction<? super U, ? super U, ? extends U> reducer;
5981 >            if ((transformer = this.transformer) != null &&
5982 >                (reducer = this.reducer) != null) {
5983 >                for (int b; (b = preSplit()) > 0;)
5984                      (rights = new MapReduceKeysTask<K,V,U>
5985 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
6156 <                }
5985 >                     (map, this, b, rights, transformer, reducer)).fork();
5986                  U r = null, u;
5987                  while (advance() != null) {
5988                      if ((u = transformer.apply((K)nextKey)) != null)
5989                          r = (r == null) ? u : reducer.apply(r, u);
5990                  }
5991                  result = r;
5992 <                for (MapReduceKeysTask<K,V,U> t = this, s;;) {
5993 <                    int c; BulkTask<K,V,?> par; U tr, sr;
5994 <                    if ((c = t.pending) == 0) {
5995 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5996 <                            if ((sr = s.result) != null)
5997 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5998 <                        }
5999 <                        if ((par = t.parent) == null ||
6000 <                            !(par instanceof MapReduceKeysTask)) {
6001 <                            t.quietlyComplete();
6002 <                            break;
6174 <                        }
6175 <                        t = (MapReduceKeysTask<K,V,U>)par;
5992 >                CountedCompleter<?> c;
5993 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5994 >                    MapReduceKeysTask<K,V,U>
5995 >                        t = (MapReduceKeysTask<K,V,U>)c,
5996 >                        s = t.rights;
5997 >                    while (s != null) {
5998 >                        U tr, sr;
5999 >                        if ((sr = s.result) != null)
6000 >                            t.result = (((tr = t.result) == null) ? sr :
6001 >                                        reducer.apply(tr, sr));
6002 >                        s = t.rights = s.nextRight;
6003                      }
6177                    else if (t.casPending(c, c - 1))
6178                        break;
6004                  }
6180            } catch (Throwable ex) {
6181                return tryCompleteComputation(ex);
6005              }
6183            MapReduceKeysTask<K,V,U> s = rights;
6184            if (s != null && !inForkJoinPool()) {
6185                do  {
6186                    if (s.tryUnfork())
6187                        s.exec();
6188                } while ((s = s.nextRight) != null);
6189            }
6190            return false;
6006          }
6192        public final U getRawResult() { return result; }
6007      }
6008  
6009      @SuppressWarnings("serial") static final class MapReduceValuesTask<K,V,U>
6010 <        extends BulkTask<K,V,U> {
6011 <        final Fun<? super V, ? extends U> transformer;
6012 <        final BiFun<? super U, ? super U, ? extends U> reducer;
6010 >        extends Traverser<K,V,U> {
6011 >        final Function<? super V, ? extends U> transformer;
6012 >        final BiFunction<? super U, ? super U, ? extends U> reducer;
6013          U result;
6014          MapReduceValuesTask<K,V,U> rights, nextRight;
6015          MapReduceValuesTask
6016 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6016 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6017               MapReduceValuesTask<K,V,U> nextRight,
6018 <             Fun<? super V, ? extends U> transformer,
6019 <             BiFun<? super U, ? super U, ? extends U> reducer) {
6018 >             Function<? super V, ? extends U> transformer,
6019 >             BiFunction<? super U, ? super U, ? extends U> reducer) {
6020              super(m, p, b); this.nextRight = nextRight;
6021              this.transformer = transformer;
6022              this.reducer = reducer;
6023          }
6024 <        @SuppressWarnings("unchecked") public final boolean exec() {
6025 <            final Fun<? super V, ? extends U> transformer =
6026 <                this.transformer;
6027 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6028 <                this.reducer;
6029 <            if (transformer == null || reducer == null)
6030 <                return abortOnNullFunction();
6217 <            try {
6218 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6219 <                    do {} while (!casPending(c = pending, c+1));
6024 >        public final U getRawResult() { return result; }
6025 >        @SuppressWarnings("unchecked") public final void compute() {
6026 >            final Function<? super V, ? extends U> transformer;
6027 >            final BiFunction<? super U, ? super U, ? extends U> reducer;
6028 >            if ((transformer = this.transformer) != null &&
6029 >                (reducer = this.reducer) != null) {
6030 >                for (int b; (b = preSplit()) > 0;)
6031                      (rights = new MapReduceValuesTask<K,V,U>
6032 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
6222 <                }
6032 >                     (map, this, b, rights, transformer, reducer)).fork();
6033                  U r = null, u;
6034 <                Object v;
6034 >                V v;
6035                  while ((v = advance()) != null) {
6036 <                    if ((u = transformer.apply((V)v)) != null)
6036 >                    if ((u = transformer.apply(v)) != null)
6037                          r = (r == null) ? u : reducer.apply(r, u);
6038                  }
6039                  result = r;
6040 <                for (MapReduceValuesTask<K,V,U> t = this, s;;) {
6041 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6042 <                    if ((c = t.pending) == 0) {
6043 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6044 <                            if ((sr = s.result) != null)
6045 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6046 <                        }
6047 <                        if ((par = t.parent) == null ||
6048 <                            !(par instanceof MapReduceValuesTask)) {
6049 <                            t.quietlyComplete();
6050 <                            break;
6241 <                        }
6242 <                        t = (MapReduceValuesTask<K,V,U>)par;
6040 >                CountedCompleter<?> c;
6041 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6042 >                    MapReduceValuesTask<K,V,U>
6043 >                        t = (MapReduceValuesTask<K,V,U>)c,
6044 >                        s = t.rights;
6045 >                    while (s != null) {
6046 >                        U tr, sr;
6047 >                        if ((sr = s.result) != null)
6048 >                            t.result = (((tr = t.result) == null) ? sr :
6049 >                                        reducer.apply(tr, sr));
6050 >                        s = t.rights = s.nextRight;
6051                      }
6244                    else if (t.casPending(c, c - 1))
6245                        break;
6052                  }
6247            } catch (Throwable ex) {
6248                return tryCompleteComputation(ex);
6053              }
6250            MapReduceValuesTask<K,V,U> s = rights;
6251            if (s != null && !inForkJoinPool()) {
6252                do  {
6253                    if (s.tryUnfork())
6254                        s.exec();
6255                } while ((s = s.nextRight) != null);
6256            }
6257            return false;
6054          }
6259        public final U getRawResult() { return result; }
6055      }
6056  
6057      @SuppressWarnings("serial") static final class MapReduceEntriesTask<K,V,U>
6058 <        extends BulkTask<K,V,U> {
6059 <        final Fun<Map.Entry<K,V>, ? extends U> transformer;
6060 <        final BiFun<? super U, ? super U, ? extends U> reducer;
6058 >        extends Traverser<K,V,U> {
6059 >        final Function<Map.Entry<K,V>, ? extends U> transformer;
6060 >        final BiFunction<? super U, ? super U, ? extends U> reducer;
6061          U result;
6062          MapReduceEntriesTask<K,V,U> rights, nextRight;
6063          MapReduceEntriesTask
6064 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6064 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6065               MapReduceEntriesTask<K,V,U> nextRight,
6066 <             Fun<Map.Entry<K,V>, ? extends U> transformer,
6067 <             BiFun<? super U, ? super U, ? extends U> reducer) {
6066 >             Function<Map.Entry<K,V>, ? extends U> transformer,
6067 >             BiFunction<? super U, ? super U, ? extends U> reducer) {
6068              super(m, p, b); this.nextRight = nextRight;
6069              this.transformer = transformer;
6070              this.reducer = reducer;
6071          }
6072 <        @SuppressWarnings("unchecked") public final boolean exec() {
6073 <            final Fun<Map.Entry<K,V>, ? extends U> transformer =
6074 <                this.transformer;
6075 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6076 <                this.reducer;
6077 <            if (transformer == null || reducer == null)
6078 <                return abortOnNullFunction();
6284 <            try {
6285 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6286 <                    do {} while (!casPending(c = pending, c+1));
6072 >        public final U getRawResult() { return result; }
6073 >        @SuppressWarnings("unchecked") public final void compute() {
6074 >            final Function<Map.Entry<K,V>, ? extends U> transformer;
6075 >            final BiFunction<? super U, ? super U, ? extends U> reducer;
6076 >            if ((transformer = this.transformer) != null &&
6077 >                (reducer = this.reducer) != null) {
6078 >                for (int b; (b = preSplit()) > 0;)
6079                      (rights = new MapReduceEntriesTask<K,V,U>
6080 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
6289 <                }
6080 >                     (map, this, b, rights, transformer, reducer)).fork();
6081                  U r = null, u;
6082 <                Object v;
6082 >                V v;
6083                  while ((v = advance()) != null) {
6084 <                    if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
6084 >                    if ((u = transformer.apply(entryFor((K)nextKey,
6085 >                                                        v))) != null)
6086                          r = (r == null) ? u : reducer.apply(r, u);
6087                  }
6088                  result = r;
6089 <                for (MapReduceEntriesTask<K,V,U> t = this, s;;) {
6090 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6091 <                    if ((c = t.pending) == 0) {
6092 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6093 <                            if ((sr = s.result) != null)
6094 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6095 <                        }
6096 <                        if ((par = t.parent) == null ||
6097 <                            !(par instanceof MapReduceEntriesTask)) {
6098 <                            t.quietlyComplete();
6099 <                            break;
6308 <                        }
6309 <                        t = (MapReduceEntriesTask<K,V,U>)par;
6089 >                CountedCompleter<?> c;
6090 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6091 >                    MapReduceEntriesTask<K,V,U>
6092 >                        t = (MapReduceEntriesTask<K,V,U>)c,
6093 >                        s = t.rights;
6094 >                    while (s != null) {
6095 >                        U tr, sr;
6096 >                        if ((sr = s.result) != null)
6097 >                            t.result = (((tr = t.result) == null) ? sr :
6098 >                                        reducer.apply(tr, sr));
6099 >                        s = t.rights = s.nextRight;
6100                      }
6311                    else if (t.casPending(c, c - 1))
6312                        break;
6101                  }
6314            } catch (Throwable ex) {
6315                return tryCompleteComputation(ex);
6102              }
6317            MapReduceEntriesTask<K,V,U> s = rights;
6318            if (s != null && !inForkJoinPool()) {
6319                do  {
6320                    if (s.tryUnfork())
6321                        s.exec();
6322                } while ((s = s.nextRight) != null);
6323            }
6324            return false;
6103          }
6326        public final U getRawResult() { return result; }
6104      }
6105  
6106      @SuppressWarnings("serial") static final class MapReduceMappingsTask<K,V,U>
6107 <        extends BulkTask<K,V,U> {
6108 <        final BiFun<? super K, ? super V, ? extends U> transformer;
6109 <        final BiFun<? super U, ? super U, ? extends U> reducer;
6107 >        extends Traverser<K,V,U> {
6108 >        final BiFunction<? super K, ? super V, ? extends U> transformer;
6109 >        final BiFunction<? super U, ? super U, ? extends U> reducer;
6110          U result;
6111          MapReduceMappingsTask<K,V,U> rights, nextRight;
6112          MapReduceMappingsTask
6113 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6113 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6114               MapReduceMappingsTask<K,V,U> nextRight,
6115 <             BiFun<? super K, ? super V, ? extends U> transformer,
6116 <             BiFun<? super U, ? super U, ? extends U> reducer) {
6115 >             BiFunction<? super K, ? super V, ? extends U> transformer,
6116 >             BiFunction<? super U, ? super U, ? extends U> reducer) {
6117              super(m, p, b); this.nextRight = nextRight;
6118              this.transformer = transformer;
6119              this.reducer = reducer;
6120          }
6121 <        @SuppressWarnings("unchecked") public final boolean exec() {
6122 <            final BiFun<? super K, ? super V, ? extends U> transformer =
6123 <                this.transformer;
6124 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6125 <                this.reducer;
6126 <            if (transformer == null || reducer == null)
6127 <                return abortOnNullFunction();
6351 <            try {
6352 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6353 <                    do {} while (!casPending(c = pending, c+1));
6121 >        public final U getRawResult() { return result; }
6122 >        @SuppressWarnings("unchecked") public final void compute() {
6123 >            final BiFunction<? super K, ? super V, ? extends U> transformer;
6124 >            final BiFunction<? super U, ? super U, ? extends U> reducer;
6125 >            if ((transformer = this.transformer) != null &&
6126 >                (reducer = this.reducer) != null) {
6127 >                for (int b; (b = preSplit()) > 0;)
6128                      (rights = new MapReduceMappingsTask<K,V,U>
6129 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
6356 <                }
6129 >                     (map, this, b, rights, transformer, reducer)).fork();
6130                  U r = null, u;
6131 <                Object v;
6131 >                V v;
6132                  while ((v = advance()) != null) {
6133 <                    if ((u = transformer.apply((K)nextKey, (V)v)) != null)
6133 >                    if ((u = transformer.apply((K)nextKey, v)) != null)
6134                          r = (r == null) ? u : reducer.apply(r, u);
6135                  }
6136                  result = r;
6137 <                for (MapReduceMappingsTask<K,V,U> t = this, s;;) {
6138 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6139 <                    if ((c = t.pending) == 0) {
6140 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6141 <                            if ((sr = s.result) != null)
6142 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6143 <                        }
6144 <                        if ((par = t.parent) == null ||
6145 <                            !(par instanceof MapReduceMappingsTask)) {
6146 <                            t.quietlyComplete();
6147 <                            break;
6375 <                        }
6376 <                        t = (MapReduceMappingsTask<K,V,U>)par;
6137 >                CountedCompleter<?> c;
6138 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6139 >                    MapReduceMappingsTask<K,V,U>
6140 >                        t = (MapReduceMappingsTask<K,V,U>)c,
6141 >                        s = t.rights;
6142 >                    while (s != null) {
6143 >                        U tr, sr;
6144 >                        if ((sr = s.result) != null)
6145 >                            t.result = (((tr = t.result) == null) ? sr :
6146 >                                        reducer.apply(tr, sr));
6147 >                        s = t.rights = s.nextRight;
6148                      }
6378                    else if (t.casPending(c, c - 1))
6379                        break;
6149                  }
6381            } catch (Throwable ex) {
6382                return tryCompleteComputation(ex);
6150              }
6384            MapReduceMappingsTask<K,V,U> s = rights;
6385            if (s != null && !inForkJoinPool()) {
6386                do  {
6387                    if (s.tryUnfork())
6388                        s.exec();
6389                } while ((s = s.nextRight) != null);
6390            }
6391            return false;
6151          }
6393        public final U getRawResult() { return result; }
6152      }
6153  
6154      @SuppressWarnings("serial") static final class MapReduceKeysToDoubleTask<K,V>
6155 <        extends BulkTask<K,V,Double> {
6156 <        final ObjectToDouble<? super K> transformer;
6157 <        final DoubleByDoubleToDouble reducer;
6155 >        extends Traverser<K,V,Double> {
6156 >        final DoubleFunction<? super K> transformer;
6157 >        final DoubleBinaryOperator reducer;
6158          final double basis;
6159          double result;
6160          MapReduceKeysToDoubleTask<K,V> rights, nextRight;
6161          MapReduceKeysToDoubleTask
6162 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6162 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6163               MapReduceKeysToDoubleTask<K,V> nextRight,
6164 <             ObjectToDouble<? super K> transformer,
6164 >             DoubleFunction<? super K> transformer,
6165               double basis,
6166 <             DoubleByDoubleToDouble reducer) {
6166 >             DoubleBinaryOperator reducer) {
6167              super(m, p, b); this.nextRight = nextRight;
6168              this.transformer = transformer;
6169              this.basis = basis; this.reducer = reducer;
6170          }
6171 <        @SuppressWarnings("unchecked") public final boolean exec() {
6172 <            final ObjectToDouble<? super K> transformer =
6173 <                this.transformer;
6174 <            final DoubleByDoubleToDouble reducer = this.reducer;
6175 <            if (transformer == null || reducer == null)
6176 <                return abortOnNullFunction();
6177 <            try {
6178 <                final double id = this.basis;
6421 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6422 <                    do {} while (!casPending(c = pending, c+1));
6171 >        public final Double getRawResult() { return result; }
6172 >        @SuppressWarnings("unchecked") public final void compute() {
6173 >            final DoubleFunction<? super K> transformer;
6174 >            final DoubleBinaryOperator reducer;
6175 >            if ((transformer = this.transformer) != null &&
6176 >                (reducer = this.reducer) != null) {
6177 >                double r = this.basis;
6178 >                for (int b; (b = preSplit()) > 0;)
6179                      (rights = new MapReduceKeysToDoubleTask<K,V>
6180 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6425 <                }
6426 <                double r = id;
6180 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6181                  while (advance() != null)
6182 <                    r = reducer.apply(r, transformer.apply((K)nextKey));
6182 >                    r = reducer.applyAsDouble(r, transformer.applyAsDouble((K)nextKey));
6183                  result = r;
6184 <                for (MapReduceKeysToDoubleTask<K,V> t = this, s;;) {
6185 <                    int c; BulkTask<K,V,?> par;
6186 <                    if ((c = t.pending) == 0) {
6187 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6188 <                            t.result = reducer.apply(t.result, s.result);
6189 <                        }
6190 <                        if ((par = t.parent) == null ||
6191 <                            !(par instanceof MapReduceKeysToDoubleTask)) {
6438 <                            t.quietlyComplete();
6439 <                            break;
6440 <                        }
6441 <                        t = (MapReduceKeysToDoubleTask<K,V>)par;
6184 >                CountedCompleter<?> c;
6185 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6186 >                    MapReduceKeysToDoubleTask<K,V>
6187 >                        t = (MapReduceKeysToDoubleTask<K,V>)c,
6188 >                        s = t.rights;
6189 >                    while (s != null) {
6190 >                        t.result = reducer.applyAsDouble(t.result, s.result);
6191 >                        s = t.rights = s.nextRight;
6192                      }
6443                    else if (t.casPending(c, c - 1))
6444                        break;
6193                  }
6446            } catch (Throwable ex) {
6447                return tryCompleteComputation(ex);
6194              }
6449            MapReduceKeysToDoubleTask<K,V> s = rights;
6450            if (s != null && !inForkJoinPool()) {
6451                do  {
6452                    if (s.tryUnfork())
6453                        s.exec();
6454                } while ((s = s.nextRight) != null);
6455            }
6456            return false;
6195          }
6458        public final Double getRawResult() { return result; }
6196      }
6197  
6198      @SuppressWarnings("serial") static final class MapReduceValuesToDoubleTask<K,V>
6199 <        extends BulkTask<K,V,Double> {
6200 <        final ObjectToDouble<? super V> transformer;
6201 <        final DoubleByDoubleToDouble reducer;
6199 >        extends Traverser<K,V,Double> {
6200 >        final DoubleFunction<? super V> transformer;
6201 >        final DoubleBinaryOperator reducer;
6202          final double basis;
6203          double result;
6204          MapReduceValuesToDoubleTask<K,V> rights, nextRight;
6205          MapReduceValuesToDoubleTask
6206 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6206 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6207               MapReduceValuesToDoubleTask<K,V> nextRight,
6208 <             ObjectToDouble<? super V> transformer,
6208 >             DoubleFunction<? super V> transformer,
6209               double basis,
6210 <             DoubleByDoubleToDouble reducer) {
6210 >             DoubleBinaryOperator reducer) {
6211              super(m, p, b); this.nextRight = nextRight;
6212              this.transformer = transformer;
6213              this.basis = basis; this.reducer = reducer;
6214          }
6215 <        @SuppressWarnings("unchecked") public final boolean exec() {
6216 <            final ObjectToDouble<? super V> transformer =
6217 <                this.transformer;
6218 <            final DoubleByDoubleToDouble reducer = this.reducer;
6219 <            if (transformer == null || reducer == null)
6220 <                return abortOnNullFunction();
6221 <            try {
6222 <                final double id = this.basis;
6486 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6487 <                    do {} while (!casPending(c = pending, c+1));
6215 >        public final Double getRawResult() { return result; }
6216 >        @SuppressWarnings("unchecked") public final void compute() {
6217 >            final DoubleFunction<? super V> transformer;
6218 >            final DoubleBinaryOperator reducer;
6219 >            if ((transformer = this.transformer) != null &&
6220 >                (reducer = this.reducer) != null) {
6221 >                double r = this.basis;
6222 >                for (int b; (b = preSplit()) > 0;)
6223                      (rights = new MapReduceValuesToDoubleTask<K,V>
6224 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6225 <                }
6491 <                double r = id;
6492 <                Object v;
6224 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6225 >                V v;
6226                  while ((v = advance()) != null)
6227 <                    r = reducer.apply(r, transformer.apply((V)v));
6227 >                    r = reducer.applyAsDouble(r, transformer.applyAsDouble(v));
6228                  result = r;
6229 <                for (MapReduceValuesToDoubleTask<K,V> t = this, s;;) {
6230 <                    int c; BulkTask<K,V,?> par;
6231 <                    if ((c = t.pending) == 0) {
6232 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6233 <                            t.result = reducer.apply(t.result, s.result);
6234 <                        }
6235 <                        if ((par = t.parent) == null ||
6236 <                            !(par instanceof MapReduceValuesToDoubleTask)) {
6504 <                            t.quietlyComplete();
6505 <                            break;
6506 <                        }
6507 <                        t = (MapReduceValuesToDoubleTask<K,V>)par;
6229 >                CountedCompleter<?> c;
6230 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6231 >                    MapReduceValuesToDoubleTask<K,V>
6232 >                        t = (MapReduceValuesToDoubleTask<K,V>)c,
6233 >                        s = t.rights;
6234 >                    while (s != null) {
6235 >                        t.result = reducer.applyAsDouble(t.result, s.result);
6236 >                        s = t.rights = s.nextRight;
6237                      }
6509                    else if (t.casPending(c, c - 1))
6510                        break;
6238                  }
6512            } catch (Throwable ex) {
6513                return tryCompleteComputation(ex);
6239              }
6515            MapReduceValuesToDoubleTask<K,V> s = rights;
6516            if (s != null && !inForkJoinPool()) {
6517                do  {
6518                    if (s.tryUnfork())
6519                        s.exec();
6520                } while ((s = s.nextRight) != null);
6521            }
6522            return false;
6240          }
6524        public final Double getRawResult() { return result; }
6241      }
6242  
6243      @SuppressWarnings("serial") static final class MapReduceEntriesToDoubleTask<K,V>
6244 <        extends BulkTask<K,V,Double> {
6245 <        final ObjectToDouble<Map.Entry<K,V>> transformer;
6246 <        final DoubleByDoubleToDouble reducer;
6244 >        extends Traverser<K,V,Double> {
6245 >        final DoubleFunction<Map.Entry<K,V>> transformer;
6246 >        final DoubleBinaryOperator reducer;
6247          final double basis;
6248          double result;
6249          MapReduceEntriesToDoubleTask<K,V> rights, nextRight;
6250          MapReduceEntriesToDoubleTask
6251 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6251 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6252               MapReduceEntriesToDoubleTask<K,V> nextRight,
6253 <             ObjectToDouble<Map.Entry<K,V>> transformer,
6253 >             DoubleFunction<Map.Entry<K,V>> transformer,
6254               double basis,
6255 <             DoubleByDoubleToDouble reducer) {
6255 >             DoubleBinaryOperator reducer) {
6256              super(m, p, b); this.nextRight = nextRight;
6257              this.transformer = transformer;
6258              this.basis = basis; this.reducer = reducer;
6259          }
6260 <        @SuppressWarnings("unchecked") public final boolean exec() {
6261 <            final ObjectToDouble<Map.Entry<K,V>> transformer =
6262 <                this.transformer;
6263 <            final DoubleByDoubleToDouble reducer = this.reducer;
6264 <            if (transformer == null || reducer == null)
6265 <                return abortOnNullFunction();
6266 <            try {
6267 <                final double id = this.basis;
6552 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6553 <                    do {} while (!casPending(c = pending, c+1));
6260 >        public final Double getRawResult() { return result; }
6261 >        @SuppressWarnings("unchecked") public final void compute() {
6262 >            final DoubleFunction<Map.Entry<K,V>> transformer;
6263 >            final DoubleBinaryOperator reducer;
6264 >            if ((transformer = this.transformer) != null &&
6265 >                (reducer = this.reducer) != null) {
6266 >                double r = this.basis;
6267 >                for (int b; (b = preSplit()) > 0;)
6268                      (rights = new MapReduceEntriesToDoubleTask<K,V>
6269 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6270 <                }
6557 <                double r = id;
6558 <                Object v;
6269 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6270 >                V v;
6271                  while ((v = advance()) != null)
6272 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6272 >                    r = reducer.applyAsDouble(r, transformer.applyAsDouble(entryFor((K)nextKey,
6273 >                                                                    v)));
6274                  result = r;
6275 <                for (MapReduceEntriesToDoubleTask<K,V> t = this, s;;) {
6276 <                    int c; BulkTask<K,V,?> par;
6277 <                    if ((c = t.pending) == 0) {
6278 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6279 <                            t.result = reducer.apply(t.result, s.result);
6280 <                        }
6281 <                        if ((par = t.parent) == null ||
6282 <                            !(par instanceof MapReduceEntriesToDoubleTask)) {
6570 <                            t.quietlyComplete();
6571 <                            break;
6572 <                        }
6573 <                        t = (MapReduceEntriesToDoubleTask<K,V>)par;
6275 >                CountedCompleter<?> c;
6276 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6277 >                    MapReduceEntriesToDoubleTask<K,V>
6278 >                        t = (MapReduceEntriesToDoubleTask<K,V>)c,
6279 >                        s = t.rights;
6280 >                    while (s != null) {
6281 >                        t.result = reducer.applyAsDouble(t.result, s.result);
6282 >                        s = t.rights = s.nextRight;
6283                      }
6575                    else if (t.casPending(c, c - 1))
6576                        break;
6284                  }
6578            } catch (Throwable ex) {
6579                return tryCompleteComputation(ex);
6285              }
6581            MapReduceEntriesToDoubleTask<K,V> s = rights;
6582            if (s != null && !inForkJoinPool()) {
6583                do  {
6584                    if (s.tryUnfork())
6585                        s.exec();
6586                } while ((s = s.nextRight) != null);
6587            }
6588            return false;
6286          }
6590        public final Double getRawResult() { return result; }
6287      }
6288  
6289      @SuppressWarnings("serial") static final class MapReduceMappingsToDoubleTask<K,V>
6290 <        extends BulkTask<K,V,Double> {
6291 <        final ObjectByObjectToDouble<? super K, ? super V> transformer;
6292 <        final DoubleByDoubleToDouble reducer;
6290 >        extends Traverser<K,V,Double> {
6291 >        final DoubleBiFunction<? super K, ? super V> transformer;
6292 >        final DoubleBinaryOperator reducer;
6293          final double basis;
6294          double result;
6295          MapReduceMappingsToDoubleTask<K,V> rights, nextRight;
6296          MapReduceMappingsToDoubleTask
6297 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6297 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6298               MapReduceMappingsToDoubleTask<K,V> nextRight,
6299 <             ObjectByObjectToDouble<? super K, ? super V> transformer,
6299 >             DoubleBiFunction<? super K, ? super V> transformer,
6300               double basis,
6301 <             DoubleByDoubleToDouble reducer) {
6301 >             DoubleBinaryOperator reducer) {
6302              super(m, p, b); this.nextRight = nextRight;
6303              this.transformer = transformer;
6304              this.basis = basis; this.reducer = reducer;
6305          }
6306 <        @SuppressWarnings("unchecked") public final boolean exec() {
6307 <            final ObjectByObjectToDouble<? super K, ? super V> transformer =
6308 <                this.transformer;
6309 <            final DoubleByDoubleToDouble reducer = this.reducer;
6310 <            if (transformer == null || reducer == null)
6311 <                return abortOnNullFunction();
6312 <            try {
6313 <                final double id = this.basis;
6618 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6619 <                    do {} while (!casPending(c = pending, c+1));
6306 >        public final Double getRawResult() { return result; }
6307 >        @SuppressWarnings("unchecked") public final void compute() {
6308 >            final DoubleBiFunction<? super K, ? super V> transformer;
6309 >            final DoubleBinaryOperator reducer;
6310 >            if ((transformer = this.transformer) != null &&
6311 >                (reducer = this.reducer) != null) {
6312 >                double r = this.basis;
6313 >                for (int b; (b = preSplit()) > 0;)
6314                      (rights = new MapReduceMappingsToDoubleTask<K,V>
6315 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6316 <                }
6623 <                double r = id;
6624 <                Object v;
6315 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6316 >                V v;
6317                  while ((v = advance()) != null)
6318 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6318 >                    r = reducer.applyAsDouble(r, transformer.applyAsDouble((K)nextKey, v));
6319                  result = r;
6320 <                for (MapReduceMappingsToDoubleTask<K,V> t = this, s;;) {
6321 <                    int c; BulkTask<K,V,?> par;
6322 <                    if ((c = t.pending) == 0) {
6323 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6324 <                            t.result = reducer.apply(t.result, s.result);
6325 <                        }
6326 <                        if ((par = t.parent) == null ||
6327 <                            !(par instanceof MapReduceMappingsToDoubleTask)) {
6636 <                            t.quietlyComplete();
6637 <                            break;
6638 <                        }
6639 <                        t = (MapReduceMappingsToDoubleTask<K,V>)par;
6320 >                CountedCompleter<?> c;
6321 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6322 >                    MapReduceMappingsToDoubleTask<K,V>
6323 >                        t = (MapReduceMappingsToDoubleTask<K,V>)c,
6324 >                        s = t.rights;
6325 >                    while (s != null) {
6326 >                        t.result = reducer.applyAsDouble(t.result, s.result);
6327 >                        s = t.rights = s.nextRight;
6328                      }
6641                    else if (t.casPending(c, c - 1))
6642                        break;
6329                  }
6644            } catch (Throwable ex) {
6645                return tryCompleteComputation(ex);
6330              }
6647            MapReduceMappingsToDoubleTask<K,V> s = rights;
6648            if (s != null && !inForkJoinPool()) {
6649                do  {
6650                    if (s.tryUnfork())
6651                        s.exec();
6652                } while ((s = s.nextRight) != null);
6653            }
6654            return false;
6331          }
6656        public final Double getRawResult() { return result; }
6332      }
6333  
6334      @SuppressWarnings("serial") static final class MapReduceKeysToLongTask<K,V>
6335 <        extends BulkTask<K,V,Long> {
6336 <        final ObjectToLong<? super K> transformer;
6337 <        final LongByLongToLong reducer;
6335 >        extends Traverser<K,V,Long> {
6336 >        final LongFunction<? super K> transformer;
6337 >        final LongBinaryOperator reducer;
6338          final long basis;
6339          long result;
6340          MapReduceKeysToLongTask<K,V> rights, nextRight;
6341          MapReduceKeysToLongTask
6342 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6342 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6343               MapReduceKeysToLongTask<K,V> nextRight,
6344 <             ObjectToLong<? super K> transformer,
6344 >             LongFunction<? super K> transformer,
6345               long basis,
6346 <             LongByLongToLong reducer) {
6346 >             LongBinaryOperator reducer) {
6347              super(m, p, b); this.nextRight = nextRight;
6348              this.transformer = transformer;
6349              this.basis = basis; this.reducer = reducer;
6350          }
6351 <        @SuppressWarnings("unchecked") public final boolean exec() {
6352 <            final ObjectToLong<? super K> transformer =
6353 <                this.transformer;
6354 <            final LongByLongToLong reducer = this.reducer;
6355 <            if (transformer == null || reducer == null)
6356 <                return abortOnNullFunction();
6357 <            try {
6358 <                final long id = this.basis;
6684 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6685 <                    do {} while (!casPending(c = pending, c+1));
6351 >        public final Long getRawResult() { return result; }
6352 >        @SuppressWarnings("unchecked") public final void compute() {
6353 >            final LongFunction<? super K> transformer;
6354 >            final LongBinaryOperator reducer;
6355 >            if ((transformer = this.transformer) != null &&
6356 >                (reducer = this.reducer) != null) {
6357 >                long r = this.basis;
6358 >                for (int b; (b = preSplit()) > 0;)
6359                      (rights = new MapReduceKeysToLongTask<K,V>
6360 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6688 <                }
6689 <                long r = id;
6360 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6361                  while (advance() != null)
6362 <                    r = reducer.apply(r, transformer.apply((K)nextKey));
6362 >                    r = reducer.applyAsLong(r, transformer.applyAsLong((K)nextKey));
6363                  result = r;
6364 <                for (MapReduceKeysToLongTask<K,V> t = this, s;;) {
6365 <                    int c; BulkTask<K,V,?> par;
6366 <                    if ((c = t.pending) == 0) {
6367 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6368 <                            t.result = reducer.apply(t.result, s.result);
6369 <                        }
6370 <                        if ((par = t.parent) == null ||
6371 <                            !(par instanceof MapReduceKeysToLongTask)) {
6701 <                            t.quietlyComplete();
6702 <                            break;
6703 <                        }
6704 <                        t = (MapReduceKeysToLongTask<K,V>)par;
6364 >                CountedCompleter<?> c;
6365 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6366 >                    MapReduceKeysToLongTask<K,V>
6367 >                        t = (MapReduceKeysToLongTask<K,V>)c,
6368 >                        s = t.rights;
6369 >                    while (s != null) {
6370 >                        t.result = reducer.applyAsLong(t.result, s.result);
6371 >                        s = t.rights = s.nextRight;
6372                      }
6706                    else if (t.casPending(c, c - 1))
6707                        break;
6373                  }
6709            } catch (Throwable ex) {
6710                return tryCompleteComputation(ex);
6374              }
6712            MapReduceKeysToLongTask<K,V> s = rights;
6713            if (s != null && !inForkJoinPool()) {
6714                do  {
6715                    if (s.tryUnfork())
6716                        s.exec();
6717                } while ((s = s.nextRight) != null);
6718            }
6719            return false;
6375          }
6721        public final Long getRawResult() { return result; }
6376      }
6377  
6378      @SuppressWarnings("serial") static final class MapReduceValuesToLongTask<K,V>
6379 <        extends BulkTask<K,V,Long> {
6380 <        final ObjectToLong<? super V> transformer;
6381 <        final LongByLongToLong reducer;
6379 >        extends Traverser<K,V,Long> {
6380 >        final LongFunction<? super V> transformer;
6381 >        final LongBinaryOperator reducer;
6382          final long basis;
6383          long result;
6384          MapReduceValuesToLongTask<K,V> rights, nextRight;
6385          MapReduceValuesToLongTask
6386 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6386 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6387               MapReduceValuesToLongTask<K,V> nextRight,
6388 <             ObjectToLong<? super V> transformer,
6388 >             LongFunction<? super V> transformer,
6389               long basis,
6390 <             LongByLongToLong reducer) {
6390 >             LongBinaryOperator reducer) {
6391              super(m, p, b); this.nextRight = nextRight;
6392              this.transformer = transformer;
6393              this.basis = basis; this.reducer = reducer;
6394          }
6395 <        @SuppressWarnings("unchecked") public final boolean exec() {
6396 <            final ObjectToLong<? super V> transformer =
6397 <                this.transformer;
6398 <            final LongByLongToLong reducer = this.reducer;
6399 <            if (transformer == null || reducer == null)
6400 <                return abortOnNullFunction();
6401 <            try {
6402 <                final long id = this.basis;
6749 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6750 <                    do {} while (!casPending(c = pending, c+1));
6395 >        public final Long getRawResult() { return result; }
6396 >        @SuppressWarnings("unchecked") public final void compute() {
6397 >            final LongFunction<? super V> transformer;
6398 >            final LongBinaryOperator reducer;
6399 >            if ((transformer = this.transformer) != null &&
6400 >                (reducer = this.reducer) != null) {
6401 >                long r = this.basis;
6402 >                for (int b; (b = preSplit()) > 0;)
6403                      (rights = new MapReduceValuesToLongTask<K,V>
6404 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6405 <                }
6754 <                long r = id;
6755 <                Object v;
6404 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6405 >                V v;
6406                  while ((v = advance()) != null)
6407 <                    r = reducer.apply(r, transformer.apply((V)v));
6407 >                    r = reducer.applyAsLong(r, transformer.applyAsLong(v));
6408                  result = r;
6409 <                for (MapReduceValuesToLongTask<K,V> t = this, s;;) {
6410 <                    int c; BulkTask<K,V,?> par;
6411 <                    if ((c = t.pending) == 0) {
6412 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6413 <                            t.result = reducer.apply(t.result, s.result);
6414 <                        }
6415 <                        if ((par = t.parent) == null ||
6416 <                            !(par instanceof MapReduceValuesToLongTask)) {
6767 <                            t.quietlyComplete();
6768 <                            break;
6769 <                        }
6770 <                        t = (MapReduceValuesToLongTask<K,V>)par;
6409 >                CountedCompleter<?> c;
6410 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6411 >                    MapReduceValuesToLongTask<K,V>
6412 >                        t = (MapReduceValuesToLongTask<K,V>)c,
6413 >                        s = t.rights;
6414 >                    while (s != null) {
6415 >                        t.result = reducer.applyAsLong(t.result, s.result);
6416 >                        s = t.rights = s.nextRight;
6417                      }
6772                    else if (t.casPending(c, c - 1))
6773                        break;
6418                  }
6775            } catch (Throwable ex) {
6776                return tryCompleteComputation(ex);
6419              }
6778            MapReduceValuesToLongTask<K,V> s = rights;
6779            if (s != null && !inForkJoinPool()) {
6780                do  {
6781                    if (s.tryUnfork())
6782                        s.exec();
6783                } while ((s = s.nextRight) != null);
6784            }
6785            return false;
6420          }
6787        public final Long getRawResult() { return result; }
6421      }
6422  
6423      @SuppressWarnings("serial") static final class MapReduceEntriesToLongTask<K,V>
6424 <        extends BulkTask<K,V,Long> {
6425 <        final ObjectToLong<Map.Entry<K,V>> transformer;
6426 <        final LongByLongToLong reducer;
6424 >        extends Traverser<K,V,Long> {
6425 >        final LongFunction<Map.Entry<K,V>> transformer;
6426 >        final LongBinaryOperator reducer;
6427          final long basis;
6428          long result;
6429          MapReduceEntriesToLongTask<K,V> rights, nextRight;
6430          MapReduceEntriesToLongTask
6431 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6431 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6432               MapReduceEntriesToLongTask<K,V> nextRight,
6433 <             ObjectToLong<Map.Entry<K,V>> transformer,
6433 >             LongFunction<Map.Entry<K,V>> transformer,
6434               long basis,
6435 <             LongByLongToLong reducer) {
6435 >             LongBinaryOperator reducer) {
6436              super(m, p, b); this.nextRight = nextRight;
6437              this.transformer = transformer;
6438              this.basis = basis; this.reducer = reducer;
6439          }
6440 <        @SuppressWarnings("unchecked") public final boolean exec() {
6441 <            final ObjectToLong<Map.Entry<K,V>> transformer =
6442 <                this.transformer;
6443 <            final LongByLongToLong reducer = this.reducer;
6444 <            if (transformer == null || reducer == null)
6445 <                return abortOnNullFunction();
6446 <            try {
6447 <                final long id = this.basis;
6815 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6816 <                    do {} while (!casPending(c = pending, c+1));
6440 >        public final Long getRawResult() { return result; }
6441 >        @SuppressWarnings("unchecked") public final void compute() {
6442 >            final LongFunction<Map.Entry<K,V>> transformer;
6443 >            final LongBinaryOperator reducer;
6444 >            if ((transformer = this.transformer) != null &&
6445 >                (reducer = this.reducer) != null) {
6446 >                long r = this.basis;
6447 >                for (int b; (b = preSplit()) > 0;)
6448                      (rights = new MapReduceEntriesToLongTask<K,V>
6449 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6450 <                }
6820 <                long r = id;
6821 <                Object v;
6449 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6450 >                V v;
6451                  while ((v = advance()) != null)
6452 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6452 >                    r = reducer.applyAsLong(r, transformer.applyAsLong(entryFor((K)nextKey, v)));
6453                  result = r;
6454 <                for (MapReduceEntriesToLongTask<K,V> t = this, s;;) {
6455 <                    int c; BulkTask<K,V,?> par;
6456 <                    if ((c = t.pending) == 0) {
6457 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6458 <                            t.result = reducer.apply(t.result, s.result);
6459 <                        }
6460 <                        if ((par = t.parent) == null ||
6461 <                            !(par instanceof MapReduceEntriesToLongTask)) {
6833 <                            t.quietlyComplete();
6834 <                            break;
6835 <                        }
6836 <                        t = (MapReduceEntriesToLongTask<K,V>)par;
6454 >                CountedCompleter<?> c;
6455 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6456 >                    MapReduceEntriesToLongTask<K,V>
6457 >                        t = (MapReduceEntriesToLongTask<K,V>)c,
6458 >                        s = t.rights;
6459 >                    while (s != null) {
6460 >                        t.result = reducer.applyAsLong(t.result, s.result);
6461 >                        s = t.rights = s.nextRight;
6462                      }
6838                    else if (t.casPending(c, c - 1))
6839                        break;
6463                  }
6841            } catch (Throwable ex) {
6842                return tryCompleteComputation(ex);
6464              }
6844            MapReduceEntriesToLongTask<K,V> s = rights;
6845            if (s != null && !inForkJoinPool()) {
6846                do  {
6847                    if (s.tryUnfork())
6848                        s.exec();
6849                } while ((s = s.nextRight) != null);
6850            }
6851            return false;
6465          }
6853        public final Long getRawResult() { return result; }
6466      }
6467  
6468      @SuppressWarnings("serial") static final class MapReduceMappingsToLongTask<K,V>
6469 <        extends BulkTask<K,V,Long> {
6470 <        final ObjectByObjectToLong<? super K, ? super V> transformer;
6471 <        final LongByLongToLong reducer;
6469 >        extends Traverser<K,V,Long> {
6470 >        final LongBiFunction<? super K, ? super V> transformer;
6471 >        final LongBinaryOperator reducer;
6472          final long basis;
6473          long result;
6474          MapReduceMappingsToLongTask<K,V> rights, nextRight;
6475          MapReduceMappingsToLongTask
6476 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6476 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6477               MapReduceMappingsToLongTask<K,V> nextRight,
6478 <             ObjectByObjectToLong<? super K, ? super V> transformer,
6478 >             LongBiFunction<? super K, ? super V> transformer,
6479               long basis,
6480 <             LongByLongToLong reducer) {
6480 >             LongBinaryOperator reducer) {
6481              super(m, p, b); this.nextRight = nextRight;
6482              this.transformer = transformer;
6483              this.basis = basis; this.reducer = reducer;
6484          }
6485 <        @SuppressWarnings("unchecked") public final boolean exec() {
6486 <            final ObjectByObjectToLong<? super K, ? super V> transformer =
6487 <                this.transformer;
6488 <            final LongByLongToLong reducer = this.reducer;
6489 <            if (transformer == null || reducer == null)
6490 <                return abortOnNullFunction();
6491 <            try {
6492 <                final long id = this.basis;
6881 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6882 <                    do {} while (!casPending(c = pending, c+1));
6485 >        public final Long getRawResult() { return result; }
6486 >        @SuppressWarnings("unchecked") public final void compute() {
6487 >            final LongBiFunction<? super K, ? super V> transformer;
6488 >            final LongBinaryOperator reducer;
6489 >            if ((transformer = this.transformer) != null &&
6490 >                (reducer = this.reducer) != null) {
6491 >                long r = this.basis;
6492 >                for (int b; (b = preSplit()) > 0;)
6493                      (rights = new MapReduceMappingsToLongTask<K,V>
6494 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6495 <                }
6886 <                long r = id;
6887 <                Object v;
6494 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6495 >                V v;
6496                  while ((v = advance()) != null)
6497 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6497 >                    r = reducer.applyAsLong(r, transformer.applyAsLong((K)nextKey, v));
6498                  result = r;
6499 <                for (MapReduceMappingsToLongTask<K,V> t = this, s;;) {
6500 <                    int c; BulkTask<K,V,?> par;
6501 <                    if ((c = t.pending) == 0) {
6502 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6503 <                            t.result = reducer.apply(t.result, s.result);
6504 <                        }
6505 <                        if ((par = t.parent) == null ||
6506 <                            !(par instanceof MapReduceMappingsToLongTask)) {
6899 <                            t.quietlyComplete();
6900 <                            break;
6901 <                        }
6902 <                        t = (MapReduceMappingsToLongTask<K,V>)par;
6499 >                CountedCompleter<?> c;
6500 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6501 >                    MapReduceMappingsToLongTask<K,V>
6502 >                        t = (MapReduceMappingsToLongTask<K,V>)c,
6503 >                        s = t.rights;
6504 >                    while (s != null) {
6505 >                        t.result = reducer.applyAsLong(t.result, s.result);
6506 >                        s = t.rights = s.nextRight;
6507                      }
6904                    else if (t.casPending(c, c - 1))
6905                        break;
6508                  }
6907            } catch (Throwable ex) {
6908                return tryCompleteComputation(ex);
6509              }
6910            MapReduceMappingsToLongTask<K,V> s = rights;
6911            if (s != null && !inForkJoinPool()) {
6912                do  {
6913                    if (s.tryUnfork())
6914                        s.exec();
6915                } while ((s = s.nextRight) != null);
6916            }
6917            return false;
6510          }
6919        public final Long getRawResult() { return result; }
6511      }
6512  
6513      @SuppressWarnings("serial") static final class MapReduceKeysToIntTask<K,V>
6514 <        extends BulkTask<K,V,Integer> {
6515 <        final ObjectToInt<? super K> transformer;
6516 <        final IntByIntToInt reducer;
6514 >        extends Traverser<K,V,Integer> {
6515 >        final IntFunction<? super K> transformer;
6516 >        final IntBinaryOperator reducer;
6517          final int basis;
6518          int result;
6519          MapReduceKeysToIntTask<K,V> rights, nextRight;
6520          MapReduceKeysToIntTask
6521 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6521 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6522               MapReduceKeysToIntTask<K,V> nextRight,
6523 <             ObjectToInt<? super K> transformer,
6523 >             IntFunction<? super K> transformer,
6524               int basis,
6525 <             IntByIntToInt reducer) {
6525 >             IntBinaryOperator reducer) {
6526              super(m, p, b); this.nextRight = nextRight;
6527              this.transformer = transformer;
6528              this.basis = basis; this.reducer = reducer;
6529          }
6530 <        @SuppressWarnings("unchecked") public final boolean exec() {
6531 <            final ObjectToInt<? super K> transformer =
6532 <                this.transformer;
6533 <            final IntByIntToInt reducer = this.reducer;
6534 <            if (transformer == null || reducer == null)
6535 <                return abortOnNullFunction();
6536 <            try {
6537 <                final int id = this.basis;
6947 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6948 <                    do {} while (!casPending(c = pending, c+1));
6530 >        public final Integer getRawResult() { return result; }
6531 >        @SuppressWarnings("unchecked") public final void compute() {
6532 >            final IntFunction<? super K> transformer;
6533 >            final IntBinaryOperator reducer;
6534 >            if ((transformer = this.transformer) != null &&
6535 >                (reducer = this.reducer) != null) {
6536 >                int r = this.basis;
6537 >                for (int b; (b = preSplit()) > 0;)
6538                      (rights = new MapReduceKeysToIntTask<K,V>
6539 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6951 <                }
6952 <                int r = id;
6539 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6540                  while (advance() != null)
6541 <                    r = reducer.apply(r, transformer.apply((K)nextKey));
6541 >                    r = reducer.applyAsInt(r, transformer.applyAsInt((K)nextKey));
6542                  result = r;
6543 <                for (MapReduceKeysToIntTask<K,V> t = this, s;;) {
6544 <                    int c; BulkTask<K,V,?> par;
6545 <                    if ((c = t.pending) == 0) {
6546 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6547 <                            t.result = reducer.apply(t.result, s.result);
6548 <                        }
6549 <                        if ((par = t.parent) == null ||
6550 <                            !(par instanceof MapReduceKeysToIntTask)) {
6964 <                            t.quietlyComplete();
6965 <                            break;
6966 <                        }
6967 <                        t = (MapReduceKeysToIntTask<K,V>)par;
6543 >                CountedCompleter<?> c;
6544 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6545 >                    MapReduceKeysToIntTask<K,V>
6546 >                        t = (MapReduceKeysToIntTask<K,V>)c,
6547 >                        s = t.rights;
6548 >                    while (s != null) {
6549 >                        t.result = reducer.applyAsInt(t.result, s.result);
6550 >                        s = t.rights = s.nextRight;
6551                      }
6969                    else if (t.casPending(c, c - 1))
6970                        break;
6552                  }
6972            } catch (Throwable ex) {
6973                return tryCompleteComputation(ex);
6553              }
6975            MapReduceKeysToIntTask<K,V> s = rights;
6976            if (s != null && !inForkJoinPool()) {
6977                do  {
6978                    if (s.tryUnfork())
6979                        s.exec();
6980                } while ((s = s.nextRight) != null);
6981            }
6982            return false;
6554          }
6984        public final Integer getRawResult() { return result; }
6555      }
6556  
6557      @SuppressWarnings("serial") static final class MapReduceValuesToIntTask<K,V>
6558 <        extends BulkTask<K,V,Integer> {
6559 <        final ObjectToInt<? super V> transformer;
6560 <        final IntByIntToInt reducer;
6558 >        extends Traverser<K,V,Integer> {
6559 >        final IntFunction<? super V> transformer;
6560 >        final IntBinaryOperator reducer;
6561          final int basis;
6562          int result;
6563          MapReduceValuesToIntTask<K,V> rights, nextRight;
6564          MapReduceValuesToIntTask
6565 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6565 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6566               MapReduceValuesToIntTask<K,V> nextRight,
6567 <             ObjectToInt<? super V> transformer,
6567 >             IntFunction<? super V> transformer,
6568               int basis,
6569 <             IntByIntToInt reducer) {
6569 >             IntBinaryOperator reducer) {
6570              super(m, p, b); this.nextRight = nextRight;
6571              this.transformer = transformer;
6572              this.basis = basis; this.reducer = reducer;
6573          }
6574 <        @SuppressWarnings("unchecked") public final boolean exec() {
6575 <            final ObjectToInt<? super V> transformer =
6576 <                this.transformer;
6577 <            final IntByIntToInt reducer = this.reducer;
6578 <            if (transformer == null || reducer == null)
6579 <                return abortOnNullFunction();
6580 <            try {
6581 <                final int id = this.basis;
7012 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
7013 <                    do {} while (!casPending(c = pending, c+1));
6574 >        public final Integer getRawResult() { return result; }
6575 >        @SuppressWarnings("unchecked") public final void compute() {
6576 >            final IntFunction<? super V> transformer;
6577 >            final IntBinaryOperator reducer;
6578 >            if ((transformer = this.transformer) != null &&
6579 >                (reducer = this.reducer) != null) {
6580 >                int r = this.basis;
6581 >                for (int b; (b = preSplit()) > 0;)
6582                      (rights = new MapReduceValuesToIntTask<K,V>
6583 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6584 <                }
7017 <                int r = id;
7018 <                Object v;
6583 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6584 >                V v;
6585                  while ((v = advance()) != null)
6586 <                    r = reducer.apply(r, transformer.apply((V)v));
6586 >                    r = reducer.applyAsInt(r, transformer.applyAsInt(v));
6587                  result = r;
6588 <                for (MapReduceValuesToIntTask<K,V> t = this, s;;) {
6589 <                    int c; BulkTask<K,V,?> par;
6590 <                    if ((c = t.pending) == 0) {
6591 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6592 <                            t.result = reducer.apply(t.result, s.result);
6593 <                        }
6594 <                        if ((par = t.parent) == null ||
6595 <                            !(par instanceof MapReduceValuesToIntTask)) {
7030 <                            t.quietlyComplete();
7031 <                            break;
7032 <                        }
7033 <                        t = (MapReduceValuesToIntTask<K,V>)par;
6588 >                CountedCompleter<?> c;
6589 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6590 >                    MapReduceValuesToIntTask<K,V>
6591 >                        t = (MapReduceValuesToIntTask<K,V>)c,
6592 >                        s = t.rights;
6593 >                    while (s != null) {
6594 >                        t.result = reducer.applyAsInt(t.result, s.result);
6595 >                        s = t.rights = s.nextRight;
6596                      }
7035                    else if (t.casPending(c, c - 1))
7036                        break;
6597                  }
7038            } catch (Throwable ex) {
7039                return tryCompleteComputation(ex);
6598              }
7041            MapReduceValuesToIntTask<K,V> s = rights;
7042            if (s != null && !inForkJoinPool()) {
7043                do  {
7044                    if (s.tryUnfork())
7045                        s.exec();
7046                } while ((s = s.nextRight) != null);
7047            }
7048            return false;
6599          }
7050        public final Integer getRawResult() { return result; }
6600      }
6601  
6602      @SuppressWarnings("serial") static final class MapReduceEntriesToIntTask<K,V>
6603 <        extends BulkTask<K,V,Integer> {
6604 <        final ObjectToInt<Map.Entry<K,V>> transformer;
6605 <        final IntByIntToInt reducer;
6603 >        extends Traverser<K,V,Integer> {
6604 >        final IntFunction<Map.Entry<K,V>> transformer;
6605 >        final IntBinaryOperator reducer;
6606          final int basis;
6607          int result;
6608          MapReduceEntriesToIntTask<K,V> rights, nextRight;
6609          MapReduceEntriesToIntTask
6610 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6610 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6611               MapReduceEntriesToIntTask<K,V> nextRight,
6612 <             ObjectToInt<Map.Entry<K,V>> transformer,
6612 >             IntFunction<Map.Entry<K,V>> transformer,
6613               int basis,
6614 <             IntByIntToInt reducer) {
6614 >             IntBinaryOperator reducer) {
6615              super(m, p, b); this.nextRight = nextRight;
6616              this.transformer = transformer;
6617              this.basis = basis; this.reducer = reducer;
6618          }
6619 <        @SuppressWarnings("unchecked") public final boolean exec() {
6620 <            final ObjectToInt<Map.Entry<K,V>> transformer =
6621 <                this.transformer;
6622 <            final IntByIntToInt reducer = this.reducer;
6623 <            if (transformer == null || reducer == null)
6624 <                return abortOnNullFunction();
6625 <            try {
6626 <                final int id = this.basis;
7078 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
7079 <                    do {} while (!casPending(c = pending, c+1));
6619 >        public final Integer getRawResult() { return result; }
6620 >        @SuppressWarnings("unchecked") public final void compute() {
6621 >            final IntFunction<Map.Entry<K,V>> transformer;
6622 >            final IntBinaryOperator reducer;
6623 >            if ((transformer = this.transformer) != null &&
6624 >                (reducer = this.reducer) != null) {
6625 >                int r = this.basis;
6626 >                for (int b; (b = preSplit()) > 0;)
6627                      (rights = new MapReduceEntriesToIntTask<K,V>
6628 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6629 <                }
7083 <                int r = id;
7084 <                Object v;
6628 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6629 >                V v;
6630                  while ((v = advance()) != null)
6631 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6631 >                    r = reducer.applyAsInt(r, transformer.applyAsInt(entryFor((K)nextKey,
6632 >                                                                    v)));
6633                  result = r;
6634 <                for (MapReduceEntriesToIntTask<K,V> t = this, s;;) {
6635 <                    int c; BulkTask<K,V,?> par;
6636 <                    if ((c = t.pending) == 0) {
6637 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6638 <                            t.result = reducer.apply(t.result, s.result);
6639 <                        }
6640 <                        if ((par = t.parent) == null ||
6641 <                            !(par instanceof MapReduceEntriesToIntTask)) {
7096 <                            t.quietlyComplete();
7097 <                            break;
7098 <                        }
7099 <                        t = (MapReduceEntriesToIntTask<K,V>)par;
6634 >                CountedCompleter<?> c;
6635 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6636 >                    MapReduceEntriesToIntTask<K,V>
6637 >                        t = (MapReduceEntriesToIntTask<K,V>)c,
6638 >                        s = t.rights;
6639 >                    while (s != null) {
6640 >                        t.result = reducer.applyAsInt(t.result, s.result);
6641 >                        s = t.rights = s.nextRight;
6642                      }
7101                    else if (t.casPending(c, c - 1))
7102                        break;
6643                  }
7104            } catch (Throwable ex) {
7105                return tryCompleteComputation(ex);
6644              }
7107            MapReduceEntriesToIntTask<K,V> s = rights;
7108            if (s != null && !inForkJoinPool()) {
7109                do  {
7110                    if (s.tryUnfork())
7111                        s.exec();
7112                } while ((s = s.nextRight) != null);
7113            }
7114            return false;
6645          }
7116        public final Integer getRawResult() { return result; }
6646      }
6647  
6648      @SuppressWarnings("serial") static final class MapReduceMappingsToIntTask<K,V>
6649 <        extends BulkTask<K,V,Integer> {
6650 <        final ObjectByObjectToInt<? super K, ? super V> transformer;
6651 <        final IntByIntToInt reducer;
6649 >        extends Traverser<K,V,Integer> {
6650 >        final IntBiFunction<? super K, ? super V> transformer;
6651 >        final IntBinaryOperator reducer;
6652          final int basis;
6653          int result;
6654          MapReduceMappingsToIntTask<K,V> rights, nextRight;
6655          MapReduceMappingsToIntTask
6656 <            (ConcurrentHashMap<K,V> m, BulkTask<K,V,?> p, int b,
6657 <             MapReduceMappingsToIntTask<K,V> rights,
6658 <             ObjectByObjectToInt<? super K, ? super V> transformer,
6656 >            (ConcurrentHashMap<K,V> m, Traverser<K,V,?> p, int b,
6657 >             MapReduceMappingsToIntTask<K,V> nextRight,
6658 >             IntBiFunction<? super K, ? super V> transformer,
6659               int basis,
6660 <             IntByIntToInt reducer) {
6660 >             IntBinaryOperator reducer) {
6661              super(m, p, b); this.nextRight = nextRight;
6662              this.transformer = transformer;
6663              this.basis = basis; this.reducer = reducer;
6664          }
6665 <        @SuppressWarnings("unchecked") public final boolean exec() {
6666 <            final ObjectByObjectToInt<? super K, ? super V> transformer =
6667 <                this.transformer;
6668 <            final IntByIntToInt reducer = this.reducer;
6669 <            if (transformer == null || reducer == null)
6670 <                return abortOnNullFunction();
6671 <            try {
6672 <                final int id = this.basis;
7144 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
7145 <                    do {} while (!casPending(c = pending, c+1));
6665 >        public final Integer getRawResult() { return result; }
6666 >        @SuppressWarnings("unchecked") public final void compute() {
6667 >            final IntBiFunction<? super K, ? super V> transformer;
6668 >            final IntBinaryOperator reducer;
6669 >            if ((transformer = this.transformer) != null &&
6670 >                (reducer = this.reducer) != null) {
6671 >                int r = this.basis;
6672 >                for (int b; (b = preSplit()) > 0;)
6673                      (rights = new MapReduceMappingsToIntTask<K,V>
6674 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6675 <                }
7149 <                int r = id;
7150 <                Object v;
6674 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6675 >                V v;
6676                  while ((v = advance()) != null)
6677 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6677 >                    r = reducer.applyAsInt(r, transformer.applyAsInt((K)nextKey, v));
6678                  result = r;
6679 <                for (MapReduceMappingsToIntTask<K,V> t = this, s;;) {
6680 <                    int c; BulkTask<K,V,?> par;
6681 <                    if ((c = t.pending) == 0) {
6682 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6683 <                            t.result = reducer.apply(t.result, s.result);
6684 <                        }
6685 <                        if ((par = t.parent) == null ||
6686 <                            !(par instanceof MapReduceMappingsToIntTask)) {
7162 <                            t.quietlyComplete();
7163 <                            break;
7164 <                        }
7165 <                        t = (MapReduceMappingsToIntTask<K,V>)par;
6679 >                CountedCompleter<?> c;
6680 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6681 >                    MapReduceMappingsToIntTask<K,V>
6682 >                        t = (MapReduceMappingsToIntTask<K,V>)c,
6683 >                        s = t.rights;
6684 >                    while (s != null) {
6685 >                        t.result = reducer.applyAsInt(t.result, s.result);
6686 >                        s = t.rights = s.nextRight;
6687                      }
7167                    else if (t.casPending(c, c - 1))
7168                        break;
6688                  }
7170            } catch (Throwable ex) {
7171                return tryCompleteComputation(ex);
7172            }
7173            MapReduceMappingsToIntTask<K,V> s = rights;
7174            if (s != null && !inForkJoinPool()) {
7175                do  {
7176                    if (s.tryUnfork())
7177                        s.exec();
7178                } while ((s = s.nextRight) != null);
6689              }
7180            return false;
6690          }
7182        public final Integer getRawResult() { return result; }
6691      }
6692  
6693      // Unsafe mechanics
6694 <    private static final sun.misc.Unsafe UNSAFE;
6695 <    private static final long counterOffset;
6696 <    private static final long sizeCtlOffset;
6694 >    private static final sun.misc.Unsafe U;
6695 >    private static final long SIZECTL;
6696 >    private static final long TRANSFERINDEX;
6697 >    private static final long TRANSFERORIGIN;
6698 >    private static final long BASECOUNT;
6699 >    private static final long CELLSBUSY;
6700 >    private static final long CELLVALUE;
6701      private static final long ABASE;
6702      private static final int ASHIFT;
6703  
6704      static {
6705          int ss;
6706          try {
6707 <            UNSAFE = sun.misc.Unsafe.getUnsafe();
6707 >            U = sun.misc.Unsafe.getUnsafe();
6708              Class<?> k = ConcurrentHashMap.class;
6709 <            counterOffset = UNSAFE.objectFieldOffset
7198 <                (k.getDeclaredField("counter"));
7199 <            sizeCtlOffset = UNSAFE.objectFieldOffset
6709 >            SIZECTL = U.objectFieldOffset
6710                  (k.getDeclaredField("sizeCtl"));
6711 +            TRANSFERINDEX = U.objectFieldOffset
6712 +                (k.getDeclaredField("transferIndex"));
6713 +            TRANSFERORIGIN = U.objectFieldOffset
6714 +                (k.getDeclaredField("transferOrigin"));
6715 +            BASECOUNT = U.objectFieldOffset
6716 +                (k.getDeclaredField("baseCount"));
6717 +            CELLSBUSY = U.objectFieldOffset
6718 +                (k.getDeclaredField("cellsBusy"));
6719 +            Class<?> ck = Cell.class;
6720 +            CELLVALUE = U.objectFieldOffset
6721 +                (ck.getDeclaredField("value"));
6722              Class<?> sc = Node[].class;
6723 <            ABASE = UNSAFE.arrayBaseOffset(sc);
6724 <            ss = UNSAFE.arrayIndexScale(sc);
6723 >            ABASE = U.arrayBaseOffset(sc);
6724 >            ss = U.arrayIndexScale(sc);
6725 >            ASHIFT = 31 - Integer.numberOfLeadingZeros(ss);
6726          } catch (Exception e) {
6727              throw new Error(e);
6728          }
6729          if ((ss & (ss-1)) != 0)
6730              throw new Error("data type scale not a power of two");
7209        ASHIFT = 31 - Integer.numberOfLeadingZeros(ss);
6731      }
6732 +
6733   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines