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

Comparing jsr166/src/jsr166e/ConcurrentHashMapV8.java (file contents):
Revision 1.64 by jsr166, Tue Oct 2 05:07:19 2012 UTC vs.
Revision 1.85 by jsr166, Wed Jan 2 07:43:49 2013 UTC

# Line 5 | Line 5
5   */
6  
7   package jsr166e;
8 import jsr166e.LongAdder;
9 import jsr166e.ForkJoinPool;
10 import jsr166e.ForkJoinTask;
8  
9   import java.util.Comparator;
10   import java.util.Arrays;
# Line 24 | Line 21 | import java.util.Enumeration;
21   import java.util.ConcurrentModificationException;
22   import java.util.NoSuchElementException;
23   import java.util.concurrent.ConcurrentMap;
27 import java.util.concurrent.ThreadLocalRandom;
28 import java.util.concurrent.locks.LockSupport;
24   import java.util.concurrent.locks.AbstractQueuedSynchronizer;
25 + import java.util.concurrent.atomic.AtomicInteger;
26   import java.util.concurrent.atomic.AtomicReference;
31
27   import java.io.Serializable;
28  
29   /**
# Line 43 | Line 38 | import java.io.Serializable;
38   * interoperable with {@code Hashtable} in programs that rely on its
39   * thread safety but not on its synchronization details.
40   *
41 < * <p> Retrieval operations (including {@code get}) generally do not
41 > * <p>Retrieval operations (including {@code get}) generally do not
42   * block, so may overlap with update operations (including {@code put}
43   * and {@code remove}). Retrievals reflect the results of the most
44   * recently <em>completed</em> update operations holding upon their
# Line 64 | Line 59 | import java.io.Serializable;
59   * that may be adequate for monitoring or estimation purposes, but not
60   * for program control.
61   *
62 < * <p> The table is dynamically expanded when there are too many
62 > * <p>The table is dynamically expanded when there are too many
63   * collisions (i.e., keys that have distinct hash codes but fall into
64   * the same slot modulo the table size), with the expected average
65   * effect of maintaining roughly two bins per mapping (corresponding
# Line 85 | Line 80 | import java.io.Serializable;
80   * {@code hashCode()} is a sure way to slow down performance of any
81   * hash table.
82   *
83 + * <p>A {@link Set} projection of a ConcurrentHashMapV8 may be created
84 + * (using {@link #newKeySet()} or {@link #newKeySet(int)}), or viewed
85 + * (using {@link #keySet(Object)} when only keys are of interest, and the
86 + * mapped values are (perhaps transiently) not used or all take the
87 + * same mapping value.
88 + *
89 + * <p>A ConcurrentHashMapV8 can be used as scalable frequency map (a
90 + * form of histogram or multiset) by using {@link LongAdder} values
91 + * and initializing via {@link #computeIfAbsent}. For example, to add
92 + * a count to a {@code ConcurrentHashMapV8<String,LongAdder> freqs}, you
93 + * can use {@code freqs.computeIfAbsent(k -> new
94 + * LongAdder()).increment();}
95 + *
96   * <p>This class and its views and iterators implement all of the
97   * <em>optional</em> methods of the {@link Map} and {@link Iterator}
98   * interfaces.
99   *
100 < * <p> Like {@link Hashtable} but unlike {@link HashMap}, this class
100 > * <p>Like {@link Hashtable} but unlike {@link HashMap}, this class
101   * does <em>not</em> allow {@code null} to be used as a key or value.
102   *
103 + * <p>ConcurrentHashMapV8s support sequential and parallel operations
104 + * bulk operations. (Parallel forms use the {@link
105 + * ForkJoinPool#commonPool()}). Tasks that may be used in other
106 + * contexts are available in class {@link ForkJoinTasks}. These
107 + * operations are designed to be safely, and often sensibly, applied
108 + * even with maps that are being concurrently updated by other
109 + * threads; for example, when computing a snapshot summary of the
110 + * values in a shared registry.  There are three kinds of operation,
111 + * each with four forms, accepting functions with Keys, Values,
112 + * Entries, and (Key, Value) arguments and/or return values. Because
113 + * the elements of a ConcurrentHashMapV8 are not ordered in any
114 + * particular way, and may be processed in different orders in
115 + * different parallel executions, the correctness of supplied
116 + * functions should not depend on any ordering, or on any other
117 + * objects or values that may transiently change while computation is
118 + * in progress; and except for forEach actions, should ideally be
119 + * side-effect-free.
120 + *
121 + * <ul>
122 + * <li> forEach: Perform a given action on each element.
123 + * A variant form applies a given transformation on each element
124 + * before performing the action.</li>
125 + *
126 + * <li> search: Return the first available non-null result of
127 + * applying a given function on each element; skipping further
128 + * search when a result is found.</li>
129 + *
130 + * <li> reduce: Accumulate each element.  The supplied reduction
131 + * function cannot rely on ordering (more formally, it should be
132 + * both associative and commutative).  There are five variants:
133 + *
134 + * <ul>
135 + *
136 + * <li> Plain reductions. (There is not a form of this method for
137 + * (key, value) function arguments since there is no corresponding
138 + * return type.)</li>
139 + *
140 + * <li> Mapped reductions that accumulate the results of a given
141 + * function applied to each element.</li>
142 + *
143 + * <li> Reductions to scalar doubles, longs, and ints, using a
144 + * given basis value.</li>
145 + *
146 + * </li>
147 + * </ul>
148 + * </ul>
149 + *
150 + * <p>The concurrency properties of bulk operations follow
151 + * from those of ConcurrentHashMapV8: Any non-null result returned
152 + * from {@code get(key)} and related access methods bears a
153 + * happens-before relation with the associated insertion or
154 + * update.  The result of any bulk operation reflects the
155 + * composition of these per-element relations (but is not
156 + * necessarily atomic with respect to the map as a whole unless it
157 + * is somehow known to be quiescent).  Conversely, because keys
158 + * and values in the map are never null, null serves as a reliable
159 + * atomic indicator of the current lack of any result.  To
160 + * maintain this property, null serves as an implicit basis for
161 + * all non-scalar reduction operations. For the double, long, and
162 + * int versions, the basis should be one that, when combined with
163 + * any other value, returns that other value (more formally, it
164 + * should be the identity element for the reduction). Most common
165 + * reductions have these properties; for example, computing a sum
166 + * with basis 0 or a minimum with basis MAX_VALUE.
167 + *
168 + * <p>Search and transformation functions provided as arguments
169 + * should similarly return null to indicate the lack of any result
170 + * (in which case it is not used). In the case of mapped
171 + * reductions, this also enables transformations to serve as
172 + * filters, returning null (or, in the case of primitive
173 + * specializations, the identity basis) if the element should not
174 + * be combined. You can create compound transformations and
175 + * filterings by composing them yourself under this "null means
176 + * there is nothing there now" rule before using them in search or
177 + * reduce operations.
178 + *
179 + * <p>Methods accepting and/or returning Entry arguments maintain
180 + * key-value associations. They may be useful for example when
181 + * finding the key for the greatest value. Note that "plain" Entry
182 + * arguments can be supplied using {@code new
183 + * AbstractMap.SimpleEntry(k,v)}.
184 + *
185 + * <p>Bulk operations may complete abruptly, throwing an
186 + * exception encountered in the application of a supplied
187 + * function. Bear in mind when handling such exceptions that other
188 + * concurrently executing functions could also have thrown
189 + * exceptions, or would have done so if the first exception had
190 + * not occurred.
191 + *
192 + * <p>Speedups for parallel compared to sequential forms are common
193 + * but not guaranteed.  Parallel operations involving brief functions
194 + * on small maps may execute more slowly than sequential forms if the
195 + * underlying work to parallelize the computation is more expensive
196 + * than the computation itself.  Similarly, parallelization may not
197 + * lead to much actual parallelism if all processors are busy
198 + * performing unrelated tasks.
199 + *
200 + * <p>All arguments to all task methods must be non-null.
201 + *
202 + * <p><em>jsr166e note: During transition, this class
203 + * uses nested functional interfaces with different names but the
204 + * same forms as those expected for JDK8.</em>
205 + *
206   * <p>This class is a member of the
207   * <a href="{@docRoot}/../technotes/guides/collections/index.html">
208   * Java Collections Framework</a>.
209   *
99 * <p><em>jsr166e note: This class is a candidate replacement for
100 * java.util.concurrent.ConcurrentHashMap.  During transition, this
101 * class declares and uses nested functional interfaces with different
102 * names but the same forms as those expected for JDK8.<em>
103 *
210   * @since 1.5
211   * @author Doug Lea
212   * @param <K> the type of keys maintained by this map
# Line 117 | Line 223 | public class ConcurrentHashMapV8<K, V>
223       * portion of the elements, and so may be amenable to parallel
224       * execution.
225       *
226 <     * <p> This interface exports a subset of expected JDK8
226 >     * <p>This interface exports a subset of expected JDK8
227       * functionality.
228       *
229       * <p>Sample usage: Here is one (of the several) ways to compute
# Line 189 | Line 295 | public class ConcurrentHashMapV8<K, V>
295       * the same or better than java.util.HashMap, and to support high
296       * initial insertion rates on an empty table by many threads.
297       *
298 <     * Each key-value mapping is held in a Node.  Because Node fields
299 <     * can contain special values, they are defined using plain Object
300 <     * types. Similarly in turn, all internal methods that use them
301 <     * work off Object types. And similarly, so do the internal
302 <     * methods of auxiliary iterator and view classes.  All public
303 <     * generic typed methods relay in/out of these internal methods,
304 <     * supplying null-checks and casts as needed. This also allows
305 <     * many of the public methods to be factored into a smaller number
306 <     * of internal methods (although sadly not so for the five
201 <     * variants of put-related operations). The validation-based
202 <     * approach explained below leads to a lot of code sprawl because
298 >     * Each key-value mapping is held in a Node.  Because Node key
299 >     * fields can contain special values, they are defined using plain
300 >     * Object types (not type "K"). This leads to a lot of explicit
301 >     * casting (and many explicit warning suppressions to tell
302 >     * compilers not to complain about it). It also allows some of the
303 >     * public methods to be factored into a smaller number of internal
304 >     * methods (although sadly not so for the five variants of
305 >     * put-related operations). The validation-based approach
306 >     * explained below leads to a lot of code sprawl because
307       * retry-control precludes factoring into smaller methods.
308       *
309       * The table is lazily initialized to a power-of-two size upon the
# Line 213 | Line 317 | public class ConcurrentHashMapV8<K, V>
317       * as lookups check hash code and non-nullness of value before
318       * checking key equality.
319       *
320 <     * We use the top two bits of Node hash fields for control
321 <     * purposes -- they are available anyway because of addressing
322 <     * constraints.  As explained further below, these top bits are
323 <     * used as follows:
324 <     *  00 - Normal
325 <     *  01 - Locked
222 <     *  11 - Locked and may have a thread waiting for lock
223 <     *  10 - Node is a forwarding node
224 <     *
225 <     * The lower 30 bits of each Node's hash field contain a
226 <     * transformation of the key's hash code, except for forwarding
227 <     * nodes, for which the lower bits are zero (and so always have
228 <     * hash field == MOVED).
320 >     * We use the top (sign) bit of Node hash fields for control
321 >     * purposes -- it is available anyway because of addressing
322 >     * constraints.  Nodes with negative hash fields are forwarding
323 >     * nodes to either TreeBins or resized tables.  The lower 31 bits
324 >     * of each normal Node's hash field contain a transformation of
325 >     * the key's hash code.
326       *
327       * Insertion (via put or its variants) of the first node in an
328       * empty bin is performed by just CASing it to the bin.  This is
# Line 234 | Line 331 | public class ConcurrentHashMapV8<K, V>
331       * delete, and replace) require locks.  We do not want to waste
332       * the space required to associate a distinct lock object with
333       * each bin, so instead use the first node of a bin list itself as
334 <     * a lock. Blocking support for these locks relies on the builtin
335 <     * "synchronized" monitors.  However, we also need a tryLock
239 <     * construction, so we overlay these by using bits of the Node
240 <     * hash field for lock control (see above), and so normally use
241 <     * builtin monitors only for blocking and signalling using
242 <     * wait/notifyAll constructions. See Node.tryAwaitLock.
334 >     * a lock. Locking support for these locks relies on builtin
335 >     * "synchronized" monitors.
336       *
337       * Using the first node of a list as a lock does not by itself
338       * suffice though: When a node is locked, any update must first
# Line 301 | Line 394 | public class ConcurrentHashMapV8<K, V>
394       * iterators in the same way.
395       *
396       * The table is resized when occupancy exceeds a percentage
397 <     * threshold (nominally, 0.75, but see below).  Only a single
398 <     * thread performs the resize (using field "sizeCtl", to arrange
399 <     * exclusion), but the table otherwise remains usable for reads
400 <     * and updates. Resizing proceeds by transferring bins, one by
401 <     * one, from the table to the next table.  Because we are using
402 <     * power-of-two expansion, the elements from each bin must either
403 <     * stay at same index, or move with a power of two offset. We
404 <     * eliminate unnecessary node creation by catching cases where old
405 <     * nodes can be reused because their next fields won't change.  On
406 <     * average, only about one-sixth of them need cloning when a table
407 <     * doubles. The nodes they replace will be garbage collectable as
408 <     * soon as they are no longer referenced by any reader thread that
409 <     * may be in the midst of concurrently traversing table.  Upon
410 <     * transfer, the old table bin contains only a special forwarding
411 <     * node (with hash field "MOVED") that contains the next table as
412 <     * its key. On encountering a forwarding node, access and update
413 <     * operations restart, using the new table.
414 <     *
415 <     * Each bin transfer requires its bin lock. However, unlike other
416 <     * cases, a transfer can skip a bin if it fails to acquire its
417 <     * lock, and revisit it later (unless it is a TreeBin). Method
418 <     * rebuild maintains a buffer of TRANSFER_BUFFER_SIZE bins that
419 <     * have been skipped because of failure to acquire a lock, and
420 <     * blocks only if none are available (i.e., only very rarely).
421 <     * The transfer operation must also ensure that all accessible
422 <     * bins in both the old and new table are usable by any traversal.
423 <     * When there are no lock acquisition failures, this is arranged
424 <     * simply by proceeding from the last bin (table.length - 1) up
425 <     * towards the first.  Upon seeing a forwarding node, traversals
426 <     * (see class Iter) arrange to move to the new table
427 <     * without revisiting nodes.  However, when any node is skipped
428 <     * during a transfer, all earlier table bins may have become
429 <     * visible, so are initialized with a reverse-forwarding node back
430 <     * to the old table until the new ones are established. (This
431 <     * sometimes requires transiently locking a forwarding node, which
432 <     * is possible under the above encoding.) These more expensive
433 <     * mechanics trigger only when necessary.
397 >     * threshold (nominally, 0.75, but see below).  Any thread
398 >     * noticing an overfull bin may assist in resizing after the
399 >     * initiating thread allocates and sets up the replacement
400 >     * array. However, rather than stalling, these other threads may
401 >     * proceed with insertions etc.  The use of TreeBins shields us
402 >     * from the worst case effects of overfilling while resizes are in
403 >     * progress.  Resizing proceeds by transferring bins, one by one,
404 >     * from the table to the next table. To enable concurrency, the
405 >     * next table must be (incrementally) prefilled with place-holders
406 >     * serving as reverse forwarders to the old table.  Because we are
407 >     * using power-of-two expansion, the elements from each bin must
408 >     * either stay at same index, or move with a power of two
409 >     * offset. We eliminate unnecessary node creation by catching
410 >     * cases where old nodes can be reused because their next fields
411 >     * won't change.  On average, only about one-sixth of them need
412 >     * cloning when a table doubles. The nodes they replace will be
413 >     * garbage collectable as soon as they are no longer referenced by
414 >     * any reader thread that may be in the midst of concurrently
415 >     * traversing table.  Upon transfer, the old table bin contains
416 >     * only a special forwarding node (with hash field "MOVED") that
417 >     * contains the next table as its key. On encountering a
418 >     * forwarding node, access and update operations restart, using
419 >     * the new table.
420 >     *
421 >     * Each bin transfer requires its bin lock, which can stall
422 >     * waiting for locks while resizing. However, because other
423 >     * threads can join in and help resize rather than contend for
424 >     * locks, average aggregate waits become shorter as resizing
425 >     * progresses.  The transfer operation must also ensure that all
426 >     * accessible bins in both the old and new table are usable by any
427 >     * traversal.  This is arranged by proceeding from the last bin
428 >     * (table.length - 1) up towards the first.  Upon seeing a
429 >     * forwarding node, traversals (see class Traverser) arrange to
430 >     * move to the new table without revisiting nodes.  However, to
431 >     * ensure that no intervening nodes are skipped, bin splitting can
432 >     * only begin after the associated reverse-forwarders are in
433 >     * place.
434       *
435       * The traversal scheme also applies to partial traversals of
436       * ranges of bins (via an alternate Traverser constructor)
# Line 352 | Line 445 | public class ConcurrentHashMapV8<K, V>
445       * These cases attempt to override the initial capacity settings,
446       * but harmlessly fail to take effect in cases of races.
447       *
448 <     * The element count is maintained using a LongAdder, which avoids
449 <     * contention on updates but can encounter cache thrashing if read
450 <     * too frequently during concurrent access. To avoid reading so
451 <     * often, resizing is attempted either when a bin lock is
452 <     * contended, or upon adding to a bin already holding two or more
453 <     * nodes (checked before adding in the xIfAbsent methods, after
454 <     * adding in others). Under uniform hash distributions, the
455 <     * probability of this occurring at threshold is around 13%,
456 <     * meaning that only about 1 in 8 puts check threshold (and after
457 <     * resizing, many fewer do so). But this approximation has high
458 <     * variance for small table sizes, so we check on any collision
459 <     * for sizes <= 64. The bulk putAll operation further reduces
460 <     * contention by only committing count updates upon these size
461 <     * checks.
448 >     * The element count is maintained using a specialization of
449 >     * LongAdder. We need to incorporate a specialization rather than
450 >     * just use a LongAdder in order to access implicit
451 >     * contention-sensing that leads to creation of multiple
452 >     * CounterCells.  The counter mechanics avoid contention on
453 >     * updates but can encounter cache thrashing if read too
454 >     * frequently during concurrent access. To avoid reading so often,
455 >     * resizing under contention is attempted only upon adding to a
456 >     * bin already holding two or more nodes. Under uniform hash
457 >     * distributions, the probability of this occurring at threshold
458 >     * is around 13%, meaning that only about 1 in 8 puts check
459 >     * threshold (and after resizing, many fewer do so). The bulk
460 >     * putAll operation further reduces contention by only committing
461 >     * count updates upon these size checks.
462       *
463       * Maintaining API and serialization compatibility with previous
464       * versions of this class introduces several oddities. Mainly: We
# Line 416 | Line 509 | public class ConcurrentHashMapV8<K, V>
509      private static final float LOAD_FACTOR = 0.75f;
510  
511      /**
419     * The buffer size for skipped bins during transfers. The
420     * value is arbitrary but should be large enough to avoid
421     * most locking stalls during resizes.
422     */
423    private static final int TRANSFER_BUFFER_SIZE = 32;
424
425    /**
512       * The bin count threshold for using a tree rather than list for a
513       * bin.  The value reflects the approximate break-even point for
514       * using tree-based operations.
515       */
516      private static final int TREE_THRESHOLD = 8;
517  
518 +    /**
519 +     * Minimum number of rebinnings per transfer step. Ranges are
520 +     * subdivided to allow multiple resizer threads.  This value
521 +     * serves as a lower bound to avoid resizers encountering
522 +     * excessive memory contention.  The value should be at least
523 +     * DEFAULT_CAPACITY.
524 +     */
525 +    private static final int MIN_TRANSFER_STRIDE = 16;
526 +
527      /*
528 <     * Encodings for special uses of Node hash fields. See above for
434 <     * explanation.
528 >     * Encodings for Node hash fields. See above for explanation.
529       */
530      static final int MOVED     = 0x80000000; // hash field for forwarding nodes
531 <    static final int LOCKED    = 0x40000000; // set/tested only as a bit
532 <    static final int WAITING   = 0xc0000000; // both bits set/tested together
533 <    static final int HASH_BITS = 0x3fffffff; // usable bits of normal node hash
531 >    static final int HASH_BITS = 0x7fffffff; // usable bits of normal node hash
532 >
533 >    /** Number of CPUS, to place bounds on some sizings */
534 >    static final int NCPU = Runtime.getRuntime().availableProcessors();
535 >
536 >    /* ---------------- Counters -------------- */
537 >
538 >    // Adapted from LongAdder and Striped64.
539 >    // See their internal docs for explanation.
540 >
541 >    // A padded cell for distributing counts
542 >    static final class CounterCell {
543 >        volatile long p0, p1, p2, p3, p4, p5, p6;
544 >        volatile long value;
545 >        volatile long q0, q1, q2, q3, q4, q5, q6;
546 >        CounterCell(long x) { value = x; }
547 >    }
548 >
549 >    /**
550 >     * Holder for the thread-local hash code determining which
551 >     * CounterCell to use. The code is initialized via the
552 >     * counterHashCodeGenerator, but may be moved upon collisions.
553 >     */
554 >    static final class CounterHashCode {
555 >        int code;
556 >    }
557 >
558 >    /**
559 >     * Generates initial value for per-thread CounterHashCodes
560 >     */
561 >    static final AtomicInteger counterHashCodeGenerator = new AtomicInteger();
562 >
563 >    /**
564 >     * Increment for counterHashCodeGenerator. See class ThreadLocal
565 >     * for explanation.
566 >     */
567 >    static final int SEED_INCREMENT = 0x61c88647;
568 >
569 >    /**
570 >     * Per-thread counter hash codes. Shared across all instances
571 >     */
572 >    static final ThreadLocal<CounterHashCode> threadCounterHashCode =
573 >        new ThreadLocal<CounterHashCode>();
574  
575      /* ---------------- Fields -------------- */
576  
# Line 444 | Line 578 | public class ConcurrentHashMapV8<K, V>
578       * The array of bins. Lazily initialized upon first insertion.
579       * Size is always a power of two. Accessed directly by iterators.
580       */
581 <    transient volatile Node[] table;
581 >    transient volatile Node<V>[] table;
582  
583      /**
584 <     * The counter maintaining number of elements.
584 >     * The next table to use; non-null only while resizing.
585       */
586 <    private transient final LongAdder counter;
586 >    private transient volatile Node<V>[] nextTable;
587 >
588 >    /**
589 >     * Base counter value, used mainly when there is no contention,
590 >     * but also as a fallback during table initialization
591 >     * races. Updated via CAS.
592 >     */
593 >    private transient volatile long baseCount;
594  
595      /**
596       * Table initialization and resizing control.  When negative, the
597 <     * table is being initialized or resized. Otherwise, when table is
598 <     * null, holds the initial table size to use upon creation, or 0
599 <     * for default. After initialization, holds the next element count
600 <     * value upon which to resize the table.
597 >     * table is being initialized or resized: -1 for initialization,
598 >     * else -(1 + the number of active resizing threads).  Otherwise,
599 >     * when table is null, holds the initial table size to use upon
600 >     * creation, or 0 for default. After initialization, holds the
601 >     * next element count value upon which to resize the table.
602       */
603      private transient volatile int sizeCtl;
604  
605 +    /**
606 +     * The next table index (plus one) to split while resizing.
607 +     */
608 +    private transient volatile int transferIndex;
609 +
610 +    /**
611 +     * The least available table index to split while resizing.
612 +     */
613 +    private transient volatile int transferOrigin;
614 +
615 +    /**
616 +     * Spinlock (locked via CAS) used when resizing and/or creating Cells.
617 +     */
618 +    private transient volatile int counterBusy;
619 +
620 +    /**
621 +     * Table of counter cells. When non-null, size is a power of 2.
622 +     */
623 +    private transient volatile CounterCell[] counterCells;
624 +
625      // views
626 <    private transient KeySet<K,V> keySet;
627 <    private transient Values<K,V> values;
628 <    private transient EntrySet<K,V> entrySet;
626 >    private transient KeySetView<K,V> keySet;
627 >    private transient ValuesView<K,V> values;
628 >    private transient EntrySetView<K,V> entrySet;
629  
630      /** For serialization compatibility. Null unless serialized; see below */
631      private Segment<K,V>[] segments;
# Line 482 | Line 644 | public class ConcurrentHashMapV8<K, V>
644       * inline assignments below.
645       */
646  
647 <    static final Node tabAt(Node[] tab, int i) { // used by Iter
648 <        return (Node)UNSAFE.getObjectVolatile(tab, ((long)i<<ASHIFT)+ABASE);
647 >    @SuppressWarnings("unchecked") static final <V> Node<V> tabAt
648 >        (Node<V>[] tab, int i) { // used by Traverser
649 >        return (Node<V>)U.getObjectVolatile(tab, ((long)i << ASHIFT) + ABASE);
650      }
651  
652 <    private static final boolean casTabAt(Node[] tab, int i, Node c, Node v) {
653 <        return UNSAFE.compareAndSwapObject(tab, ((long)i<<ASHIFT)+ABASE, c, v);
652 >    private static final <V> boolean casTabAt
653 >        (Node<V>[] tab, int i, Node<V> c, Node<V> v) {
654 >        return U.compareAndSwapObject(tab, ((long)i << ASHIFT) + ABASE, c, v);
655      }
656  
657 <    private static final void setTabAt(Node[] tab, int i, Node v) {
658 <        UNSAFE.putObjectVolatile(tab, ((long)i<<ASHIFT)+ABASE, v);
657 >    private static final <V> void setTabAt
658 >        (Node<V>[] tab, int i, Node<V> v) {
659 >        U.putObjectVolatile(tab, ((long)i << ASHIFT) + ABASE, v);
660      }
661  
662      /* ---------------- Nodes -------------- */
# Line 506 | Line 671 | public class ConcurrentHashMapV8<K, V>
671       * before a val, but can only be used after checking val to be
672       * non-null.
673       */
674 <    static class Node {
675 <        volatile int hash;
674 >    static class Node<V> {
675 >        final int hash;
676          final Object key;
677 <        volatile Object val;
678 <        volatile Node next;
677 >        volatile V val;
678 >        volatile Node<V> next;
679  
680 <        Node(int hash, Object key, Object val, Node next) {
680 >        Node(int hash, Object key, V val, Node<V> next) {
681              this.hash = hash;
682              this.key = key;
683              this.val = val;
684              this.next = next;
685          }
521
522        /** CompareAndSet the hash field */
523        final boolean casHash(int cmp, int val) {
524            return UNSAFE.compareAndSwapInt(this, hashOffset, cmp, val);
525        }
526
527        /** The number of spins before blocking for a lock */
528        static final int MAX_SPINS =
529            Runtime.getRuntime().availableProcessors() > 1 ? 64 : 1;
530
531        /**
532         * Spins a while if LOCKED bit set and this node is the first
533         * of its bin, and then sets WAITING bits on hash field and
534         * blocks (once) if they are still set.  It is OK for this
535         * method to return even if lock is not available upon exit,
536         * which enables these simple single-wait mechanics.
537         *
538         * The corresponding signalling operation is performed within
539         * callers: Upon detecting that WAITING has been set when
540         * unlocking lock (via a failed CAS from non-waiting LOCKED
541         * state), unlockers acquire the sync lock and perform a
542         * notifyAll.
543         *
544         * The initial sanity check on tab and bounds is not currently
545         * necessary in the only usages of this method, but enables
546         * use in other future contexts.
547         */
548        final void tryAwaitLock(Node[] tab, int i) {
549            if (tab != null && i >= 0 && i < tab.length) { // sanity check
550                int r = ThreadLocalRandom.current().nextInt(); // randomize spins
551                int spins = MAX_SPINS, h;
552                while (tabAt(tab, i) == this && ((h = hash) & LOCKED) != 0) {
553                    if (spins >= 0) {
554                        r ^= r << 1; r ^= r >>> 3; r ^= r << 10; // xorshift
555                        if (r >= 0 && --spins == 0)
556                            Thread.yield();  // yield before block
557                    }
558                    else if (casHash(h, h | WAITING)) {
559                        synchronized (this) {
560                            if (tabAt(tab, i) == this &&
561                                (hash & WAITING) == WAITING) {
562                                try {
563                                    wait();
564                                } catch (InterruptedException ie) {
565                                    Thread.currentThread().interrupt();
566                                }
567                            }
568                            else
569                                notifyAll(); // possibly won race vs signaller
570                        }
571                        break;
572                    }
573                }
574            }
575        }
576
577        // Unsafe mechanics for casHash
578        private static final sun.misc.Unsafe UNSAFE;
579        private static final long hashOffset;
580
581        static {
582            try {
583                UNSAFE = getUnsafe();
584                Class<?> k = Node.class;
585                hashOffset = UNSAFE.objectFieldOffset
586                    (k.getDeclaredField("hash"));
587            } catch (Exception e) {
588                throw new Error(e);
589            }
590        }
686      }
687  
688      /* ---------------- TreeBins -------------- */
# Line 595 | Line 690 | public class ConcurrentHashMapV8<K, V>
690      /**
691       * Nodes for use in TreeBins
692       */
693 <    static final class TreeNode extends Node {
694 <        TreeNode parent;  // red-black tree links
695 <        TreeNode left;
696 <        TreeNode right;
697 <        TreeNode prev;    // needed to unlink next upon deletion
693 >    static final class TreeNode<V> extends Node<V> {
694 >        TreeNode<V> parent;  // red-black tree links
695 >        TreeNode<V> left;
696 >        TreeNode<V> right;
697 >        TreeNode<V> prev;    // needed to unlink next upon deletion
698          boolean red;
699  
700 <        TreeNode(int hash, Object key, Object val, Node next, TreeNode parent) {
700 >        TreeNode(int hash, Object key, V val, Node<V> next, TreeNode<V> parent) {
701              super(hash, key, val, next);
702              this.parent = parent;
703          }
# Line 651 | Line 746 | public class ConcurrentHashMapV8<K, V>
746       * and writers. Since we don't need to export full Lock API, we
747       * just override the minimal AQS methods and use them directly.
748       */
749 <    static final class TreeBin extends AbstractQueuedSynchronizer {
749 >    static final class TreeBin<V> extends AbstractQueuedSynchronizer {
750          private static final long serialVersionUID = 2249069246763182397L;
751 <        transient TreeNode root;  // root of tree
752 <        transient TreeNode first; // head of next-pointer list
751 >        transient TreeNode<V> root;  // root of tree
752 >        transient TreeNode<V> first; // head of next-pointer list
753  
754          /* AQS overrides */
755          public final boolean isHeldExclusively() { return getState() > 0; }
# Line 685 | Line 780 | public class ConcurrentHashMapV8<K, V>
780          }
781  
782          /** From CLR */
783 <        private void rotateLeft(TreeNode p) {
783 >        private void rotateLeft(TreeNode<V> p) {
784              if (p != null) {
785 <                TreeNode r = p.right, pp, rl;
785 >                TreeNode<V> r = p.right, pp, rl;
786                  if ((rl = p.right = r.left) != null)
787                      rl.parent = p;
788                  if ((pp = r.parent = p.parent) == null)
# Line 702 | Line 797 | public class ConcurrentHashMapV8<K, V>
797          }
798  
799          /** From CLR */
800 <        private void rotateRight(TreeNode p) {
800 >        private void rotateRight(TreeNode<V> p) {
801              if (p != null) {
802 <                TreeNode l = p.left, pp, lr;
802 >                TreeNode<V> l = p.left, pp, lr;
803                  if ((lr = p.left = l.right) != null)
804                      lr.parent = p;
805                  if ((pp = l.parent = p.parent) == null)
# Line 722 | Line 817 | public class ConcurrentHashMapV8<K, V>
817           * Returns the TreeNode (or null if not found) for the given key
818           * starting at given root.
819           */
820 <        @SuppressWarnings("unchecked") final TreeNode getTreeNode
821 <            (int h, Object k, TreeNode p) {
820 >        @SuppressWarnings("unchecked") final TreeNode<V> getTreeNode
821 >            (int h, Object k, TreeNode<V> p) {
822              Class<?> c = k.getClass();
823              while (p != null) {
824                  int dir, ph;  Object pk; Class<?> pc;
# Line 733 | Line 828 | public class ConcurrentHashMapV8<K, V>
828                      if (c != (pc = pk.getClass()) ||
829                          !(k instanceof Comparable) ||
830                          (dir = ((Comparable)k).compareTo((Comparable)pk)) == 0) {
831 <                        dir = (c == pc) ? 0 : c.getName().compareTo(pc.getName());
832 <                        TreeNode r = null, s = null, pl, pr;
833 <                        if (dir >= 0) {
834 <                            if ((pl = p.left) != null && h <= pl.hash)
835 <                                s = pl;
831 >                        if ((dir = (c == pc) ? 0 :
832 >                             c.getName().compareTo(pc.getName())) == 0) {
833 >                            TreeNode<V> r = null, pl, pr; // check both sides
834 >                            if ((pr = p.right) != null && h >= pr.hash &&
835 >                                (r = getTreeNode(h, k, pr)) != null)
836 >                                return r;
837 >                            else if ((pl = p.left) != null && h <= pl.hash)
838 >                                dir = -1;
839 >                            else // nothing there
840 >                                return null;
841                          }
742                        else if ((pr = p.right) != null && h >= pr.hash)
743                            s = pr;
744                        if (s != null && (r = getTreeNode(h, k, s)) != null)
745                            return r;
842                      }
843                  }
844                  else
# Line 757 | Line 853 | public class ConcurrentHashMapV8<K, V>
853           * read-lock to call getTreeNode, but during failure to get
854           * lock, searches along next links.
855           */
856 <        final Object getValue(int h, Object k) {
857 <            Node r = null;
856 >        final V getValue(int h, Object k) {
857 >            Node<V> r = null;
858              int c = getState(); // Must read lock state first
859 <            for (Node e = first; e != null; e = e.next) {
859 >            for (Node<V> e = first; e != null; e = e.next) {
860                  if (c <= 0 && compareAndSetState(c, c - 1)) {
861                      try {
862                          r = getTreeNode(h, k, root);
# Line 769 | Line 865 | public class ConcurrentHashMapV8<K, V>
865                      }
866                      break;
867                  }
868 <                else if ((e.hash & HASH_BITS) == h && k.equals(e.key)) {
868 >                else if (e.hash == h && k.equals(e.key)) {
869                      r = e;
870                      break;
871                  }
# Line 783 | Line 879 | public class ConcurrentHashMapV8<K, V>
879           * Finds or adds a node.
880           * @return null if added
881           */
882 <        @SuppressWarnings("unchecked") final TreeNode putTreeNode
883 <            (int h, Object k, Object v) {
882 >        @SuppressWarnings("unchecked") final TreeNode<V> putTreeNode
883 >            (int h, Object k, V v) {
884              Class<?> c = k.getClass();
885 <            TreeNode pp = root, p = null;
885 >            TreeNode<V> pp = root, p = null;
886              int dir = 0;
887              while (pp != null) { // find existing node or leaf to insert at
888                  int ph;  Object pk; Class<?> pc;
# Line 797 | Line 893 | public class ConcurrentHashMapV8<K, V>
893                      if (c != (pc = pk.getClass()) ||
894                          !(k instanceof Comparable) ||
895                          (dir = ((Comparable)k).compareTo((Comparable)pk)) == 0) {
896 <                        dir = (c == pc) ? 0 : c.getName().compareTo(pc.getName());
897 <                        TreeNode r = null, s = null, pl, pr;
898 <                        if (dir >= 0) {
899 <                            if ((pl = p.left) != null && h <= pl.hash)
900 <                                s = pl;
896 >                        TreeNode<V> s = null, r = null, pr;
897 >                        if ((dir = (c == pc) ? 0 :
898 >                             c.getName().compareTo(pc.getName())) == 0) {
899 >                            if ((pr = p.right) != null && h >= pr.hash &&
900 >                                (r = getTreeNode(h, k, pr)) != null)
901 >                                return r;
902 >                            else // continue left
903 >                                dir = -1;
904                          }
905                          else if ((pr = p.right) != null && h >= pr.hash)
906                              s = pr;
# Line 814 | Line 913 | public class ConcurrentHashMapV8<K, V>
913                  pp = (dir > 0) ? p.right : p.left;
914              }
915  
916 <            TreeNode f = first;
917 <            TreeNode x = first = new TreeNode(h, k, v, f, p);
916 >            TreeNode<V> f = first;
917 >            TreeNode<V> x = first = new TreeNode<V>(h, k, v, f, p);
918              if (p == null)
919                  root = x;
920              else { // attach and rebalance; adapted from CLR
921 <                TreeNode xp, xpp;
921 >                TreeNode<V> xp, xpp;
922                  if (f != null)
923                      f.prev = x;
924                  if (dir <= 0)
# Line 829 | Line 928 | public class ConcurrentHashMapV8<K, V>
928                  x.red = true;
929                  while (x != null && (xp = x.parent) != null && xp.red &&
930                         (xpp = xp.parent) != null) {
931 <                    TreeNode xppl = xpp.left;
931 >                    TreeNode<V> xppl = xpp.left;
932                      if (xp == xppl) {
933 <                        TreeNode y = xpp.right;
933 >                        TreeNode<V> y = xpp.right;
934                          if (y != null && y.red) {
935                              y.red = false;
936                              xp.red = false;
# Line 853 | Line 952 | public class ConcurrentHashMapV8<K, V>
952                          }
953                      }
954                      else {
955 <                        TreeNode y = xppl;
955 >                        TreeNode<V> y = xppl;
956                          if (y != null && y.red) {
957                              y.red = false;
958                              xp.red = false;
# Line 875 | Line 974 | public class ConcurrentHashMapV8<K, V>
974                          }
975                      }
976                  }
977 <                TreeNode r = root;
977 >                TreeNode<V> r = root;
978                  if (r != null && r.red)
979                      r.red = false;
980              }
# Line 890 | Line 989 | public class ConcurrentHashMapV8<K, V>
989           * that are accessible independently of lock. So instead we
990           * swap the tree linkages.
991           */
992 <        final void deleteTreeNode(TreeNode p) {
993 <            TreeNode next = (TreeNode)p.next; // unlink traversal pointers
994 <            TreeNode pred = p.prev;
992 >        final void deleteTreeNode(TreeNode<V> p) {
993 >            TreeNode<V> next = (TreeNode<V>)p.next; // unlink traversal pointers
994 >            TreeNode<V> pred = p.prev;
995              if (pred == null)
996                  first = next;
997              else
998                  pred.next = next;
999              if (next != null)
1000                  next.prev = pred;
1001 <            TreeNode replacement;
1002 <            TreeNode pl = p.left;
1003 <            TreeNode pr = p.right;
1001 >            TreeNode<V> replacement;
1002 >            TreeNode<V> pl = p.left;
1003 >            TreeNode<V> pr = p.right;
1004              if (pl != null && pr != null) {
1005 <                TreeNode s = pr, sl;
1005 >                TreeNode<V> s = pr, sl;
1006                  while ((sl = s.left) != null) // find successor
1007                      s = sl;
1008                  boolean c = s.red; s.red = p.red; p.red = c; // swap colors
1009 <                TreeNode sr = s.right;
1010 <                TreeNode pp = p.parent;
1009 >                TreeNode<V> sr = s.right;
1010 >                TreeNode<V> pp = p.parent;
1011                  if (s == pr) { // p was s's direct parent
1012                      p.parent = s;
1013                      s.right = p;
1014                  }
1015                  else {
1016 <                    TreeNode sp = s.parent;
1016 >                    TreeNode<V> sp = s.parent;
1017                      if ((p.parent = sp) != null) {
1018                          if (s == sp.left)
1019                              sp.left = p;
# Line 939 | Line 1038 | public class ConcurrentHashMapV8<K, V>
1038              }
1039              else
1040                  replacement = (pl != null) ? pl : pr;
1041 <            TreeNode pp = p.parent;
1041 >            TreeNode<V> pp = p.parent;
1042              if (replacement == null) {
1043                  if (pp == null) {
1044                      root = null;
# Line 958 | Line 1057 | public class ConcurrentHashMapV8<K, V>
1057                  p.left = p.right = p.parent = null;
1058              }
1059              if (!p.red) { // rebalance, from CLR
1060 <                TreeNode x = replacement;
1060 >                TreeNode<V> x = replacement;
1061                  while (x != null) {
1062 <                    TreeNode xp, xpl;
1062 >                    TreeNode<V> xp, xpl;
1063                      if (x.red || (xp = x.parent) == null) {
1064                          x.red = false;
1065                          break;
1066                      }
1067                      if (x == (xpl = xp.left)) {
1068 <                        TreeNode sib = xp.right;
1068 >                        TreeNode<V> sib = xp.right;
1069                          if (sib != null && sib.red) {
1070                              sib.red = false;
1071                              xp.red = true;
# Line 976 | Line 1075 | public class ConcurrentHashMapV8<K, V>
1075                          if (sib == null)
1076                              x = xp;
1077                          else {
1078 <                            TreeNode sl = sib.left, sr = sib.right;
1078 >                            TreeNode<V> sl = sib.left, sr = sib.right;
1079                              if ((sr == null || !sr.red) &&
1080                                  (sl == null || !sl.red)) {
1081                                  sib.red = true;
# Line 988 | Line 1087 | public class ConcurrentHashMapV8<K, V>
1087                                          sl.red = false;
1088                                      sib.red = true;
1089                                      rotateRight(sib);
1090 <                                    sib = (xp = x.parent) == null ? null : xp.right;
1090 >                                    sib = (xp = x.parent) == null ?
1091 >                                        null : xp.right;
1092                                  }
1093                                  if (sib != null) {
1094                                      sib.red = (xp == null) ? false : xp.red;
# Line 1004 | Line 1104 | public class ConcurrentHashMapV8<K, V>
1104                          }
1105                      }
1106                      else { // symmetric
1107 <                        TreeNode sib = xpl;
1107 >                        TreeNode<V> sib = xpl;
1108                          if (sib != null && sib.red) {
1109                              sib.red = false;
1110                              xp.red = true;
# Line 1014 | Line 1114 | public class ConcurrentHashMapV8<K, V>
1114                          if (sib == null)
1115                              x = xp;
1116                          else {
1117 <                            TreeNode sl = sib.left, sr = sib.right;
1117 >                            TreeNode<V> sl = sib.left, sr = sib.right;
1118                              if ((sl == null || !sl.red) &&
1119                                  (sr == null || !sr.red)) {
1120                                  sib.red = true;
# Line 1026 | Line 1126 | public class ConcurrentHashMapV8<K, V>
1126                                          sr.red = false;
1127                                      sib.red = true;
1128                                      rotateLeft(sib);
1129 <                                    sib = (xp = x.parent) == null ? null : xp.left;
1129 >                                    sib = (xp = x.parent) == null ?
1130 >                                        null : xp.left;
1131                                  }
1132                                  if (sib != null) {
1133                                      sib.red = (xp == null) ? false : xp.red;
# Line 1056 | Line 1157 | public class ConcurrentHashMapV8<K, V>
1157      /* ---------------- Collision reduction methods -------------- */
1158  
1159      /**
1160 <     * Spreads higher bits to lower, and also forces top 2 bits to 0.
1160 >     * Spreads higher bits to lower, and also forces top bit to 0.
1161       * Because the table uses power-of-two masking, sets of hashes
1162       * that vary only in bits above the current mask will always
1163       * collide. (Among known examples are sets of Float keys holding
# Line 1074 | Line 1175 | public class ConcurrentHashMapV8<K, V>
1175      }
1176  
1177      /**
1178 <     * Replaces a list bin with a tree bin. Call only when locked.
1179 <     * Fails to replace if the given key is non-comparable or table
1180 <     * is, or needs, resizing.
1181 <     */
1182 <    private final void replaceWithTreeBin(Node[] tab, int index, Object key) {
1183 <        if ((key instanceof Comparable) &&
1184 <            (tab.length >= MAXIMUM_CAPACITY || counter.sum() < (long)sizeCtl)) {
1185 <            TreeBin t = new TreeBin();
1186 <            for (Node e = tabAt(tab, index); e != null; e = e.next)
1086 <                t.putTreeNode(e.hash & HASH_BITS, e.key, e.val);
1087 <            setTabAt(tab, index, new Node(MOVED, t, null, null));
1178 >     * Replaces a list bin with a tree bin if key is comparable.  Call
1179 >     * only when locked.
1180 >     */
1181 >    private final void replaceWithTreeBin(Node<V>[] tab, int index, Object key) {
1182 >        if (key instanceof Comparable) {
1183 >            TreeBin<V> t = new TreeBin<V>();
1184 >            for (Node<V> e = tabAt(tab, index); e != null; e = e.next)
1185 >                t.putTreeNode(e.hash, e.key, e.val);
1186 >            setTabAt(tab, index, new Node<V>(MOVED, t, null, null));
1187          }
1188      }
1189  
1190      /* ---------------- Internal access and update methods -------------- */
1191  
1192      /** Implementation for get and containsKey */
1193 <    private final Object internalGet(Object k) {
1193 >    @SuppressWarnings("unchecked") private final V internalGet(Object k) {
1194          int h = spread(k.hashCode());
1195 <        retry: for (Node[] tab = table; tab != null;) {
1196 <            Node e, p; Object ek, ev; int eh;      // locals to read fields once
1195 >        retry: for (Node<V>[] tab = table; tab != null;) {
1196 >            Node<V> e; Object ek; V ev; int eh; // locals to read fields once
1197              for (e = tabAt(tab, (tab.length - 1) & h); e != null; e = e.next) {
1198 <                if ((eh = e.hash) == MOVED) {
1198 >                if ((eh = e.hash) < 0) {
1199                      if ((ek = e.key) instanceof TreeBin)  // search TreeBin
1200 <                        return ((TreeBin)ek).getValue(h, k);
1201 <                    else {                        // restart with new table
1202 <                        tab = (Node[])ek;
1200 >                        return ((TreeBin<V>)ek).getValue(h, k);
1201 >                    else {                      // restart with new table
1202 >                        tab = (Node<V>[])ek;
1203                          continue retry;
1204                      }
1205                  }
1206 <                else if ((eh & HASH_BITS) == h && (ev = e.val) != null &&
1206 >                else if (eh == h && (ev = e.val) != null &&
1207                           ((ek = e.key) == k || k.equals(ek)))
1208                      return ev;
1209              }
# Line 1118 | Line 1217 | public class ConcurrentHashMapV8<K, V>
1217       * Replaces node value with v, conditional upon match of cv if
1218       * non-null.  If resulting value is null, delete.
1219       */
1220 <    private final Object internalReplace(Object k, Object v, Object cv) {
1220 >    @SuppressWarnings("unchecked") private final V internalReplace
1221 >        (Object k, V v, Object cv) {
1222          int h = spread(k.hashCode());
1223 <        Object oldVal = null;
1224 <        for (Node[] tab = table;;) {
1225 <            Node f; int i, fh; Object fk;
1223 >        V oldVal = null;
1224 >        for (Node<V>[] tab = table;;) {
1225 >            Node<V> f; int i, fh; Object fk;
1226              if (tab == null ||
1227                  (f = tabAt(tab, i = (tab.length - 1) & h)) == null)
1228                  break;
1229 <            else if ((fh = f.hash) == MOVED) {
1229 >            else if ((fh = f.hash) < 0) {
1230                  if ((fk = f.key) instanceof TreeBin) {
1231 <                    TreeBin t = (TreeBin)fk;
1231 >                    TreeBin<V> t = (TreeBin<V>)fk;
1232                      boolean validated = false;
1233                      boolean deleted = false;
1234                      t.acquire(0);
1235                      try {
1236                          if (tabAt(tab, i) == f) {
1237                              validated = true;
1238 <                            TreeNode p = t.getTreeNode(h, k, t.root);
1238 >                            TreeNode<V> p = t.getTreeNode(h, k, t.root);
1239                              if (p != null) {
1240 <                                Object pv = p.val;
1240 >                                V pv = p.val;
1241                                  if (cv == null || cv == pv || cv.equals(pv)) {
1242                                      oldVal = pv;
1243                                      if ((p.val = v) == null) {
# Line 1152 | Line 1252 | public class ConcurrentHashMapV8<K, V>
1252                      }
1253                      if (validated) {
1254                          if (deleted)
1255 <                            counter.add(-1L);
1255 >                            addCount(-1L, -1);
1256                          break;
1257                      }
1258                  }
1259                  else
1260 <                    tab = (Node[])fk;
1260 >                    tab = (Node<V>[])fk;
1261              }
1262 <            else if ((fh & HASH_BITS) != h && f.next == null) // precheck
1262 >            else if (fh != h && f.next == null) // precheck
1263                  break;                          // rules out possible existence
1264 <            else if ((fh & LOCKED) != 0) {
1165 <                checkForResize();               // try resizing if can't get lock
1166 <                f.tryAwaitLock(tab, i);
1167 <            }
1168 <            else if (f.casHash(fh, fh | LOCKED)) {
1264 >            else {
1265                  boolean validated = false;
1266                  boolean deleted = false;
1267 <                try {
1267 >                synchronized (f) {
1268                      if (tabAt(tab, i) == f) {
1269                          validated = true;
1270 <                        for (Node e = f, pred = null;;) {
1271 <                            Object ek, ev;
1272 <                            if ((e.hash & HASH_BITS) == h &&
1270 >                        for (Node<V> e = f, pred = null;;) {
1271 >                            Object ek; V ev;
1272 >                            if (e.hash == h &&
1273                                  ((ev = e.val) != null) &&
1274                                  ((ek = e.key) == k || k.equals(ek))) {
1275                                  if (cv == null || cv == ev || cv.equals(ev)) {
1276                                      oldVal = ev;
1277                                      if ((e.val = v) == null) {
1278                                          deleted = true;
1279 <                                        Node en = e.next;
1279 >                                        Node<V> en = e.next;
1280                                          if (pred != null)
1281                                              pred.next = en;
1282                                          else
# Line 1194 | Line 1290 | public class ConcurrentHashMapV8<K, V>
1290                                  break;
1291                          }
1292                      }
1197                } finally {
1198                    if (!f.casHash(fh | LOCKED, fh)) {
1199                        f.hash = fh;
1200                        synchronized (f) { f.notifyAll(); };
1201                    }
1293                  }
1294                  if (validated) {
1295                      if (deleted)
1296 <                        counter.add(-1L);
1296 >                        addCount(-1L, -1);
1297                      break;
1298                  }
1299              }
# Line 1211 | Line 1302 | public class ConcurrentHashMapV8<K, V>
1302      }
1303  
1304      /*
1305 <     * Internal versions of the six insertion methods, each a
1306 <     * little more complicated than the last. All have
1216 <     * the same basic structure as the first (internalPut):
1305 >     * Internal versions of insertion methods
1306 >     * All have the same basic structure as the first (internalPut):
1307       *  1. If table uninitialized, create
1308       *  2. If bin empty, try to CAS new node
1309       *  3. If bin stale, use new table
1310       *  4. if bin converted to TreeBin, validate and relay to TreeBin methods
1311       *  5. Lock and validate; if valid, scan and add or update
1312       *
1313 <     * The others interweave other checks and/or alternative actions:
1314 <     *  * Plain put checks for and performs resize after insertion.
1315 <     *  * putIfAbsent prescans for mapping without lock (and fails to add
1316 <     *    if present), which also makes pre-emptive resize checks worthwhile.
1317 <     *  * computeIfAbsent extends form used in putIfAbsent with additional
1318 <     *    mechanics to deal with, calls, potential exceptions and null
1319 <     *    returns from function call.
1230 <     *  * compute uses the same function-call mechanics, but without
1231 <     *    the prescans
1232 <     *  * merge acts as putIfAbsent in the absent case, but invokes the
1233 <     *    update function if present
1234 <     *  * putAll attempts to pre-allocate enough table space
1235 <     *    and more lazily performs count updates and checks.
1236 <     *
1237 <     * Someday when details settle down a bit more, it might be worth
1238 <     * some factoring to reduce sprawl.
1313 >     * The putAll method differs mainly in attempting to pre-allocate
1314 >     * enough table space, and also more lazily performs count updates
1315 >     * and checks.
1316 >     *
1317 >     * Most of the function-accepting methods can't be factored nicely
1318 >     * because they require different functional forms, so instead
1319 >     * sprawl out similar mechanics.
1320       */
1321  
1322 <    /** Implementation for put */
1323 <    private final Object internalPut(Object k, Object v) {
1322 >    /** Implementation for put and putIfAbsent */
1323 >    @SuppressWarnings("unchecked") private final V internalPut
1324 >        (K k, V v, boolean onlyIfAbsent) {
1325 >        if (k == null || v == null) throw new NullPointerException();
1326          int h = spread(k.hashCode());
1327 <        int count = 0;
1328 <        for (Node[] tab = table;;) {
1329 <            int i; Node f; int fh; Object fk;
1327 >        int len = 0;
1328 >        for (Node<V>[] tab = table;;) {
1329 >            int i, fh; Node<V> f; Object fk; V fv;
1330              if (tab == null)
1331                  tab = initTable();
1332              else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1333 <                if (casTabAt(tab, i, null, new Node(h, k, v, null)))
1333 >                if (casTabAt(tab, i, null, new Node<V>(h, k, v, null)))
1334                      break;                   // no lock when adding to empty bin
1335              }
1336 <            else if ((fh = f.hash) == MOVED) {
1336 >            else if ((fh = f.hash) < 0) {
1337                  if ((fk = f.key) instanceof TreeBin) {
1338 <                    TreeBin t = (TreeBin)fk;
1339 <                    Object oldVal = null;
1338 >                    TreeBin<V> t = (TreeBin<V>)fk;
1339 >                    V oldVal = null;
1340                      t.acquire(0);
1341                      try {
1342                          if (tabAt(tab, i) == f) {
1343 <                            count = 2;
1344 <                            TreeNode p = t.putTreeNode(h, k, v);
1343 >                            len = 2;
1344 >                            TreeNode<V> p = t.putTreeNode(h, k, v);
1345                              if (p != null) {
1346                                  oldVal = p.val;
1347 <                                p.val = v;
1347 >                                if (!onlyIfAbsent)
1348 >                                    p.val = v;
1349                              }
1350                          }
1351                      } finally {
1352                          t.release(0);
1353                      }
1354 <                    if (count != 0) {
1354 >                    if (len != 0) {
1355                          if (oldVal != null)
1356                              return oldVal;
1357                          break;
1358                      }
1359                  }
1360                  else
1361 <                    tab = (Node[])fk;
1361 >                    tab = (Node<V>[])fk;
1362              }
1363 <            else if ((fh & LOCKED) != 0) {
1364 <                checkForResize();
1365 <                f.tryAwaitLock(tab, i);
1366 <            }
1367 <            else if (f.casHash(fh, fh | LOCKED)) {
1368 <                Object oldVal = null;
1285 <                try {                        // needed in case equals() throws
1363 >            else if (onlyIfAbsent && fh == h && (fv = f.val) != null &&
1364 >                     ((fk = f.key) == k || k.equals(fk))) // peek while nearby
1365 >                return fv;
1366 >            else {
1367 >                V oldVal = null;
1368 >                synchronized (f) {
1369                      if (tabAt(tab, i) == f) {
1370 <                        count = 1;
1371 <                        for (Node e = f;; ++count) {
1372 <                            Object ek, ev;
1373 <                            if ((e.hash & HASH_BITS) == h &&
1370 >                        len = 1;
1371 >                        for (Node<V> e = f;; ++len) {
1372 >                            Object ek; V ev;
1373 >                            if (e.hash == h &&
1374                                  (ev = e.val) != null &&
1375                                  ((ek = e.key) == k || k.equals(ek))) {
1376                                  oldVal = ev;
1377 <                                e.val = v;
1377 >                                if (!onlyIfAbsent)
1378 >                                    e.val = v;
1379                                  break;
1380                              }
1381 <                            Node last = e;
1381 >                            Node<V> last = e;
1382                              if ((e = e.next) == null) {
1383 <                                last.next = new Node(h, k, v, null);
1384 <                                if (count >= TREE_THRESHOLD)
1383 >                                last.next = new Node<V>(h, k, v, null);
1384 >                                if (len >= TREE_THRESHOLD)
1385                                      replaceWithTreeBin(tab, i, k);
1386                                  break;
1387                              }
1388                          }
1389                      }
1306                } finally {                  // unlock and signal if needed
1307                    if (!f.casHash(fh | LOCKED, fh)) {
1308                        f.hash = fh;
1309                        synchronized (f) { f.notifyAll(); };
1310                    }
1390                  }
1391 <                if (count != 0) {
1391 >                if (len != 0) {
1392                      if (oldVal != null)
1393                          return oldVal;
1315                    if (tab.length <= 64)
1316                        count = 2;
1394                      break;
1395                  }
1396              }
1397          }
1398 <        counter.add(1L);
1322 <        if (count > 1)
1323 <            checkForResize();
1324 <        return null;
1325 <    }
1326 <
1327 <    /** Implementation for putIfAbsent */
1328 <    private final Object internalPutIfAbsent(Object k, Object v) {
1329 <        int h = spread(k.hashCode());
1330 <        int count = 0;
1331 <        for (Node[] tab = table;;) {
1332 <            int i; Node f; int fh; Object fk, fv;
1333 <            if (tab == null)
1334 <                tab = initTable();
1335 <            else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1336 <                if (casTabAt(tab, i, null, new Node(h, k, v, null)))
1337 <                    break;
1338 <            }
1339 <            else if ((fh = f.hash) == MOVED) {
1340 <                if ((fk = f.key) instanceof TreeBin) {
1341 <                    TreeBin t = (TreeBin)fk;
1342 <                    Object oldVal = null;
1343 <                    t.acquire(0);
1344 <                    try {
1345 <                        if (tabAt(tab, i) == f) {
1346 <                            count = 2;
1347 <                            TreeNode p = t.putTreeNode(h, k, v);
1348 <                            if (p != null)
1349 <                                oldVal = p.val;
1350 <                        }
1351 <                    } finally {
1352 <                        t.release(0);
1353 <                    }
1354 <                    if (count != 0) {
1355 <                        if (oldVal != null)
1356 <                            return oldVal;
1357 <                        break;
1358 <                    }
1359 <                }
1360 <                else
1361 <                    tab = (Node[])fk;
1362 <            }
1363 <            else if ((fh & HASH_BITS) == h && (fv = f.val) != null &&
1364 <                     ((fk = f.key) == k || k.equals(fk)))
1365 <                return fv;
1366 <            else {
1367 <                Node g = f.next;
1368 <                if (g != null) { // at least 2 nodes -- search and maybe resize
1369 <                    for (Node e = g;;) {
1370 <                        Object ek, ev;
1371 <                        if ((e.hash & HASH_BITS) == h && (ev = e.val) != null &&
1372 <                            ((ek = e.key) == k || k.equals(ek)))
1373 <                            return ev;
1374 <                        if ((e = e.next) == null) {
1375 <                            checkForResize();
1376 <                            break;
1377 <                        }
1378 <                    }
1379 <                }
1380 <                if (((fh = f.hash) & LOCKED) != 0) {
1381 <                    checkForResize();
1382 <                    f.tryAwaitLock(tab, i);
1383 <                }
1384 <                else if (tabAt(tab, i) == f && f.casHash(fh, fh | LOCKED)) {
1385 <                    Object oldVal = null;
1386 <                    try {
1387 <                        if (tabAt(tab, i) == f) {
1388 <                            count = 1;
1389 <                            for (Node e = f;; ++count) {
1390 <                                Object ek, ev;
1391 <                                if ((e.hash & HASH_BITS) == h &&
1392 <                                    (ev = e.val) != null &&
1393 <                                    ((ek = e.key) == k || k.equals(ek))) {
1394 <                                    oldVal = ev;
1395 <                                    break;
1396 <                                }
1397 <                                Node last = e;
1398 <                                if ((e = e.next) == null) {
1399 <                                    last.next = new Node(h, k, v, null);
1400 <                                    if (count >= TREE_THRESHOLD)
1401 <                                        replaceWithTreeBin(tab, i, k);
1402 <                                    break;
1403 <                                }
1404 <                            }
1405 <                        }
1406 <                    } finally {
1407 <                        if (!f.casHash(fh | LOCKED, fh)) {
1408 <                            f.hash = fh;
1409 <                            synchronized (f) { f.notifyAll(); };
1410 <                        }
1411 <                    }
1412 <                    if (count != 0) {
1413 <                        if (oldVal != null)
1414 <                            return oldVal;
1415 <                        if (tab.length <= 64)
1416 <                            count = 2;
1417 <                        break;
1418 <                    }
1419 <                }
1420 <            }
1421 <        }
1422 <        counter.add(1L);
1423 <        if (count > 1)
1424 <            checkForResize();
1398 >        addCount(1L, len);
1399          return null;
1400      }
1401  
1402      /** Implementation for computeIfAbsent */
1403 <    private final Object internalComputeIfAbsent(K k,
1404 <                                                 Fun<? super K, ?> mf) {
1403 >    @SuppressWarnings("unchecked") private final V internalComputeIfAbsent
1404 >        (K k, Fun<? super K, ? extends V> mf) {
1405 >        if (k == null || mf == null)
1406 >            throw new NullPointerException();
1407          int h = spread(k.hashCode());
1408 <        Object val = null;
1409 <        int count = 0;
1410 <        for (Node[] tab = table;;) {
1411 <            Node f; int i, fh; Object fk, fv;
1408 >        V val = null;
1409 >        int len = 0;
1410 >        for (Node<V>[] tab = table;;) {
1411 >            Node<V> f; int i; Object fk;
1412              if (tab == null)
1413                  tab = initTable();
1414              else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1415 <                Node node = new Node(fh = h | LOCKED, k, null, null);
1416 <                if (casTabAt(tab, i, null, node)) {
1417 <                    count = 1;
1418 <                    try {
1419 <                        if ((val = mf.apply(k)) != null)
1420 <                            node.val = val;
1421 <                    } finally {
1422 <                        if (val == null)
1423 <                            setTabAt(tab, i, null);
1424 <                        if (!node.casHash(fh, h)) {
1449 <                            node.hash = h;
1450 <                            synchronized (node) { node.notifyAll(); };
1415 >                Node<V> node = new Node<V>(h, k, null, null);
1416 >                synchronized (node) {
1417 >                    if (casTabAt(tab, i, null, node)) {
1418 >                        len = 1;
1419 >                        try {
1420 >                            if ((val = mf.apply(k)) != null)
1421 >                                node.val = val;
1422 >                        } finally {
1423 >                            if (val == null)
1424 >                                setTabAt(tab, i, null);
1425                          }
1426                      }
1427                  }
1428 <                if (count != 0)
1428 >                if (len != 0)
1429                      break;
1430              }
1431 <            else if ((fh = f.hash) == MOVED) {
1431 >            else if (f.hash < 0) {
1432                  if ((fk = f.key) instanceof TreeBin) {
1433 <                    TreeBin t = (TreeBin)fk;
1433 >                    TreeBin<V> t = (TreeBin<V>)fk;
1434                      boolean added = false;
1435                      t.acquire(0);
1436                      try {
1437                          if (tabAt(tab, i) == f) {
1438 <                            count = 1;
1439 <                            TreeNode p = t.getTreeNode(h, k, t.root);
1438 >                            len = 1;
1439 >                            TreeNode<V> p = t.getTreeNode(h, k, t.root);
1440                              if (p != null)
1441                                  val = p.val;
1442                              else if ((val = mf.apply(k)) != null) {
1443                                  added = true;
1444 <                                count = 2;
1444 >                                len = 2;
1445                                  t.putTreeNode(h, k, val);
1446                              }
1447                          }
1448                      } finally {
1449                          t.release(0);
1450                      }
1451 <                    if (count != 0) {
1451 >                    if (len != 0) {
1452                          if (!added)
1453                              return val;
1454                          break;
1455                      }
1456                  }
1457                  else
1458 <                    tab = (Node[])fk;
1458 >                    tab = (Node<V>[])fk;
1459              }
1486            else if ((fh & HASH_BITS) == h && (fv = f.val) != null &&
1487                     ((fk = f.key) == k || k.equals(fk)))
1488                return fv;
1460              else {
1461 <                Node g = f.next;
1462 <                if (g != null) {
1463 <                    for (Node e = g;;) {
1464 <                        Object ek, ev;
1465 <                        if ((e.hash & HASH_BITS) == h && (ev = e.val) != null &&
1495 <                            ((ek = e.key) == k || k.equals(ek)))
1496 <                            return ev;
1497 <                        if ((e = e.next) == null) {
1498 <                            checkForResize();
1499 <                            break;
1500 <                        }
1501 <                    }
1502 <                }
1503 <                if (((fh = f.hash) & LOCKED) != 0) {
1504 <                    checkForResize();
1505 <                    f.tryAwaitLock(tab, i);
1461 >                for (Node<V> e = f; e != null; e = e.next) { // prescan
1462 >                    Object ek; V ev;
1463 >                    if (e.hash == h && (ev = e.val) != null &&
1464 >                        ((ek = e.key) == k || k.equals(ek)))
1465 >                        return ev;
1466                  }
1467 <                else if (tabAt(tab, i) == f && f.casHash(fh, fh | LOCKED)) {
1468 <                    boolean added = false;
1469 <                    try {
1470 <                        if (tabAt(tab, i) == f) {
1471 <                            count = 1;
1472 <                            for (Node e = f;; ++count) {
1473 <                                Object ek, ev;
1474 <                                if ((e.hash & HASH_BITS) == h &&
1475 <                                    (ev = e.val) != null &&
1476 <                                    ((ek = e.key) == k || k.equals(ek))) {
1477 <                                    val = ev;
1478 <                                    break;
1479 <                                }
1480 <                                Node last = e;
1481 <                                if ((e = e.next) == null) {
1482 <                                    if ((val = mf.apply(k)) != null) {
1483 <                                        added = true;
1484 <                                        last.next = new Node(h, k, val, null);
1485 <                                        if (count >= TREE_THRESHOLD)
1526 <                                            replaceWithTreeBin(tab, i, k);
1527 <                                    }
1528 <                                    break;
1467 >                boolean added = false;
1468 >                synchronized (f) {
1469 >                    if (tabAt(tab, i) == f) {
1470 >                        len = 1;
1471 >                        for (Node<V> e = f;; ++len) {
1472 >                            Object ek; V ev;
1473 >                            if (e.hash == h &&
1474 >                                (ev = e.val) != null &&
1475 >                                ((ek = e.key) == k || k.equals(ek))) {
1476 >                                val = ev;
1477 >                                break;
1478 >                            }
1479 >                            Node<V> last = e;
1480 >                            if ((e = e.next) == null) {
1481 >                                if ((val = mf.apply(k)) != null) {
1482 >                                    added = true;
1483 >                                    last.next = new Node<V>(h, k, val, null);
1484 >                                    if (len >= TREE_THRESHOLD)
1485 >                                        replaceWithTreeBin(tab, i, k);
1486                                  }
1487 +                                break;
1488                              }
1489                          }
1532                    } finally {
1533                        if (!f.casHash(fh | LOCKED, fh)) {
1534                            f.hash = fh;
1535                            synchronized (f) { f.notifyAll(); };
1536                        }
1537                    }
1538                    if (count != 0) {
1539                        if (!added)
1540                            return val;
1541                        if (tab.length <= 64)
1542                            count = 2;
1543                        break;
1490                      }
1491                  }
1492 +                if (len != 0) {
1493 +                    if (!added)
1494 +                        return val;
1495 +                    break;
1496 +                }
1497              }
1498          }
1499 <        if (val != null) {
1500 <            counter.add(1L);
1550 <            if (count > 1)
1551 <                checkForResize();
1552 <        }
1499 >        if (val != null)
1500 >            addCount(1L, len);
1501          return val;
1502      }
1503  
1504      /** Implementation for compute */
1505 <    @SuppressWarnings("unchecked") private final Object internalCompute
1506 <        (K k, boolean onlyIfPresent, BiFun<? super K, ? super V, ? extends V> mf) {
1505 >    @SuppressWarnings("unchecked") private final V internalCompute
1506 >        (K k, boolean onlyIfPresent,
1507 >         BiFun<? super K, ? super V, ? extends V> mf) {
1508 >        if (k == null || mf == null)
1509 >            throw new NullPointerException();
1510          int h = spread(k.hashCode());
1511 <        Object val = null;
1511 >        V val = null;
1512          int delta = 0;
1513 <        int count = 0;
1514 <        for (Node[] tab = table;;) {
1515 <            Node f; int i, fh; Object fk;
1513 >        int len = 0;
1514 >        for (Node<V>[] tab = table;;) {
1515 >            Node<V> f; int i, fh; Object fk;
1516              if (tab == null)
1517                  tab = initTable();
1518              else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1519                  if (onlyIfPresent)
1520                      break;
1521 <                Node node = new Node(fh = h | LOCKED, k, null, null);
1522 <                if (casTabAt(tab, i, null, node)) {
1523 <                    try {
1524 <                        count = 1;
1525 <                        if ((val = mf.apply(k, null)) != null) {
1526 <                            node.val = val;
1527 <                            delta = 1;
1528 <                        }
1529 <                    } finally {
1530 <                        if (delta == 0)
1531 <                            setTabAt(tab, i, null);
1532 <                        if (!node.casHash(fh, h)) {
1582 <                            node.hash = h;
1583 <                            synchronized (node) { node.notifyAll(); };
1521 >                Node<V> node = new Node<V>(h, k, null, null);
1522 >                synchronized (node) {
1523 >                    if (casTabAt(tab, i, null, node)) {
1524 >                        try {
1525 >                            len = 1;
1526 >                            if ((val = mf.apply(k, null)) != null) {
1527 >                                node.val = val;
1528 >                                delta = 1;
1529 >                            }
1530 >                        } finally {
1531 >                            if (delta == 0)
1532 >                                setTabAt(tab, i, null);
1533                          }
1534                      }
1535                  }
1536 <                if (count != 0)
1536 >                if (len != 0)
1537                      break;
1538              }
1539 <            else if ((fh = f.hash) == MOVED) {
1539 >            else if ((fh = f.hash) < 0) {
1540                  if ((fk = f.key) instanceof TreeBin) {
1541 <                    TreeBin t = (TreeBin)fk;
1541 >                    TreeBin<V> t = (TreeBin<V>)fk;
1542                      t.acquire(0);
1543                      try {
1544                          if (tabAt(tab, i) == f) {
1545 <                            count = 1;
1546 <                            TreeNode p = t.getTreeNode(h, k, t.root);
1547 <                            Object pv = (p == null) ? null : p.val;
1548 <                            if ((val = mf.apply(k, (V)pv)) != null) {
1545 >                            len = 1;
1546 >                            TreeNode<V> p = t.getTreeNode(h, k, t.root);
1547 >                            if (p == null && onlyIfPresent)
1548 >                                break;
1549 >                            V pv = (p == null) ? null : p.val;
1550 >                            if ((val = mf.apply(k, pv)) != null) {
1551                                  if (p != null)
1552                                      p.val = val;
1553                                  else {
1554 <                                    count = 2;
1554 >                                    len = 2;
1555                                      delta = 1;
1556                                      t.putTreeNode(h, k, val);
1557                                  }
# Line 1613 | Line 1564 | public class ConcurrentHashMapV8<K, V>
1564                      } finally {
1565                          t.release(0);
1566                      }
1567 <                    if (count != 0)
1567 >                    if (len != 0)
1568                          break;
1569                  }
1570                  else
1571 <                    tab = (Node[])fk;
1621 <            }
1622 <            else if ((fh & LOCKED) != 0) {
1623 <                checkForResize();
1624 <                f.tryAwaitLock(tab, i);
1571 >                    tab = (Node<V>[])fk;
1572              }
1573 <            else if (f.casHash(fh, fh | LOCKED)) {
1574 <                try {
1573 >            else {
1574 >                synchronized (f) {
1575                      if (tabAt(tab, i) == f) {
1576 <                        count = 1;
1577 <                        for (Node e = f, pred = null;; ++count) {
1578 <                            Object ek, ev;
1579 <                            if ((e.hash & HASH_BITS) == h &&
1576 >                        len = 1;
1577 >                        for (Node<V> e = f, pred = null;; ++len) {
1578 >                            Object ek; V ev;
1579 >                            if (e.hash == h &&
1580                                  (ev = e.val) != null &&
1581                                  ((ek = e.key) == k || k.equals(ek))) {
1582 <                                val = mf.apply(k, (V)ev);
1582 >                                val = mf.apply(k, ev);
1583                                  if (val != null)
1584                                      e.val = val;
1585                                  else {
1586                                      delta = -1;
1587 <                                    Node en = e.next;
1587 >                                    Node<V> en = e.next;
1588                                      if (pred != null)
1589                                          pred.next = en;
1590                                      else
# Line 1647 | Line 1594 | public class ConcurrentHashMapV8<K, V>
1594                              }
1595                              pred = e;
1596                              if ((e = e.next) == null) {
1597 <                                if (!onlyIfPresent && (val = mf.apply(k, null)) != null) {
1598 <                                    pred.next = new Node(h, k, val, null);
1597 >                                if (!onlyIfPresent &&
1598 >                                    (val = mf.apply(k, null)) != null) {
1599 >                                    pred.next = new Node<V>(h, k, val, null);
1600                                      delta = 1;
1601 <                                    if (count >= TREE_THRESHOLD)
1601 >                                    if (len >= TREE_THRESHOLD)
1602                                          replaceWithTreeBin(tab, i, k);
1603                                  }
1604                                  break;
1605                              }
1606                          }
1607                      }
1660                } finally {
1661                    if (!f.casHash(fh | LOCKED, fh)) {
1662                        f.hash = fh;
1663                        synchronized (f) { f.notifyAll(); };
1664                    }
1608                  }
1609 <                if (count != 0) {
1667 <                    if (tab.length <= 64)
1668 <                        count = 2;
1609 >                if (len != 0)
1610                      break;
1670                }
1611              }
1612          }
1613 <        if (delta != 0) {
1614 <            counter.add((long)delta);
1675 <            if (count > 1)
1676 <                checkForResize();
1677 <        }
1613 >        if (delta != 0)
1614 >            addCount((long)delta, len);
1615          return val;
1616      }
1617  
1618      /** Implementation for merge */
1619 <    @SuppressWarnings("unchecked") private final Object internalMerge
1619 >    @SuppressWarnings("unchecked") private final V internalMerge
1620          (K k, V v, BiFun<? super V, ? super V, ? extends V> mf) {
1621 +        if (k == null || v == null || mf == null)
1622 +            throw new NullPointerException();
1623          int h = spread(k.hashCode());
1624 <        Object val = null;
1624 >        V val = null;
1625          int delta = 0;
1626 <        int count = 0;
1627 <        for (Node[] tab = table;;) {
1628 <            int i; Node f; int fh; Object fk, fv;
1626 >        int len = 0;
1627 >        for (Node<V>[] tab = table;;) {
1628 >            int i; Node<V> f; Object fk; V fv;
1629              if (tab == null)
1630                  tab = initTable();
1631              else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1632 <                if (casTabAt(tab, i, null, new Node(h, k, v, null))) {
1632 >                if (casTabAt(tab, i, null, new Node<V>(h, k, v, null))) {
1633                      delta = 1;
1634                      val = v;
1635                      break;
1636                  }
1637              }
1638 <            else if ((fh = f.hash) == MOVED) {
1638 >            else if (f.hash < 0) {
1639                  if ((fk = f.key) instanceof TreeBin) {
1640 <                    TreeBin t = (TreeBin)fk;
1640 >                    TreeBin<V> t = (TreeBin<V>)fk;
1641                      t.acquire(0);
1642                      try {
1643                          if (tabAt(tab, i) == f) {
1644 <                            count = 1;
1645 <                            TreeNode p = t.getTreeNode(h, k, t.root);
1646 <                            val = (p == null) ? v : mf.apply((V)p.val, v);
1644 >                            len = 1;
1645 >                            TreeNode<V> p = t.getTreeNode(h, k, t.root);
1646 >                            val = (p == null) ? v : mf.apply(p.val, v);
1647                              if (val != null) {
1648                                  if (p != null)
1649                                      p.val = val;
1650                                  else {
1651 <                                    count = 2;
1651 >                                    len = 2;
1652                                      delta = 1;
1653                                      t.putTreeNode(h, k, val);
1654                                  }
# Line 1722 | Line 1661 | public class ConcurrentHashMapV8<K, V>
1661                      } finally {
1662                          t.release(0);
1663                      }
1664 <                    if (count != 0)
1664 >                    if (len != 0)
1665                          break;
1666                  }
1667                  else
1668 <                    tab = (Node[])fk;
1730 <            }
1731 <            else if ((fh & LOCKED) != 0) {
1732 <                checkForResize();
1733 <                f.tryAwaitLock(tab, i);
1668 >                    tab = (Node<V>[])fk;
1669              }
1670 <            else if (f.casHash(fh, fh | LOCKED)) {
1671 <                try {
1670 >            else {
1671 >                synchronized (f) {
1672                      if (tabAt(tab, i) == f) {
1673 <                        count = 1;
1674 <                        for (Node e = f, pred = null;; ++count) {
1675 <                            Object ek, ev;
1676 <                            if ((e.hash & HASH_BITS) == h &&
1673 >                        len = 1;
1674 >                        for (Node<V> e = f, pred = null;; ++len) {
1675 >                            Object ek; V ev;
1676 >                            if (e.hash == h &&
1677                                  (ev = e.val) != null &&
1678                                  ((ek = e.key) == k || k.equals(ek))) {
1679 <                                val = mf.apply(v, (V)ev);
1679 >                                val = mf.apply(ev, v);
1680                                  if (val != null)
1681                                      e.val = val;
1682                                  else {
1683                                      delta = -1;
1684 <                                    Node en = e.next;
1684 >                                    Node<V> en = e.next;
1685                                      if (pred != null)
1686                                          pred.next = en;
1687                                      else
# Line 1757 | Line 1692 | public class ConcurrentHashMapV8<K, V>
1692                              pred = e;
1693                              if ((e = e.next) == null) {
1694                                  val = v;
1695 <                                pred.next = new Node(h, k, val, null);
1695 >                                pred.next = new Node<V>(h, k, val, null);
1696                                  delta = 1;
1697 <                                if (count >= TREE_THRESHOLD)
1697 >                                if (len >= TREE_THRESHOLD)
1698                                      replaceWithTreeBin(tab, i, k);
1699                                  break;
1700                              }
1701                          }
1702                      }
1768                } finally {
1769                    if (!f.casHash(fh | LOCKED, fh)) {
1770                        f.hash = fh;
1771                        synchronized (f) { f.notifyAll(); };
1772                    }
1703                  }
1704 <                if (count != 0) {
1775 <                    if (tab.length <= 64)
1776 <                        count = 2;
1704 >                if (len != 0)
1705                      break;
1778                }
1706              }
1707          }
1708 <        if (delta != 0) {
1709 <            counter.add((long)delta);
1783 <            if (count > 1)
1784 <                checkForResize();
1785 <        }
1708 >        if (delta != 0)
1709 >            addCount((long)delta, len);
1710          return val;
1711      }
1712  
1713      /** Implementation for putAll */
1714 <    private final void internalPutAll(Map<?, ?> m) {
1714 >    @SuppressWarnings("unchecked") private final void internalPutAll
1715 >        (Map<? extends K, ? extends V> m) {
1716          tryPresize(m.size());
1717          long delta = 0L;     // number of uncommitted additions
1718          boolean npe = false; // to throw exception on exit for nulls
1719          try {                // to clean up counts on other exceptions
1720 <            for (Map.Entry<?, ?> entry : m.entrySet()) {
1721 <                Object k, v;
1720 >            for (Map.Entry<?, ? extends V> entry : m.entrySet()) {
1721 >                Object k; V v;
1722                  if (entry == null || (k = entry.getKey()) == null ||
1723                      (v = entry.getValue()) == null) {
1724                      npe = true;
1725                      break;
1726                  }
1727                  int h = spread(k.hashCode());
1728 <                for (Node[] tab = table;;) {
1729 <                    int i; Node f; int fh; Object fk;
1728 >                for (Node<V>[] tab = table;;) {
1729 >                    int i; Node<V> f; int fh; Object fk;
1730                      if (tab == null)
1731                          tab = initTable();
1732                      else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null){
1733 <                        if (casTabAt(tab, i, null, new Node(h, k, v, null))) {
1733 >                        if (casTabAt(tab, i, null, new Node<V>(h, k, v, null))) {
1734                              ++delta;
1735                              break;
1736                          }
1737                      }
1738 <                    else if ((fh = f.hash) == MOVED) {
1738 >                    else if ((fh = f.hash) < 0) {
1739                          if ((fk = f.key) instanceof TreeBin) {
1740 <                            TreeBin t = (TreeBin)fk;
1740 >                            TreeBin<V> t = (TreeBin<V>)fk;
1741                              boolean validated = false;
1742                              t.acquire(0);
1743                              try {
1744                                  if (tabAt(tab, i) == f) {
1745                                      validated = true;
1746 <                                    TreeNode p = t.getTreeNode(h, k, t.root);
1746 >                                    TreeNode<V> p = t.getTreeNode(h, k, t.root);
1747                                      if (p != null)
1748                                          p.val = v;
1749                                      else {
# Line 1833 | Line 1758 | public class ConcurrentHashMapV8<K, V>
1758                                  break;
1759                          }
1760                          else
1761 <                            tab = (Node[])fk;
1761 >                            tab = (Node<V>[])fk;
1762                      }
1763 <                    else if ((fh & LOCKED) != 0) {
1764 <                        counter.add(delta);
1765 <                        delta = 0L;
1841 <                        checkForResize();
1842 <                        f.tryAwaitLock(tab, i);
1843 <                    }
1844 <                    else if (f.casHash(fh, fh | LOCKED)) {
1845 <                        int count = 0;
1846 <                        try {
1763 >                    else {
1764 >                        int len = 0;
1765 >                        synchronized (f) {
1766                              if (tabAt(tab, i) == f) {
1767 <                                count = 1;
1768 <                                for (Node e = f;; ++count) {
1769 <                                    Object ek, ev;
1770 <                                    if ((e.hash & HASH_BITS) == h &&
1767 >                                len = 1;
1768 >                                for (Node<V> e = f;; ++len) {
1769 >                                    Object ek; V ev;
1770 >                                    if (e.hash == h &&
1771                                          (ev = e.val) != null &&
1772                                          ((ek = e.key) == k || k.equals(ek))) {
1773                                          e.val = v;
1774                                          break;
1775                                      }
1776 <                                    Node last = e;
1776 >                                    Node<V> last = e;
1777                                      if ((e = e.next) == null) {
1778                                          ++delta;
1779 <                                        last.next = new Node(h, k, v, null);
1780 <                                        if (count >= TREE_THRESHOLD)
1779 >                                        last.next = new Node<V>(h, k, v, null);
1780 >                                        if (len >= TREE_THRESHOLD)
1781                                              replaceWithTreeBin(tab, i, k);
1782                                          break;
1783                                      }
1784                                  }
1785                              }
1867                        } finally {
1868                            if (!f.casHash(fh | LOCKED, fh)) {
1869                                f.hash = fh;
1870                                synchronized (f) { f.notifyAll(); };
1871                            }
1786                          }
1787 <                        if (count != 0) {
1788 <                            if (count > 1) {
1789 <                                counter.add(delta);
1876 <                                delta = 0L;
1877 <                                checkForResize();
1878 <                            }
1787 >                        if (len != 0) {
1788 >                            if (len > 1)
1789 >                                addCount(delta, len);
1790                              break;
1791                          }
1792                      }
1793                  }
1794              }
1795          } finally {
1796 <            if (delta != 0)
1797 <                counter.add(delta);
1796 >            if (delta != 0L)
1797 >                addCount(delta, 2);
1798          }
1799          if (npe)
1800              throw new NullPointerException();
1801      }
1802  
1803 +    /**
1804 +     * Implementation for clear. Steps through each bin, removing all
1805 +     * nodes.
1806 +     */
1807 +    @SuppressWarnings("unchecked") private final void internalClear() {
1808 +        long delta = 0L; // negative number of deletions
1809 +        int i = 0;
1810 +        Node<V>[] tab = table;
1811 +        while (tab != null && i < tab.length) {
1812 +            Node<V> f = tabAt(tab, i);
1813 +            if (f == null)
1814 +                ++i;
1815 +            else if (f.hash < 0) {
1816 +                Object fk;
1817 +                if ((fk = f.key) instanceof TreeBin) {
1818 +                    TreeBin<V> t = (TreeBin<V>)fk;
1819 +                    t.acquire(0);
1820 +                    try {
1821 +                        if (tabAt(tab, i) == f) {
1822 +                            for (Node<V> p = t.first; p != null; p = p.next) {
1823 +                                if (p.val != null) { // (currently always true)
1824 +                                    p.val = null;
1825 +                                    --delta;
1826 +                                }
1827 +                            }
1828 +                            t.first = null;
1829 +                            t.root = null;
1830 +                            ++i;
1831 +                        }
1832 +                    } finally {
1833 +                        t.release(0);
1834 +                    }
1835 +                }
1836 +                else
1837 +                    tab = (Node<V>[])fk;
1838 +            }
1839 +            else {
1840 +                synchronized (f) {
1841 +                    if (tabAt(tab, i) == f) {
1842 +                        for (Node<V> e = f; e != null; e = e.next) {
1843 +                            if (e.val != null) {  // (currently always true)
1844 +                                e.val = null;
1845 +                                --delta;
1846 +                            }
1847 +                        }
1848 +                        setTabAt(tab, i, null);
1849 +                        ++i;
1850 +                    }
1851 +                }
1852 +            }
1853 +        }
1854 +        if (delta != 0L)
1855 +            addCount(delta, -1);
1856 +    }
1857 +
1858      /* ---------------- Table Initialization and Resizing -------------- */
1859  
1860      /**
# Line 1908 | Line 1874 | public class ConcurrentHashMapV8<K, V>
1874      /**
1875       * Initializes table, using the size recorded in sizeCtl.
1876       */
1877 <    private final Node[] initTable() {
1878 <        Node[] tab; int sc;
1877 >    @SuppressWarnings("unchecked") private final Node<V>[] initTable() {
1878 >        Node<V>[] tab; int sc;
1879          while ((tab = table) == null) {
1880              if ((sc = sizeCtl) < 0)
1881                  Thread.yield(); // lost initialization race; just spin
1882 <            else if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1882 >            else if (U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
1883                  try {
1884                      if ((tab = table) == null) {
1885                          int n = (sc > 0) ? sc : DEFAULT_CAPACITY;
1886 <                        tab = table = new Node[n];
1886 >                        @SuppressWarnings("rawtypes") Node[] tb = new Node[n];
1887 >                        table = tab = (Node<V>[])tb;
1888                          sc = n - (n >>> 2);
1889                      }
1890                  } finally {
# Line 1930 | Line 1897 | public class ConcurrentHashMapV8<K, V>
1897      }
1898  
1899      /**
1900 <     * If table is too small and not already resizing, creates next
1901 <     * table and transfers bins.  Rechecks occupancy after a transfer
1902 <     * to see if another resize is already needed because resizings
1903 <     * are lagging additions.
1904 <     */
1905 <    private final void checkForResize() {
1906 <        Node[] tab; int n, sc;
1907 <        while ((tab = table) != null &&
1908 <               (n = tab.length) < MAXIMUM_CAPACITY &&
1909 <               (sc = sizeCtl) >= 0 && counter.sum() >= (long)sc &&
1910 <               UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1911 <            try {
1912 <                if (tab == table) {
1913 <                    table = rebuild(tab);
1914 <                    sc = (n << 1) - (n >>> 1);
1900 >     * Adds to count, and if table is too small and not already
1901 >     * resizing, initiates transfer. If already resizing, helps
1902 >     * perform transfer if work is available.  Rechecks occupancy
1903 >     * after a transfer to see if another resize is already needed
1904 >     * because resizings are lagging additions.
1905 >     *
1906 >     * @param x the count to add
1907 >     * @param check if <0, don't check resize, if <= 1 only check if uncontended
1908 >     */
1909 >    private final void addCount(long x, int check) {
1910 >        CounterCell[] as; long b, s;
1911 >        if ((as = counterCells) != null ||
1912 >            !U.compareAndSwapLong(this, BASECOUNT, b = baseCount, s = b + x)) {
1913 >            CounterHashCode hc; CounterCell a; long v; int m;
1914 >            boolean uncontended = true;
1915 >            if ((hc = threadCounterHashCode.get()) == null ||
1916 >                as == null || (m = as.length - 1) < 0 ||
1917 >                (a = as[m & hc.code]) == null ||
1918 >                !(uncontended =
1919 >                  U.compareAndSwapLong(a, CELLVALUE, v = a.value, v + x))) {
1920 >                fullAddCount(x, hc, uncontended);
1921 >                return;
1922 >            }
1923 >            if (check <= 1)
1924 >                return;
1925 >            s = sumCount();
1926 >        }
1927 >        if (check >= 0) {
1928 >            Node<V>[] tab, nt; int sc;
1929 >            while (s >= (long)(sc = sizeCtl) && (tab = table) != null &&
1930 >                   tab.length < MAXIMUM_CAPACITY) {
1931 >                if (sc < 0) {
1932 >                    if (sc == -1 || transferIndex <= transferOrigin ||
1933 >                        (nt = nextTable) == null)
1934 >                        break;
1935 >                    if (U.compareAndSwapInt(this, SIZECTL, sc, sc - 1))
1936 >                        transfer(tab, nt);
1937                  }
1938 <            } finally {
1939 <                sizeCtl = sc;
1938 >                else if (U.compareAndSwapInt(this, SIZECTL, sc, -2))
1939 >                    transfer(tab, null);
1940 >                s = sumCount();
1941              }
1942          }
1943      }
# Line 1957 | Line 1947 | public class ConcurrentHashMapV8<K, V>
1947       *
1948       * @param size number of elements (doesn't need to be perfectly accurate)
1949       */
1950 <    private final void tryPresize(int size) {
1950 >    @SuppressWarnings("unchecked") private final void tryPresize(int size) {
1951          int c = (size >= (MAXIMUM_CAPACITY >>> 1)) ? MAXIMUM_CAPACITY :
1952              tableSizeFor(size + (size >>> 1) + 1);
1953          int sc;
1954          while ((sc = sizeCtl) >= 0) {
1955 <            Node[] tab = table; int n;
1955 >            Node<V>[] tab = table; int n;
1956              if (tab == null || (n = tab.length) == 0) {
1957                  n = (sc > c) ? sc : c;
1958 <                if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1958 >                if (U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
1959                      try {
1960                          if (table == tab) {
1961 <                            table = new Node[n];
1961 >                            @SuppressWarnings("rawtypes") Node[] tb = new Node[n];
1962 >                            table = (Node<V>[])tb;
1963                              sc = n - (n >>> 2);
1964                          }
1965                      } finally {
# Line 1978 | Line 1969 | public class ConcurrentHashMapV8<K, V>
1969              }
1970              else if (c <= sc || n >= MAXIMUM_CAPACITY)
1971                  break;
1972 <            else if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1973 <                try {
1974 <                    if (table == tab) {
1984 <                        table = rebuild(tab);
1985 <                        sc = (n << 1) - (n >>> 1);
1986 <                    }
1987 <                } finally {
1988 <                    sizeCtl = sc;
1989 <                }
1990 <            }
1972 >            else if (tab == table &&
1973 >                     U.compareAndSwapInt(this, SIZECTL, sc, -2))
1974 >                transfer(tab, null);
1975          }
1976      }
1977  
1978      /*
1979       * Moves and/or copies the nodes in each bin to new table. See
1980       * above for explanation.
1997     *
1998     * @return the new table
1981       */
1982 <    private static final Node[] rebuild(Node[] tab) {
1983 <        int n = tab.length;
1984 <        Node[] nextTab = new Node[n << 1];
1985 <        Node fwd = new Node(MOVED, nextTab, null, null);
1986 <        int[] buffer = null;       // holds bins to revisit; null until needed
1987 <        Node rev = null;           // reverse forwarder; null until needed
1988 <        int nbuffered = 0;         // the number of bins in buffer list
1989 <        int bufferIndex = 0;       // buffer index of current buffered bin
1990 <        int bin = n - 1;           // current non-buffered bin or -1 if none
1991 <
1992 <        for (int i = bin;;) {      // start upwards sweep
1993 <            int fh; Node f;
1994 <            if ((f = tabAt(tab, i)) == null) {
1995 <                if (bin >= 0) {    // Unbuffered; no lock needed (or available)
1996 <                    if (!casTabAt(tab, i, f, fwd))
1997 <                        continue;
1998 <                }
1999 <                else {             // transiently use a locked forwarding node
2000 <                    Node g = new Node(MOVED|LOCKED, nextTab, null, null);
2001 <                    if (!casTabAt(tab, i, f, g))
2002 <                        continue;
1982 >    @SuppressWarnings("unchecked") private final void transfer
1983 >        (Node<V>[] tab, Node<V>[] nextTab) {
1984 >        int n = tab.length, stride;
1985 >        if ((stride = (NCPU > 1) ? (n >>> 3) / NCPU : n) < MIN_TRANSFER_STRIDE)
1986 >            stride = MIN_TRANSFER_STRIDE; // subdivide range
1987 >        if (nextTab == null) {            // initiating
1988 >            try {
1989 >                @SuppressWarnings("rawtypes") Node[] tb = new Node[n << 1];
1990 >                nextTab = (Node<V>[])tb;
1991 >            } catch (Throwable ex) {      // try to cope with OOME
1992 >                sizeCtl = Integer.MAX_VALUE;
1993 >                return;
1994 >            }
1995 >            nextTable = nextTab;
1996 >            transferOrigin = n;
1997 >            transferIndex = n;
1998 >            Node<V> rev = new Node<V>(MOVED, tab, null, null);
1999 >            for (int k = n; k > 0;) {    // progressively reveal ready slots
2000 >                int nextk = (k > stride) ? k - stride : 0;
2001 >                for (int m = nextk; m < k; ++m)
2002 >                    nextTab[m] = rev;
2003 >                for (int m = n + nextk; m < n + k; ++m)
2004 >                    nextTab[m] = rev;
2005 >                U.putOrderedInt(this, TRANSFERORIGIN, k = nextk);
2006 >            }
2007 >        }
2008 >        int nextn = nextTab.length;
2009 >        Node<V> fwd = new Node<V>(MOVED, nextTab, null, null);
2010 >        boolean advance = true;
2011 >        for (int i = 0, bound = 0;;) {
2012 >            int nextIndex, nextBound; Node<V> f; Object fk;
2013 >            while (advance) {
2014 >                if (--i >= bound)
2015 >                    advance = false;
2016 >                else if ((nextIndex = transferIndex) <= transferOrigin) {
2017 >                    i = -1;
2018 >                    advance = false;
2019 >                }
2020 >                else if (U.compareAndSwapInt
2021 >                         (this, TRANSFERINDEX, nextIndex,
2022 >                          nextBound = (nextIndex > stride ?
2023 >                                       nextIndex - stride : 0))) {
2024 >                    bound = nextBound;
2025 >                    i = nextIndex - 1;
2026 >                    advance = false;
2027 >                }
2028 >            }
2029 >            if (i < 0 || i >= n || i + n >= nextn) {
2030 >                for (int sc;;) {
2031 >                    if (U.compareAndSwapInt(this, SIZECTL, sc = sizeCtl, ++sc)) {
2032 >                        if (sc == -1) {
2033 >                            nextTable = null;
2034 >                            table = nextTab;
2035 >                            sizeCtl = (n << 1) - (n >>> 1);
2036 >                        }
2037 >                        return;
2038 >                    }
2039 >                }
2040 >            }
2041 >            else if ((f = tabAt(tab, i)) == null) {
2042 >                if (casTabAt(tab, i, null, fwd)) {
2043                      setTabAt(nextTab, i, null);
2044                      setTabAt(nextTab, i + n, null);
2045 <                    setTabAt(tab, i, fwd);
2024 <                    if (!g.casHash(MOVED|LOCKED, MOVED)) {
2025 <                        g.hash = MOVED;
2026 <                        synchronized (g) { g.notifyAll(); }
2027 <                    }
2045 >                    advance = true;
2046                  }
2047              }
2048 <            else if ((fh = f.hash) == MOVED) {
2049 <                Object fk = f.key;
2050 <                if (fk instanceof TreeBin) {
2051 <                    TreeBin t = (TreeBin)fk;
2052 <                    boolean validated = false;
2053 <                    t.acquire(0);
2054 <                    try {
2055 <                        if (tabAt(tab, i) == f) {
2056 <                            validated = true;
2057 <                            splitTreeBin(nextTab, i, t);
2058 <                            setTabAt(tab, i, fwd);
2048 >            else if (f.hash >= 0) {
2049 >                synchronized (f) {
2050 >                    if (tabAt(tab, i) == f) {
2051 >                        int runBit = f.hash & n;
2052 >                        Node<V> lastRun = f, lo = null, hi = null;
2053 >                        for (Node<V> p = f.next; p != null; p = p.next) {
2054 >                            int b = p.hash & n;
2055 >                            if (b != runBit) {
2056 >                                runBit = b;
2057 >                                lastRun = p;
2058 >                            }
2059                          }
2060 <                    } finally {
2061 <                        t.release(0);
2060 >                        if (runBit == 0)
2061 >                            lo = lastRun;
2062 >                        else
2063 >                            hi = lastRun;
2064 >                        for (Node<V> p = f; p != lastRun; p = p.next) {
2065 >                            int ph = p.hash;
2066 >                            Object pk = p.key; V pv = p.val;
2067 >                            if ((ph & n) == 0)
2068 >                                lo = new Node<V>(ph, pk, pv, lo);
2069 >                            else
2070 >                                hi = new Node<V>(ph, pk, pv, hi);
2071 >                        }
2072 >                        setTabAt(nextTab, i, lo);
2073 >                        setTabAt(nextTab, i + n, hi);
2074 >                        setTabAt(tab, i, fwd);
2075 >                        advance = true;
2076                      }
2045                    if (!validated)
2046                        continue;
2077                  }
2078              }
2079 <            else if ((fh & LOCKED) == 0 && f.casHash(fh, fh|LOCKED)) {
2080 <                boolean validated = false;
2081 <                try {              // split to lo and hi lists; copying as needed
2079 >            else if ((fk = f.key) instanceof TreeBin) {
2080 >                TreeBin<V> t = (TreeBin<V>)fk;
2081 >                t.acquire(0);
2082 >                try {
2083                      if (tabAt(tab, i) == f) {
2084 <                        validated = true;
2085 <                        splitBin(nextTab, i, f);
2084 >                        TreeBin<V> lt = new TreeBin<V>();
2085 >                        TreeBin<V> ht = new TreeBin<V>();
2086 >                        int lc = 0, hc = 0;
2087 >                        for (Node<V> e = t.first; e != null; e = e.next) {
2088 >                            int h = e.hash;
2089 >                            Object k = e.key; V v = e.val;
2090 >                            if ((h & n) == 0) {
2091 >                                ++lc;
2092 >                                lt.putTreeNode(h, k, v);
2093 >                            }
2094 >                            else {
2095 >                                ++hc;
2096 >                                ht.putTreeNode(h, k, v);
2097 >                            }
2098 >                        }
2099 >                        Node<V> ln, hn; // throw away trees if too small
2100 >                        if (lc < TREE_THRESHOLD) {
2101 >                            ln = null;
2102 >                            for (Node<V> p = lt.first; p != null; p = p.next)
2103 >                                ln = new Node<V>(p.hash, p.key, p.val, ln);
2104 >                        }
2105 >                        else
2106 >                            ln = new Node<V>(MOVED, lt, null, null);
2107 >                        setTabAt(nextTab, i, ln);
2108 >                        if (hc < TREE_THRESHOLD) {
2109 >                            hn = null;
2110 >                            for (Node<V> p = ht.first; p != null; p = p.next)
2111 >                                hn = new Node<V>(p.hash, p.key, p.val, hn);
2112 >                        }
2113 >                        else
2114 >                            hn = new Node<V>(MOVED, ht, null, null);
2115 >                        setTabAt(nextTab, i + n, hn);
2116                          setTabAt(tab, i, fwd);
2117 +                        advance = true;
2118                      }
2119                  } finally {
2120 <                    if (!f.casHash(fh | LOCKED, fh)) {
2059 <                        f.hash = fh;
2060 <                        synchronized (f) { f.notifyAll(); };
2061 <                    }
2120 >                    t.release(0);
2121                  }
2063                if (!validated)
2064                    continue;
2065            }
2066            else {
2067                if (buffer == null) // initialize buffer for revisits
2068                    buffer = new int[TRANSFER_BUFFER_SIZE];
2069                if (bin < 0 && bufferIndex > 0) {
2070                    int j = buffer[--bufferIndex];
2071                    buffer[bufferIndex] = i;
2072                    i = j;         // swap with another bin
2073                    continue;
2074                }
2075                if (bin < 0 || nbuffered >= TRANSFER_BUFFER_SIZE) {
2076                    f.tryAwaitLock(tab, i);
2077                    continue;      // no other options -- block
2078                }
2079                if (rev == null)   // initialize reverse-forwarder
2080                    rev = new Node(MOVED, tab, null, null);
2081                if (tabAt(tab, i) != f || (f.hash & LOCKED) == 0)
2082                    continue;      // recheck before adding to list
2083                buffer[nbuffered++] = i;
2084                setTabAt(nextTab, i, rev);     // install place-holders
2085                setTabAt(nextTab, i + n, rev);
2086            }
2087
2088            if (bin > 0)
2089                i = --bin;
2090            else if (buffer != null && nbuffered > 0) {
2091                bin = -1;
2092                i = buffer[bufferIndex = --nbuffered];
2122              }
2123              else
2124 <                return nextTab;
2124 >                advance = true; // already processed
2125          }
2126      }
2127  
2128 <    /**
2129 <     * Splits a normal bin with list headed by e into lo and hi parts;
2130 <     * installs in given table.
2131 <     */
2132 <    private static void splitBin(Node[] nextTab, int i, Node e) {
2133 <        int bit = nextTab.length >>> 1; // bit to split on
2134 <        int runBit = e.hash & bit;
2135 <        Node lastRun = e, lo = null, hi = null;
2136 <        for (Node p = e.next; p != null; p = p.next) {
2108 <            int b = p.hash & bit;
2109 <            if (b != runBit) {
2110 <                runBit = b;
2111 <                lastRun = p;
2128 >    /* ---------------- Counter support -------------- */
2129 >
2130 >    final long sumCount() {
2131 >        CounterCell[] as = counterCells; CounterCell a;
2132 >        long sum = baseCount;
2133 >        if (as != null) {
2134 >            for (int i = 0; i < as.length; ++i) {
2135 >                if ((a = as[i]) != null)
2136 >                    sum += a.value;
2137              }
2138          }
2139 <        if (runBit == 0)
2115 <            lo = lastRun;
2116 <        else
2117 <            hi = lastRun;
2118 <        for (Node p = e; p != lastRun; p = p.next) {
2119 <            int ph = p.hash & HASH_BITS;
2120 <            Object pk = p.key, pv = p.val;
2121 <            if ((ph & bit) == 0)
2122 <                lo = new Node(ph, pk, pv, lo);
2123 <            else
2124 <                hi = new Node(ph, pk, pv, hi);
2125 <        }
2126 <        setTabAt(nextTab, i, lo);
2127 <        setTabAt(nextTab, i + bit, hi);
2139 >        return sum;
2140      }
2141  
2142 <    /**
2143 <     * Splits a tree bin into lo and hi parts; installs in given table.
2144 <     */
2145 <    private static void splitTreeBin(Node[] nextTab, int i, TreeBin t) {
2146 <        int bit = nextTab.length >>> 1;
2147 <        TreeBin lt = new TreeBin();
2148 <        TreeBin ht = new TreeBin();
2149 <        int lc = 0, hc = 0;
2150 <        for (Node e = t.first; e != null; e = e.next) {
2139 <            int h = e.hash & HASH_BITS;
2140 <            Object k = e.key, v = e.val;
2141 <            if ((h & bit) == 0) {
2142 <                ++lc;
2143 <                lt.putTreeNode(h, k, v);
2144 <            }
2145 <            else {
2146 <                ++hc;
2147 <                ht.putTreeNode(h, k, v);
2148 <            }
2149 <        }
2150 <        Node ln, hn; // throw away trees if too small
2151 <        if (lc <= (TREE_THRESHOLD >>> 1)) {
2152 <            ln = null;
2153 <            for (Node p = lt.first; p != null; p = p.next)
2154 <                ln = new Node(p.hash, p.key, p.val, ln);
2142 >    // See LongAdder version for explanation
2143 >    private final void fullAddCount(long x, CounterHashCode hc,
2144 >                                    boolean wasUncontended) {
2145 >        int h;
2146 >        if (hc == null) {
2147 >            hc = new CounterHashCode();
2148 >            int s = counterHashCodeGenerator.addAndGet(SEED_INCREMENT);
2149 >            h = hc.code = (s == 0) ? 1 : s; // Avoid zero
2150 >            threadCounterHashCode.set(hc);
2151          }
2152          else
2153 <            ln = new Node(MOVED, lt, null, null);
2154 <        setTabAt(nextTab, i, ln);
2155 <        if (hc <= (TREE_THRESHOLD >>> 1)) {
2156 <            hn = null;
2157 <            for (Node p = ht.first; p != null; p = p.next)
2158 <                hn = new Node(p.hash, p.key, p.val, hn);
2159 <        }
2160 <        else
2161 <            hn = new Node(MOVED, ht, null, null);
2162 <        setTabAt(nextTab, i + bit, hn);
2163 <    }
2164 <
2165 <    /**
2166 <     * Implementation for clear. Steps through each bin, removing all
2167 <     * nodes.
2168 <     */
2169 <    private final void internalClear() {
2170 <        long delta = 0L; // negative number of deletions
2175 <        int i = 0;
2176 <        Node[] tab = table;
2177 <        while (tab != null && i < tab.length) {
2178 <            int fh; Object fk;
2179 <            Node f = tabAt(tab, i);
2180 <            if (f == null)
2181 <                ++i;
2182 <            else if ((fh = f.hash) == MOVED) {
2183 <                if ((fk = f.key) instanceof TreeBin) {
2184 <                    TreeBin t = (TreeBin)fk;
2185 <                    t.acquire(0);
2186 <                    try {
2187 <                        if (tabAt(tab, i) == f) {
2188 <                            for (Node p = t.first; p != null; p = p.next) {
2189 <                                if (p.val != null) { // (currently always true)
2190 <                                    p.val = null;
2191 <                                    --delta;
2153 >            h = hc.code;
2154 >        boolean collide = false;                // True if last slot nonempty
2155 >        for (;;) {
2156 >            CounterCell[] as; CounterCell a; int n; long v;
2157 >            if ((as = counterCells) != null && (n = as.length) > 0) {
2158 >                if ((a = as[(n - 1) & h]) == null) {
2159 >                    if (counterBusy == 0) {            // Try to attach new Cell
2160 >                        CounterCell r = new CounterCell(x); // Optimistic create
2161 >                        if (counterBusy == 0 &&
2162 >                            U.compareAndSwapInt(this, COUNTERBUSY, 0, 1)) {
2163 >                            boolean created = false;
2164 >                            try {               // Recheck under lock
2165 >                                CounterCell[] rs; int m, j;
2166 >                                if ((rs = counterCells) != null &&
2167 >                                    (m = rs.length) > 0 &&
2168 >                                    rs[j = (m - 1) & h] == null) {
2169 >                                    rs[j] = r;
2170 >                                    created = true;
2171                                  }
2172 +                            } finally {
2173 +                                counterBusy = 0;
2174                              }
2175 <                            t.first = null;
2176 <                            t.root = null;
2177 <                            ++i;
2175 >                            if (created)
2176 >                                break;
2177 >                            continue;           // Slot is now non-empty
2178                          }
2198                    } finally {
2199                        t.release(0);
2179                      }
2180 +                    collide = false;
2181                  }
2182 <                else
2183 <                    tab = (Node[])fk;
2184 <            }
2185 <            else if ((fh & LOCKED) != 0) {
2186 <                counter.add(delta); // opportunistically update count
2187 <                delta = 0L;
2188 <                f.tryAwaitLock(tab, i);
2189 <            }
2190 <            else if (f.casHash(fh, fh | LOCKED)) {
2191 <                try {
2192 <                    if (tabAt(tab, i) == f) {
2193 <                        for (Node e = f; e != null; e = e.next) {
2194 <                            if (e.val != null) {  // (currently always true)
2195 <                                e.val = null;
2196 <                                --delta;
2197 <                            }
2182 >                else if (!wasUncontended)       // CAS already known to fail
2183 >                    wasUncontended = true;      // Continue after rehash
2184 >                else if (U.compareAndSwapLong(a, CELLVALUE, v = a.value, v + x))
2185 >                    break;
2186 >                else if (counterCells != as || n >= NCPU)
2187 >                    collide = false;            // At max size or stale
2188 >                else if (!collide)
2189 >                    collide = true;
2190 >                else if (counterBusy == 0 &&
2191 >                         U.compareAndSwapInt(this, COUNTERBUSY, 0, 1)) {
2192 >                    try {
2193 >                        if (counterCells == as) {// Expand table unless stale
2194 >                            CounterCell[] rs = new CounterCell[n << 1];
2195 >                            for (int i = 0; i < n; ++i)
2196 >                                rs[i] = as[i];
2197 >                            counterCells = rs;
2198                          }
2199 <                        setTabAt(tab, i, null);
2200 <                        ++i;
2199 >                    } finally {
2200 >                        counterBusy = 0;
2201                      }
2202 <                } finally {
2203 <                    if (!f.casHash(fh | LOCKED, fh)) {
2204 <                        f.hash = fh;
2205 <                        synchronized (f) { f.notifyAll(); };
2202 >                    collide = false;
2203 >                    continue;                   // Retry with expanded table
2204 >                }
2205 >                h ^= h << 13;                   // Rehash
2206 >                h ^= h >>> 17;
2207 >                h ^= h << 5;
2208 >            }
2209 >            else if (counterBusy == 0 && counterCells == as &&
2210 >                     U.compareAndSwapInt(this, COUNTERBUSY, 0, 1)) {
2211 >                boolean init = false;
2212 >                try {                           // Initialize table
2213 >                    if (counterCells == as) {
2214 >                        CounterCell[] rs = new CounterCell[2];
2215 >                        rs[h & 1] = new CounterCell(x);
2216 >                        counterCells = rs;
2217 >                        init = true;
2218                      }
2219 +                } finally {
2220 +                    counterBusy = 0;
2221                  }
2222 +                if (init)
2223 +                    break;
2224              }
2225 +            else if (U.compareAndSwapLong(this, BASECOUNT, v = baseCount, v + x))
2226 +                break;                          // Fall back on using base
2227          }
2228 <        if (delta != 0)
2231 <            counter.add(delta);
2228 >        hc.code = h;                            // Record index for next time
2229      }
2230  
2231      /* ----------------Table Traversal -------------- */
# Line 2243 | Line 2240 | public class ConcurrentHashMapV8<K, V>
2240       * change (including to null, indicating deletion), field nextVal
2241       * might not be accurate at point of use, but still maintains the
2242       * weak consistency property of holding a value that was once
2243 <     * valid.
2243 >     * valid. To support iterator.remove, the nextKey field is not
2244 >     * updated (nulled out) when the iterator cannot advance.
2245       *
2246       * Internal traversals directly access these fields, as in:
2247       * {@code while (it.advance() != null) { process(it.nextKey); }}
# Line 2270 | Line 2268 | public class ConcurrentHashMapV8<K, V>
2268       * across threads, iteration terminates if a bounds checks fails
2269       * for a table read.
2270       *
2271 <     * This class extends ForkJoinTask to streamline parallel
2272 <     * iteration in bulk operations (see BulkTask). This adds only an
2273 <     * int of space overhead, which is close enough to negligible in
2274 <     * cases where it is not needed to not worry about it.  Because
2275 <     * ForkJoinTask is Serializable, but iterators need not be, we
2276 <     * need to add warning suppressions.
2271 >     * This class extends CountedCompleter to streamline parallel
2272 >     * iteration in bulk operations. This adds only a few fields of
2273 >     * space overhead, which is small enough in cases where it is not
2274 >     * needed to not worry about it.  Because CountedCompleter is
2275 >     * Serializable, but iterators need not be, we need to add warning
2276 >     * suppressions.
2277       */
2278 <    @SuppressWarnings("serial") static class Traverser<K,V,R> extends ForkJoinTask<R> {
2278 >    @SuppressWarnings("serial") static class Traverser<K,V,R>
2279 >        extends CountedCompleter<R> {
2280          final ConcurrentHashMapV8<K, V> map;
2281 <        Node next;           // the next entry to use
2283 <        Node last;           // the last entry used
2281 >        Node<V> next;        // the next entry to use
2282          Object nextKey;      // cached key field of next
2283 <        Object nextVal;      // cached val field of next
2284 <        Node[] tab;          // current table; updated if resized
2283 >        V nextVal;           // cached val field of next
2284 >        Node<V>[] tab;       // current table; updated if resized
2285          int index;           // index of bin to use next
2286          int baseIndex;       // current index of initial table
2287          int baseLimit;       // index bound for initial table
2288          int baseSize;        // initial table size
2289 +        int batch;           // split control
2290  
2291          /** Creates iterator for all entries in the table. */
2292          Traverser(ConcurrentHashMapV8<K, V> map) {
2293              this.map = map;
2294          }
2295  
2296 <        /** Creates iterator for split() methods */
2297 <        Traverser(Traverser<K,V,?> it) {
2298 <            ConcurrentHashMapV8<K, V> m; Node[] t;
2299 <            if ((m = this.map = it.map) == null)
2300 <                t = null;
2301 <            else if ((t = it.tab) == null && // force parent tab initialization
2302 <                     (t = it.tab = m.table) != null)
2303 <                it.baseLimit = it.baseSize = t.length;
2304 <            this.tab = t;
2305 <            this.baseSize = it.baseSize;
2306 <            it.baseLimit = this.index = this.baseIndex =
2307 <                ((this.baseLimit = it.baseLimit) + it.baseIndex + 1) >>> 1;
2296 >        /** Creates iterator for split() methods and task constructors */
2297 >        Traverser(ConcurrentHashMapV8<K,V> map, Traverser<K,V,?> it, int batch) {
2298 >            super(it);
2299 >            this.batch = batch;
2300 >            if ((this.map = map) != null && it != null) { // split parent
2301 >                Node<V>[] t;
2302 >                if ((t = it.tab) == null &&
2303 >                    (t = it.tab = map.table) != null)
2304 >                    it.baseLimit = it.baseSize = t.length;
2305 >                this.tab = t;
2306 >                this.baseSize = it.baseSize;
2307 >                int hi = this.baseLimit = it.baseLimit;
2308 >                it.baseLimit = this.index = this.baseIndex =
2309 >                    (hi + it.baseIndex + 1) >>> 1;
2310 >            }
2311          }
2312  
2313          /**
2314           * Advances next; returns nextVal or null if terminated.
2315           * See above for explanation.
2316           */
2317 <        final Object advance() {
2318 <            Node e = last = next;
2319 <            Object ev = null;
2317 >        @SuppressWarnings("unchecked") final V advance() {
2318 >            Node<V> e = next;
2319 >            V ev = null;
2320              outer: do {
2321                  if (e != null)                  // advance past used/skipped node
2322                      e = e.next;
2323                  while (e == null) {             // get to next non-null bin
2324                      ConcurrentHashMapV8<K, V> m;
2325 <                    Node[] t; int b, i, n; Object ek; // checks must use locals
2325 >                    Node<V>[] t; int b, i, n; Object ek; //  must use locals
2326                      if ((t = tab) != null)
2327                          n = t.length;
2328                      else if ((m = map) != null && (t = tab = m.table) != null)
# Line 2330 | Line 2332 | public class ConcurrentHashMapV8<K, V>
2332                      if ((b = baseIndex) >= baseLimit ||
2333                          (i = index) < 0 || i >= n)
2334                          break outer;
2335 <                    if ((e = tabAt(t, i)) != null && e.hash == MOVED) {
2335 >                    if ((e = tabAt(t, i)) != null && e.hash < 0) {
2336                          if ((ek = e.key) instanceof TreeBin)
2337 <                            e = ((TreeBin)ek).first;
2337 >                            e = ((TreeBin<V>)ek).first;
2338                          else {
2339 <                            tab = (Node[])ek;
2339 >                            tab = (Node<V>[])ek;
2340                              continue;           // restarts due to null val
2341                          }
2342                      }                           // visit upper slots if present
# Line 2347 | Line 2349 | public class ConcurrentHashMapV8<K, V>
2349          }
2350  
2351          public final void remove() {
2352 <            if (nextVal == null && last == null)
2353 <                advance();
2352 <            Node e = last;
2353 <            if (e == null)
2352 >            Object k = nextKey;
2353 >            if (k == null && (advance() == null || (k = nextKey) == null))
2354                  throw new IllegalStateException();
2355 <            last = null;
2356 <            map.remove(e.key);
2355 >            map.internalReplace(k, null, null);
2356          }
2357  
2358          public final boolean hasNext() {
# Line 2361 | Line 2360 | public class ConcurrentHashMapV8<K, V>
2360          }
2361  
2362          public final boolean hasMoreElements() { return hasNext(); }
2363 <        public final void setRawResult(Object x) { }
2364 <        public R getRawResult() { return null; }
2365 <        public boolean exec() { return true; }
2363 >
2364 >        public void compute() { } // default no-op CountedCompleter body
2365 >
2366 >        /**
2367 >         * Returns a batch value > 0 if this task should (and must) be
2368 >         * split, if so, adding to pending count, and in any case
2369 >         * updating batch value. The initial batch value is approx
2370 >         * exp2 of the number of times (minus one) to split task by
2371 >         * two before executing leaf action. This value is faster to
2372 >         * compute and more convenient to use as a guide to splitting
2373 >         * than is the depth, since it is used while dividing by two
2374 >         * anyway.
2375 >         */
2376 >        final int preSplit() {
2377 >            ConcurrentHashMapV8<K, V> m; int b; Node<V>[] t;  ForkJoinPool pool;
2378 >            if ((b = batch) < 0 && (m = map) != null) { // force initialization
2379 >                if ((t = tab) == null && (t = tab = m.table) != null)
2380 >                    baseLimit = baseSize = t.length;
2381 >                if (t != null) {
2382 >                    long n = m.sumCount();
2383 >                    int par = ((pool = getPool()) == null) ?
2384 >                        ForkJoinPool.getCommonPoolParallelism() :
2385 >                        pool.getParallelism();
2386 >                    int sp = par << 3; // slack of 8
2387 >                    b = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp;
2388 >                }
2389 >            }
2390 >            b = (b <= 1 || baseIndex == baseLimit) ? 0 : (b >>> 1);
2391 >            if ((batch = b) > 0)
2392 >                addToPendingCount(1);
2393 >            return b;
2394 >        }
2395 >
2396      }
2397  
2398      /* ---------------- Public operations -------------- */
# Line 2372 | Line 2401 | public class ConcurrentHashMapV8<K, V>
2401       * Creates a new, empty map with the default initial table size (16).
2402       */
2403      public ConcurrentHashMapV8() {
2375        this.counter = new LongAdder();
2404      }
2405  
2406      /**
# Line 2391 | Line 2419 | public class ConcurrentHashMapV8<K, V>
2419          int cap = ((initialCapacity >= (MAXIMUM_CAPACITY >>> 1)) ?
2420                     MAXIMUM_CAPACITY :
2421                     tableSizeFor(initialCapacity + (initialCapacity >>> 1) + 1));
2394        this.counter = new LongAdder();
2422          this.sizeCtl = cap;
2423      }
2424  
# Line 2401 | Line 2428 | public class ConcurrentHashMapV8<K, V>
2428       * @param m the map
2429       */
2430      public ConcurrentHashMapV8(Map<? extends K, ? extends V> m) {
2404        this.counter = new LongAdder();
2431          this.sizeCtl = DEFAULT_CAPACITY;
2432          internalPutAll(m);
2433      }
# Line 2452 | Line 2478 | public class ConcurrentHashMapV8<K, V>
2478          long size = (long)(1.0 + (long)initialCapacity / loadFactor);
2479          int cap = (size >= (long)MAXIMUM_CAPACITY) ?
2480              MAXIMUM_CAPACITY : tableSizeFor((int)size);
2455        this.counter = new LongAdder();
2481          this.sizeCtl = cap;
2482      }
2483  
2484      /**
2485 +     * Creates a new {@link Set} backed by a ConcurrentHashMapV8
2486 +     * from the given type to {@code Boolean.TRUE}.
2487 +     *
2488 +     * @return the new set
2489 +     */
2490 +    public static <K> KeySetView<K,Boolean> newKeySet() {
2491 +        return new KeySetView<K,Boolean>(new ConcurrentHashMapV8<K,Boolean>(),
2492 +                                      Boolean.TRUE);
2493 +    }
2494 +
2495 +    /**
2496 +     * Creates a new {@link Set} backed by a ConcurrentHashMapV8
2497 +     * from the given type to {@code Boolean.TRUE}.
2498 +     *
2499 +     * @param initialCapacity The implementation performs internal
2500 +     * sizing to accommodate this many elements.
2501 +     * @throws IllegalArgumentException if the initial capacity of
2502 +     * elements is negative
2503 +     * @return the new set
2504 +     */
2505 +    public static <K> KeySetView<K,Boolean> newKeySet(int initialCapacity) {
2506 +        return new KeySetView<K,Boolean>
2507 +            (new ConcurrentHashMapV8<K,Boolean>(initialCapacity), Boolean.TRUE);
2508 +    }
2509 +
2510 +    /**
2511       * {@inheritDoc}
2512       */
2513      public boolean isEmpty() {
2514 <        return counter.sum() <= 0L; // ignore transient negative values
2514 >        return sumCount() <= 0L; // ignore transient negative values
2515      }
2516  
2517      /**
2518       * {@inheritDoc}
2519       */
2520      public int size() {
2521 <        long n = counter.sum();
2521 >        long n = sumCount();
2522          return ((n < 0L) ? 0 :
2523                  (n > (long)Integer.MAX_VALUE) ? Integer.MAX_VALUE :
2524                  (int)n);
# Line 2475 | Line 2526 | public class ConcurrentHashMapV8<K, V>
2526  
2527      /**
2528       * Returns the number of mappings. This method should be used
2529 <     * instead of {@link #size} because a ConcurrentHashMap may
2529 >     * instead of {@link #size} because a ConcurrentHashMapV8 may
2530       * contain more mappings than can be represented as an int. The
2531 <     * value returned is a snapshot; the actual count may differ if
2532 <     * there are ongoing concurrent insertions or removals.
2531 >     * value returned is an estimate; the actual count may differ if
2532 >     * there are concurrent insertions or removals.
2533       *
2534       * @return the number of mappings
2535       */
2536      public long mappingCount() {
2537 <        long n = counter.sum();
2537 >        long n = sumCount();
2538          return (n < 0L) ? 0L : n; // ignore transient negative values
2539      }
2540  
# Line 2498 | Line 2549 | public class ConcurrentHashMapV8<K, V>
2549       *
2550       * @throws NullPointerException if the specified key is null
2551       */
2552 <    @SuppressWarnings("unchecked") public V get(Object key) {
2553 <        if (key == null)
2503 <            throw new NullPointerException();
2504 <        return (V)internalGet(key);
2552 >    public V get(Object key) {
2553 >        return internalGet(key);
2554      }
2555  
2556      /**
2557       * Returns the value to which the specified key is mapped,
2558 <     * or the gieven defaultValue if this map contains no mapping for the key.
2558 >     * or the given defaultValue if this map contains no mapping for the key.
2559       *
2560       * @param key the key
2561       * @param defaultValue the value to return if this map contains
2562 <     * no mapping for the given key.
2562 >     * no mapping for the given key
2563       * @return the mapping for the key, if present; else the defaultValue
2564       * @throws NullPointerException if the specified key is null
2565       */
2566 <    @SuppressWarnings("unchecked") public V getValueOrDefault(Object key, V defaultValue) {
2567 <        if (key == null)
2568 <            throw new NullPointerException();
2520 <        V v = (V) internalGet(key);
2521 <        return v == null ? defaultValue : v;
2566 >    public V getValueOrDefault(Object key, V defaultValue) {
2567 >        V v;
2568 >        return (v = internalGet(key)) == null ? defaultValue : v;
2569      }
2570  
2571      /**
# Line 2531 | Line 2578 | public class ConcurrentHashMapV8<K, V>
2578       * @throws NullPointerException if the specified key is null
2579       */
2580      public boolean containsKey(Object key) {
2534        if (key == null)
2535            throw new NullPointerException();
2581          return internalGet(key) != null;
2582      }
2583  
# Line 2549 | Line 2594 | public class ConcurrentHashMapV8<K, V>
2594      public boolean containsValue(Object value) {
2595          if (value == null)
2596              throw new NullPointerException();
2597 <        Object v;
2597 >        V v;
2598          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
2599          while ((v = it.advance()) != null) {
2600              if (v == value || value.equals(v))
# Line 2573 | Line 2618 | public class ConcurrentHashMapV8<K, V>
2618       *         {@code false} otherwise
2619       * @throws NullPointerException if the specified value is null
2620       */
2621 <    public boolean contains(Object value) {
2621 >    @Deprecated public boolean contains(Object value) {
2622          return containsValue(value);
2623      }
2624  
# Line 2581 | Line 2626 | public class ConcurrentHashMapV8<K, V>
2626       * Maps the specified key to the specified value in this table.
2627       * Neither the key nor the value can be null.
2628       *
2629 <     * <p> The value can be retrieved by calling the {@code get} method
2629 >     * <p>The value can be retrieved by calling the {@code get} method
2630       * with a key that is equal to the original key.
2631       *
2632       * @param key key with which the specified value is to be associated
# Line 2590 | Line 2635 | public class ConcurrentHashMapV8<K, V>
2635       *         {@code null} if there was no mapping for {@code key}
2636       * @throws NullPointerException if the specified key or value is null
2637       */
2638 <    @SuppressWarnings("unchecked") public V put(K key, V value) {
2639 <        if (key == null || value == null)
2595 <            throw new NullPointerException();
2596 <        return (V)internalPut(key, value);
2638 >    public V put(K key, V value) {
2639 >        return internalPut(key, value, false);
2640      }
2641  
2642      /**
# Line 2603 | Line 2646 | public class ConcurrentHashMapV8<K, V>
2646       *         or {@code null} if there was no mapping for the key
2647       * @throws NullPointerException if the specified key or value is null
2648       */
2649 <    @SuppressWarnings("unchecked") public V putIfAbsent(K key, V value) {
2650 <        if (key == null || value == null)
2608 <            throw new NullPointerException();
2609 <        return (V)internalPutIfAbsent(key, value);
2649 >    public V putIfAbsent(K key, V value) {
2650 >        return internalPut(key, value, true);
2651      }
2652  
2653      /**
# Line 2650 | Line 2691 | public class ConcurrentHashMapV8<K, V>
2691       * @param key key with which the specified value is to be associated
2692       * @param mappingFunction the function to compute a value
2693       * @return the current (existing or computed) value associated with
2694 <     *         the specified key, or null if the computed value is null.
2694 >     *         the specified key, or null if the computed value is null
2695       * @throws NullPointerException if the specified key or mappingFunction
2696       *         is null
2697       * @throws IllegalStateException if the computation detectably
# Line 2659 | Line 2700 | public class ConcurrentHashMapV8<K, V>
2700       * @throws RuntimeException or Error if the mappingFunction does so,
2701       *         in which case the mapping is left unestablished
2702       */
2703 <    @SuppressWarnings("unchecked") public V computeIfAbsent
2703 >    public V computeIfAbsent
2704          (K key, Fun<? super K, ? extends V> mappingFunction) {
2705 <        if (key == null || mappingFunction == null)
2665 <            throw new NullPointerException();
2666 <        return (V)internalComputeIfAbsent(key, mappingFunction);
2705 >        return internalComputeIfAbsent(key, mappingFunction);
2706      }
2707  
2708      /**
# Line 2700 | Line 2739 | public class ConcurrentHashMapV8<K, V>
2739       * @throws RuntimeException or Error if the remappingFunction does so,
2740       *         in which case the mapping is unchanged
2741       */
2742 <    @SuppressWarnings("unchecked") public V computeIfPresent
2742 >    public V computeIfPresent
2743          (K key, BiFun<? super K, ? super V, ? extends V> remappingFunction) {
2744 <        if (key == null || remappingFunction == null)
2706 <            throw new NullPointerException();
2707 <        return (V)internalCompute(key, true, remappingFunction);
2744 >        return internalCompute(key, true, remappingFunction);
2745      }
2746  
2747      /**
# Line 2747 | Line 2784 | public class ConcurrentHashMapV8<K, V>
2784       * @throws RuntimeException or Error if the remappingFunction does so,
2785       *         in which case the mapping is unchanged
2786       */
2787 <    @SuppressWarnings("unchecked") public V compute
2787 >    public V compute
2788          (K key, BiFun<? super K, ? super V, ? extends V> remappingFunction) {
2789 <        if (key == null || remappingFunction == null)
2753 <            throw new NullPointerException();
2754 <        return (V)internalCompute(key, false, remappingFunction);
2789 >        return internalCompute(key, false, remappingFunction);
2790      }
2791  
2792      /**
# Line 2779 | Line 2814 | public class ConcurrentHashMapV8<K, V>
2814       * so the computation should be short and simple, and must not
2815       * attempt to update any other mappings of this Map.
2816       */
2817 <    @SuppressWarnings("unchecked") public V merge
2818 <        (K key, V value, BiFun<? super V, ? super V, ? extends V> remappingFunction) {
2819 <        if (key == null || value == null || remappingFunction == null)
2820 <            throw new NullPointerException();
2786 <        return (V)internalMerge(key, value, remappingFunction);
2817 >    public V merge
2818 >        (K key, V value,
2819 >         BiFun<? super V, ? super V, ? extends V> remappingFunction) {
2820 >        return internalMerge(key, value, remappingFunction);
2821      }
2822  
2823      /**
# Line 2795 | Line 2829 | public class ConcurrentHashMapV8<K, V>
2829       *         {@code null} if there was no mapping for {@code key}
2830       * @throws NullPointerException if the specified key is null
2831       */
2832 <    @SuppressWarnings("unchecked") public V remove(Object key) {
2833 <        if (key == null)
2800 <            throw new NullPointerException();
2801 <        return (V)internalReplace(key, null, null);
2832 >    public V remove(Object key) {
2833 >        return internalReplace(key, null, null);
2834      }
2835  
2836      /**
# Line 2807 | Line 2839 | public class ConcurrentHashMapV8<K, V>
2839       * @throws NullPointerException if the specified key is null
2840       */
2841      public boolean remove(Object key, Object value) {
2842 <        if (key == null)
2811 <            throw new NullPointerException();
2812 <        if (value == null)
2813 <            return false;
2814 <        return internalReplace(key, null, value) != null;
2842 >        return value != null && internalReplace(key, null, value) != null;
2843      }
2844  
2845      /**
# Line 2832 | Line 2860 | public class ConcurrentHashMapV8<K, V>
2860       *         or {@code null} if there was no mapping for the key
2861       * @throws NullPointerException if the specified key or value is null
2862       */
2863 <    @SuppressWarnings("unchecked") public V replace(K key, V value) {
2863 >    public V replace(K key, V value) {
2864          if (key == null || value == null)
2865              throw new NullPointerException();
2866 <        return (V)internalReplace(key, value, null);
2866 >        return internalReplace(key, value, null);
2867      }
2868  
2869      /**
# Line 2848 | Line 2876 | public class ConcurrentHashMapV8<K, V>
2876      /**
2877       * Returns a {@link Set} view of the keys contained in this map.
2878       * The set is backed by the map, so changes to the map are
2879 <     * reflected in the set, and vice-versa.  The set supports element
2852 <     * removal, which removes the corresponding mapping from this map,
2853 <     * via the {@code Iterator.remove}, {@code Set.remove},
2854 <     * {@code removeAll}, {@code retainAll}, and {@code clear}
2855 <     * operations.  It does not support the {@code add} or
2856 <     * {@code addAll} operations.
2879 >     * reflected in the set, and vice-versa.
2880       *
2881 <     * <p>The view's {@code iterator} is a "weakly consistent" iterator
2859 <     * that will never throw {@link ConcurrentModificationException},
2860 <     * and guarantees to traverse elements as they existed upon
2861 <     * construction of the iterator, and may (but is not guaranteed to)
2862 <     * reflect any modifications subsequent to construction.
2881 >     * @return the set view
2882       */
2883 <    public Set<K> keySet() {
2884 <        KeySet<K,V> ks = keySet;
2885 <        return (ks != null) ? ks : (keySet = new KeySet<K,V>(this));
2883 >    public KeySetView<K,V> keySet() {
2884 >        KeySetView<K,V> ks = keySet;
2885 >        return (ks != null) ? ks : (keySet = new KeySetView<K,V>(this, null));
2886 >    }
2887 >
2888 >    /**
2889 >     * Returns a {@link Set} view of the keys in this map, using the
2890 >     * given common mapped value for any additions (i.e., {@link
2891 >     * Collection#add} and {@link Collection#addAll}). This is of
2892 >     * course only appropriate if it is acceptable to use the same
2893 >     * value for all additions from this view.
2894 >     *
2895 >     * @param mappedValue the mapped value to use for any
2896 >     * additions.
2897 >     * @return the set view
2898 >     * @throws NullPointerException if the mappedValue is null
2899 >     */
2900 >    public KeySetView<K,V> keySet(V mappedValue) {
2901 >        if (mappedValue == null)
2902 >            throw new NullPointerException();
2903 >        return new KeySetView<K,V>(this, mappedValue);
2904      }
2905  
2906      /**
2907       * Returns a {@link Collection} view of the values contained in this map.
2908       * The collection is backed by the map, so changes to the map are
2909 <     * reflected in the collection, and vice-versa.  The collection
2873 <     * supports element removal, which removes the corresponding
2874 <     * mapping from this map, via the {@code Iterator.remove},
2875 <     * {@code Collection.remove}, {@code removeAll},
2876 <     * {@code retainAll}, and {@code clear} operations.  It does not
2877 <     * support the {@code add} or {@code addAll} operations.
2878 <     *
2879 <     * <p>The view's {@code iterator} is a "weakly consistent" iterator
2880 <     * that will never throw {@link ConcurrentModificationException},
2881 <     * and guarantees to traverse elements as they existed upon
2882 <     * construction of the iterator, and may (but is not guaranteed to)
2883 <     * reflect any modifications subsequent to construction.
2909 >     * reflected in the collection, and vice-versa.
2910       */
2911 <    public Collection<V> values() {
2912 <        Values<K,V> vs = values;
2913 <        return (vs != null) ? vs : (values = new Values<K,V>(this));
2911 >    public ValuesView<K,V> values() {
2912 >        ValuesView<K,V> vs = values;
2913 >        return (vs != null) ? vs : (values = new ValuesView<K,V>(this));
2914      }
2915  
2916      /**
# Line 2904 | Line 2930 | public class ConcurrentHashMapV8<K, V>
2930       * reflect any modifications subsequent to construction.
2931       */
2932      public Set<Map.Entry<K,V>> entrySet() {
2933 <        EntrySet<K,V> es = entrySet;
2934 <        return (es != null) ? es : (entrySet = new EntrySet<K,V>(this));
2933 >        EntrySetView<K,V> es = entrySet;
2934 >        return (es != null) ? es : (entrySet = new EntrySetView<K,V>(this));
2935      }
2936  
2937      /**
# Line 2965 | Line 2991 | public class ConcurrentHashMapV8<K, V>
2991      public int hashCode() {
2992          int h = 0;
2993          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
2994 <        Object v;
2994 >        V v;
2995          while ((v = it.advance()) != null) {
2996              h += it.nextKey.hashCode() ^ v.hashCode();
2997          }
# Line 2987 | Line 3013 | public class ConcurrentHashMapV8<K, V>
3013          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3014          StringBuilder sb = new StringBuilder();
3015          sb.append('{');
3016 <        Object v;
3016 >        V v;
3017          if ((v = it.advance()) != null) {
3018              for (;;) {
3019                  Object k = it.nextKey;
# Line 3018 | Line 3044 | public class ConcurrentHashMapV8<K, V>
3044                  return false;
3045              Map<?,?> m = (Map<?,?>) o;
3046              Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3047 <            Object val;
3047 >            V val;
3048              while ((val = it.advance()) != null) {
3049                  Object v = m.get(it.nextKey);
3050                  if (v == null || (v != val && !v.equals(val)))
# Line 3038 | Line 3064 | public class ConcurrentHashMapV8<K, V>
3064  
3065      /* ----------------Iterators -------------- */
3066  
3067 <    @SuppressWarnings("serial") static final class KeyIterator<K,V> extends Traverser<K,V,Object>
3067 >    @SuppressWarnings("serial") static final class KeyIterator<K,V>
3068 >        extends Traverser<K,V,Object>
3069          implements Spliterator<K>, Enumeration<K> {
3070          KeyIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3071 <        KeyIterator(Traverser<K,V,Object> it) {
3072 <            super(it);
3071 >        KeyIterator(ConcurrentHashMapV8<K, V> map, Traverser<K,V,Object> it) {
3072 >            super(map, it, -1);
3073          }
3074          public KeyIterator<K,V> split() {
3075 <            if (last != null || (next != null && nextVal == null))
3075 >            if (nextKey != null)
3076                  throw new IllegalStateException();
3077 <            return new KeyIterator<K,V>(this);
3077 >            return new KeyIterator<K,V>(map, this);
3078          }
3079          @SuppressWarnings("unchecked") public final K next() {
3080              if (nextVal == null && advance() == null)
# Line 3060 | Line 3087 | public class ConcurrentHashMapV8<K, V>
3087          public final K nextElement() { return next(); }
3088      }
3089  
3090 <    @SuppressWarnings("serial") static final class ValueIterator<K,V> extends Traverser<K,V,Object>
3090 >    @SuppressWarnings("serial") static final class ValueIterator<K,V>
3091 >        extends Traverser<K,V,Object>
3092          implements Spliterator<V>, Enumeration<V> {
3093          ValueIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3094 <        ValueIterator(Traverser<K,V,Object> it) {
3095 <            super(it);
3094 >        ValueIterator(ConcurrentHashMapV8<K, V> map, Traverser<K,V,Object> it) {
3095 >            super(map, it, -1);
3096          }
3097          public ValueIterator<K,V> split() {
3098 <            if (last != null || (next != null && nextVal == null))
3098 >            if (nextKey != null)
3099                  throw new IllegalStateException();
3100 <            return new ValueIterator<K,V>(this);
3100 >            return new ValueIterator<K,V>(map, this);
3101          }
3102  
3103 <        @SuppressWarnings("unchecked") public final V next() {
3104 <            Object v;
3103 >        public final V next() {
3104 >            V v;
3105              if ((v = nextVal) == null && (v = advance()) == null)
3106                  throw new NoSuchElementException();
3107              nextVal = null;
3108 <            return (V) v;
3108 >            return v;
3109          }
3110  
3111          public final V nextElement() { return next(); }
3112      }
3113  
3114 <    @SuppressWarnings("serial") static final class EntryIterator<K,V> extends Traverser<K,V,Object>
3114 >    @SuppressWarnings("serial") static final class EntryIterator<K,V>
3115 >        extends Traverser<K,V,Object>
3116          implements Spliterator<Map.Entry<K,V>> {
3117          EntryIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3118 <        EntryIterator(Traverser<K,V,Object> it) {
3119 <            super(it);
3118 >        EntryIterator(ConcurrentHashMapV8<K, V> map, Traverser<K,V,Object> it) {
3119 >            super(map, it, -1);
3120          }
3121          public EntryIterator<K,V> split() {
3122 <            if (last != null || (next != null && nextVal == null))
3122 >            if (nextKey != null)
3123                  throw new IllegalStateException();
3124 <            return new EntryIterator<K,V>(this);
3124 >            return new EntryIterator<K,V>(map, this);
3125          }
3126  
3127          @SuppressWarnings("unchecked") public final Map.Entry<K,V> next() {
3128 <            Object v;
3128 >            V v;
3129              if ((v = nextVal) == null && (v = advance()) == null)
3130                  throw new NoSuchElementException();
3131              Object k = nextKey;
3132              nextVal = null;
3133 <            return new MapEntry<K,V>((K)k, (V)v, map);
3133 >            return new MapEntry<K,V>((K)k, v, map);
3134          }
3135      }
3136  
# Line 3148 | Line 3177 | public class ConcurrentHashMapV8<K, V>
3177          }
3178      }
3179  
3151    /* ----------------Views -------------- */
3152
3180      /**
3181 <     * Base class for views.
3181 >     * Returns exportable snapshot entry for the given key and value
3182 >     * when write-through can't or shouldn't be used.
3183       */
3184 <    static abstract class CHMView<K, V> {
3185 <        final ConcurrentHashMapV8<K, V> map;
3158 <        CHMView(ConcurrentHashMapV8<K, V> map)  { this.map = map; }
3159 <        public final int size()                 { return map.size(); }
3160 <        public final boolean isEmpty()          { return map.isEmpty(); }
3161 <        public final void clear()               { map.clear(); }
3162 <
3163 <        // implementations below rely on concrete classes supplying these
3164 <        abstract public Iterator<?> iterator();
3165 <        abstract public boolean contains(Object o);
3166 <        abstract public boolean remove(Object o);
3167 <
3168 <        private static final String oomeMsg = "Required array size too large";
3169 <
3170 <        public final Object[] toArray() {
3171 <            long sz = map.mappingCount();
3172 <            if (sz > (long)(MAX_ARRAY_SIZE))
3173 <                throw new OutOfMemoryError(oomeMsg);
3174 <            int n = (int)sz;
3175 <            Object[] r = new Object[n];
3176 <            int i = 0;
3177 <            Iterator<?> it = iterator();
3178 <            while (it.hasNext()) {
3179 <                if (i == n) {
3180 <                    if (n >= MAX_ARRAY_SIZE)
3181 <                        throw new OutOfMemoryError(oomeMsg);
3182 <                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
3183 <                        n = MAX_ARRAY_SIZE;
3184 <                    else
3185 <                        n += (n >>> 1) + 1;
3186 <                    r = Arrays.copyOf(r, n);
3187 <                }
3188 <                r[i++] = it.next();
3189 <            }
3190 <            return (i == n) ? r : Arrays.copyOf(r, i);
3191 <        }
3192 <
3193 <        @SuppressWarnings("unchecked") public final <T> T[] toArray(T[] a) {
3194 <            long sz = map.mappingCount();
3195 <            if (sz > (long)(MAX_ARRAY_SIZE))
3196 <                throw new OutOfMemoryError(oomeMsg);
3197 <            int m = (int)sz;
3198 <            T[] r = (a.length >= m) ? a :
3199 <                (T[])java.lang.reflect.Array
3200 <                .newInstance(a.getClass().getComponentType(), m);
3201 <            int n = r.length;
3202 <            int i = 0;
3203 <            Iterator<?> it = iterator();
3204 <            while (it.hasNext()) {
3205 <                if (i == n) {
3206 <                    if (n >= MAX_ARRAY_SIZE)
3207 <                        throw new OutOfMemoryError(oomeMsg);
3208 <                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
3209 <                        n = MAX_ARRAY_SIZE;
3210 <                    else
3211 <                        n += (n >>> 1) + 1;
3212 <                    r = Arrays.copyOf(r, n);
3213 <                }
3214 <                r[i++] = (T)it.next();
3215 <            }
3216 <            if (a == r && i < n) {
3217 <                r[i] = null; // null-terminate
3218 <                return r;
3219 <            }
3220 <            return (i == n) ? r : Arrays.copyOf(r, i);
3221 <        }
3222 <
3223 <        public final int hashCode() {
3224 <            int h = 0;
3225 <            for (Iterator<?> it = iterator(); it.hasNext();)
3226 <                h += it.next().hashCode();
3227 <            return h;
3228 <        }
3229 <
3230 <        public final String toString() {
3231 <            StringBuilder sb = new StringBuilder();
3232 <            sb.append('[');
3233 <            Iterator<?> it = iterator();
3234 <            if (it.hasNext()) {
3235 <                for (;;) {
3236 <                    Object e = it.next();
3237 <                    sb.append(e == this ? "(this Collection)" : e);
3238 <                    if (!it.hasNext())
3239 <                        break;
3240 <                    sb.append(',').append(' ');
3241 <                }
3242 <            }
3243 <            return sb.append(']').toString();
3244 <        }
3245 <
3246 <        public final boolean containsAll(Collection<?> c) {
3247 <            if (c != this) {
3248 <                for (Iterator<?> it = c.iterator(); it.hasNext();) {
3249 <                    Object e = it.next();
3250 <                    if (e == null || !contains(e))
3251 <                        return false;
3252 <                }
3253 <            }
3254 <            return true;
3255 <        }
3256 <
3257 <        public final boolean removeAll(Collection<?> c) {
3258 <            boolean modified = false;
3259 <            for (Iterator<?> it = iterator(); it.hasNext();) {
3260 <                if (c.contains(it.next())) {
3261 <                    it.remove();
3262 <                    modified = true;
3263 <                }
3264 <            }
3265 <            return modified;
3266 <        }
3267 <
3268 <        public final boolean retainAll(Collection<?> c) {
3269 <            boolean modified = false;
3270 <            for (Iterator<?> it = iterator(); it.hasNext();) {
3271 <                if (!c.contains(it.next())) {
3272 <                    it.remove();
3273 <                    modified = true;
3274 <                }
3275 <            }
3276 <            return modified;
3277 <        }
3278 <
3279 <    }
3280 <
3281 <    static final class KeySet<K,V> extends CHMView<K,V> implements Set<K> {
3282 <        KeySet(ConcurrentHashMapV8<K, V> map)  {
3283 <            super(map);
3284 <        }
3285 <        public final boolean contains(Object o) { return map.containsKey(o); }
3286 <        public final boolean remove(Object o)   { return map.remove(o) != null; }
3287 <        public final Iterator<K> iterator() {
3288 <            return new KeyIterator<K,V>(map);
3289 <        }
3290 <        public final boolean add(K e) {
3291 <            throw new UnsupportedOperationException();
3292 <        }
3293 <        public final boolean addAll(Collection<? extends K> c) {
3294 <            throw new UnsupportedOperationException();
3295 <        }
3296 <        public boolean equals(Object o) {
3297 <            Set<?> c;
3298 <            return ((o instanceof Set) &&
3299 <                    ((c = (Set<?>)o) == this ||
3300 <                     (containsAll(c) && c.containsAll(this))));
3301 <        }
3302 <    }
3303 <
3304 <
3305 <    static final class Values<K,V> extends CHMView<K,V>
3306 <        implements Collection<V> {
3307 <        Values(ConcurrentHashMapV8<K, V> map)   { super(map); }
3308 <        public final boolean contains(Object o) { return map.containsValue(o); }
3309 <        public final boolean remove(Object o) {
3310 <            if (o != null) {
3311 <                Iterator<V> it = new ValueIterator<K,V>(map);
3312 <                while (it.hasNext()) {
3313 <                    if (o.equals(it.next())) {
3314 <                        it.remove();
3315 <                        return true;
3316 <                    }
3317 <                }
3318 <            }
3319 <            return false;
3320 <        }
3321 <        public final Iterator<V> iterator() {
3322 <            return new ValueIterator<K,V>(map);
3323 <        }
3324 <        public final boolean add(V e) {
3325 <            throw new UnsupportedOperationException();
3326 <        }
3327 <        public final boolean addAll(Collection<? extends V> c) {
3328 <            throw new UnsupportedOperationException();
3329 <        }
3330 <
3331 <    }
3332 <
3333 <    static final class EntrySet<K,V> extends CHMView<K,V>
3334 <        implements Set<Map.Entry<K,V>> {
3335 <        EntrySet(ConcurrentHashMapV8<K, V> map) { super(map); }
3336 <        public final boolean contains(Object o) {
3337 <            Object k, v, r; Map.Entry<?,?> e;
3338 <            return ((o instanceof Map.Entry) &&
3339 <                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
3340 <                    (r = map.get(k)) != null &&
3341 <                    (v = e.getValue()) != null &&
3342 <                    (v == r || v.equals(r)));
3343 <        }
3344 <        public final boolean remove(Object o) {
3345 <            Object k, v; Map.Entry<?,?> e;
3346 <            return ((o instanceof Map.Entry) &&
3347 <                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
3348 <                    (v = e.getValue()) != null &&
3349 <                    map.remove(k, v));
3350 <        }
3351 <        public final Iterator<Map.Entry<K,V>> iterator() {
3352 <            return new EntryIterator<K,V>(map);
3353 <        }
3354 <        public final boolean add(Entry<K,V> e) {
3355 <            throw new UnsupportedOperationException();
3356 <        }
3357 <        public final boolean addAll(Collection<? extends Entry<K,V>> c) {
3358 <            throw new UnsupportedOperationException();
3359 <        }
3360 <        public boolean equals(Object o) {
3361 <            Set<?> c;
3362 <            return ((o instanceof Set) &&
3363 <                    ((c = (Set<?>)o) == this ||
3364 <                     (containsAll(c) && c.containsAll(this))));
3365 <        }
3184 >    static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
3185 >        return new AbstractMap.SimpleEntry<K,V>(k, v);
3186      }
3187  
3188      /* ---------------- Serialization Support -------------- */
# Line 3386 | Line 3206 | public class ConcurrentHashMapV8<K, V>
3206       * for each key-value mapping, followed by a null pair.
3207       * The key-value mappings are emitted in no particular order.
3208       */
3209 <    @SuppressWarnings("unchecked") private void writeObject(java.io.ObjectOutputStream s)
3209 >    @SuppressWarnings("unchecked") private void writeObject
3210 >        (java.io.ObjectOutputStream s)
3211          throws java.io.IOException {
3212          if (segments == null) { // for serialization compatibility
3213              segments = (Segment<K,V>[])
# Line 3396 | Line 3217 | public class ConcurrentHashMapV8<K, V>
3217          }
3218          s.defaultWriteObject();
3219          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3220 <        Object v;
3220 >        V v;
3221          while ((v = it.advance()) != null) {
3222              s.writeObject(it.nextKey);
3223              s.writeObject(v);
# Line 3410 | Line 3231 | public class ConcurrentHashMapV8<K, V>
3231       * Reconstitutes the instance from a stream (that is, deserializes it).
3232       * @param s the stream
3233       */
3234 <    @SuppressWarnings("unchecked") private void readObject(java.io.ObjectInputStream s)
3234 >    @SuppressWarnings("unchecked") private void readObject
3235 >        (java.io.ObjectInputStream s)
3236          throws java.io.IOException, ClassNotFoundException {
3237          s.defaultReadObject();
3238          this.segments = null; // unneeded
3417        // initialize transient final field
3418        UNSAFE.putObjectVolatile(this, counterOffset, new LongAdder());
3239  
3240          // Create all nodes, then place in table once size is known
3241          long size = 0L;
3242 <        Node p = null;
3242 >        Node<V> p = null;
3243          for (;;) {
3244              K k = (K) s.readObject();
3245              V v = (V) s.readObject();
3246              if (k != null && v != null) {
3247                  int h = spread(k.hashCode());
3248 <                p = new Node(h, k, v, p);
3248 >                p = new Node<V>(h, k, v, p);
3249                  ++size;
3250              }
3251              else
# Line 3443 | Line 3263 | public class ConcurrentHashMapV8<K, V>
3263              int sc = sizeCtl;
3264              boolean collide = false;
3265              if (n > sc &&
3266 <                UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
3266 >                U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
3267                  try {
3268                      if (table == null) {
3269                          init = true;
3270 <                        Node[] tab = new Node[n];
3270 >                        @SuppressWarnings("rawtypes") Node[] rt = new Node[n];
3271 >                        Node<V>[] tab = (Node<V>[])rt;
3272                          int mask = n - 1;
3273                          while (p != null) {
3274                              int j = p.hash & mask;
3275 <                            Node next = p.next;
3276 <                            Node q = p.next = tabAt(tab, j);
3275 >                            Node<V> next = p.next;
3276 >                            Node<V> q = p.next = tabAt(tab, j);
3277                              setTabAt(tab, j, p);
3278                              if (!collide && q != null && q.hash == p.hash)
3279                                  collide = true;
3280                              p = next;
3281                          }
3282                          table = tab;
3283 <                        counter.add(size);
3283 >                        addCount(size, -1);
3284                          sc = n - (n >>> 2);
3285                      }
3286                  } finally {
3287                      sizeCtl = sc;
3288                  }
3289                  if (collide) { // rescan and convert to TreeBins
3290 <                    Node[] tab = table;
3290 >                    Node<V>[] tab = table;
3291                      for (int i = 0; i < tab.length; ++i) {
3292                          int c = 0;
3293 <                        for (Node e = tabAt(tab, i); e != null; e = e.next) {
3293 >                        for (Node<V> e = tabAt(tab, i); e != null; e = e.next) {
3294                              if (++c > TREE_THRESHOLD &&
3295                                  (e.key instanceof Comparable)) {
3296                                  replaceWithTreeBin(tab, i, e.key);
# Line 3481 | Line 3302 | public class ConcurrentHashMapV8<K, V>
3302              }
3303              if (!init) { // Can only happen if unsafely published.
3304                  while (p != null) {
3305 <                    internalPut(p.key, p.val);
3305 >                    internalPut((K)p.key, p.val, false);
3306                      p = p.next;
3307                  }
3308              }
3309          }
3310      }
3311  
3491
3312      // -------------------------------------------------------
3313  
3314      // Sams
# Line 3530 | Line 3350 | public class ConcurrentHashMapV8<K, V>
3350  
3351      // -------------------------------------------------------
3352  
3353 +    // Sequential bulk operations
3354 +
3355      /**
3356 <     * Returns an extended {@link Parallel} view of this map using the
3535 <     * given executor for bulk parallel operations.
3356 >     * Performs the given action for each (key, value).
3357       *
3358 <     * @param executor the executor
3538 <     * @return a parallel view
3358 >     * @param action the action
3359       */
3360 <    public Parallel parallel(ForkJoinPool executor)  {
3361 <        return new Parallel(executor);
3360 >    @SuppressWarnings("unchecked") public void forEachSequentially
3361 >        (BiAction<K,V> action) {
3362 >        if (action == null) throw new NullPointerException();
3363 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3364 >        V v;
3365 >        while ((v = it.advance()) != null)
3366 >            action.apply((K)it.nextKey, v);
3367      }
3368  
3369      /**
3370 <     * An extended view of a ConcurrentHashMap supporting bulk
3371 <     * parallel operations. These operations are designed to be
3372 <     * safely, and often sensibly, applied even with maps that are
3373 <     * being concurrently updated by other threads; for example, when
3374 <     * computing a snapshot summary of the values in a shared
3375 <     * registry.  There are three kinds of operation, each with four
3376 <     * forms, accepting functions with Keys, Values, Entries, and
3552 <     * (Key, Value) arguments and/or return values. Because the
3553 <     * elements of a ConcurrentHashMap are not ordered in any
3554 <     * particular way, and may be processed in different orders in
3555 <     * different parallel executions, the correctness of supplied
3556 <     * functions should not depend on any ordering, or on any other
3557 <     * objects or values that may transiently change while computation
3558 <     * is in progress; and except for forEach actions, should ideally
3559 <     * be side-effect-free.
3560 <     *
3561 <     * <ul>
3562 <     * <li> forEach: Perform a given action on each element.
3563 <     * A variant form applies a given transformation on each element
3564 <     * before performing the action.</li>
3565 <     *
3566 <     * <li> search: Return the first available non-null result of
3567 <     * applying a given function on each element; skipping further
3568 <     * search when a result is found.</li>
3569 <     *
3570 <     * <li> reduce: Accumulate each element.  The supplied reduction
3571 <     * function cannot rely on ordering (more formally, it should be
3572 <     * both associative and commutative).  There are five variants:
3573 <     *
3574 <     * <ul>
3575 <     *
3576 <     * <li> Plain reductions. (There is not a form of this method for
3577 <     * (key, value) function arguments since there is no corresponding
3578 <     * return type.)</li>
3579 <     *
3580 <     * <li> Mapped reductions that accumulate the results of a given
3581 <     * function applied to each element.</li>
3582 <     *
3583 <     * <li> Reductions to scalar doubles, longs, and ints, using a
3584 <     * given basis value.</li>
3585 <     *
3586 <     * </li>
3587 <     * </ul>
3588 <     * </ul>
3589 <     *
3590 <     * <p>The concurrency properties of the bulk operations follow
3591 <     * from those of ConcurrentHashMap: Any non-null result returned
3592 <     * from {@code get(key)} and related access methods bears a
3593 <     * happens-before relation with the associated insertion or
3594 <     * update.  The result of any bulk operation reflects the
3595 <     * composition of these per-element relations (but is not
3596 <     * necessarily atomic with respect to the map as a whole unless it
3597 <     * is somehow known to be quiescent).  Conversely, because keys
3598 <     * and values in the map are never null, null serves as a reliable
3599 <     * atomic indicator of the current lack of any result.  To
3600 <     * maintain this property, null serves as an implicit basis for
3601 <     * all non-scalar reduction operations. For the double, long, and
3602 <     * int versions, the basis should be one that, when combined with
3603 <     * any other value, returns that other value (more formally, it
3604 <     * should be the identity element for the reduction). Most common
3605 <     * reductions have these properties; for example, computing a sum
3606 <     * with basis 0 or a minimum with basis MAX_VALUE.
3607 <     *
3608 <     * <p>Search and transformation functions provided as arguments
3609 <     * should similarly return null to indicate the lack of any result
3610 <     * (in which case it is not used). In the case of mapped
3611 <     * reductions, this also enables transformations to serve as
3612 <     * filters, returning null (or, in the case of primitive
3613 <     * specializations, the identity basis) if the element should not
3614 <     * be combined. You can create compound transformations and
3615 <     * filterings by composing them yourself under this "null means
3616 <     * there is nothing there now" rule before using them in search or
3617 <     * reduce operations.
3618 <     *
3619 <     * <p>Methods accepting and/or returning Entry arguments maintain
3620 <     * key-value associations. They may be useful for example when
3621 <     * finding the key for the greatest value. Note that "plain" Entry
3622 <     * arguments can be supplied using {@code new
3623 <     * AbstractMap.SimpleEntry(k,v)}.
3624 <     *
3625 <     * <p> Bulk operations may complete abruptly, throwing an
3626 <     * exception encountered in the application of a supplied
3627 <     * function. Bear in mind when handling such exceptions that other
3628 <     * concurrently executing functions could also have thrown
3629 <     * exceptions, or would have done so if the first exception had
3630 <     * not occurred.
3631 <     *
3632 <     * <p>Parallel speedups compared to sequential processing are
3633 <     * common but not guaranteed.  Operations involving brief
3634 <     * functions on small maps may execute more slowly than sequential
3635 <     * loops if the underlying work to parallelize the computation is
3636 <     * more expensive than the computation itself. Similarly,
3637 <     * parallelization may not lead to much actual parallelism if all
3638 <     * processors are busy performing unrelated tasks.
3639 <     *
3640 <     * <p> All arguments to all task methods must be non-null.
3641 <     *
3642 <     * <p><em>jsr166e note: During transition, this class
3643 <     * uses nested functional interfaces with different names but the
3644 <     * same forms as those expected for JDK8.<em>
3370 >     * Performs the given action for each non-null transformation
3371 >     * of each (key, value).
3372 >     *
3373 >     * @param transformer a function returning the transformation
3374 >     * for an element, or null of there is no transformation (in
3375 >     * which case the action is not applied).
3376 >     * @param action the action
3377       */
3378 <    public class Parallel {
3379 <        final ForkJoinPool fjp;
3380 <
3381 <        /**
3382 <         * Returns an extended view of this map using the given
3383 <         * executor for bulk parallel operations.
3384 <         *
3385 <         * @param executor the executor
3386 <         */
3387 <        public Parallel(ForkJoinPool executor)  {
3656 <            this.fjp = executor;
3378 >    @SuppressWarnings("unchecked") public <U> void forEachSequentially
3379 >        (BiFun<? super K, ? super V, ? extends U> transformer,
3380 >         Action<U> action) {
3381 >        if (transformer == null || action == null)
3382 >            throw new NullPointerException();
3383 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3384 >        V v; U u;
3385 >        while ((v = it.advance()) != null) {
3386 >            if ((u = transformer.apply((K)it.nextKey, v)) != null)
3387 >                action.apply(u);
3388          }
3389 +    }
3390  
3391 <        /**
3392 <         * Performs the given action for each (key, value).
3393 <         *
3394 <         * @param action the action
3395 <         */
3396 <        public void forEach(BiAction<K,V> action) {
3397 <            fjp.invoke(ForkJoinTasks.forEach
3398 <                       (ConcurrentHashMapV8.this, action));
3391 >    /**
3392 >     * Returns a non-null result from applying the given search
3393 >     * function on each (key, value), or null if none.
3394 >     *
3395 >     * @param searchFunction a function returning a non-null
3396 >     * result on success, else null
3397 >     * @return a non-null result from applying the given search
3398 >     * function on each (key, value), or null if none
3399 >     */
3400 >    @SuppressWarnings("unchecked") public <U> U searchSequentially
3401 >        (BiFun<? super K, ? super V, ? extends U> searchFunction) {
3402 >        if (searchFunction == null) throw new NullPointerException();
3403 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3404 >        V v; U u;
3405 >        while ((v = it.advance()) != null) {
3406 >            if ((u = searchFunction.apply((K)it.nextKey, v)) != null)
3407 >                return u;
3408          }
3409 +        return null;
3410 +    }
3411  
3412 <        /**
3413 <         * Performs the given action for each non-null transformation
3414 <         * of each (key, value).
3415 <         *
3416 <         * @param transformer a function returning the transformation
3417 <         * for an element, or null of there is no transformation (in
3418 <         * which case the action is not applied).
3419 <         * @param action the action
3420 <         */
3421 <        public <U> void forEach(BiFun<? super K, ? super V, ? extends U> transformer,
3422 <                                Action<U> action) {
3423 <            fjp.invoke(ForkJoinTasks.forEach
3424 <                       (ConcurrentHashMapV8.this, transformer, action));
3412 >    /**
3413 >     * Returns the result of accumulating the given transformation
3414 >     * of all (key, value) pairs using the given reducer to
3415 >     * combine values, or null if none.
3416 >     *
3417 >     * @param transformer a function returning the transformation
3418 >     * for an element, or null of there is no transformation (in
3419 >     * which case it is not combined).
3420 >     * @param reducer a commutative associative combining function
3421 >     * @return the result of accumulating the given transformation
3422 >     * of all (key, value) pairs
3423 >     */
3424 >    @SuppressWarnings("unchecked") public <U> U reduceSequentially
3425 >        (BiFun<? super K, ? super V, ? extends U> transformer,
3426 >         BiFun<? super U, ? super U, ? extends U> reducer) {
3427 >        if (transformer == null || reducer == null)
3428 >            throw new NullPointerException();
3429 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3430 >        U r = null, u; V v;
3431 >        while ((v = it.advance()) != null) {
3432 >            if ((u = transformer.apply((K)it.nextKey, v)) != null)
3433 >                r = (r == null) ? u : reducer.apply(r, u);
3434          }
3435 +        return r;
3436 +    }
3437  
3438 <        /**
3439 <         * Returns a non-null result from applying the given search
3440 <         * function on each (key, value), or null if none.  Upon
3441 <         * success, further element processing is suppressed and the
3442 <         * results of any other parallel invocations of the search
3443 <         * function are ignored.
3444 <         *
3445 <         * @param searchFunction a function returning a non-null
3446 <         * result on success, else null
3447 <         * @return a non-null result from applying the given search
3448 <         * function on each (key, value), or null if none
3449 <         */
3450 <        public <U> U search(BiFun<? super K, ? super V, ? extends U> searchFunction) {
3451 <            return fjp.invoke(ForkJoinTasks.search
3452 <                              (ConcurrentHashMapV8.this, searchFunction));
3453 <        }
3438 >    /**
3439 >     * Returns the result of accumulating the given transformation
3440 >     * of all (key, value) pairs using the given reducer to
3441 >     * combine values, and the given basis as an identity value.
3442 >     *
3443 >     * @param transformer a function returning the transformation
3444 >     * for an element
3445 >     * @param basis the identity (initial default value) for the reduction
3446 >     * @param reducer a commutative associative combining function
3447 >     * @return the result of accumulating the given transformation
3448 >     * of all (key, value) pairs
3449 >     */
3450 >    @SuppressWarnings("unchecked") public double reduceToDoubleSequentially
3451 >        (ObjectByObjectToDouble<? super K, ? super V> transformer,
3452 >         double basis,
3453 >         DoubleByDoubleToDouble reducer) {
3454 >        if (transformer == null || reducer == null)
3455 >            throw new NullPointerException();
3456 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3457 >        double r = basis; V v;
3458 >        while ((v = it.advance()) != null)
3459 >            r = reducer.apply(r, transformer.apply((K)it.nextKey, v));
3460 >        return r;
3461 >    }
3462  
3463 <        /**
3464 <         * Returns the result of accumulating the given transformation
3465 <         * of all (key, value) pairs using the given reducer to
3466 <         * combine values, or null if none.
3467 <         *
3468 <         * @param transformer a function returning the transformation
3469 <         * for an element, or null of there is no transformation (in
3470 <         * which case it is not combined).
3471 <         * @param reducer a commutative associative combining function
3472 <         * @return the result of accumulating the given transformation
3473 <         * of all (key, value) pairs
3474 <         */
3475 <        public <U> U reduce(BiFun<? super K, ? super V, ? extends U> transformer,
3476 <                            BiFun<? super U, ? super U, ? extends U> reducer) {
3477 <            return fjp.invoke(ForkJoinTasks.reduce
3478 <                              (ConcurrentHashMapV8.this, transformer, reducer));
3479 <        }
3463 >    /**
3464 >     * Returns the result of accumulating the given transformation
3465 >     * of all (key, value) pairs using the given reducer to
3466 >     * combine values, and the given basis as an identity value.
3467 >     *
3468 >     * @param transformer a function returning the transformation
3469 >     * for an element
3470 >     * @param basis the identity (initial default value) for the reduction
3471 >     * @param reducer a commutative associative combining function
3472 >     * @return the result of accumulating the given transformation
3473 >     * of all (key, value) pairs
3474 >     */
3475 >    @SuppressWarnings("unchecked") public long reduceToLongSequentially
3476 >        (ObjectByObjectToLong<? super K, ? super V> transformer,
3477 >         long basis,
3478 >         LongByLongToLong reducer) {
3479 >        if (transformer == null || reducer == null)
3480 >            throw new NullPointerException();
3481 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3482 >        long r = basis; V v;
3483 >        while ((v = it.advance()) != null)
3484 >            r = reducer.apply(r, transformer.apply((K)it.nextKey, v));
3485 >        return r;
3486 >    }
3487  
3488 <        /**
3489 <         * Returns the result of accumulating the given transformation
3490 <         * of all (key, value) pairs using the given reducer to
3491 <         * combine values, and the given basis as an identity value.
3492 <         *
3493 <         * @param transformer a function returning the transformation
3494 <         * for an element
3495 <         * @param basis the identity (initial default value) for the reduction
3496 <         * @param reducer a commutative associative combining function
3497 <         * @return the result of accumulating the given transformation
3498 <         * of all (key, value) pairs
3499 <         */
3500 <        public double reduceToDouble(ObjectByObjectToDouble<? super K, ? super V> transformer,
3501 <                                     double basis,
3502 <                                     DoubleByDoubleToDouble reducer) {
3503 <            return fjp.invoke(ForkJoinTasks.reduceToDouble
3504 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
3505 <        }
3488 >    /**
3489 >     * Returns the result of accumulating the given transformation
3490 >     * of all (key, value) pairs using the given reducer to
3491 >     * combine values, and the given basis as an identity value.
3492 >     *
3493 >     * @param transformer a function returning the transformation
3494 >     * for an element
3495 >     * @param basis the identity (initial default value) for the reduction
3496 >     * @param reducer a commutative associative combining function
3497 >     * @return the result of accumulating the given transformation
3498 >     * of all (key, value) pairs
3499 >     */
3500 >    @SuppressWarnings("unchecked") public int reduceToIntSequentially
3501 >        (ObjectByObjectToInt<? super K, ? super V> transformer,
3502 >         int basis,
3503 >         IntByIntToInt reducer) {
3504 >        if (transformer == null || reducer == null)
3505 >            throw new NullPointerException();
3506 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3507 >        int r = basis; V v;
3508 >        while ((v = it.advance()) != null)
3509 >            r = reducer.apply(r, transformer.apply((K)it.nextKey, v));
3510 >        return r;
3511 >    }
3512  
3513 <        /**
3514 <         * Returns the result of accumulating the given transformation
3515 <         * of all (key, value) pairs using the given reducer to
3516 <         * combine values, and the given basis as an identity value.
3517 <         *
3518 <         * @param transformer a function returning the transformation
3519 <         * for an element
3520 <         * @param basis the identity (initial default value) for the reduction
3521 <         * @param reducer a commutative associative combining function
3522 <         * @return the result of accumulating the given transformation
3523 <         * of all (key, value) pairs
3524 <         */
3750 <        public long reduceToLong(ObjectByObjectToLong<? super K, ? super V> transformer,
3751 <                                 long basis,
3752 <                                 LongByLongToLong reducer) {
3753 <            return fjp.invoke(ForkJoinTasks.reduceToLong
3754 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
3755 <        }
3513 >    /**
3514 >     * Performs the given action for each key.
3515 >     *
3516 >     * @param action the action
3517 >     */
3518 >    @SuppressWarnings("unchecked") public void forEachKeySequentially
3519 >        (Action<K> action) {
3520 >        if (action == null) throw new NullPointerException();
3521 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3522 >        while (it.advance() != null)
3523 >            action.apply((K)it.nextKey);
3524 >    }
3525  
3526 <        /**
3527 <         * Returns the result of accumulating the given transformation
3528 <         * of all (key, value) pairs using the given reducer to
3529 <         * combine values, and the given basis as an identity value.
3530 <         *
3531 <         * @param transformer a function returning the transformation
3532 <         * for an element
3533 <         * @param basis the identity (initial default value) for the reduction
3534 <         * @param reducer a commutative associative combining function
3535 <         * @return the result of accumulating the given transformation
3536 <         * of all (key, value) pairs
3537 <         */
3538 <        public int reduceToInt(ObjectByObjectToInt<? super K, ? super V> transformer,
3539 <                               int basis,
3540 <                               IntByIntToInt reducer) {
3541 <            return fjp.invoke(ForkJoinTasks.reduceToInt
3542 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
3526 >    /**
3527 >     * Performs the given action for each non-null transformation
3528 >     * of each key.
3529 >     *
3530 >     * @param transformer a function returning the transformation
3531 >     * for an element, or null of there is no transformation (in
3532 >     * which case the action is not applied).
3533 >     * @param action the action
3534 >     */
3535 >    @SuppressWarnings("unchecked") public <U> void forEachKeySequentially
3536 >        (Fun<? super K, ? extends U> transformer,
3537 >         Action<U> action) {
3538 >        if (transformer == null || action == null)
3539 >            throw new NullPointerException();
3540 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3541 >        U u;
3542 >        while (it.advance() != null) {
3543 >            if ((u = transformer.apply((K)it.nextKey)) != null)
3544 >                action.apply(u);
3545          }
3546 +        ForkJoinTasks.forEachKey
3547 +            (this, transformer, action).invoke();
3548 +    }
3549  
3550 <        /**
3551 <         * Performs the given action for each key.
3552 <         *
3553 <         * @param action the action
3554 <         */
3555 <        public void forEachKey(Action<K> action) {
3556 <            fjp.invoke(ForkJoinTasks.forEachKey
3557 <                       (ConcurrentHashMapV8.this, action));
3550 >    /**
3551 >     * Returns a non-null result from applying the given search
3552 >     * function on each key, or null if none.
3553 >     *
3554 >     * @param searchFunction a function returning a non-null
3555 >     * result on success, else null
3556 >     * @return a non-null result from applying the given search
3557 >     * function on each key, or null if none
3558 >     */
3559 >    @SuppressWarnings("unchecked") public <U> U searchKeysSequentially
3560 >        (Fun<? super K, ? extends U> searchFunction) {
3561 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3562 >        U u;
3563 >        while (it.advance() != null) {
3564 >            if ((u = searchFunction.apply((K)it.nextKey)) != null)
3565 >                return u;
3566          }
3567 +        return null;
3568 +    }
3569  
3570 <        /**
3571 <         * Performs the given action for each non-null transformation
3572 <         * of each key.
3573 <         *
3574 <         * @param transformer a function returning the transformation
3575 <         * for an element, or null of there is no transformation (in
3576 <         * which case the action is not applied).
3577 <         * @param action the action
3578 <         */
3579 <        public <U> void forEachKey(Fun<? super K, ? extends U> transformer,
3580 <                                   Action<U> action) {
3581 <            fjp.invoke(ForkJoinTasks.forEachKey
3582 <                       (ConcurrentHashMapV8.this, transformer, action));
3583 <        }
3570 >    /**
3571 >     * Returns the result of accumulating all keys using the given
3572 >     * reducer to combine values, or null if none.
3573 >     *
3574 >     * @param reducer a commutative associative combining function
3575 >     * @return the result of accumulating all keys using the given
3576 >     * reducer to combine values, or null if none
3577 >     */
3578 >    @SuppressWarnings("unchecked") public K reduceKeysSequentially
3579 >        (BiFun<? super K, ? super K, ? extends K> reducer) {
3580 >        if (reducer == null) throw new NullPointerException();
3581 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3582 >        K r = null;
3583 >        while (it.advance() != null) {
3584 >            K u = (K)it.nextKey;
3585 >            r = (r == null) ? u : reducer.apply(r, u);
3586 >        }
3587 >        return r;
3588 >    }
3589  
3590 <        /**
3591 <         * Returns a non-null result from applying the given search
3592 <         * function on each key, or null if none. Upon success,
3593 <         * further element processing is suppressed and the results of
3594 <         * any other parallel invocations of the search function are
3595 <         * ignored.
3596 <         *
3597 <         * @param searchFunction a function returning a non-null
3598 <         * result on success, else null
3599 <         * @return a non-null result from applying the given search
3600 <         * function on each key, or null if none
3601 <         */
3602 <        public <U> U searchKeys(Fun<? super K, ? extends U> searchFunction) {
3603 <            return fjp.invoke(ForkJoinTasks.searchKeys
3604 <                              (ConcurrentHashMapV8.this, searchFunction));
3590 >    /**
3591 >     * Returns the result of accumulating the given transformation
3592 >     * of all keys using the given reducer to combine values, or
3593 >     * null if none.
3594 >     *
3595 >     * @param transformer a function returning the transformation
3596 >     * for an element, or null of there is no transformation (in
3597 >     * which case it is not combined).
3598 >     * @param reducer a commutative associative combining function
3599 >     * @return the result of accumulating the given transformation
3600 >     * of all keys
3601 >     */
3602 >    @SuppressWarnings("unchecked") public <U> U reduceKeysSequentially
3603 >        (Fun<? super K, ? extends U> transformer,
3604 >         BiFun<? super U, ? super U, ? extends U> reducer) {
3605 >        if (transformer == null || reducer == null)
3606 >            throw new NullPointerException();
3607 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3608 >        U r = null, u;
3609 >        while (it.advance() != null) {
3610 >            if ((u = transformer.apply((K)it.nextKey)) != null)
3611 >                r = (r == null) ? u : reducer.apply(r, u);
3612 >        }
3613 >        return r;
3614 >    }
3615 >
3616 >    /**
3617 >     * Returns the result of accumulating the given transformation
3618 >     * of all keys using the given reducer to combine values, and
3619 >     * the given basis as an identity value.
3620 >     *
3621 >     * @param transformer a function returning the transformation
3622 >     * for an element
3623 >     * @param basis the identity (initial default value) for the reduction
3624 >     * @param reducer a commutative associative combining function
3625 >     * @return  the result of accumulating the given transformation
3626 >     * of all keys
3627 >     */
3628 >    @SuppressWarnings("unchecked") public double reduceKeysToDoubleSequentially
3629 >        (ObjectToDouble<? super K> transformer,
3630 >         double basis,
3631 >         DoubleByDoubleToDouble reducer) {
3632 >        if (transformer == null || reducer == null)
3633 >            throw new NullPointerException();
3634 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3635 >        double r = basis;
3636 >        while (it.advance() != null)
3637 >            r = reducer.apply(r, transformer.apply((K)it.nextKey));
3638 >        return r;
3639 >    }
3640 >
3641 >    /**
3642 >     * Returns the result of accumulating the given transformation
3643 >     * of all keys using the given reducer to combine values, and
3644 >     * the given basis as an identity value.
3645 >     *
3646 >     * @param transformer a function returning the transformation
3647 >     * for an element
3648 >     * @param basis the identity (initial default value) for the reduction
3649 >     * @param reducer a commutative associative combining function
3650 >     * @return the result of accumulating the given transformation
3651 >     * of all keys
3652 >     */
3653 >    @SuppressWarnings("unchecked") public long reduceKeysToLongSequentially
3654 >        (ObjectToLong<? super K> transformer,
3655 >         long basis,
3656 >         LongByLongToLong reducer) {
3657 >        if (transformer == null || reducer == null)
3658 >            throw new NullPointerException();
3659 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3660 >        long r = basis;
3661 >        while (it.advance() != null)
3662 >            r = reducer.apply(r, transformer.apply((K)it.nextKey));
3663 >        return r;
3664 >    }
3665 >
3666 >    /**
3667 >     * Returns the result of accumulating the given transformation
3668 >     * of all keys using the given reducer to combine values, and
3669 >     * the given basis as an identity value.
3670 >     *
3671 >     * @param transformer a function returning the transformation
3672 >     * for an element
3673 >     * @param basis the identity (initial default value) for the reduction
3674 >     * @param reducer a commutative associative combining function
3675 >     * @return the result of accumulating the given transformation
3676 >     * of all keys
3677 >     */
3678 >    @SuppressWarnings("unchecked") public int reduceKeysToIntSequentially
3679 >        (ObjectToInt<? super K> transformer,
3680 >         int basis,
3681 >         IntByIntToInt reducer) {
3682 >        if (transformer == null || reducer == null)
3683 >            throw new NullPointerException();
3684 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3685 >        int r = basis;
3686 >        while (it.advance() != null)
3687 >            r = reducer.apply(r, transformer.apply((K)it.nextKey));
3688 >        return r;
3689 >    }
3690 >
3691 >    /**
3692 >     * Performs the given action for each value.
3693 >     *
3694 >     * @param action the action
3695 >     */
3696 >    public void forEachValueSequentially(Action<V> action) {
3697 >        if (action == null) throw new NullPointerException();
3698 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3699 >        V v;
3700 >        while ((v = it.advance()) != null)
3701 >            action.apply(v);
3702 >    }
3703 >
3704 >    /**
3705 >     * Performs the given action for each non-null transformation
3706 >     * of each value.
3707 >     *
3708 >     * @param transformer a function returning the transformation
3709 >     * for an element, or null of there is no transformation (in
3710 >     * which case the action is not applied).
3711 >     */
3712 >    public <U> void forEachValueSequentially
3713 >        (Fun<? super V, ? extends U> transformer,
3714 >         Action<U> action) {
3715 >        if (transformer == null || action == null)
3716 >            throw new NullPointerException();
3717 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3718 >        V v; U u;
3719 >        while ((v = it.advance()) != null) {
3720 >            if ((u = transformer.apply(v)) != null)
3721 >                action.apply(u);
3722          }
3723 +    }
3724  
3725 <        /**
3726 <         * Returns the result of accumulating all keys using the given
3727 <         * reducer to combine values, or null if none.
3728 <         *
3729 <         * @param reducer a commutative associative combining function
3730 <         * @return the result of accumulating all keys using the given
3731 <         * reducer to combine values, or null if none
3732 <         */
3733 <        public K reduceKeys(BiFun<? super K, ? super K, ? extends K> reducer) {
3734 <            return fjp.invoke(ForkJoinTasks.reduceKeys
3735 <                              (ConcurrentHashMapV8.this, reducer));
3725 >    /**
3726 >     * Returns a non-null result from applying the given search
3727 >     * function on each value, or null if none.
3728 >     *
3729 >     * @param searchFunction a function returning a non-null
3730 >     * result on success, else null
3731 >     * @return a non-null result from applying the given search
3732 >     * function on each value, or null if none
3733 >     */
3734 >    public <U> U searchValuesSequentially
3735 >        (Fun<? super V, ? extends U> searchFunction) {
3736 >        if (searchFunction == null) throw new NullPointerException();
3737 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3738 >        V v; U u;
3739 >        while ((v = it.advance()) != null) {
3740 >            if ((u = searchFunction.apply(v)) != null)
3741 >                return u;
3742          }
3743 +        return null;
3744 +    }
3745  
3746 <        /**
3747 <         * Returns the result of accumulating the given transformation
3748 <         * of all keys using the given reducer to combine values, or
3749 <         * null if none.
3750 <         *
3751 <         * @param transformer a function returning the transformation
3752 <         * for an element, or null of there is no transformation (in
3753 <         * which case it is not combined).
3754 <         * @param reducer a commutative associative combining function
3755 <         * @return the result of accumulating the given transformation
3756 <         * of all keys
3757 <         */
3758 <        public <U> U reduceKeys(Fun<? super K, ? extends U> transformer,
3759 <                                BiFun<? super U, ? super U, ? extends U> reducer) {
3760 <            return fjp.invoke(ForkJoinTasks.reduceKeys
3761 <                              (ConcurrentHashMapV8.this, transformer, reducer));
3746 >    /**
3747 >     * Returns the result of accumulating all values using the
3748 >     * given reducer to combine values, or null if none.
3749 >     *
3750 >     * @param reducer a commutative associative combining function
3751 >     * @return  the result of accumulating all values
3752 >     */
3753 >    public V reduceValuesSequentially
3754 >        (BiFun<? super V, ? super V, ? extends V> reducer) {
3755 >        if (reducer == null) throw new NullPointerException();
3756 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3757 >        V r = null; V v;
3758 >        while ((v = it.advance()) != null)
3759 >            r = (r == null) ? v : reducer.apply(r, v);
3760 >        return r;
3761 >    }
3762 >
3763 >    /**
3764 >     * Returns the result of accumulating the given transformation
3765 >     * of all values using the given reducer to combine values, or
3766 >     * null if none.
3767 >     *
3768 >     * @param transformer a function returning the transformation
3769 >     * for an element, or null of there is no transformation (in
3770 >     * which case it is not combined).
3771 >     * @param reducer a commutative associative combining function
3772 >     * @return the result of accumulating the given transformation
3773 >     * of all values
3774 >     */
3775 >    public <U> U reduceValuesSequentially
3776 >        (Fun<? super V, ? extends U> transformer,
3777 >         BiFun<? super U, ? super U, ? extends U> reducer) {
3778 >        if (transformer == null || reducer == null)
3779 >            throw new NullPointerException();
3780 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3781 >        U r = null, u; V v;
3782 >        while ((v = it.advance()) != null) {
3783 >            if ((u = transformer.apply(v)) != null)
3784 >                r = (r == null) ? u : reducer.apply(r, u);
3785          }
3786 +        return r;
3787 +    }
3788  
3789 <        /**
3790 <         * Returns the result of accumulating the given transformation
3791 <         * of all keys using the given reducer to combine values, and
3792 <         * the given basis as an identity value.
3793 <         *
3794 <         * @param transformer a function returning the transformation
3795 <         * for an element
3796 <         * @param basis the identity (initial default value) for the reduction
3797 <         * @param reducer a commutative associative combining function
3798 <         * @return  the result of accumulating the given transformation
3799 <         * of all keys
3800 <         */
3801 <        public double reduceKeysToDouble(ObjectToDouble<? super K> transformer,
3802 <                                         double basis,
3803 <                                         DoubleByDoubleToDouble reducer) {
3804 <            return fjp.invoke(ForkJoinTasks.reduceKeysToDouble
3805 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
3789 >    /**
3790 >     * Returns the result of accumulating the given transformation
3791 >     * of all values using the given reducer to combine values,
3792 >     * and the given basis as an identity value.
3793 >     *
3794 >     * @param transformer a function returning the transformation
3795 >     * for an element
3796 >     * @param basis the identity (initial default value) for the reduction
3797 >     * @param reducer a commutative associative combining function
3798 >     * @return the result of accumulating the given transformation
3799 >     * of all values
3800 >     */
3801 >    public double reduceValuesToDoubleSequentially
3802 >        (ObjectToDouble<? super V> transformer,
3803 >         double basis,
3804 >         DoubleByDoubleToDouble reducer) {
3805 >        if (transformer == null || reducer == null)
3806 >            throw new NullPointerException();
3807 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3808 >        double r = basis; V v;
3809 >        while ((v = it.advance()) != null)
3810 >            r = reducer.apply(r, transformer.apply(v));
3811 >        return r;
3812 >    }
3813 >
3814 >    /**
3815 >     * Returns the result of accumulating the given transformation
3816 >     * of all values using the given reducer to combine values,
3817 >     * and the given basis as an identity value.
3818 >     *
3819 >     * @param transformer a function returning the transformation
3820 >     * for an element
3821 >     * @param basis the identity (initial default value) for the reduction
3822 >     * @param reducer a commutative associative combining function
3823 >     * @return the result of accumulating the given transformation
3824 >     * of all values
3825 >     */
3826 >    public long reduceValuesToLongSequentially
3827 >        (ObjectToLong<? super V> transformer,
3828 >         long basis,
3829 >         LongByLongToLong reducer) {
3830 >        if (transformer == null || reducer == null)
3831 >            throw new NullPointerException();
3832 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3833 >        long r = basis; V v;
3834 >        while ((v = it.advance()) != null)
3835 >            r = reducer.apply(r, transformer.apply(v));
3836 >        return r;
3837 >    }
3838 >
3839 >    /**
3840 >     * Returns the result of accumulating the given transformation
3841 >     * of all values using the given reducer to combine values,
3842 >     * and the given basis as an identity value.
3843 >     *
3844 >     * @param transformer a function returning the transformation
3845 >     * for an element
3846 >     * @param basis the identity (initial default value) for the reduction
3847 >     * @param reducer a commutative associative combining function
3848 >     * @return the result of accumulating the given transformation
3849 >     * of all values
3850 >     */
3851 >    public int reduceValuesToIntSequentially
3852 >        (ObjectToInt<? super V> transformer,
3853 >         int basis,
3854 >         IntByIntToInt reducer) {
3855 >        if (transformer == null || reducer == null)
3856 >            throw new NullPointerException();
3857 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3858 >        int r = basis; V v;
3859 >        while ((v = it.advance()) != null)
3860 >            r = reducer.apply(r, transformer.apply(v));
3861 >        return r;
3862 >    }
3863 >
3864 >    /**
3865 >     * Performs the given action for each entry.
3866 >     *
3867 >     * @param action the action
3868 >     */
3869 >    @SuppressWarnings("unchecked") public void forEachEntrySequentially
3870 >        (Action<Map.Entry<K,V>> action) {
3871 >        if (action == null) throw new NullPointerException();
3872 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3873 >        V v;
3874 >        while ((v = it.advance()) != null)
3875 >            action.apply(entryFor((K)it.nextKey, v));
3876 >    }
3877 >
3878 >    /**
3879 >     * Performs the given action for each non-null transformation
3880 >     * of each entry.
3881 >     *
3882 >     * @param transformer a function returning the transformation
3883 >     * for an element, or null of there is no transformation (in
3884 >     * which case the action is not applied).
3885 >     * @param action the action
3886 >     */
3887 >    @SuppressWarnings("unchecked") public <U> void forEachEntrySequentially
3888 >        (Fun<Map.Entry<K,V>, ? extends U> transformer,
3889 >         Action<U> action) {
3890 >        if (transformer == null || action == null)
3891 >            throw new NullPointerException();
3892 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3893 >        V v; U u;
3894 >        while ((v = it.advance()) != null) {
3895 >            if ((u = transformer.apply(entryFor((K)it.nextKey, v))) != null)
3896 >                action.apply(u);
3897          }
3898 +    }
3899  
3900 <        /**
3901 <         * Returns the result of accumulating the given transformation
3902 <         * of all keys using the given reducer to combine values, and
3903 <         * the given basis as an identity value.
3904 <         *
3905 <         * @param transformer a function returning the transformation
3906 <         * for an element
3907 <         * @param basis the identity (initial default value) for the reduction
3908 <         * @param reducer a commutative associative combining function
3909 <         * @return the result of accumulating the given transformation
3910 <         * of all keys
3911 <         */
3912 <        public long reduceKeysToLong(ObjectToLong<? super K> transformer,
3913 <                                     long basis,
3914 <                                     LongByLongToLong reducer) {
3915 <            return fjp.invoke(ForkJoinTasks.reduceKeysToLong
3916 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
3900 >    /**
3901 >     * Returns a non-null result from applying the given search
3902 >     * function on each entry, or null if none.
3903 >     *
3904 >     * @param searchFunction a function returning a non-null
3905 >     * result on success, else null
3906 >     * @return a non-null result from applying the given search
3907 >     * function on each entry, or null if none
3908 >     */
3909 >    @SuppressWarnings("unchecked") public <U> U searchEntriesSequentially
3910 >        (Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
3911 >        if (searchFunction == null) throw new NullPointerException();
3912 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3913 >        V v; U u;
3914 >        while ((v = it.advance()) != null) {
3915 >            if ((u = searchFunction.apply(entryFor((K)it.nextKey, v))) != null)
3916 >                return u;
3917          }
3918 +        return null;
3919 +    }
3920  
3921 <        /**
3922 <         * Returns the result of accumulating the given transformation
3923 <         * of all keys using the given reducer to combine values, and
3924 <         * the given basis as an identity value.
3925 <         *
3926 <         * @param transformer a function returning the transformation
3927 <         * for an element
3928 <         * @param basis the identity (initial default value) for the reduction
3929 <         * @param reducer a commutative associative combining function
3930 <         * @return the result of accumulating the given transformation
3931 <         * of all keys
3932 <         */
3933 <        public int reduceKeysToInt(ObjectToInt<? super K> transformer,
3934 <                                   int basis,
3935 <                                   IntByIntToInt reducer) {
3902 <            return fjp.invoke(ForkJoinTasks.reduceKeysToInt
3903 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
3921 >    /**
3922 >     * Returns the result of accumulating all entries using the
3923 >     * given reducer to combine values, or null if none.
3924 >     *
3925 >     * @param reducer a commutative associative combining function
3926 >     * @return the result of accumulating all entries
3927 >     */
3928 >    @SuppressWarnings("unchecked") public Map.Entry<K,V> reduceEntriesSequentially
3929 >        (BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
3930 >        if (reducer == null) throw new NullPointerException();
3931 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3932 >        Map.Entry<K,V> r = null; V v;
3933 >        while ((v = it.advance()) != null) {
3934 >            Map.Entry<K,V> u = entryFor((K)it.nextKey, v);
3935 >            r = (r == null) ? u : reducer.apply(r, u);
3936          }
3937 +        return r;
3938 +    }
3939  
3940 <        /**
3941 <         * Performs the given action for each value.
3942 <         *
3943 <         * @param action the action
3944 <         */
3945 <        public void forEachValue(Action<V> action) {
3946 <            fjp.invoke(ForkJoinTasks.forEachValue
3947 <                       (ConcurrentHashMapV8.this, action));
3940 >    /**
3941 >     * Returns the result of accumulating the given transformation
3942 >     * of all entries using the given reducer to combine values,
3943 >     * or null if none.
3944 >     *
3945 >     * @param transformer a function returning the transformation
3946 >     * for an element, or null of there is no transformation (in
3947 >     * which case it is not combined).
3948 >     * @param reducer a commutative associative combining function
3949 >     * @return the result of accumulating the given transformation
3950 >     * of all entries
3951 >     */
3952 >    @SuppressWarnings("unchecked") public <U> U reduceEntriesSequentially
3953 >        (Fun<Map.Entry<K,V>, ? extends U> transformer,
3954 >         BiFun<? super U, ? super U, ? extends U> reducer) {
3955 >        if (transformer == null || reducer == null)
3956 >            throw new NullPointerException();
3957 >        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3958 >        U r = null, u; V v;
3959 >        while ((v = it.advance()) != null) {
3960 >            if ((u = transformer.apply(entryFor((K)it.nextKey, v))) != null)
3961 >                r = (r == null) ? u : reducer.apply(r, u);
3962          }
3963 +        return r;
3964 +    }
3965 +
3966 +    /**
3967 +     * Returns the result of accumulating the given transformation
3968 +     * of all entries using the given reducer to combine values,
3969 +     * and the given basis as an identity value.
3970 +     *
3971 +     * @param transformer a function returning the transformation
3972 +     * for an element
3973 +     * @param basis the identity (initial default value) for the reduction
3974 +     * @param reducer a commutative associative combining function
3975 +     * @return the result of accumulating the given transformation
3976 +     * of all entries
3977 +     */
3978 +    @SuppressWarnings("unchecked") public double reduceEntriesToDoubleSequentially
3979 +        (ObjectToDouble<Map.Entry<K,V>> transformer,
3980 +         double basis,
3981 +         DoubleByDoubleToDouble reducer) {
3982 +        if (transformer == null || reducer == null)
3983 +            throw new NullPointerException();
3984 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3985 +        double r = basis; V v;
3986 +        while ((v = it.advance()) != null)
3987 +            r = reducer.apply(r, transformer.apply(entryFor((K)it.nextKey, v)));
3988 +        return r;
3989 +    }
3990 +
3991 +    /**
3992 +     * Returns the result of accumulating the given transformation
3993 +     * of all entries using the given reducer to combine values,
3994 +     * and the given basis as an identity value.
3995 +     *
3996 +     * @param transformer a function returning the transformation
3997 +     * for an element
3998 +     * @param basis the identity (initial default value) for the reduction
3999 +     * @param reducer a commutative associative combining function
4000 +     * @return  the result of accumulating the given transformation
4001 +     * of all entries
4002 +     */
4003 +    @SuppressWarnings("unchecked") public long reduceEntriesToLongSequentially
4004 +        (ObjectToLong<Map.Entry<K,V>> transformer,
4005 +         long basis,
4006 +         LongByLongToLong reducer) {
4007 +        if (transformer == null || reducer == null)
4008 +            throw new NullPointerException();
4009 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
4010 +        long r = basis; V v;
4011 +        while ((v = it.advance()) != null)
4012 +            r = reducer.apply(r, transformer.apply(entryFor((K)it.nextKey, v)));
4013 +        return r;
4014 +    }
4015 +
4016 +    /**
4017 +     * Returns the result of accumulating the given transformation
4018 +     * of all entries using the given reducer to combine values,
4019 +     * and the given basis as an identity value.
4020 +     *
4021 +     * @param transformer a function returning the transformation
4022 +     * for an element
4023 +     * @param basis the identity (initial default value) for the reduction
4024 +     * @param reducer a commutative associative combining function
4025 +     * @return the result of accumulating the given transformation
4026 +     * of all entries
4027 +     */
4028 +    @SuppressWarnings("unchecked") public int reduceEntriesToIntSequentially
4029 +        (ObjectToInt<Map.Entry<K,V>> transformer,
4030 +         int basis,
4031 +         IntByIntToInt reducer) {
4032 +        if (transformer == null || reducer == null)
4033 +            throw new NullPointerException();
4034 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
4035 +        int r = basis; V v;
4036 +        while ((v = it.advance()) != null)
4037 +            r = reducer.apply(r, transformer.apply(entryFor((K)it.nextKey, v)));
4038 +        return r;
4039 +    }
4040 +
4041 +    // Parallel bulk operations
4042 +
4043 +    /**
4044 +     * Performs the given action for each (key, value).
4045 +     *
4046 +     * @param action the action
4047 +     */
4048 +    public void forEachInParallel(BiAction<K,V> action) {
4049 +        ForkJoinTasks.forEach
4050 +            (this, action).invoke();
4051 +    }
4052 +
4053 +    /**
4054 +     * Performs the given action for each non-null transformation
4055 +     * of each (key, value).
4056 +     *
4057 +     * @param transformer a function returning the transformation
4058 +     * for an element, or null of there is no transformation (in
4059 +     * which case the action is not applied).
4060 +     * @param action the action
4061 +     */
4062 +    public <U> void forEachInParallel
4063 +        (BiFun<? super K, ? super V, ? extends U> transformer,
4064 +                            Action<U> action) {
4065 +        ForkJoinTasks.forEach
4066 +            (this, transformer, action).invoke();
4067 +    }
4068 +
4069 +    /**
4070 +     * Returns a non-null result from applying the given search
4071 +     * function on each (key, value), or null if none.  Upon
4072 +     * success, further element processing is suppressed and the
4073 +     * results of any other parallel invocations of the search
4074 +     * function are ignored.
4075 +     *
4076 +     * @param searchFunction a function returning a non-null
4077 +     * result on success, else null
4078 +     * @return a non-null result from applying the given search
4079 +     * function on each (key, value), or null if none
4080 +     */
4081 +    public <U> U searchInParallel
4082 +        (BiFun<? super K, ? super V, ? extends U> searchFunction) {
4083 +        return ForkJoinTasks.search
4084 +            (this, searchFunction).invoke();
4085 +    }
4086 +
4087 +    /**
4088 +     * Returns the result of accumulating the given transformation
4089 +     * of all (key, value) pairs using the given reducer to
4090 +     * combine values, or null if none.
4091 +     *
4092 +     * @param transformer a function returning the transformation
4093 +     * for an element, or null of there is no transformation (in
4094 +     * which case it is not combined).
4095 +     * @param reducer a commutative associative combining function
4096 +     * @return the result of accumulating the given transformation
4097 +     * of all (key, value) pairs
4098 +     */
4099 +    public <U> U reduceInParallel
4100 +        (BiFun<? super K, ? super V, ? extends U> transformer,
4101 +         BiFun<? super U, ? super U, ? extends U> reducer) {
4102 +        return ForkJoinTasks.reduce
4103 +            (this, transformer, reducer).invoke();
4104 +    }
4105 +
4106 +    /**
4107 +     * Returns the result of accumulating the given transformation
4108 +     * of all (key, value) pairs using the given reducer to
4109 +     * combine values, and the given basis as an identity value.
4110 +     *
4111 +     * @param transformer a function returning the transformation
4112 +     * for an element
4113 +     * @param basis the identity (initial default value) for the reduction
4114 +     * @param reducer a commutative associative combining function
4115 +     * @return the result of accumulating the given transformation
4116 +     * of all (key, value) pairs
4117 +     */
4118 +    public double reduceToDoubleInParallel
4119 +        (ObjectByObjectToDouble<? super K, ? super V> transformer,
4120 +         double basis,
4121 +         DoubleByDoubleToDouble reducer) {
4122 +        return ForkJoinTasks.reduceToDouble
4123 +            (this, transformer, basis, reducer).invoke();
4124 +    }
4125 +
4126 +    /**
4127 +     * Returns the result of accumulating the given transformation
4128 +     * of all (key, value) pairs using the given reducer to
4129 +     * combine values, and the given basis as an identity value.
4130 +     *
4131 +     * @param transformer a function returning the transformation
4132 +     * for an element
4133 +     * @param basis the identity (initial default value) for the reduction
4134 +     * @param reducer a commutative associative combining function
4135 +     * @return the result of accumulating the given transformation
4136 +     * of all (key, value) pairs
4137 +     */
4138 +    public long reduceToLongInParallel
4139 +        (ObjectByObjectToLong<? super K, ? super V> transformer,
4140 +         long basis,
4141 +         LongByLongToLong reducer) {
4142 +        return ForkJoinTasks.reduceToLong
4143 +            (this, transformer, basis, reducer).invoke();
4144 +    }
4145 +
4146 +    /**
4147 +     * Returns the result of accumulating the given transformation
4148 +     * of all (key, value) pairs using the given reducer to
4149 +     * combine values, and the given basis as an identity value.
4150 +     *
4151 +     * @param transformer a function returning the transformation
4152 +     * for an element
4153 +     * @param basis the identity (initial default value) for the reduction
4154 +     * @param reducer a commutative associative combining function
4155 +     * @return the result of accumulating the given transformation
4156 +     * of all (key, value) pairs
4157 +     */
4158 +    public int reduceToIntInParallel
4159 +        (ObjectByObjectToInt<? super K, ? super V> transformer,
4160 +         int basis,
4161 +         IntByIntToInt reducer) {
4162 +        return ForkJoinTasks.reduceToInt
4163 +            (this, transformer, basis, reducer).invoke();
4164 +    }
4165 +
4166 +    /**
4167 +     * Performs the given action for each key.
4168 +     *
4169 +     * @param action the action
4170 +     */
4171 +    public void forEachKeyInParallel(Action<K> action) {
4172 +        ForkJoinTasks.forEachKey
4173 +            (this, action).invoke();
4174 +    }
4175 +
4176 +    /**
4177 +     * Performs the given action for each non-null transformation
4178 +     * of each key.
4179 +     *
4180 +     * @param transformer a function returning the transformation
4181 +     * for an element, or null of there is no transformation (in
4182 +     * which case the action is not applied).
4183 +     * @param action the action
4184 +     */
4185 +    public <U> void forEachKeyInParallel
4186 +        (Fun<? super K, ? extends U> transformer,
4187 +         Action<U> action) {
4188 +        ForkJoinTasks.forEachKey
4189 +            (this, transformer, action).invoke();
4190 +    }
4191 +
4192 +    /**
4193 +     * Returns a non-null result from applying the given search
4194 +     * function on each key, or null if none. Upon success,
4195 +     * further element processing is suppressed and the results of
4196 +     * any other parallel invocations of the search function are
4197 +     * ignored.
4198 +     *
4199 +     * @param searchFunction a function returning a non-null
4200 +     * result on success, else null
4201 +     * @return a non-null result from applying the given search
4202 +     * function on each key, or null if none
4203 +     */
4204 +    public <U> U searchKeysInParallel
4205 +        (Fun<? super K, ? extends U> searchFunction) {
4206 +        return ForkJoinTasks.searchKeys
4207 +            (this, searchFunction).invoke();
4208 +    }
4209 +
4210 +    /**
4211 +     * Returns the result of accumulating all keys using the given
4212 +     * reducer to combine values, or null if none.
4213 +     *
4214 +     * @param reducer a commutative associative combining function
4215 +     * @return the result of accumulating all keys using the given
4216 +     * reducer to combine values, or null if none
4217 +     */
4218 +    public K reduceKeysInParallel
4219 +        (BiFun<? super K, ? super K, ? extends K> reducer) {
4220 +        return ForkJoinTasks.reduceKeys
4221 +            (this, reducer).invoke();
4222 +    }
4223 +
4224 +    /**
4225 +     * Returns the result of accumulating the given transformation
4226 +     * of all keys using the given reducer to combine values, or
4227 +     * null if none.
4228 +     *
4229 +     * @param transformer a function returning the transformation
4230 +     * for an element, or null of there is no transformation (in
4231 +     * which case it is not combined).
4232 +     * @param reducer a commutative associative combining function
4233 +     * @return the result of accumulating the given transformation
4234 +     * of all keys
4235 +     */
4236 +    public <U> U reduceKeysInParallel
4237 +        (Fun<? super K, ? extends U> transformer,
4238 +         BiFun<? super U, ? super U, ? extends U> reducer) {
4239 +        return ForkJoinTasks.reduceKeys
4240 +            (this, transformer, reducer).invoke();
4241 +    }
4242 +
4243 +    /**
4244 +     * Returns the result of accumulating the given transformation
4245 +     * of all keys using the given reducer to combine values, and
4246 +     * the given basis as an identity value.
4247 +     *
4248 +     * @param transformer a function returning the transformation
4249 +     * for an element
4250 +     * @param basis the identity (initial default value) for the reduction
4251 +     * @param reducer a commutative associative combining function
4252 +     * @return  the result of accumulating the given transformation
4253 +     * of all keys
4254 +     */
4255 +    public double reduceKeysToDoubleInParallel
4256 +        (ObjectToDouble<? super K> transformer,
4257 +         double basis,
4258 +         DoubleByDoubleToDouble reducer) {
4259 +        return ForkJoinTasks.reduceKeysToDouble
4260 +            (this, transformer, basis, reducer).invoke();
4261 +    }
4262 +
4263 +    /**
4264 +     * Returns the result of accumulating the given transformation
4265 +     * of all keys using the given reducer to combine values, and
4266 +     * the given basis as an identity value.
4267 +     *
4268 +     * @param transformer a function returning the transformation
4269 +     * for an element
4270 +     * @param basis the identity (initial default value) for the reduction
4271 +     * @param reducer a commutative associative combining function
4272 +     * @return the result of accumulating the given transformation
4273 +     * of all keys
4274 +     */
4275 +    public long reduceKeysToLongInParallel
4276 +        (ObjectToLong<? super K> transformer,
4277 +         long basis,
4278 +         LongByLongToLong reducer) {
4279 +        return ForkJoinTasks.reduceKeysToLong
4280 +            (this, transformer, basis, reducer).invoke();
4281 +    }
4282 +
4283 +    /**
4284 +     * Returns the result of accumulating the given transformation
4285 +     * of all keys using the given reducer to combine values, and
4286 +     * the given basis as an identity value.
4287 +     *
4288 +     * @param transformer a function returning the transformation
4289 +     * for an element
4290 +     * @param basis the identity (initial default value) for the reduction
4291 +     * @param reducer a commutative associative combining function
4292 +     * @return the result of accumulating the given transformation
4293 +     * of all keys
4294 +     */
4295 +    public int reduceKeysToIntInParallel
4296 +        (ObjectToInt<? super K> transformer,
4297 +         int basis,
4298 +         IntByIntToInt reducer) {
4299 +        return ForkJoinTasks.reduceKeysToInt
4300 +            (this, transformer, basis, reducer).invoke();
4301 +    }
4302 +
4303 +    /**
4304 +     * Performs the given action for each value.
4305 +     *
4306 +     * @param action the action
4307 +     */
4308 +    public void forEachValueInParallel(Action<V> action) {
4309 +        ForkJoinTasks.forEachValue
4310 +            (this, action).invoke();
4311 +    }
4312 +
4313 +    /**
4314 +     * Performs the given action for each non-null transformation
4315 +     * of each value.
4316 +     *
4317 +     * @param transformer a function returning the transformation
4318 +     * for an element, or null of there is no transformation (in
4319 +     * which case the action is not applied).
4320 +     */
4321 +    public <U> void forEachValueInParallel
4322 +        (Fun<? super V, ? extends U> transformer,
4323 +         Action<U> action) {
4324 +        ForkJoinTasks.forEachValue
4325 +            (this, transformer, action).invoke();
4326 +    }
4327 +
4328 +    /**
4329 +     * Returns a non-null result from applying the given search
4330 +     * function on each value, or null if none.  Upon success,
4331 +     * further element processing is suppressed and the results of
4332 +     * any other parallel invocations of the search function are
4333 +     * ignored.
4334 +     *
4335 +     * @param searchFunction a function returning a non-null
4336 +     * result on success, else null
4337 +     * @return a non-null result from applying the given search
4338 +     * function on each value, or null if none
4339 +     */
4340 +    public <U> U searchValuesInParallel
4341 +        (Fun<? super V, ? extends U> searchFunction) {
4342 +        return ForkJoinTasks.searchValues
4343 +            (this, searchFunction).invoke();
4344 +    }
4345 +
4346 +    /**
4347 +     * Returns the result of accumulating all values using the
4348 +     * given reducer to combine values, or null if none.
4349 +     *
4350 +     * @param reducer a commutative associative combining function
4351 +     * @return  the result of accumulating all values
4352 +     */
4353 +    public V reduceValuesInParallel
4354 +        (BiFun<? super V, ? super V, ? extends V> reducer) {
4355 +        return ForkJoinTasks.reduceValues
4356 +            (this, reducer).invoke();
4357 +    }
4358 +
4359 +    /**
4360 +     * Returns the result of accumulating the given transformation
4361 +     * of all values using the given reducer to combine values, or
4362 +     * null if none.
4363 +     *
4364 +     * @param transformer a function returning the transformation
4365 +     * for an element, or null of there is no transformation (in
4366 +     * which case it is not combined).
4367 +     * @param reducer a commutative associative combining function
4368 +     * @return the result of accumulating the given transformation
4369 +     * of all values
4370 +     */
4371 +    public <U> U reduceValuesInParallel
4372 +        (Fun<? super V, ? extends U> transformer,
4373 +         BiFun<? super U, ? super U, ? extends U> reducer) {
4374 +        return ForkJoinTasks.reduceValues
4375 +            (this, transformer, reducer).invoke();
4376 +    }
4377 +
4378 +    /**
4379 +     * Returns the result of accumulating the given transformation
4380 +     * of all values using the given reducer to combine values,
4381 +     * and the given basis as an identity value.
4382 +     *
4383 +     * @param transformer a function returning the transformation
4384 +     * for an element
4385 +     * @param basis the identity (initial default value) for the reduction
4386 +     * @param reducer a commutative associative combining function
4387 +     * @return the result of accumulating the given transformation
4388 +     * of all values
4389 +     */
4390 +    public double reduceValuesToDoubleInParallel
4391 +        (ObjectToDouble<? super V> transformer,
4392 +         double basis,
4393 +         DoubleByDoubleToDouble reducer) {
4394 +        return ForkJoinTasks.reduceValuesToDouble
4395 +            (this, transformer, basis, 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 long reduceValuesToLongInParallel
4411 +        (ObjectToLong<? super V> transformer,
4412 +         long basis,
4413 +         LongByLongToLong reducer) {
4414 +        return ForkJoinTasks.reduceValuesToLong
4415 +            (this, transformer, basis, reducer).invoke();
4416 +    }
4417 +
4418 +    /**
4419 +     * Returns the result of accumulating the given transformation
4420 +     * of all values using the given reducer to combine values,
4421 +     * and the given basis as an identity value.
4422 +     *
4423 +     * @param transformer a function returning the transformation
4424 +     * for an element
4425 +     * @param basis the identity (initial default value) for the reduction
4426 +     * @param reducer a commutative associative combining function
4427 +     * @return the result of accumulating the given transformation
4428 +     * of all values
4429 +     */
4430 +    public int reduceValuesToIntInParallel
4431 +        (ObjectToInt<? super V> transformer,
4432 +         int basis,
4433 +         IntByIntToInt reducer) {
4434 +        return ForkJoinTasks.reduceValuesToInt
4435 +            (this, transformer, basis, reducer).invoke();
4436 +    }
4437 +
4438 +    /**
4439 +     * Performs the given action for each entry.
4440 +     *
4441 +     * @param action the action
4442 +     */
4443 +    public void forEachEntryInParallel(Action<Map.Entry<K,V>> action) {
4444 +        ForkJoinTasks.forEachEntry
4445 +            (this, action).invoke();
4446 +    }
4447 +
4448 +    /**
4449 +     * Performs the given action for each non-null transformation
4450 +     * of each entry.
4451 +     *
4452 +     * @param transformer a function returning the transformation
4453 +     * for an element, or null of there is no transformation (in
4454 +     * which case the action is not applied).
4455 +     * @param action the action
4456 +     */
4457 +    public <U> void forEachEntryInParallel
4458 +        (Fun<Map.Entry<K,V>, ? extends U> transformer,
4459 +         Action<U> action) {
4460 +        ForkJoinTasks.forEachEntry
4461 +            (this, transformer, action).invoke();
4462 +    }
4463 +
4464 +    /**
4465 +     * Returns a non-null result from applying the given search
4466 +     * function on each entry, or null if none.  Upon success,
4467 +     * further element processing is suppressed and the results of
4468 +     * any other parallel invocations of the search function are
4469 +     * ignored.
4470 +     *
4471 +     * @param searchFunction a function returning a non-null
4472 +     * result on success, else null
4473 +     * @return a non-null result from applying the given search
4474 +     * function on each entry, or null if none
4475 +     */
4476 +    public <U> U searchEntriesInParallel
4477 +        (Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4478 +        return ForkJoinTasks.searchEntries
4479 +            (this, searchFunction).invoke();
4480 +    }
4481 +
4482 +    /**
4483 +     * Returns the result of accumulating all entries using the
4484 +     * given reducer to combine values, or null if none.
4485 +     *
4486 +     * @param reducer a commutative associative combining function
4487 +     * @return the result of accumulating all entries
4488 +     */
4489 +    public Map.Entry<K,V> reduceEntriesInParallel
4490 +        (BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4491 +        return ForkJoinTasks.reduceEntries
4492 +            (this, reducer).invoke();
4493 +    }
4494 +
4495 +    /**
4496 +     * Returns the result of accumulating the given transformation
4497 +     * of all entries using the given reducer to combine values,
4498 +     * or null if none.
4499 +     *
4500 +     * @param transformer a function returning the transformation
4501 +     * for an element, or null of there is no transformation (in
4502 +     * which case it is not combined).
4503 +     * @param reducer a commutative associative combining function
4504 +     * @return the result of accumulating the given transformation
4505 +     * of all entries
4506 +     */
4507 +    public <U> U reduceEntriesInParallel
4508 +        (Fun<Map.Entry<K,V>, ? extends U> transformer,
4509 +         BiFun<? super U, ? super U, ? extends U> reducer) {
4510 +        return ForkJoinTasks.reduceEntries
4511 +            (this, transformer, reducer).invoke();
4512 +    }
4513 +
4514 +    /**
4515 +     * Returns the result of accumulating the given transformation
4516 +     * of all entries using the given reducer to combine values,
4517 +     * and the given basis as an identity value.
4518 +     *
4519 +     * @param transformer a function returning the transformation
4520 +     * for an element
4521 +     * @param basis the identity (initial default value) for the reduction
4522 +     * @param reducer a commutative associative combining function
4523 +     * @return the result of accumulating the given transformation
4524 +     * of all entries
4525 +     */
4526 +    public double reduceEntriesToDoubleInParallel
4527 +        (ObjectToDouble<Map.Entry<K,V>> transformer,
4528 +         double basis,
4529 +         DoubleByDoubleToDouble reducer) {
4530 +        return ForkJoinTasks.reduceEntriesToDouble
4531 +            (this, transformer, basis, reducer).invoke();
4532 +    }
4533 +
4534 +    /**
4535 +     * Returns the result of accumulating the given transformation
4536 +     * of all entries using the given reducer to combine values,
4537 +     * and the given basis as an identity value.
4538 +     *
4539 +     * @param transformer a function returning the transformation
4540 +     * for an element
4541 +     * @param basis the identity (initial default value) for the reduction
4542 +     * @param reducer a commutative associative combining function
4543 +     * @return  the result of accumulating the given transformation
4544 +     * of all entries
4545 +     */
4546 +    public long reduceEntriesToLongInParallel
4547 +        (ObjectToLong<Map.Entry<K,V>> transformer,
4548 +         long basis,
4549 +         LongByLongToLong reducer) {
4550 +        return ForkJoinTasks.reduceEntriesToLong
4551 +            (this, transformer, basis, reducer).invoke();
4552 +    }
4553 +
4554 +    /**
4555 +     * Returns the result of accumulating the given transformation
4556 +     * of all entries using the given reducer to combine values,
4557 +     * and the given basis as an identity value.
4558 +     *
4559 +     * @param transformer a function returning the transformation
4560 +     * for an element
4561 +     * @param basis the identity (initial default value) for the reduction
4562 +     * @param reducer a commutative associative combining function
4563 +     * @return the result of accumulating the given transformation
4564 +     * of all entries
4565 +     */
4566 +    public int reduceEntriesToIntInParallel
4567 +        (ObjectToInt<Map.Entry<K,V>> transformer,
4568 +         int basis,
4569 +         IntByIntToInt reducer) {
4570 +        return ForkJoinTasks.reduceEntriesToInt
4571 +            (this, transformer, basis, reducer).invoke();
4572 +    }
4573 +
4574 +
4575 +    /* ----------------Views -------------- */
4576 +
4577 +    /**
4578 +     * Base class for views.
4579 +     */
4580 +    static abstract class CHMView<K, V> {
4581 +        final ConcurrentHashMapV8<K, V> map;
4582 +        CHMView(ConcurrentHashMapV8<K, V> map)  { this.map = map; }
4583  
4584          /**
4585 <         * Performs the given action for each non-null transformation
3918 <         * of each value.
4585 >         * Returns the map backing this view.
4586           *
4587 <         * @param transformer a function returning the transformation
3921 <         * for an element, or null of there is no transformation (in
3922 <         * which case the action is not applied).
4587 >         * @return the map backing this view
4588           */
4589 <        public <U> void forEachValue(Fun<? super V, ? extends U> transformer,
4590 <                                     Action<U> action) {
4591 <            fjp.invoke(ForkJoinTasks.forEachValue
4592 <                       (ConcurrentHashMapV8.this, transformer, action));
4589 >        public ConcurrentHashMapV8<K,V> getMap() { return map; }
4590 >
4591 >        public final int size()                 { return map.size(); }
4592 >        public final boolean isEmpty()          { return map.isEmpty(); }
4593 >        public final void clear()               { map.clear(); }
4594 >
4595 >        // implementations below rely on concrete classes supplying these
4596 >        abstract public Iterator<?> iterator();
4597 >        abstract public boolean contains(Object o);
4598 >        abstract public boolean remove(Object o);
4599 >
4600 >        private static final String oomeMsg = "Required array size too large";
4601 >
4602 >        public final Object[] toArray() {
4603 >            long sz = map.mappingCount();
4604 >            if (sz > (long)(MAX_ARRAY_SIZE))
4605 >                throw new OutOfMemoryError(oomeMsg);
4606 >            int n = (int)sz;
4607 >            Object[] r = new Object[n];
4608 >            int i = 0;
4609 >            Iterator<?> it = iterator();
4610 >            while (it.hasNext()) {
4611 >                if (i == n) {
4612 >                    if (n >= MAX_ARRAY_SIZE)
4613 >                        throw new OutOfMemoryError(oomeMsg);
4614 >                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
4615 >                        n = MAX_ARRAY_SIZE;
4616 >                    else
4617 >                        n += (n >>> 1) + 1;
4618 >                    r = Arrays.copyOf(r, n);
4619 >                }
4620 >                r[i++] = it.next();
4621 >            }
4622 >            return (i == n) ? r : Arrays.copyOf(r, i);
4623          }
4624  
4625 <        /**
4626 <         * Returns a non-null result from applying the given search
4627 <         * function on each value, or null if none.  Upon success,
4628 <         * further element processing is suppressed and the results of
4629 <         * any other parallel invocations of the search function are
4630 <         * ignored.
4631 <         *
4632 <         * @param searchFunction a function returning a non-null
4633 <         * result on success, else null
4634 <         * @return a non-null result from applying the given search
4635 <         * function on each value, or null if none
4636 <         *
4637 <         */
4638 <        public <U> U searchValues(Fun<? super V, ? extends U> searchFunction) {
4639 <            return fjp.invoke(ForkJoinTasks.searchValues
4640 <                              (ConcurrentHashMapV8.this, searchFunction));
4625 >        @SuppressWarnings("unchecked") public final <T> T[] toArray(T[] a) {
4626 >            long sz = map.mappingCount();
4627 >            if (sz > (long)(MAX_ARRAY_SIZE))
4628 >                throw new OutOfMemoryError(oomeMsg);
4629 >            int m = (int)sz;
4630 >            T[] r = (a.length >= m) ? a :
4631 >                (T[])java.lang.reflect.Array
4632 >                .newInstance(a.getClass().getComponentType(), m);
4633 >            int n = r.length;
4634 >            int i = 0;
4635 >            Iterator<?> it = iterator();
4636 >            while (it.hasNext()) {
4637 >                if (i == n) {
4638 >                    if (n >= MAX_ARRAY_SIZE)
4639 >                        throw new OutOfMemoryError(oomeMsg);
4640 >                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
4641 >                        n = MAX_ARRAY_SIZE;
4642 >                    else
4643 >                        n += (n >>> 1) + 1;
4644 >                    r = Arrays.copyOf(r, n);
4645 >                }
4646 >                r[i++] = (T)it.next();
4647 >            }
4648 >            if (a == r && i < n) {
4649 >                r[i] = null; // null-terminate
4650 >                return r;
4651 >            }
4652 >            return (i == n) ? r : Arrays.copyOf(r, i);
4653          }
4654  
4655 <        /**
4656 <         * Returns the result of accumulating all values using the
4657 <         * given reducer to combine values, or null if none.
4658 <         *
4659 <         * @param reducer a commutative associative combining function
3953 <         * @return  the result of accumulating all values
3954 <         */
3955 <        public V reduceValues(BiFun<? super V, ? super V, ? extends V> reducer) {
3956 <            return fjp.invoke(ForkJoinTasks.reduceValues
3957 <                              (ConcurrentHashMapV8.this, reducer));
4655 >        public final int hashCode() {
4656 >            int h = 0;
4657 >            for (Iterator<?> it = iterator(); it.hasNext();)
4658 >                h += it.next().hashCode();
4659 >            return h;
4660          }
4661  
4662 <        /**
4663 <         * Returns the result of accumulating the given transformation
4664 <         * of all values using the given reducer to combine values, or
4665 <         * null if none.
4666 <         *
4667 <         * @param transformer a function returning the transformation
4668 <         * for an element, or null of there is no transformation (in
4669 <         * which case it is not combined).
4670 <         * @param reducer a commutative associative combining function
4671 <         * @return the result of accumulating the given transformation
4672 <         * of all values
4673 <         */
4674 <        public <U> U reduceValues(Fun<? super V, ? extends U> transformer,
4675 <                                  BiFun<? super U, ? super U, ? extends U> reducer) {
3974 <            return fjp.invoke(ForkJoinTasks.reduceValues
3975 <                              (ConcurrentHashMapV8.this, transformer, reducer));
4662 >        public final String toString() {
4663 >            StringBuilder sb = new StringBuilder();
4664 >            sb.append('[');
4665 >            Iterator<?> it = iterator();
4666 >            if (it.hasNext()) {
4667 >                for (;;) {
4668 >                    Object e = it.next();
4669 >                    sb.append(e == this ? "(this Collection)" : e);
4670 >                    if (!it.hasNext())
4671 >                        break;
4672 >                    sb.append(',').append(' ');
4673 >                }
4674 >            }
4675 >            return sb.append(']').toString();
4676          }
4677  
4678 <        /**
4679 <         * Returns the result of accumulating the given transformation
4680 <         * of all values using the given reducer to combine values,
4681 <         * and the given basis as an identity value.
4682 <         *
4683 <         * @param transformer a function returning the transformation
4684 <         * for an element
4685 <         * @param basis the identity (initial default value) for the reduction
4686 <         * @param reducer a commutative associative combining function
3987 <         * @return the result of accumulating the given transformation
3988 <         * of all values
3989 <         */
3990 <        public double reduceValuesToDouble(ObjectToDouble<? super V> transformer,
3991 <                                           double basis,
3992 <                                           DoubleByDoubleToDouble reducer) {
3993 <            return fjp.invoke(ForkJoinTasks.reduceValuesToDouble
3994 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4678 >        public final boolean containsAll(Collection<?> c) {
4679 >            if (c != this) {
4680 >                for (Iterator<?> it = c.iterator(); it.hasNext();) {
4681 >                    Object e = it.next();
4682 >                    if (e == null || !contains(e))
4683 >                        return false;
4684 >                }
4685 >            }
4686 >            return true;
4687          }
4688  
4689 <        /**
4690 <         * Returns the result of accumulating the given transformation
4691 <         * of all values using the given reducer to combine values,
4692 <         * and the given basis as an identity value.
4693 <         *
4694 <         * @param transformer a function returning the transformation
4695 <         * for an element
4696 <         * @param basis the identity (initial default value) for the reduction
4697 <         * @param reducer a commutative associative combining function
4006 <         * @return the result of accumulating the given transformation
4007 <         * of all values
4008 <         */
4009 <        public long reduceValuesToLong(ObjectToLong<? super V> transformer,
4010 <                                       long basis,
4011 <                                       LongByLongToLong reducer) {
4012 <            return fjp.invoke(ForkJoinTasks.reduceValuesToLong
4013 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4689 >        public final boolean removeAll(Collection<?> c) {
4690 >            boolean modified = false;
4691 >            for (Iterator<?> it = iterator(); it.hasNext();) {
4692 >                if (c.contains(it.next())) {
4693 >                    it.remove();
4694 >                    modified = true;
4695 >                }
4696 >            }
4697 >            return modified;
4698          }
4699  
4700 <        /**
4701 <         * Returns the result of accumulating the given transformation
4702 <         * of all values using the given reducer to combine values,
4703 <         * and the given basis as an identity value.
4704 <         *
4705 <         * @param transformer a function returning the transformation
4706 <         * for an element
4707 <         * @param basis the identity (initial default value) for the reduction
4708 <         * @param reducer a commutative associative combining function
4025 <         * @return the result of accumulating the given transformation
4026 <         * of all values
4027 <         */
4028 <        public int reduceValuesToInt(ObjectToInt<? super V> transformer,
4029 <                                     int basis,
4030 <                                     IntByIntToInt reducer) {
4031 <            return fjp.invoke(ForkJoinTasks.reduceValuesToInt
4032 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4700 >        public final boolean retainAll(Collection<?> c) {
4701 >            boolean modified = false;
4702 >            for (Iterator<?> it = iterator(); it.hasNext();) {
4703 >                if (!c.contains(it.next())) {
4704 >                    it.remove();
4705 >                    modified = true;
4706 >                }
4707 >            }
4708 >            return modified;
4709          }
4710  
4711 <        /**
4712 <         * Performs the given action for each entry.
4713 <         *
4714 <         * @param action the action
4715 <         */
4716 <        public void forEachEntry(Action<Map.Entry<K,V>> action) {
4717 <            fjp.invoke(ForkJoinTasks.forEachEntry
4718 <                       (ConcurrentHashMapV8.this, action));
4711 >    }
4712 >
4713 >    /**
4714 >     * A view of a ConcurrentHashMapV8 as a {@link Set} of keys, in
4715 >     * which additions may optionally be enabled by mapping to a
4716 >     * common value.  This class cannot be directly instantiated. See
4717 >     * {@link #keySet}, {@link #keySet(Object)}, {@link #newKeySet()},
4718 >     * {@link #newKeySet(int)}.
4719 >     */
4720 >    public static class KeySetView<K,V> extends CHMView<K,V>
4721 >        implements Set<K>, java.io.Serializable {
4722 >        private static final long serialVersionUID = 7249069246763182397L;
4723 >        private final V value;
4724 >        KeySetView(ConcurrentHashMapV8<K, V> map, V value) {  // non-public
4725 >            super(map);
4726 >            this.value = value;
4727          }
4728  
4729          /**
4730 <         * Performs the given action for each non-null transformation
4731 <         * of each entry.
4730 >         * Returns the default mapped value for additions,
4731 >         * or {@code null} if additions are not supported.
4732           *
4733 <         * @param transformer a function returning the transformation
4734 <         * for an element, or null of there is no transformation (in
4051 <         * which case the action is not applied).
4052 <         * @param action the action
4733 >         * @return the default mapped value for additions, or {@code null}
4734 >         * if not supported.
4735           */
4736 <        public <U> void forEachEntry(Fun<Map.Entry<K,V>, ? extends U> transformer,
4737 <                                     Action<U> action) {
4738 <            fjp.invoke(ForkJoinTasks.forEachEntry
4739 <                       (ConcurrentHashMapV8.this, transformer, action));
4740 <        }
4736 >        public V getMappedValue() { return value; }
4737 >
4738 >        // implement Set API
4739 >
4740 >        public boolean contains(Object o) { return map.containsKey(o); }
4741 >        public boolean remove(Object o)   { return map.remove(o) != null; }
4742  
4743          /**
4744 <         * Returns a non-null result from applying the given search
4745 <         * function on each entry, or null if none.  Upon success,
4746 <         * further element processing is suppressed and the results of
4747 <         * any other parallel invocations of the search function are
4748 <         * ignored.
4744 >         * Returns a "weakly consistent" iterator that will never
4745 >         * throw {@link ConcurrentModificationException}, and
4746 >         * guarantees to traverse elements as they existed upon
4747 >         * construction of the iterator, and may (but is not
4748 >         * guaranteed to) reflect any modifications subsequent to
4749 >         * construction.
4750           *
4751 <         * @param searchFunction a function returning a non-null
4068 <         * result on success, else null
4069 <         * @return a non-null result from applying the given search
4070 <         * function on each entry, or null if none
4751 >         * @return an iterator over the keys of this map
4752           */
4753 <        public <U> U searchEntries(Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4754 <            return fjp.invoke(ForkJoinTasks.searchEntries
4755 <                              (ConcurrentHashMapV8.this, searchFunction));
4753 >        public Iterator<K> iterator()     { return new KeyIterator<K,V>(map); }
4754 >        public boolean add(K e) {
4755 >            V v;
4756 >            if ((v = value) == null)
4757 >                throw new UnsupportedOperationException();
4758 >            if (e == null)
4759 >                throw new NullPointerException();
4760 >            return map.internalPut(e, v, true) == null;
4761 >        }
4762 >        public boolean addAll(Collection<? extends K> c) {
4763 >            boolean added = false;
4764 >            V v;
4765 >            if ((v = value) == null)
4766 >                throw new UnsupportedOperationException();
4767 >            for (K e : c) {
4768 >                if (e == null)
4769 >                    throw new NullPointerException();
4770 >                if (map.internalPut(e, v, true) == null)
4771 >                    added = true;
4772 >            }
4773 >            return added;
4774          }
4775 +        public boolean equals(Object o) {
4776 +            Set<?> c;
4777 +            return ((o instanceof Set) &&
4778 +                    ((c = (Set<?>)o) == this ||
4779 +                     (containsAll(c) && c.containsAll(this))));
4780 +        }
4781 +    }
4782  
4783 <        /**
4784 <         * Returns the result of accumulating all entries using the
4785 <         * given reducer to combine values, or null if none.
4786 <         *
4787 <         * @param reducer a commutative associative combining function
4788 <         * @return the result of accumulating all entries
4789 <         */
4790 <        public Map.Entry<K,V> reduceEntries(BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4791 <            return fjp.invoke(ForkJoinTasks.reduceEntries
4792 <                              (ConcurrentHashMapV8.this, reducer));
4783 >    /**
4784 >     * A view of a ConcurrentHashMapV8 as a {@link Collection} of
4785 >     * values, in which additions are disabled. This class cannot be
4786 >     * directly instantiated. See {@link #values},
4787 >     *
4788 >     * <p>The view's {@code iterator} is a "weakly consistent" iterator
4789 >     * that will never throw {@link ConcurrentModificationException},
4790 >     * and guarantees to traverse elements as they existed upon
4791 >     * construction of the iterator, and may (but is not guaranteed to)
4792 >     * reflect any modifications subsequent to construction.
4793 >     */
4794 >    public static final class ValuesView<K,V> extends CHMView<K,V>
4795 >        implements Collection<V> {
4796 >        ValuesView(ConcurrentHashMapV8<K, V> map)   { super(map); }
4797 >        public final boolean contains(Object o) { return map.containsValue(o); }
4798 >        public final boolean remove(Object o) {
4799 >            if (o != null) {
4800 >                Iterator<V> it = new ValueIterator<K,V>(map);
4801 >                while (it.hasNext()) {
4802 >                    if (o.equals(it.next())) {
4803 >                        it.remove();
4804 >                        return true;
4805 >                    }
4806 >                }
4807 >            }
4808 >            return false;
4809          }
4810  
4811          /**
4812 <         * Returns the result of accumulating the given transformation
4813 <         * of all entries using the given reducer to combine values,
4814 <         * or null if none.
4812 >         * Returns a "weakly consistent" iterator that will never
4813 >         * throw {@link ConcurrentModificationException}, and
4814 >         * guarantees to traverse elements as they existed upon
4815 >         * construction of the iterator, and may (but is not
4816 >         * guaranteed to) reflect any modifications subsequent to
4817 >         * construction.
4818           *
4819 <         * @param transformer a function returning the transformation
4095 <         * for an element, or null of there is no transformation (in
4096 <         * which case it is not combined).
4097 <         * @param reducer a commutative associative combining function
4098 <         * @return the result of accumulating the given transformation
4099 <         * of all entries
4819 >         * @return an iterator over the values of this map
4820           */
4821 <        public <U> U reduceEntries(Fun<Map.Entry<K,V>, ? extends U> transformer,
4822 <                                   BiFun<? super U, ? super U, ? extends U> reducer) {
4823 <            return fjp.invoke(ForkJoinTasks.reduceEntries
4824 <                              (ConcurrentHashMapV8.this, transformer, reducer));
4821 >        public final Iterator<V> iterator() {
4822 >            return new ValueIterator<K,V>(map);
4823 >        }
4824 >        public final boolean add(V e) {
4825 >            throw new UnsupportedOperationException();
4826 >        }
4827 >        public final boolean addAll(Collection<? extends V> c) {
4828 >            throw new UnsupportedOperationException();
4829          }
4830  
4831 <        /**
4832 <         * Returns the result of accumulating the given transformation
4833 <         * of all entries using the given reducer to combine values,
4834 <         * and the given basis as an identity value.
4835 <         *
4836 <         * @param transformer a function returning the transformation
4837 <         * for an element
4838 <         * @param basis the identity (initial default value) for the reduction
4839 <         * @param reducer a commutative associative combining function
4840 <         * @return the result of accumulating the given transformation
4841 <         * of all entries
4842 <         */
4843 <        public double reduceEntriesToDouble(ObjectToDouble<Map.Entry<K,V>> transformer,
4844 <                                            double basis,
4845 <                                            DoubleByDoubleToDouble reducer) {
4846 <            return fjp.invoke(ForkJoinTasks.reduceEntriesToDouble
4847 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4831 >    }
4832 >
4833 >    /**
4834 >     * A view of a ConcurrentHashMapV8 as a {@link Set} of (key, value)
4835 >     * entries.  This class cannot be directly instantiated. See
4836 >     * {@link #entrySet}.
4837 >     */
4838 >    public static final class EntrySetView<K,V> extends CHMView<K,V>
4839 >        implements Set<Map.Entry<K,V>> {
4840 >        EntrySetView(ConcurrentHashMapV8<K, V> map) { super(map); }
4841 >        public final boolean contains(Object o) {
4842 >            Object k, v, r; Map.Entry<?,?> e;
4843 >            return ((o instanceof Map.Entry) &&
4844 >                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
4845 >                    (r = map.get(k)) != null &&
4846 >                    (v = e.getValue()) != null &&
4847 >                    (v == r || v.equals(r)));
4848 >        }
4849 >        public final boolean remove(Object o) {
4850 >            Object k, v; Map.Entry<?,?> e;
4851 >            return ((o instanceof Map.Entry) &&
4852 >                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
4853 >                    (v = e.getValue()) != null &&
4854 >                    map.remove(k, v));
4855          }
4856  
4857          /**
4858 <         * Returns the result of accumulating the given transformation
4859 <         * of all entries using the given reducer to combine values,
4860 <         * and the given basis as an identity value.
4858 >         * Returns a "weakly consistent" iterator that will never
4859 >         * throw {@link ConcurrentModificationException}, and
4860 >         * guarantees to traverse elements as they existed upon
4861 >         * construction of the iterator, and may (but is not
4862 >         * guaranteed to) reflect any modifications subsequent to
4863 >         * construction.
4864           *
4865 <         * @param transformer a function returning the transformation
4132 <         * for an element
4133 <         * @param basis the identity (initial default value) for the reduction
4134 <         * @param reducer a commutative associative combining function
4135 <         * @return  the result of accumulating the given transformation
4136 <         * of all entries
4865 >         * @return an iterator over the entries of this map
4866           */
4867 <        public long reduceEntriesToLong(ObjectToLong<Map.Entry<K,V>> transformer,
4868 <                                        long basis,
4140 <                                        LongByLongToLong reducer) {
4141 <            return fjp.invoke(ForkJoinTasks.reduceEntriesToLong
4142 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4867 >        public final Iterator<Map.Entry<K,V>> iterator() {
4868 >            return new EntryIterator<K,V>(map);
4869          }
4870  
4871 <        /**
4872 <         * Returns the result of accumulating the given transformation
4873 <         * of all entries using the given reducer to combine values,
4874 <         * and the given basis as an identity value.
4875 <         *
4876 <         * @param transformer a function returning the transformation
4877 <         * for an element
4878 <         * @param basis the identity (initial default value) for the reduction
4879 <         * @param reducer a commutative associative combining function
4880 <         * @return the result of accumulating the given transformation
4881 <         * of all entries
4882 <         */
4883 <        public int reduceEntriesToInt(ObjectToInt<Map.Entry<K,V>> transformer,
4884 <                                      int basis,
4885 <                                      IntByIntToInt reducer) {
4886 <            return fjp.invoke(ForkJoinTasks.reduceEntriesToInt
4887 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4871 >        public final boolean add(Entry<K,V> e) {
4872 >            K key = e.getKey();
4873 >            V value = e.getValue();
4874 >            if (key == null || value == null)
4875 >                throw new NullPointerException();
4876 >            return map.internalPut(key, value, false) == null;
4877 >        }
4878 >        public final boolean addAll(Collection<? extends Entry<K,V>> c) {
4879 >            boolean added = false;
4880 >            for (Entry<K,V> e : c) {
4881 >                if (add(e))
4882 >                    added = true;
4883 >            }
4884 >            return added;
4885 >        }
4886 >        public boolean equals(Object o) {
4887 >            Set<?> c;
4888 >            return ((o instanceof Set) &&
4889 >                    ((c = (Set<?>)o) == this ||
4890 >                     (containsAll(c) && c.containsAll(this))));
4891          }
4892      }
4893  
# Line 4166 | Line 4895 | public class ConcurrentHashMapV8<K, V>
4895  
4896      /**
4897       * Predefined tasks for performing bulk parallel operations on
4898 <     * ConcurrentHashMaps. These tasks follow the forms and rules used
4899 <     * in class {@link Parallel}. Each method has the same name, but
4900 <     * returns a task rather than invoking it. These methods may be
4901 <     * useful in custom applications such as submitting a task without
4902 <     * waiting for completion, or combining with other tasks.
4898 >     * ConcurrentHashMapV8s. These tasks follow the forms and rules used
4899 >     * for bulk operations. Each method has the same name, but returns
4900 >     * a task rather than invoking it. These methods may be useful in
4901 >     * custom applications such as submitting a task without waiting
4902 >     * for completion, using a custom pool, or combining with other
4903 >     * tasks.
4904       */
4905      public static class ForkJoinTasks {
4906          private ForkJoinTasks() {}
# Line 4196 | Line 4926 | public class ConcurrentHashMapV8<K, V>
4926           *
4927           * @param map the map
4928           * @param transformer a function returning the transformation
4929 <         * for an element, or null of there is no transformation (in
4930 <         * which case the action is not applied).
4929 >         * for an element, or null if there is no transformation (in
4930 >         * which case the action is not applied)
4931           * @param action the action
4932           * @return the task
4933           */
# Line 4239 | Line 4969 | public class ConcurrentHashMapV8<K, V>
4969           *
4970           * @param map the map
4971           * @param transformer a function returning the transformation
4972 <         * for an element, or null of there is no transformation (in
4972 >         * for an element, or null if there is no transformation (in
4973           * which case it is not combined).
4974           * @param reducer a commutative associative combining function
4975           * @return the task
# Line 4346 | Line 5076 | public class ConcurrentHashMapV8<K, V>
5076           *
5077           * @param map the map
5078           * @param transformer a function returning the transformation
5079 <         * for an element, or null of there is no transformation (in
5080 <         * which case the action is not applied).
5079 >         * for an element, or null if there is no transformation (in
5080 >         * which case the action is not applied)
5081           * @param action the action
5082           * @return the task
5083           */
# Line 4406 | Line 5136 | public class ConcurrentHashMapV8<K, V>
5136           *
5137           * @param map the map
5138           * @param transformer a function returning the transformation
5139 <         * for an element, or null of there is no transformation (in
5139 >         * for an element, or null if there is no transformation (in
5140           * which case it is not combined).
5141           * @param reducer a commutative associative combining function
5142           * @return the task
# Line 4513 | Line 5243 | public class ConcurrentHashMapV8<K, V>
5243           *
5244           * @param map the map
5245           * @param transformer a function returning the transformation
5246 <         * for an element, or null of there is no transformation (in
5247 <         * which case the action is not applied).
5246 >         * for an element, or null if there is no transformation (in
5247 >         * which case the action is not applied)
5248           * @param action the action
5249           */
5250          public static <K,V,U> ForkJoinTask<Void> forEachValue
# Line 4538 | Line 5268 | public class ConcurrentHashMapV8<K, V>
5268           * @param searchFunction a function returning a non-null
5269           * result on success, else null
5270           * @return the task
4541         *
5271           */
5272          public static <K,V,U> ForkJoinTask<U> searchValues
5273              (ConcurrentHashMapV8<K,V> map,
# Line 4573 | Line 5302 | public class ConcurrentHashMapV8<K, V>
5302           *
5303           * @param map the map
5304           * @param transformer a function returning the transformation
5305 <         * for an element, or null of there is no transformation (in
5305 >         * for an element, or null if there is no transformation (in
5306           * which case it is not combined).
5307           * @param reducer a commutative associative combining function
5308           * @return the task
# Line 4680 | Line 5409 | public class ConcurrentHashMapV8<K, V>
5409           *
5410           * @param map the map
5411           * @param transformer a function returning the transformation
5412 <         * for an element, or null of there is no transformation (in
5413 <         * which case the action is not applied).
5412 >         * for an element, or null if there is no transformation (in
5413 >         * which case the action is not applied)
5414           * @param action the action
5415           */
5416          public static <K,V,U> ForkJoinTask<Void> forEachEntry
# Line 4705 | Line 5434 | public class ConcurrentHashMapV8<K, V>
5434           * @param searchFunction a function returning a non-null
5435           * result on success, else null
5436           * @return the task
4708         *
5437           */
5438          public static <K,V,U> ForkJoinTask<U> searchEntries
5439              (ConcurrentHashMapV8<K,V> map,
# Line 4740 | Line 5468 | public class ConcurrentHashMapV8<K, V>
5468           *
5469           * @param map the map
5470           * @param transformer a function returning the transformation
5471 <         * for an element, or null of there is no transformation (in
5471 >         * for an element, or null if there is no transformation (in
5472           * which case it is not combined).
5473           * @param reducer a commutative associative combining function
5474           * @return the task
# Line 4830 | Line 5558 | public class ConcurrentHashMapV8<K, V>
5558  
5559      // -------------------------------------------------------
5560  
4833    /**
4834     * Base for FJ tasks for bulk operations. This adds a variant of
4835     * CountedCompleters and some split and merge bookkeeping to
4836     * iterator functionality. The forEach and reduce methods are
4837     * similar to those illustrated in CountedCompleter documentation,
4838     * except that bottom-up reduction completions perform them within
4839     * their compute methods. The search methods are like forEach
4840     * except they continually poll for success and exit early.  Also,
4841     * exceptions are handled in a simpler manner, by just trying to
4842     * complete root task exceptionally.
4843     */
4844    @SuppressWarnings("serial") static abstract class BulkTask<K,V,R> extends Traverser<K,V,R> {
4845        final BulkTask<K,V,?> parent;  // completion target
4846        int batch;                     // split control; -1 for unknown
4847        int pending;                   // completion control
4848
4849        BulkTask(ConcurrentHashMapV8<K,V> map, BulkTask<K,V,?> parent,
4850                 int batch) {
4851            super(map);
4852            this.parent = parent;
4853            this.batch = batch;
4854            if (parent != null && map != null) { // split parent
4855                Node[] t;
4856                if ((t = parent.tab) == null &&
4857                    (t = parent.tab = map.table) != null)
4858                    parent.baseLimit = parent.baseSize = t.length;
4859                this.tab = t;
4860                this.baseSize = parent.baseSize;
4861                int hi = this.baseLimit = parent.baseLimit;
4862                parent.baseLimit = this.index = this.baseIndex =
4863                    (hi + parent.baseIndex + 1) >>> 1;
4864            }
4865        }
4866
4867        // FJ methods
4868
4869        /**
4870         * Propagates completion. Note that all reduce actions
4871         * bypass this method to combine while completing.
4872         */
4873        final void tryComplete() {
4874            BulkTask<K,V,?> a = this, s = a;
4875            for (int c;;) {
4876                if ((c = a.pending) == 0) {
4877                    if ((a = (s = a).parent) == null) {
4878                        s.quietlyComplete();
4879                        break;
4880                    }
4881                }
4882                else if (U.compareAndSwapInt(a, PENDING, c, c - 1))
4883                    break;
4884            }
4885        }
4886
4887        /**
4888         * Forces root task to complete.
4889         * @param ex if null, complete normally, else exceptionally
4890         * @return false to simplify use
4891         */
4892        final boolean tryCompleteComputation(Throwable ex) {
4893            for (BulkTask<K,V,?> a = this;;) {
4894                BulkTask<K,V,?> p = a.parent;
4895                if (p == null) {
4896                    if (ex != null)
4897                        a.completeExceptionally(ex);
4898                    else
4899                        a.quietlyComplete();
4900                    return false;
4901                }
4902                a = p;
4903            }
4904        }
4905
4906        /**
4907         * Version of tryCompleteComputation for function screening checks
4908         */
4909        final boolean abortOnNullFunction() {
4910            return tryCompleteComputation(new Error("Unexpected null function"));
4911        }
4912
4913        // utilities
4914
4915        /** CompareAndSet pending count */
4916        final boolean casPending(int cmp, int val) {
4917            return U.compareAndSwapInt(this, PENDING, cmp, val);
4918        }
4919
4920        /**
4921         * Returns approx exp2 of the number of times (minus one) to
4922         * split task by two before executing leaf action. This value
4923         * is faster to compute and more convenient to use as a guide
4924         * to splitting than is the depth, since it is used while
4925         * dividing by two anyway.
4926         */
4927        final int batch() {
4928            ConcurrentHashMapV8<K, V> m; int b; Node[] t;
4929            if ((b = batch) < 0 && (m = map) != null) { // force initialization
4930                if ((t = tab) == null && (t = tab = m.table) != null)
4931                    baseLimit = baseSize = t.length;
4932                if (t != null) {
4933                    long n = m.counter.sum();
4934                    int sp = getPool().getParallelism() << 3; // slack of 8
4935                    b = batch = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp;
4936                }
4937            }
4938            return b;
4939        }
4940
4941        /**
4942         * Returns exportable snapshot entry.
4943         */
4944        static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
4945            return new AbstractMap.SimpleEntry<K,V>(k, v);
4946        }
4947
4948        // Unsafe mechanics
4949        private static final sun.misc.Unsafe U;
4950        private static final long PENDING;
4951        static {
4952            try {
4953                U = getUnsafe();
4954                PENDING = U.objectFieldOffset
4955                    (BulkTask.class.getDeclaredField("pending"));
4956            } catch (Exception e) {
4957                throw new Error(e);
4958            }
4959        }
4960    }
4961
5561      /*
5562       * Task classes. Coded in a regular but ugly format/style to
5563       * simplify checks that each variant differs in the right way from
5564 <     * others.
5564 >     * others. The null screenings exist because compilers cannot tell
5565 >     * that we've already null-checked task arguments, so we force
5566 >     * simplest hoisted bypass to help avoid convoluted traps.
5567       */
5568  
5569      @SuppressWarnings("serial") static final class ForEachKeyTask<K,V>
5570 <        extends BulkTask<K,V,Void> {
5570 >        extends Traverser<K,V,Void> {
5571          final Action<K> action;
5572          ForEachKeyTask
5573 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5573 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5574               Action<K> action) {
5575              super(m, p, b);
5576              this.action = action;
5577          }
5578 <        @SuppressWarnings("unchecked") public final boolean exec() {
5579 <            final Action<K> action = this.action;
5580 <            if (action == null)
5581 <                return abortOnNullFunction();
5582 <            try {
4982 <                int b = batch(), c;
4983 <                while (b > 1 && baseIndex != baseLimit) {
4984 <                    do {} while (!casPending(c = pending, c+1));
4985 <                    new ForEachKeyTask<K,V>(map, this, b >>>= 1, action).fork();
4986 <                }
5578 >        @SuppressWarnings("unchecked") public final void compute() {
5579 >            final Action<K> action;
5580 >            if ((action = this.action) != null) {
5581 >                for (int b; (b = preSplit()) > 0;)
5582 >                    new ForEachKeyTask<K,V>(map, this, b, action).fork();
5583                  while (advance() != null)
5584                      action.apply((K)nextKey);
5585 <                tryComplete();
4990 <            } catch (Throwable ex) {
4991 <                return tryCompleteComputation(ex);
5585 >                propagateCompletion();
5586              }
4993            return false;
5587          }
5588      }
5589  
5590      @SuppressWarnings("serial") static final class ForEachValueTask<K,V>
5591 <        extends BulkTask<K,V,Void> {
5591 >        extends Traverser<K,V,Void> {
5592          final Action<V> action;
5593          ForEachValueTask
5594 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5594 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5595               Action<V> action) {
5596              super(m, p, b);
5597              this.action = action;
5598          }
5599 <        @SuppressWarnings("unchecked") public final boolean exec() {
5600 <            final Action<V> action = this.action;
5601 <            if (action == null)
5602 <                return abortOnNullFunction();
5603 <            try {
5604 <                int b = batch(), c;
5012 <                while (b > 1 && baseIndex != baseLimit) {
5013 <                    do {} while (!casPending(c = pending, c+1));
5014 <                    new ForEachValueTask<K,V>(map, this, b >>>= 1, action).fork();
5015 <                }
5016 <                Object v;
5599 >        @SuppressWarnings("unchecked") public final void compute() {
5600 >            final Action<V> action;
5601 >            if ((action = this.action) != null) {
5602 >                for (int b; (b = preSplit()) > 0;)
5603 >                    new ForEachValueTask<K,V>(map, this, b, action).fork();
5604 >                V v;
5605                  while ((v = advance()) != null)
5606 <                    action.apply((V)v);
5607 <                tryComplete();
5020 <            } catch (Throwable ex) {
5021 <                return tryCompleteComputation(ex);
5606 >                    action.apply(v);
5607 >                propagateCompletion();
5608              }
5023            return false;
5609          }
5610      }
5611  
5612      @SuppressWarnings("serial") static final class ForEachEntryTask<K,V>
5613 <        extends BulkTask<K,V,Void> {
5613 >        extends Traverser<K,V,Void> {
5614          final Action<Entry<K,V>> action;
5615          ForEachEntryTask
5616 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5616 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5617               Action<Entry<K,V>> action) {
5618              super(m, p, b);
5619              this.action = action;
5620          }
5621 <        @SuppressWarnings("unchecked") public final boolean exec() {
5622 <            final Action<Entry<K,V>> action = this.action;
5623 <            if (action == null)
5624 <                return abortOnNullFunction();
5625 <            try {
5626 <                int b = batch(), c;
5042 <                while (b > 1 && baseIndex != baseLimit) {
5043 <                    do {} while (!casPending(c = pending, c+1));
5044 <                    new ForEachEntryTask<K,V>(map, this, b >>>= 1, action).fork();
5045 <                }
5046 <                Object v;
5621 >        @SuppressWarnings("unchecked") public final void compute() {
5622 >            final Action<Entry<K,V>> action;
5623 >            if ((action = this.action) != null) {
5624 >                for (int b; (b = preSplit()) > 0;)
5625 >                    new ForEachEntryTask<K,V>(map, this, b, action).fork();
5626 >                V v;
5627                  while ((v = advance()) != null)
5628 <                    action.apply(entryFor((K)nextKey, (V)v));
5629 <                tryComplete();
5050 <            } catch (Throwable ex) {
5051 <                return tryCompleteComputation(ex);
5628 >                    action.apply(entryFor((K)nextKey, v));
5629 >                propagateCompletion();
5630              }
5053            return false;
5631          }
5632      }
5633  
5634      @SuppressWarnings("serial") static final class ForEachMappingTask<K,V>
5635 <        extends BulkTask<K,V,Void> {
5635 >        extends Traverser<K,V,Void> {
5636          final BiAction<K,V> action;
5637          ForEachMappingTask
5638 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5638 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5639               BiAction<K,V> action) {
5640              super(m, p, b);
5641              this.action = action;
5642          }
5643 <        @SuppressWarnings("unchecked") public final boolean exec() {
5644 <            final BiAction<K,V> action = this.action;
5645 <            if (action == null)
5646 <                return abortOnNullFunction();
5647 <            try {
5648 <                int b = batch(), c;
5072 <                while (b > 1 && baseIndex != baseLimit) {
5073 <                    do {} while (!casPending(c = pending, c+1));
5074 <                    new ForEachMappingTask<K,V>(map, this, b >>>= 1,
5075 <                                                action).fork();
5076 <                }
5077 <                Object v;
5643 >        @SuppressWarnings("unchecked") public final void compute() {
5644 >            final BiAction<K,V> action;
5645 >            if ((action = this.action) != null) {
5646 >                for (int b; (b = preSplit()) > 0;)
5647 >                    new ForEachMappingTask<K,V>(map, this, b, action).fork();
5648 >                V v;
5649                  while ((v = advance()) != null)
5650 <                    action.apply((K)nextKey, (V)v);
5651 <                tryComplete();
5081 <            } catch (Throwable ex) {
5082 <                return tryCompleteComputation(ex);
5650 >                    action.apply((K)nextKey, v);
5651 >                propagateCompletion();
5652              }
5084            return false;
5653          }
5654      }
5655  
5656      @SuppressWarnings("serial") static final class ForEachTransformedKeyTask<K,V,U>
5657 <        extends BulkTask<K,V,Void> {
5657 >        extends Traverser<K,V,Void> {
5658          final Fun<? super K, ? extends U> transformer;
5659          final Action<U> action;
5660          ForEachTransformedKeyTask
5661 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5662 <             Fun<? super K, ? extends U> transformer,
5095 <             Action<U> action) {
5661 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5662 >             Fun<? super K, ? extends U> transformer, Action<U> action) {
5663              super(m, p, b);
5664 <            this.transformer = transformer;
5098 <            this.action = action;
5099 <
5664 >            this.transformer = transformer; this.action = action;
5665          }
5666 <        @SuppressWarnings("unchecked") public final boolean exec() {
5667 <            final Fun<? super K, ? extends U> transformer =
5668 <                this.transformer;
5669 <            final Action<U> action = this.action;
5670 <            if (transformer == null || action == null)
5671 <                return abortOnNullFunction();
5107 <            try {
5108 <                int b = batch(), c;
5109 <                while (b > 1 && baseIndex != baseLimit) {
5110 <                    do {} while (!casPending(c = pending, c+1));
5666 >        @SuppressWarnings("unchecked") public final void compute() {
5667 >            final Fun<? super K, ? extends U> transformer;
5668 >            final Action<U> action;
5669 >            if ((transformer = this.transformer) != null &&
5670 >                (action = this.action) != null) {
5671 >                for (int b; (b = preSplit()) > 0;)
5672                      new ForEachTransformedKeyTask<K,V,U>
5673 <                        (map, this, b >>>= 1, transformer, action).fork();
5113 <                }
5673 >                        (map, this, b, transformer, action).fork();
5674                  U u;
5675                  while (advance() != null) {
5676                      if ((u = transformer.apply((K)nextKey)) != null)
5677                          action.apply(u);
5678                  }
5679 <                tryComplete();
5120 <            } catch (Throwable ex) {
5121 <                return tryCompleteComputation(ex);
5679 >                propagateCompletion();
5680              }
5123            return false;
5681          }
5682      }
5683  
5684      @SuppressWarnings("serial") static final class ForEachTransformedValueTask<K,V,U>
5685 <        extends BulkTask<K,V,Void> {
5685 >        extends Traverser<K,V,Void> {
5686          final Fun<? super V, ? extends U> transformer;
5687          final Action<U> action;
5688          ForEachTransformedValueTask
5689 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5690 <             Fun<? super V, ? extends U> transformer,
5134 <             Action<U> action) {
5689 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5690 >             Fun<? super V, ? extends U> transformer, Action<U> action) {
5691              super(m, p, b);
5692 <            this.transformer = transformer;
5137 <            this.action = action;
5138 <
5692 >            this.transformer = transformer; this.action = action;
5693          }
5694 <        @SuppressWarnings("unchecked") public final boolean exec() {
5695 <            final Fun<? super V, ? extends U> transformer =
5696 <                this.transformer;
5697 <            final Action<U> action = this.action;
5698 <            if (transformer == null || action == null)
5699 <                return abortOnNullFunction();
5146 <            try {
5147 <                int b = batch(), c;
5148 <                while (b > 1 && baseIndex != baseLimit) {
5149 <                    do {} while (!casPending(c = pending, c+1));
5694 >        @SuppressWarnings("unchecked") public final void compute() {
5695 >            final Fun<? super V, ? extends U> transformer;
5696 >            final Action<U> action;
5697 >            if ((transformer = this.transformer) != null &&
5698 >                (action = this.action) != null) {
5699 >                for (int b; (b = preSplit()) > 0;)
5700                      new ForEachTransformedValueTask<K,V,U>
5701 <                        (map, this, b >>>= 1, transformer, action).fork();
5702 <                }
5153 <                Object v; U u;
5701 >                        (map, this, b, transformer, action).fork();
5702 >                V v; U u;
5703                  while ((v = advance()) != null) {
5704 <                    if ((u = transformer.apply((V)v)) != null)
5704 >                    if ((u = transformer.apply(v)) != null)
5705                          action.apply(u);
5706                  }
5707 <                tryComplete();
5159 <            } catch (Throwable ex) {
5160 <                return tryCompleteComputation(ex);
5707 >                propagateCompletion();
5708              }
5162            return false;
5709          }
5710      }
5711  
5712      @SuppressWarnings("serial") static final class ForEachTransformedEntryTask<K,V,U>
5713 <        extends BulkTask<K,V,Void> {
5713 >        extends Traverser<K,V,Void> {
5714          final Fun<Map.Entry<K,V>, ? extends U> transformer;
5715          final Action<U> action;
5716          ForEachTransformedEntryTask
5717 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5718 <             Fun<Map.Entry<K,V>, ? extends U> transformer,
5173 <             Action<U> action) {
5717 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5718 >             Fun<Map.Entry<K,V>, ? extends U> transformer, Action<U> action) {
5719              super(m, p, b);
5720 <            this.transformer = transformer;
5176 <            this.action = action;
5177 <
5720 >            this.transformer = transformer; this.action = action;
5721          }
5722 <        @SuppressWarnings("unchecked") public final boolean exec() {
5723 <            final Fun<Map.Entry<K,V>, ? extends U> transformer =
5724 <                this.transformer;
5725 <            final Action<U> action = this.action;
5726 <            if (transformer == null || action == null)
5727 <                return abortOnNullFunction();
5185 <            try {
5186 <                int b = batch(), c;
5187 <                while (b > 1 && baseIndex != baseLimit) {
5188 <                    do {} while (!casPending(c = pending, c+1));
5722 >        @SuppressWarnings("unchecked") public final void compute() {
5723 >            final Fun<Map.Entry<K,V>, ? extends U> transformer;
5724 >            final Action<U> action;
5725 >            if ((transformer = this.transformer) != null &&
5726 >                (action = this.action) != null) {
5727 >                for (int b; (b = preSplit()) > 0;)
5728                      new ForEachTransformedEntryTask<K,V,U>
5729 <                        (map, this, b >>>= 1, transformer, action).fork();
5730 <                }
5192 <                Object v; U u;
5729 >                        (map, this, b, transformer, action).fork();
5730 >                V v; U u;
5731                  while ((v = advance()) != null) {
5732 <                    if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
5732 >                    if ((u = transformer.apply(entryFor((K)nextKey,
5733 >                                                        v))) != null)
5734                          action.apply(u);
5735                  }
5736 <                tryComplete();
5198 <            } catch (Throwable ex) {
5199 <                return tryCompleteComputation(ex);
5736 >                propagateCompletion();
5737              }
5201            return false;
5738          }
5739      }
5740  
5741      @SuppressWarnings("serial") static final class ForEachTransformedMappingTask<K,V,U>
5742 <        extends BulkTask<K,V,Void> {
5742 >        extends Traverser<K,V,Void> {
5743          final BiFun<? super K, ? super V, ? extends U> transformer;
5744          final Action<U> action;
5745          ForEachTransformedMappingTask
5746 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5746 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5747               BiFun<? super K, ? super V, ? extends U> transformer,
5748               Action<U> action) {
5749              super(m, p, b);
5750 <            this.transformer = transformer;
5215 <            this.action = action;
5216 <
5750 >            this.transformer = transformer; this.action = action;
5751          }
5752 <        @SuppressWarnings("unchecked") public final boolean exec() {
5753 <            final BiFun<? super K, ? super V, ? extends U> transformer =
5754 <                this.transformer;
5755 <            final Action<U> action = this.action;
5756 <            if (transformer == null || action == null)
5757 <                return abortOnNullFunction();
5224 <            try {
5225 <                int b = batch(), c;
5226 <                while (b > 1 && baseIndex != baseLimit) {
5227 <                    do {} while (!casPending(c = pending, c+1));
5752 >        @SuppressWarnings("unchecked") public final void compute() {
5753 >            final BiFun<? super K, ? super V, ? extends U> transformer;
5754 >            final Action<U> action;
5755 >            if ((transformer = this.transformer) != null &&
5756 >                (action = this.action) != null) {
5757 >                for (int b; (b = preSplit()) > 0;)
5758                      new ForEachTransformedMappingTask<K,V,U>
5759 <                        (map, this, b >>>= 1, transformer, action).fork();
5760 <                }
5231 <                Object v; U u;
5759 >                        (map, this, b, transformer, action).fork();
5760 >                V v; U u;
5761                  while ((v = advance()) != null) {
5762 <                    if ((u = transformer.apply((K)nextKey, (V)v)) != null)
5762 >                    if ((u = transformer.apply((K)nextKey, v)) != null)
5763                          action.apply(u);
5764                  }
5765 <                tryComplete();
5237 <            } catch (Throwable ex) {
5238 <                return tryCompleteComputation(ex);
5765 >                propagateCompletion();
5766              }
5240            return false;
5767          }
5768      }
5769  
5770      @SuppressWarnings("serial") static final class SearchKeysTask<K,V,U>
5771 <        extends BulkTask<K,V,U> {
5771 >        extends Traverser<K,V,U> {
5772          final Fun<? super K, ? extends U> searchFunction;
5773          final AtomicReference<U> result;
5774          SearchKeysTask
5775 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5775 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5776               Fun<? super K, ? extends U> searchFunction,
5777               AtomicReference<U> result) {
5778              super(m, p, b);
5779              this.searchFunction = searchFunction; this.result = result;
5780          }
5781 <        @SuppressWarnings("unchecked") public final boolean exec() {
5782 <            AtomicReference<U> result = this.result;
5783 <            final Fun<? super K, ? extends U> searchFunction =
5784 <                this.searchFunction;
5785 <            if (searchFunction == null || result == null)
5786 <                return abortOnNullFunction();
5787 <            try {
5788 <                int b = batch(), c;
5789 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5790 <                    do {} while (!casPending(c = pending, c+1));
5791 <                    new SearchKeysTask<K,V,U>(map, this, b >>>= 1,
5792 <                                              searchFunction, result).fork();
5781 >        public final U getRawResult() { return result.get(); }
5782 >        @SuppressWarnings("unchecked") public final void compute() {
5783 >            final Fun<? super K, ? extends U> searchFunction;
5784 >            final AtomicReference<U> result;
5785 >            if ((searchFunction = this.searchFunction) != null &&
5786 >                (result = this.result) != null) {
5787 >                for (int b;;) {
5788 >                    if (result.get() != null)
5789 >                        return;
5790 >                    if ((b = preSplit()) <= 0)
5791 >                        break;
5792 >                    new SearchKeysTask<K,V,U>
5793 >                        (map, this, b, searchFunction, result).fork();
5794                  }
5795 <                U u;
5796 <                while (result.get() == null && advance() != null) {
5795 >                while (result.get() == null) {
5796 >                    U u;
5797 >                    if (advance() == null) {
5798 >                        propagateCompletion();
5799 >                        break;
5800 >                    }
5801                      if ((u = searchFunction.apply((K)nextKey)) != null) {
5802                          if (result.compareAndSet(null, u))
5803 <                            tryCompleteComputation(null);
5803 >                            quietlyCompleteRoot();
5804                          break;
5805                      }
5806                  }
5276                tryComplete();
5277            } catch (Throwable ex) {
5278                return tryCompleteComputation(ex);
5807              }
5280            return false;
5808          }
5282        public final U getRawResult() { return result.get(); }
5809      }
5810  
5811      @SuppressWarnings("serial") static final class SearchValuesTask<K,V,U>
5812 <        extends BulkTask<K,V,U> {
5812 >        extends Traverser<K,V,U> {
5813          final Fun<? super V, ? extends U> searchFunction;
5814          final AtomicReference<U> result;
5815          SearchValuesTask
5816 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5816 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5817               Fun<? super V, ? extends U> searchFunction,
5818               AtomicReference<U> result) {
5819              super(m, p, b);
5820              this.searchFunction = searchFunction; this.result = result;
5821          }
5822 <        @SuppressWarnings("unchecked") public final boolean exec() {
5823 <            AtomicReference<U> result = this.result;
5824 <            final Fun<? super V, ? extends U> searchFunction =
5825 <                this.searchFunction;
5826 <            if (searchFunction == null || result == null)
5827 <                return abortOnNullFunction();
5828 <            try {
5829 <                int b = batch(), c;
5830 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5831 <                    do {} while (!casPending(c = pending, c+1));
5832 <                    new SearchValuesTask<K,V,U>(map, this, b >>>= 1,
5833 <                                                searchFunction, result).fork();
5834 <                }
5835 <                Object v; U u;
5836 <                while (result.get() == null && (v = advance()) != null) {
5837 <                    if ((u = searchFunction.apply((V)v)) != null) {
5822 >        public final U getRawResult() { return result.get(); }
5823 >        @SuppressWarnings("unchecked") public final void compute() {
5824 >            final Fun<? super V, ? extends U> searchFunction;
5825 >            final AtomicReference<U> result;
5826 >            if ((searchFunction = this.searchFunction) != null &&
5827 >                (result = this.result) != null) {
5828 >                for (int b;;) {
5829 >                    if (result.get() != null)
5830 >                        return;
5831 >                    if ((b = preSplit()) <= 0)
5832 >                        break;
5833 >                    new SearchValuesTask<K,V,U>
5834 >                        (map, this, b, searchFunction, result).fork();
5835 >                }
5836 >                while (result.get() == null) {
5837 >                    V v; U u;
5838 >                    if ((v = advance()) == null) {
5839 >                        propagateCompletion();
5840 >                        break;
5841 >                    }
5842 >                    if ((u = searchFunction.apply(v)) != null) {
5843                          if (result.compareAndSet(null, u))
5844 <                            tryCompleteComputation(null);
5844 >                            quietlyCompleteRoot();
5845                          break;
5846                      }
5847                  }
5317                tryComplete();
5318            } catch (Throwable ex) {
5319                return tryCompleteComputation(ex);
5848              }
5321            return false;
5849          }
5323        public final U getRawResult() { return result.get(); }
5850      }
5851  
5852      @SuppressWarnings("serial") static final class SearchEntriesTask<K,V,U>
5853 <        extends BulkTask<K,V,U> {
5853 >        extends Traverser<K,V,U> {
5854          final Fun<Entry<K,V>, ? extends U> searchFunction;
5855          final AtomicReference<U> result;
5856          SearchEntriesTask
5857 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5857 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5858               Fun<Entry<K,V>, ? extends U> searchFunction,
5859               AtomicReference<U> result) {
5860              super(m, p, b);
5861              this.searchFunction = searchFunction; this.result = result;
5862          }
5863 <        @SuppressWarnings("unchecked") public final boolean exec() {
5864 <            AtomicReference<U> result = this.result;
5865 <            final Fun<Entry<K,V>, ? extends U> searchFunction =
5866 <                this.searchFunction;
5867 <            if (searchFunction == null || result == null)
5868 <                return abortOnNullFunction();
5869 <            try {
5870 <                int b = batch(), c;
5871 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5872 <                    do {} while (!casPending(c = pending, c+1));
5873 <                    new SearchEntriesTask<K,V,U>(map, this, b >>>= 1,
5874 <                                                 searchFunction, result).fork();
5875 <                }
5876 <                Object v; U u;
5877 <                while (result.get() == null && (v = advance()) != null) {
5878 <                    if ((u = searchFunction.apply(entryFor((K)nextKey, (V)v))) != null) {
5879 <                        if (result.compareAndSet(null, u))
5880 <                            tryCompleteComputation(null);
5863 >        public final U getRawResult() { return result.get(); }
5864 >        @SuppressWarnings("unchecked") public final void compute() {
5865 >            final Fun<Entry<K,V>, ? extends U> searchFunction;
5866 >            final AtomicReference<U> result;
5867 >            if ((searchFunction = this.searchFunction) != null &&
5868 >                (result = this.result) != null) {
5869 >                for (int b;;) {
5870 >                    if (result.get() != null)
5871 >                        return;
5872 >                    if ((b = preSplit()) <= 0)
5873 >                        break;
5874 >                    new SearchEntriesTask<K,V,U>
5875 >                        (map, this, b, searchFunction, result).fork();
5876 >                }
5877 >                while (result.get() == null) {
5878 >                    V v; U u;
5879 >                    if ((v = advance()) == null) {
5880 >                        propagateCompletion();
5881                          break;
5882                      }
5883 +                    if ((u = searchFunction.apply(entryFor((K)nextKey,
5884 +                                                           v))) != null) {
5885 +                        if (result.compareAndSet(null, u))
5886 +                            quietlyCompleteRoot();
5887 +                        return;
5888 +                    }
5889                  }
5358                tryComplete();
5359            } catch (Throwable ex) {
5360                return tryCompleteComputation(ex);
5890              }
5362            return false;
5891          }
5364        public final U getRawResult() { return result.get(); }
5892      }
5893  
5894      @SuppressWarnings("serial") static final class SearchMappingsTask<K,V,U>
5895 <        extends BulkTask<K,V,U> {
5895 >        extends Traverser<K,V,U> {
5896          final BiFun<? super K, ? super V, ? extends U> searchFunction;
5897          final AtomicReference<U> result;
5898          SearchMappingsTask
5899 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5899 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5900               BiFun<? super K, ? super V, ? extends U> searchFunction,
5901               AtomicReference<U> result) {
5902              super(m, p, b);
5903              this.searchFunction = searchFunction; this.result = result;
5904          }
5905 <        @SuppressWarnings("unchecked") public final boolean exec() {
5906 <            AtomicReference<U> result = this.result;
5907 <            final BiFun<? super K, ? super V, ? extends U> searchFunction =
5908 <                this.searchFunction;
5909 <            if (searchFunction == null || result == null)
5910 <                return abortOnNullFunction();
5911 <            try {
5912 <                int b = batch(), c;
5913 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5914 <                    do {} while (!casPending(c = pending, c+1));
5915 <                    new SearchMappingsTask<K,V,U>(map, this, b >>>= 1,
5916 <                                                  searchFunction, result).fork();
5917 <                }
5918 <                Object v; U u;
5919 <                while (result.get() == null && (v = advance()) != null) {
5920 <                    if ((u = searchFunction.apply((K)nextKey, (V)v)) != null) {
5905 >        public final U getRawResult() { return result.get(); }
5906 >        @SuppressWarnings("unchecked") public final void compute() {
5907 >            final BiFun<? super K, ? super V, ? extends U> searchFunction;
5908 >            final AtomicReference<U> result;
5909 >            if ((searchFunction = this.searchFunction) != null &&
5910 >                (result = this.result) != null) {
5911 >                for (int b;;) {
5912 >                    if (result.get() != null)
5913 >                        return;
5914 >                    if ((b = preSplit()) <= 0)
5915 >                        break;
5916 >                    new SearchMappingsTask<K,V,U>
5917 >                        (map, this, b, searchFunction, result).fork();
5918 >                }
5919 >                while (result.get() == null) {
5920 >                    V v; U u;
5921 >                    if ((v = advance()) == null) {
5922 >                        propagateCompletion();
5923 >                        break;
5924 >                    }
5925 >                    if ((u = searchFunction.apply((K)nextKey, v)) != null) {
5926                          if (result.compareAndSet(null, u))
5927 <                            tryCompleteComputation(null);
5927 >                            quietlyCompleteRoot();
5928                          break;
5929                      }
5930                  }
5399                tryComplete();
5400            } catch (Throwable ex) {
5401                return tryCompleteComputation(ex);
5931              }
5403            return false;
5932          }
5405        public final U getRawResult() { return result.get(); }
5933      }
5934  
5935      @SuppressWarnings("serial") static final class ReduceKeysTask<K,V>
5936 <        extends BulkTask<K,V,K> {
5936 >        extends Traverser<K,V,K> {
5937          final BiFun<? super K, ? super K, ? extends K> reducer;
5938          K result;
5939          ReduceKeysTask<K,V> rights, nextRight;
5940          ReduceKeysTask
5941 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5941 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5942               ReduceKeysTask<K,V> nextRight,
5943               BiFun<? super K, ? super K, ? extends K> reducer) {
5944              super(m, p, b); this.nextRight = nextRight;
5945              this.reducer = reducer;
5946          }
5947 <        @SuppressWarnings("unchecked") public final boolean exec() {
5948 <            final BiFun<? super K, ? super K, ? extends K> reducer =
5949 <                this.reducer;
5950 <            if (reducer == null)
5951 <                return abortOnNullFunction();
5425 <            try {
5426 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5427 <                    do {} while (!casPending(c = pending, c+1));
5947 >        public final K getRawResult() { return result; }
5948 >        @SuppressWarnings("unchecked") public final void compute() {
5949 >            final BiFun<? super K, ? super K, ? extends K> reducer;
5950 >            if ((reducer = this.reducer) != null) {
5951 >                for (int b; (b = preSplit()) > 0;)
5952                      (rights = new ReduceKeysTask<K,V>
5953 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5430 <                }
5953 >                     (map, this, b, rights, reducer)).fork();
5954                  K r = null;
5955                  while (advance() != null) {
5956                      K u = (K)nextKey;
5957                      r = (r == null) ? u : reducer.apply(r, u);
5958                  }
5959                  result = r;
5960 <                for (ReduceKeysTask<K,V> t = this, s;;) {
5961 <                    int c; BulkTask<K,V,?> par; K tr, sr;
5962 <                    if ((c = t.pending) == 0) {
5963 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5964 <                            if ((sr = s.result) != null)
5965 <                                t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr);
5966 <                        }
5967 <                        if ((par = t.parent) == null ||
5968 <                            !(par instanceof ReduceKeysTask)) {
5969 <                            t.quietlyComplete();
5970 <                            break;
5448 <                        }
5449 <                        t = (ReduceKeysTask<K,V>)par;
5960 >                CountedCompleter<?> c;
5961 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5962 >                    ReduceKeysTask<K,V>
5963 >                        t = (ReduceKeysTask<K,V>)c,
5964 >                        s = t.rights;
5965 >                    while (s != null) {
5966 >                        K tr, sr;
5967 >                        if ((sr = s.result) != null)
5968 >                            t.result = (((tr = t.result) == null) ? sr :
5969 >                                        reducer.apply(tr, sr));
5970 >                        s = t.rights = s.nextRight;
5971                      }
5451                    else if (t.casPending(c, c - 1))
5452                        break;
5972                  }
5454            } catch (Throwable ex) {
5455                return tryCompleteComputation(ex);
5973              }
5457            return false;
5974          }
5459        public final K getRawResult() { return result; }
5975      }
5976  
5977      @SuppressWarnings("serial") static final class ReduceValuesTask<K,V>
5978 <        extends BulkTask<K,V,V> {
5978 >        extends Traverser<K,V,V> {
5979          final BiFun<? super V, ? super V, ? extends V> reducer;
5980          V result;
5981          ReduceValuesTask<K,V> rights, nextRight;
5982          ReduceValuesTask
5983 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5983 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5984               ReduceValuesTask<K,V> nextRight,
5985               BiFun<? super V, ? super V, ? extends V> reducer) {
5986              super(m, p, b); this.nextRight = nextRight;
5987              this.reducer = reducer;
5988          }
5989 <        @SuppressWarnings("unchecked") public final boolean exec() {
5990 <            final BiFun<? super V, ? super V, ? extends V> reducer =
5991 <                this.reducer;
5992 <            if (reducer == null)
5993 <                return abortOnNullFunction();
5479 <            try {
5480 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5481 <                    do {} while (!casPending(c = pending, c+1));
5989 >        public final V getRawResult() { return result; }
5990 >        @SuppressWarnings("unchecked") public final void compute() {
5991 >            final BiFun<? super V, ? super V, ? extends V> reducer;
5992 >            if ((reducer = this.reducer) != null) {
5993 >                for (int b; (b = preSplit()) > 0;)
5994                      (rights = new ReduceValuesTask<K,V>
5995 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5484 <                }
5995 >                     (map, this, b, rights, reducer)).fork();
5996                  V r = null;
5997 <                Object v;
5997 >                V v;
5998                  while ((v = advance()) != null) {
5999 <                    V u = (V)v;
5999 >                    V u = v;
6000                      r = (r == null) ? u : reducer.apply(r, u);
6001                  }
6002                  result = r;
6003 <                for (ReduceValuesTask<K,V> t = this, s;;) {
6004 <                    int c; BulkTask<K,V,?> par; V tr, sr;
6005 <                    if ((c = t.pending) == 0) {
6006 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6007 <                            if ((sr = s.result) != null)
6008 <                                t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr);
6009 <                        }
6010 <                        if ((par = t.parent) == null ||
6011 <                            !(par instanceof ReduceValuesTask)) {
6012 <                            t.quietlyComplete();
6013 <                            break;
5503 <                        }
5504 <                        t = (ReduceValuesTask<K,V>)par;
6003 >                CountedCompleter<?> c;
6004 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6005 >                    ReduceValuesTask<K,V>
6006 >                        t = (ReduceValuesTask<K,V>)c,
6007 >                        s = t.rights;
6008 >                    while (s != null) {
6009 >                        V tr, sr;
6010 >                        if ((sr = s.result) != null)
6011 >                            t.result = (((tr = t.result) == null) ? sr :
6012 >                                        reducer.apply(tr, sr));
6013 >                        s = t.rights = s.nextRight;
6014                      }
5506                    else if (t.casPending(c, c - 1))
5507                        break;
6015                  }
5509            } catch (Throwable ex) {
5510                return tryCompleteComputation(ex);
6016              }
5512            return false;
6017          }
5514        public final V getRawResult() { return result; }
6018      }
6019  
6020      @SuppressWarnings("serial") static final class ReduceEntriesTask<K,V>
6021 <        extends BulkTask<K,V,Map.Entry<K,V>> {
6021 >        extends Traverser<K,V,Map.Entry<K,V>> {
6022          final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer;
6023          Map.Entry<K,V> result;
6024          ReduceEntriesTask<K,V> rights, nextRight;
6025          ReduceEntriesTask
6026 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6026 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6027               ReduceEntriesTask<K,V> nextRight,
6028               BiFun<Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
6029              super(m, p, b); this.nextRight = nextRight;
6030              this.reducer = reducer;
6031          }
6032 <        @SuppressWarnings("unchecked") public final boolean exec() {
6033 <            final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer =
6034 <                this.reducer;
6035 <            if (reducer == null)
6036 <                return abortOnNullFunction();
5534 <            try {
5535 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5536 <                    do {} while (!casPending(c = pending, c+1));
6032 >        public final Map.Entry<K,V> getRawResult() { return result; }
6033 >        @SuppressWarnings("unchecked") public final void compute() {
6034 >            final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer;
6035 >            if ((reducer = this.reducer) != null) {
6036 >                for (int b; (b = preSplit()) > 0;)
6037                      (rights = new ReduceEntriesTask<K,V>
6038 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5539 <                }
6038 >                     (map, this, b, rights, reducer)).fork();
6039                  Map.Entry<K,V> r = null;
6040 <                Object v;
6040 >                V v;
6041                  while ((v = advance()) != null) {
6042 <                    Map.Entry<K,V> u = entryFor((K)nextKey, (V)v);
6042 >                    Map.Entry<K,V> u = entryFor((K)nextKey, v);
6043                      r = (r == null) ? u : reducer.apply(r, u);
6044                  }
6045                  result = r;
6046 <                for (ReduceEntriesTask<K,V> t = this, s;;) {
6047 <                    int c; BulkTask<K,V,?> par; Map.Entry<K,V> tr, sr;
6048 <                    if ((c = t.pending) == 0) {
6049 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6050 <                            if ((sr = s.result) != null)
6051 <                                t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr);
6052 <                        }
6053 <                        if ((par = t.parent) == null ||
6054 <                            !(par instanceof ReduceEntriesTask)) {
6055 <                            t.quietlyComplete();
6056 <                            break;
5558 <                        }
5559 <                        t = (ReduceEntriesTask<K,V>)par;
6046 >                CountedCompleter<?> c;
6047 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6048 >                    ReduceEntriesTask<K,V>
6049 >                        t = (ReduceEntriesTask<K,V>)c,
6050 >                        s = t.rights;
6051 >                    while (s != null) {
6052 >                        Map.Entry<K,V> tr, sr;
6053 >                        if ((sr = s.result) != null)
6054 >                            t.result = (((tr = t.result) == null) ? sr :
6055 >                                        reducer.apply(tr, sr));
6056 >                        s = t.rights = s.nextRight;
6057                      }
5561                    else if (t.casPending(c, c - 1))
5562                        break;
6058                  }
5564            } catch (Throwable ex) {
5565                return tryCompleteComputation(ex);
6059              }
5567            return false;
6060          }
5569        public final Map.Entry<K,V> getRawResult() { return result; }
6061      }
6062  
6063      @SuppressWarnings("serial") static final class MapReduceKeysTask<K,V,U>
6064 <        extends BulkTask<K,V,U> {
6064 >        extends Traverser<K,V,U> {
6065          final Fun<? super K, ? extends U> transformer;
6066          final BiFun<? super U, ? super U, ? extends U> reducer;
6067          U result;
6068          MapReduceKeysTask<K,V,U> rights, nextRight;
6069          MapReduceKeysTask
6070 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6070 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6071               MapReduceKeysTask<K,V,U> nextRight,
6072               Fun<? super K, ? extends U> transformer,
6073               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 5584 | Line 6075 | public class ConcurrentHashMapV8<K, V>
6075              this.transformer = transformer;
6076              this.reducer = reducer;
6077          }
6078 <        @SuppressWarnings("unchecked") public final boolean exec() {
6079 <            final Fun<? super K, ? extends U> transformer =
6080 <                this.transformer;
6081 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6082 <                this.reducer;
6083 <            if (transformer == null || reducer == null)
6084 <                return abortOnNullFunction();
5594 <            try {
5595 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5596 <                    do {} while (!casPending(c = pending, c+1));
6078 >        public final U getRawResult() { return result; }
6079 >        @SuppressWarnings("unchecked") public final void compute() {
6080 >            final Fun<? super K, ? extends U> transformer;
6081 >            final BiFun<? super U, ? super U, ? extends U> reducer;
6082 >            if ((transformer = this.transformer) != null &&
6083 >                (reducer = this.reducer) != null) {
6084 >                for (int b; (b = preSplit()) > 0;)
6085                      (rights = new MapReduceKeysTask<K,V,U>
6086 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
5599 <                }
6086 >                     (map, this, b, rights, transformer, reducer)).fork();
6087                  U r = null, u;
6088                  while (advance() != null) {
6089                      if ((u = transformer.apply((K)nextKey)) != null)
6090                          r = (r == null) ? u : reducer.apply(r, u);
6091                  }
6092                  result = r;
6093 <                for (MapReduceKeysTask<K,V,U> t = this, s;;) {
6094 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6095 <                    if ((c = t.pending) == 0) {
6096 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6097 <                            if ((sr = s.result) != null)
6098 <                                t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr);
6099 <                        }
6100 <                        if ((par = t.parent) == null ||
6101 <                            !(par instanceof MapReduceKeysTask)) {
6102 <                            t.quietlyComplete();
6103 <                            break;
5617 <                        }
5618 <                        t = (MapReduceKeysTask<K,V,U>)par;
6093 >                CountedCompleter<?> c;
6094 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6095 >                    MapReduceKeysTask<K,V,U>
6096 >                        t = (MapReduceKeysTask<K,V,U>)c,
6097 >                        s = t.rights;
6098 >                    while (s != null) {
6099 >                        U tr, sr;
6100 >                        if ((sr = s.result) != null)
6101 >                            t.result = (((tr = t.result) == null) ? sr :
6102 >                                        reducer.apply(tr, sr));
6103 >                        s = t.rights = s.nextRight;
6104                      }
5620                    else if (t.casPending(c, c - 1))
5621                        break;
6105                  }
5623            } catch (Throwable ex) {
5624                return tryCompleteComputation(ex);
6106              }
5626            return false;
6107          }
5628        public final U getRawResult() { return result; }
6108      }
6109  
6110      @SuppressWarnings("serial") static final class MapReduceValuesTask<K,V,U>
6111 <        extends BulkTask<K,V,U> {
6111 >        extends Traverser<K,V,U> {
6112          final Fun<? super V, ? extends U> transformer;
6113          final BiFun<? super U, ? super U, ? extends U> reducer;
6114          U result;
6115          MapReduceValuesTask<K,V,U> rights, nextRight;
6116          MapReduceValuesTask
6117 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6117 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6118               MapReduceValuesTask<K,V,U> nextRight,
6119               Fun<? super V, ? extends U> transformer,
6120               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 5643 | Line 6122 | public class ConcurrentHashMapV8<K, V>
6122              this.transformer = transformer;
6123              this.reducer = reducer;
6124          }
6125 <        @SuppressWarnings("unchecked") public final boolean exec() {
6126 <            final Fun<? super V, ? extends U> transformer =
6127 <                this.transformer;
6128 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6129 <                this.reducer;
6130 <            if (transformer == null || reducer == null)
6131 <                return abortOnNullFunction();
5653 <            try {
5654 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5655 <                    do {} while (!casPending(c = pending, c+1));
6125 >        public final U getRawResult() { return result; }
6126 >        @SuppressWarnings("unchecked") public final void compute() {
6127 >            final Fun<? super V, ? extends U> transformer;
6128 >            final BiFun<? super U, ? super U, ? extends U> reducer;
6129 >            if ((transformer = this.transformer) != null &&
6130 >                (reducer = this.reducer) != null) {
6131 >                for (int b; (b = preSplit()) > 0;)
6132                      (rights = new MapReduceValuesTask<K,V,U>
6133 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
5658 <                }
6133 >                     (map, this, b, rights, transformer, reducer)).fork();
6134                  U r = null, u;
6135 <                Object v;
6135 >                V v;
6136                  while ((v = advance()) != null) {
6137 <                    if ((u = transformer.apply((V)v)) != null)
6137 >                    if ((u = transformer.apply(v)) != null)
6138                          r = (r == null) ? u : reducer.apply(r, u);
6139                  }
6140                  result = r;
6141 <                for (MapReduceValuesTask<K,V,U> t = this, s;;) {
6142 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6143 <                    if ((c = t.pending) == 0) {
6144 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6145 <                            if ((sr = s.result) != null)
6146 <                                t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr);
6147 <                        }
6148 <                        if ((par = t.parent) == null ||
6149 <                            !(par instanceof MapReduceValuesTask)) {
6150 <                            t.quietlyComplete();
6151 <                            break;
5677 <                        }
5678 <                        t = (MapReduceValuesTask<K,V,U>)par;
6141 >                CountedCompleter<?> c;
6142 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6143 >                    MapReduceValuesTask<K,V,U>
6144 >                        t = (MapReduceValuesTask<K,V,U>)c,
6145 >                        s = t.rights;
6146 >                    while (s != null) {
6147 >                        U tr, sr;
6148 >                        if ((sr = s.result) != null)
6149 >                            t.result = (((tr = t.result) == null) ? sr :
6150 >                                        reducer.apply(tr, sr));
6151 >                        s = t.rights = s.nextRight;
6152                      }
5680                    else if (t.casPending(c, c - 1))
5681                        break;
6153                  }
5683            } catch (Throwable ex) {
5684                return tryCompleteComputation(ex);
6154              }
5686            return false;
6155          }
5688        public final U getRawResult() { return result; }
6156      }
6157  
6158      @SuppressWarnings("serial") static final class MapReduceEntriesTask<K,V,U>
6159 <        extends BulkTask<K,V,U> {
6159 >        extends Traverser<K,V,U> {
6160          final Fun<Map.Entry<K,V>, ? extends U> transformer;
6161          final BiFun<? super U, ? super U, ? extends U> reducer;
6162          U result;
6163          MapReduceEntriesTask<K,V,U> rights, nextRight;
6164          MapReduceEntriesTask
6165 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6165 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6166               MapReduceEntriesTask<K,V,U> nextRight,
6167               Fun<Map.Entry<K,V>, ? extends U> transformer,
6168               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 5703 | Line 6170 | public class ConcurrentHashMapV8<K, V>
6170              this.transformer = transformer;
6171              this.reducer = reducer;
6172          }
6173 <        @SuppressWarnings("unchecked") public final boolean exec() {
6174 <            final Fun<Map.Entry<K,V>, ? extends U> transformer =
6175 <                this.transformer;
6176 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6177 <                this.reducer;
6178 <            if (transformer == null || reducer == null)
6179 <                return abortOnNullFunction();
5713 <            try {
5714 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5715 <                    do {} while (!casPending(c = pending, c+1));
6173 >        public final U getRawResult() { return result; }
6174 >        @SuppressWarnings("unchecked") public final void compute() {
6175 >            final Fun<Map.Entry<K,V>, ? extends U> transformer;
6176 >            final BiFun<? super U, ? super U, ? extends U> reducer;
6177 >            if ((transformer = this.transformer) != null &&
6178 >                (reducer = this.reducer) != null) {
6179 >                for (int b; (b = preSplit()) > 0;)
6180                      (rights = new MapReduceEntriesTask<K,V,U>
6181 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
5718 <                }
6181 >                     (map, this, b, rights, transformer, reducer)).fork();
6182                  U r = null, u;
6183 <                Object v;
6183 >                V v;
6184                  while ((v = advance()) != null) {
6185 <                    if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
6185 >                    if ((u = transformer.apply(entryFor((K)nextKey,
6186 >                                                        v))) != null)
6187                          r = (r == null) ? u : reducer.apply(r, u);
6188                  }
6189                  result = r;
6190 <                for (MapReduceEntriesTask<K,V,U> t = this, s;;) {
6191 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6192 <                    if ((c = t.pending) == 0) {
6193 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6194 <                            if ((sr = s.result) != null)
6195 <                                t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr);
6196 <                        }
6197 <                        if ((par = t.parent) == null ||
6198 <                            !(par instanceof MapReduceEntriesTask)) {
6199 <                            t.quietlyComplete();
6200 <                            break;
5737 <                        }
5738 <                        t = (MapReduceEntriesTask<K,V,U>)par;
6190 >                CountedCompleter<?> c;
6191 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6192 >                    MapReduceEntriesTask<K,V,U>
6193 >                        t = (MapReduceEntriesTask<K,V,U>)c,
6194 >                        s = t.rights;
6195 >                    while (s != null) {
6196 >                        U tr, sr;
6197 >                        if ((sr = s.result) != null)
6198 >                            t.result = (((tr = t.result) == null) ? sr :
6199 >                                        reducer.apply(tr, sr));
6200 >                        s = t.rights = s.nextRight;
6201                      }
5740                    else if (t.casPending(c, c - 1))
5741                        break;
6202                  }
5743            } catch (Throwable ex) {
5744                return tryCompleteComputation(ex);
6203              }
5746            return false;
6204          }
5748        public final U getRawResult() { return result; }
6205      }
6206  
6207      @SuppressWarnings("serial") static final class MapReduceMappingsTask<K,V,U>
6208 <        extends BulkTask<K,V,U> {
6208 >        extends Traverser<K,V,U> {
6209          final BiFun<? super K, ? super V, ? extends U> transformer;
6210          final BiFun<? super U, ? super U, ? extends U> reducer;
6211          U result;
6212          MapReduceMappingsTask<K,V,U> rights, nextRight;
6213          MapReduceMappingsTask
6214 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6214 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6215               MapReduceMappingsTask<K,V,U> nextRight,
6216               BiFun<? super K, ? super V, ? extends U> transformer,
6217               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 5763 | Line 6219 | public class ConcurrentHashMapV8<K, V>
6219              this.transformer = transformer;
6220              this.reducer = reducer;
6221          }
6222 <        @SuppressWarnings("unchecked") public final boolean exec() {
6223 <            final BiFun<? super K, ? super V, ? extends U> transformer =
6224 <                this.transformer;
6225 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6226 <                this.reducer;
6227 <            if (transformer == null || reducer == null)
6228 <                return abortOnNullFunction();
5773 <            try {
5774 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5775 <                    do {} while (!casPending(c = pending, c+1));
6222 >        public final U getRawResult() { return result; }
6223 >        @SuppressWarnings("unchecked") public final void compute() {
6224 >            final BiFun<? super K, ? super V, ? extends U> transformer;
6225 >            final BiFun<? super U, ? super U, ? extends U> reducer;
6226 >            if ((transformer = this.transformer) != null &&
6227 >                (reducer = this.reducer) != null) {
6228 >                for (int b; (b = preSplit()) > 0;)
6229                      (rights = new MapReduceMappingsTask<K,V,U>
6230 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
5778 <                }
6230 >                     (map, this, b, rights, transformer, reducer)).fork();
6231                  U r = null, u;
6232 <                Object v;
6232 >                V v;
6233                  while ((v = advance()) != null) {
6234 <                    if ((u = transformer.apply((K)nextKey, (V)v)) != null)
6234 >                    if ((u = transformer.apply((K)nextKey, v)) != null)
6235                          r = (r == null) ? u : reducer.apply(r, u);
6236                  }
6237                  result = r;
6238 <                for (MapReduceMappingsTask<K,V,U> t = this, s;;) {
6239 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6240 <                    if ((c = t.pending) == 0) {
6241 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6242 <                            if ((sr = s.result) != null)
6243 <                                t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr);
6244 <                        }
6245 <                        if ((par = t.parent) == null ||
6246 <                            !(par instanceof MapReduceMappingsTask)) {
6247 <                            t.quietlyComplete();
6248 <                            break;
5797 <                        }
5798 <                        t = (MapReduceMappingsTask<K,V,U>)par;
6238 >                CountedCompleter<?> c;
6239 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6240 >                    MapReduceMappingsTask<K,V,U>
6241 >                        t = (MapReduceMappingsTask<K,V,U>)c,
6242 >                        s = t.rights;
6243 >                    while (s != null) {
6244 >                        U tr, sr;
6245 >                        if ((sr = s.result) != null)
6246 >                            t.result = (((tr = t.result) == null) ? sr :
6247 >                                        reducer.apply(tr, sr));
6248 >                        s = t.rights = s.nextRight;
6249                      }
5800                    else if (t.casPending(c, c - 1))
5801                        break;
6250                  }
5803            } catch (Throwable ex) {
5804                return tryCompleteComputation(ex);
6251              }
5806            return false;
6252          }
5808        public final U getRawResult() { return result; }
6253      }
6254  
6255      @SuppressWarnings("serial") static final class MapReduceKeysToDoubleTask<K,V>
6256 <        extends BulkTask<K,V,Double> {
6256 >        extends Traverser<K,V,Double> {
6257          final ObjectToDouble<? super K> transformer;
6258          final DoubleByDoubleToDouble reducer;
6259          final double basis;
6260          double result;
6261          MapReduceKeysToDoubleTask<K,V> rights, nextRight;
6262          MapReduceKeysToDoubleTask
6263 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6263 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6264               MapReduceKeysToDoubleTask<K,V> nextRight,
6265               ObjectToDouble<? super K> transformer,
6266               double basis,
# Line 5825 | Line 6269 | public class ConcurrentHashMapV8<K, V>
6269              this.transformer = transformer;
6270              this.basis = basis; this.reducer = reducer;
6271          }
6272 <        @SuppressWarnings("unchecked") public final boolean exec() {
6273 <            final ObjectToDouble<? super K> transformer =
6274 <                this.transformer;
6275 <            final DoubleByDoubleToDouble reducer = this.reducer;
6276 <            if (transformer == null || reducer == null)
6277 <                return abortOnNullFunction();
6278 <            try {
6279 <                final double id = this.basis;
5836 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5837 <                    do {} while (!casPending(c = pending, c+1));
6272 >        public final Double getRawResult() { return result; }
6273 >        @SuppressWarnings("unchecked") public final void compute() {
6274 >            final ObjectToDouble<? super K> transformer;
6275 >            final DoubleByDoubleToDouble reducer;
6276 >            if ((transformer = this.transformer) != null &&
6277 >                (reducer = this.reducer) != null) {
6278 >                double r = this.basis;
6279 >                for (int b; (b = preSplit()) > 0;)
6280                      (rights = new MapReduceKeysToDoubleTask<K,V>
6281 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
5840 <                }
5841 <                double r = id;
6281 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6282                  while (advance() != null)
6283                      r = reducer.apply(r, transformer.apply((K)nextKey));
6284                  result = r;
6285 <                for (MapReduceKeysToDoubleTask<K,V> t = this, s;;) {
6286 <                    int c; BulkTask<K,V,?> par;
6287 <                    if ((c = t.pending) == 0) {
6288 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6289 <                            t.result = reducer.apply(t.result, s.result);
6290 <                        }
6291 <                        if ((par = t.parent) == null ||
6292 <                            !(par instanceof MapReduceKeysToDoubleTask)) {
5853 <                            t.quietlyComplete();
5854 <                            break;
5855 <                        }
5856 <                        t = (MapReduceKeysToDoubleTask<K,V>)par;
6285 >                CountedCompleter<?> c;
6286 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6287 >                    MapReduceKeysToDoubleTask<K,V>
6288 >                        t = (MapReduceKeysToDoubleTask<K,V>)c,
6289 >                        s = t.rights;
6290 >                    while (s != null) {
6291 >                        t.result = reducer.apply(t.result, s.result);
6292 >                        s = t.rights = s.nextRight;
6293                      }
5858                    else if (t.casPending(c, c - 1))
5859                        break;
6294                  }
5861            } catch (Throwable ex) {
5862                return tryCompleteComputation(ex);
6295              }
5864            return false;
6296          }
5866        public final Double getRawResult() { return result; }
6297      }
6298  
6299      @SuppressWarnings("serial") static final class MapReduceValuesToDoubleTask<K,V>
6300 <        extends BulkTask<K,V,Double> {
6300 >        extends Traverser<K,V,Double> {
6301          final ObjectToDouble<? super V> transformer;
6302          final DoubleByDoubleToDouble reducer;
6303          final double basis;
6304          double result;
6305          MapReduceValuesToDoubleTask<K,V> rights, nextRight;
6306          MapReduceValuesToDoubleTask
6307 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6307 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6308               MapReduceValuesToDoubleTask<K,V> nextRight,
6309               ObjectToDouble<? super V> transformer,
6310               double basis,
# Line 5883 | Line 6313 | public class ConcurrentHashMapV8<K, V>
6313              this.transformer = transformer;
6314              this.basis = basis; this.reducer = reducer;
6315          }
6316 <        @SuppressWarnings("unchecked") public final boolean exec() {
6317 <            final ObjectToDouble<? super V> transformer =
6318 <                this.transformer;
6319 <            final DoubleByDoubleToDouble reducer = this.reducer;
6320 <            if (transformer == null || reducer == null)
6321 <                return abortOnNullFunction();
6322 <            try {
6323 <                final double id = this.basis;
5894 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5895 <                    do {} while (!casPending(c = pending, c+1));
6316 >        public final Double getRawResult() { return result; }
6317 >        @SuppressWarnings("unchecked") public final void compute() {
6318 >            final ObjectToDouble<? super V> transformer;
6319 >            final DoubleByDoubleToDouble reducer;
6320 >            if ((transformer = this.transformer) != null &&
6321 >                (reducer = this.reducer) != null) {
6322 >                double r = this.basis;
6323 >                for (int b; (b = preSplit()) > 0;)
6324                      (rights = new MapReduceValuesToDoubleTask<K,V>
6325 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6326 <                }
5899 <                double r = id;
5900 <                Object v;
6325 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6326 >                V v;
6327                  while ((v = advance()) != null)
6328 <                    r = reducer.apply(r, transformer.apply((V)v));
6328 >                    r = reducer.apply(r, transformer.apply(v));
6329                  result = r;
6330 <                for (MapReduceValuesToDoubleTask<K,V> t = this, s;;) {
6331 <                    int c; BulkTask<K,V,?> par;
6332 <                    if ((c = t.pending) == 0) {
6333 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6334 <                            t.result = reducer.apply(t.result, s.result);
6335 <                        }
6336 <                        if ((par = t.parent) == null ||
6337 <                            !(par instanceof MapReduceValuesToDoubleTask)) {
5912 <                            t.quietlyComplete();
5913 <                            break;
5914 <                        }
5915 <                        t = (MapReduceValuesToDoubleTask<K,V>)par;
6330 >                CountedCompleter<?> c;
6331 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6332 >                    MapReduceValuesToDoubleTask<K,V>
6333 >                        t = (MapReduceValuesToDoubleTask<K,V>)c,
6334 >                        s = t.rights;
6335 >                    while (s != null) {
6336 >                        t.result = reducer.apply(t.result, s.result);
6337 >                        s = t.rights = s.nextRight;
6338                      }
5917                    else if (t.casPending(c, c - 1))
5918                        break;
6339                  }
5920            } catch (Throwable ex) {
5921                return tryCompleteComputation(ex);
6340              }
5923            return false;
6341          }
5925        public final Double getRawResult() { return result; }
6342      }
6343  
6344      @SuppressWarnings("serial") static final class MapReduceEntriesToDoubleTask<K,V>
6345 <        extends BulkTask<K,V,Double> {
6345 >        extends Traverser<K,V,Double> {
6346          final ObjectToDouble<Map.Entry<K,V>> transformer;
6347          final DoubleByDoubleToDouble reducer;
6348          final double basis;
6349          double result;
6350          MapReduceEntriesToDoubleTask<K,V> rights, nextRight;
6351          MapReduceEntriesToDoubleTask
6352 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6352 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6353               MapReduceEntriesToDoubleTask<K,V> nextRight,
6354               ObjectToDouble<Map.Entry<K,V>> transformer,
6355               double basis,
# Line 5942 | Line 6358 | public class ConcurrentHashMapV8<K, V>
6358              this.transformer = transformer;
6359              this.basis = basis; this.reducer = reducer;
6360          }
6361 <        @SuppressWarnings("unchecked") public final boolean exec() {
6362 <            final ObjectToDouble<Map.Entry<K,V>> transformer =
6363 <                this.transformer;
6364 <            final DoubleByDoubleToDouble reducer = this.reducer;
6365 <            if (transformer == null || reducer == null)
6366 <                return abortOnNullFunction();
6367 <            try {
6368 <                final double id = this.basis;
5953 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5954 <                    do {} while (!casPending(c = pending, c+1));
6361 >        public final Double getRawResult() { return result; }
6362 >        @SuppressWarnings("unchecked") public final void compute() {
6363 >            final ObjectToDouble<Map.Entry<K,V>> transformer;
6364 >            final DoubleByDoubleToDouble reducer;
6365 >            if ((transformer = this.transformer) != null &&
6366 >                (reducer = this.reducer) != null) {
6367 >                double r = this.basis;
6368 >                for (int b; (b = preSplit()) > 0;)
6369                      (rights = new MapReduceEntriesToDoubleTask<K,V>
6370 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6371 <                }
5958 <                double r = id;
5959 <                Object v;
6370 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6371 >                V v;
6372                  while ((v = advance()) != null)
6373 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6373 >                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey,
6374 >                                                                    v)));
6375                  result = r;
6376 <                for (MapReduceEntriesToDoubleTask<K,V> t = this, s;;) {
6377 <                    int c; BulkTask<K,V,?> par;
6378 <                    if ((c = t.pending) == 0) {
6379 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6380 <                            t.result = reducer.apply(t.result, s.result);
6381 <                        }
6382 <                        if ((par = t.parent) == null ||
6383 <                            !(par instanceof MapReduceEntriesToDoubleTask)) {
5971 <                            t.quietlyComplete();
5972 <                            break;
5973 <                        }
5974 <                        t = (MapReduceEntriesToDoubleTask<K,V>)par;
6376 >                CountedCompleter<?> c;
6377 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6378 >                    MapReduceEntriesToDoubleTask<K,V>
6379 >                        t = (MapReduceEntriesToDoubleTask<K,V>)c,
6380 >                        s = t.rights;
6381 >                    while (s != null) {
6382 >                        t.result = reducer.apply(t.result, s.result);
6383 >                        s = t.rights = s.nextRight;
6384                      }
5976                    else if (t.casPending(c, c - 1))
5977                        break;
6385                  }
5979            } catch (Throwable ex) {
5980                return tryCompleteComputation(ex);
6386              }
5982            return false;
6387          }
5984        public final Double getRawResult() { return result; }
6388      }
6389  
6390      @SuppressWarnings("serial") static final class MapReduceMappingsToDoubleTask<K,V>
6391 <        extends BulkTask<K,V,Double> {
6391 >        extends Traverser<K,V,Double> {
6392          final ObjectByObjectToDouble<? super K, ? super V> transformer;
6393          final DoubleByDoubleToDouble reducer;
6394          final double basis;
6395          double result;
6396          MapReduceMappingsToDoubleTask<K,V> rights, nextRight;
6397          MapReduceMappingsToDoubleTask
6398 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6398 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6399               MapReduceMappingsToDoubleTask<K,V> nextRight,
6400               ObjectByObjectToDouble<? super K, ? super V> transformer,
6401               double basis,
# Line 6001 | Line 6404 | public class ConcurrentHashMapV8<K, V>
6404              this.transformer = transformer;
6405              this.basis = basis; this.reducer = reducer;
6406          }
6407 <        @SuppressWarnings("unchecked") public final boolean exec() {
6408 <            final ObjectByObjectToDouble<? super K, ? super V> transformer =
6409 <                this.transformer;
6410 <            final DoubleByDoubleToDouble reducer = this.reducer;
6411 <            if (transformer == null || reducer == null)
6412 <                return abortOnNullFunction();
6413 <            try {
6414 <                final double id = this.basis;
6012 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6013 <                    do {} while (!casPending(c = pending, c+1));
6407 >        public final Double getRawResult() { return result; }
6408 >        @SuppressWarnings("unchecked") public final void compute() {
6409 >            final ObjectByObjectToDouble<? super K, ? super V> transformer;
6410 >            final DoubleByDoubleToDouble reducer;
6411 >            if ((transformer = this.transformer) != null &&
6412 >                (reducer = this.reducer) != null) {
6413 >                double r = this.basis;
6414 >                for (int b; (b = preSplit()) > 0;)
6415                      (rights = new MapReduceMappingsToDoubleTask<K,V>
6416 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6417 <                }
6017 <                double r = id;
6018 <                Object v;
6416 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6417 >                V v;
6418                  while ((v = advance()) != null)
6419 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6419 >                    r = reducer.apply(r, transformer.apply((K)nextKey, v));
6420                  result = r;
6421 <                for (MapReduceMappingsToDoubleTask<K,V> t = this, s;;) {
6422 <                    int c; BulkTask<K,V,?> par;
6423 <                    if ((c = t.pending) == 0) {
6424 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6425 <                            t.result = reducer.apply(t.result, s.result);
6426 <                        }
6427 <                        if ((par = t.parent) == null ||
6428 <                            !(par instanceof MapReduceMappingsToDoubleTask)) {
6030 <                            t.quietlyComplete();
6031 <                            break;
6032 <                        }
6033 <                        t = (MapReduceMappingsToDoubleTask<K,V>)par;
6421 >                CountedCompleter<?> c;
6422 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6423 >                    MapReduceMappingsToDoubleTask<K,V>
6424 >                        t = (MapReduceMappingsToDoubleTask<K,V>)c,
6425 >                        s = t.rights;
6426 >                    while (s != null) {
6427 >                        t.result = reducer.apply(t.result, s.result);
6428 >                        s = t.rights = s.nextRight;
6429                      }
6035                    else if (t.casPending(c, c - 1))
6036                        break;
6430                  }
6038            } catch (Throwable ex) {
6039                return tryCompleteComputation(ex);
6431              }
6041            return false;
6432          }
6043        public final Double getRawResult() { return result; }
6433      }
6434  
6435      @SuppressWarnings("serial") static final class MapReduceKeysToLongTask<K,V>
6436 <        extends BulkTask<K,V,Long> {
6436 >        extends Traverser<K,V,Long> {
6437          final ObjectToLong<? super K> transformer;
6438          final LongByLongToLong reducer;
6439          final long basis;
6440          long result;
6441          MapReduceKeysToLongTask<K,V> rights, nextRight;
6442          MapReduceKeysToLongTask
6443 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6443 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6444               MapReduceKeysToLongTask<K,V> nextRight,
6445               ObjectToLong<? super K> transformer,
6446               long basis,
# Line 6060 | Line 6449 | public class ConcurrentHashMapV8<K, V>
6449              this.transformer = transformer;
6450              this.basis = basis; this.reducer = reducer;
6451          }
6452 <        @SuppressWarnings("unchecked") public final boolean exec() {
6453 <            final ObjectToLong<? super K> transformer =
6454 <                this.transformer;
6455 <            final LongByLongToLong reducer = this.reducer;
6456 <            if (transformer == null || reducer == null)
6457 <                return abortOnNullFunction();
6458 <            try {
6459 <                final long id = this.basis;
6071 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6072 <                    do {} while (!casPending(c = pending, c+1));
6452 >        public final Long getRawResult() { return result; }
6453 >        @SuppressWarnings("unchecked") public final void compute() {
6454 >            final ObjectToLong<? super K> transformer;
6455 >            final LongByLongToLong reducer;
6456 >            if ((transformer = this.transformer) != null &&
6457 >                (reducer = this.reducer) != null) {
6458 >                long r = this.basis;
6459 >                for (int b; (b = preSplit()) > 0;)
6460                      (rights = new MapReduceKeysToLongTask<K,V>
6461 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6075 <                }
6076 <                long r = id;
6461 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6462                  while (advance() != null)
6463                      r = reducer.apply(r, transformer.apply((K)nextKey));
6464                  result = r;
6465 <                for (MapReduceKeysToLongTask<K,V> t = this, s;;) {
6466 <                    int c; BulkTask<K,V,?> par;
6467 <                    if ((c = t.pending) == 0) {
6468 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6469 <                            t.result = reducer.apply(t.result, s.result);
6470 <                        }
6471 <                        if ((par = t.parent) == null ||
6472 <                            !(par instanceof MapReduceKeysToLongTask)) {
6088 <                            t.quietlyComplete();
6089 <                            break;
6090 <                        }
6091 <                        t = (MapReduceKeysToLongTask<K,V>)par;
6465 >                CountedCompleter<?> c;
6466 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6467 >                    MapReduceKeysToLongTask<K,V>
6468 >                        t = (MapReduceKeysToLongTask<K,V>)c,
6469 >                        s = t.rights;
6470 >                    while (s != null) {
6471 >                        t.result = reducer.apply(t.result, s.result);
6472 >                        s = t.rights = s.nextRight;
6473                      }
6093                    else if (t.casPending(c, c - 1))
6094                        break;
6474                  }
6096            } catch (Throwable ex) {
6097                return tryCompleteComputation(ex);
6475              }
6099            return false;
6476          }
6101        public final Long getRawResult() { return result; }
6477      }
6478  
6479      @SuppressWarnings("serial") static final class MapReduceValuesToLongTask<K,V>
6480 <        extends BulkTask<K,V,Long> {
6480 >        extends Traverser<K,V,Long> {
6481          final ObjectToLong<? super V> transformer;
6482          final LongByLongToLong reducer;
6483          final long basis;
6484          long result;
6485          MapReduceValuesToLongTask<K,V> rights, nextRight;
6486          MapReduceValuesToLongTask
6487 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6487 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6488               MapReduceValuesToLongTask<K,V> nextRight,
6489               ObjectToLong<? super V> transformer,
6490               long basis,
# Line 6118 | Line 6493 | public class ConcurrentHashMapV8<K, V>
6493              this.transformer = transformer;
6494              this.basis = basis; this.reducer = reducer;
6495          }
6496 <        @SuppressWarnings("unchecked") public final boolean exec() {
6497 <            final ObjectToLong<? super V> transformer =
6498 <                this.transformer;
6499 <            final LongByLongToLong reducer = this.reducer;
6500 <            if (transformer == null || reducer == null)
6501 <                return abortOnNullFunction();
6502 <            try {
6503 <                final long id = this.basis;
6129 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6130 <                    do {} while (!casPending(c = pending, c+1));
6496 >        public final Long getRawResult() { return result; }
6497 >        @SuppressWarnings("unchecked") public final void compute() {
6498 >            final ObjectToLong<? super V> transformer;
6499 >            final LongByLongToLong reducer;
6500 >            if ((transformer = this.transformer) != null &&
6501 >                (reducer = this.reducer) != null) {
6502 >                long r = this.basis;
6503 >                for (int b; (b = preSplit()) > 0;)
6504                      (rights = new MapReduceValuesToLongTask<K,V>
6505 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6506 <                }
6134 <                long r = id;
6135 <                Object v;
6505 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6506 >                V v;
6507                  while ((v = advance()) != null)
6508 <                    r = reducer.apply(r, transformer.apply((V)v));
6508 >                    r = reducer.apply(r, transformer.apply(v));
6509                  result = r;
6510 <                for (MapReduceValuesToLongTask<K,V> t = this, s;;) {
6511 <                    int c; BulkTask<K,V,?> par;
6512 <                    if ((c = t.pending) == 0) {
6513 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6514 <                            t.result = reducer.apply(t.result, s.result);
6515 <                        }
6516 <                        if ((par = t.parent) == null ||
6517 <                            !(par instanceof MapReduceValuesToLongTask)) {
6147 <                            t.quietlyComplete();
6148 <                            break;
6149 <                        }
6150 <                        t = (MapReduceValuesToLongTask<K,V>)par;
6510 >                CountedCompleter<?> c;
6511 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6512 >                    MapReduceValuesToLongTask<K,V>
6513 >                        t = (MapReduceValuesToLongTask<K,V>)c,
6514 >                        s = t.rights;
6515 >                    while (s != null) {
6516 >                        t.result = reducer.apply(t.result, s.result);
6517 >                        s = t.rights = s.nextRight;
6518                      }
6152                    else if (t.casPending(c, c - 1))
6153                        break;
6519                  }
6155            } catch (Throwable ex) {
6156                return tryCompleteComputation(ex);
6520              }
6158            return false;
6521          }
6160        public final Long getRawResult() { return result; }
6522      }
6523  
6524      @SuppressWarnings("serial") static final class MapReduceEntriesToLongTask<K,V>
6525 <        extends BulkTask<K,V,Long> {
6525 >        extends Traverser<K,V,Long> {
6526          final ObjectToLong<Map.Entry<K,V>> transformer;
6527          final LongByLongToLong reducer;
6528          final long basis;
6529          long result;
6530          MapReduceEntriesToLongTask<K,V> rights, nextRight;
6531          MapReduceEntriesToLongTask
6532 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6532 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6533               MapReduceEntriesToLongTask<K,V> nextRight,
6534               ObjectToLong<Map.Entry<K,V>> transformer,
6535               long basis,
# Line 6177 | Line 6538 | public class ConcurrentHashMapV8<K, V>
6538              this.transformer = transformer;
6539              this.basis = basis; this.reducer = reducer;
6540          }
6541 <        @SuppressWarnings("unchecked") public final boolean exec() {
6542 <            final ObjectToLong<Map.Entry<K,V>> transformer =
6543 <                this.transformer;
6544 <            final LongByLongToLong reducer = this.reducer;
6545 <            if (transformer == null || reducer == null)
6546 <                return abortOnNullFunction();
6547 <            try {
6548 <                final long id = this.basis;
6188 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6189 <                    do {} while (!casPending(c = pending, c+1));
6541 >        public final Long getRawResult() { return result; }
6542 >        @SuppressWarnings("unchecked") public final void compute() {
6543 >            final ObjectToLong<Map.Entry<K,V>> transformer;
6544 >            final LongByLongToLong reducer;
6545 >            if ((transformer = this.transformer) != null &&
6546 >                (reducer = this.reducer) != null) {
6547 >                long r = this.basis;
6548 >                for (int b; (b = preSplit()) > 0;)
6549                      (rights = new MapReduceEntriesToLongTask<K,V>
6550 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6551 <                }
6193 <                long r = id;
6194 <                Object v;
6550 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6551 >                V v;
6552                  while ((v = advance()) != null)
6553 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6553 >                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey,
6554 >                                                                    v)));
6555                  result = r;
6556 <                for (MapReduceEntriesToLongTask<K,V> t = this, s;;) {
6557 <                    int c; BulkTask<K,V,?> par;
6558 <                    if ((c = t.pending) == 0) {
6559 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6560 <                            t.result = reducer.apply(t.result, s.result);
6561 <                        }
6562 <                        if ((par = t.parent) == null ||
6563 <                            !(par instanceof MapReduceEntriesToLongTask)) {
6206 <                            t.quietlyComplete();
6207 <                            break;
6208 <                        }
6209 <                        t = (MapReduceEntriesToLongTask<K,V>)par;
6556 >                CountedCompleter<?> c;
6557 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6558 >                    MapReduceEntriesToLongTask<K,V>
6559 >                        t = (MapReduceEntriesToLongTask<K,V>)c,
6560 >                        s = t.rights;
6561 >                    while (s != null) {
6562 >                        t.result = reducer.apply(t.result, s.result);
6563 >                        s = t.rights = s.nextRight;
6564                      }
6211                    else if (t.casPending(c, c - 1))
6212                        break;
6565                  }
6214            } catch (Throwable ex) {
6215                return tryCompleteComputation(ex);
6566              }
6217            return false;
6567          }
6219        public final Long getRawResult() { return result; }
6568      }
6569  
6570      @SuppressWarnings("serial") static final class MapReduceMappingsToLongTask<K,V>
6571 <        extends BulkTask<K,V,Long> {
6571 >        extends Traverser<K,V,Long> {
6572          final ObjectByObjectToLong<? super K, ? super V> transformer;
6573          final LongByLongToLong reducer;
6574          final long basis;
6575          long result;
6576          MapReduceMappingsToLongTask<K,V> rights, nextRight;
6577          MapReduceMappingsToLongTask
6578 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6578 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6579               MapReduceMappingsToLongTask<K,V> nextRight,
6580               ObjectByObjectToLong<? super K, ? super V> transformer,
6581               long basis,
# Line 6236 | Line 6584 | public class ConcurrentHashMapV8<K, V>
6584              this.transformer = transformer;
6585              this.basis = basis; this.reducer = reducer;
6586          }
6587 <        @SuppressWarnings("unchecked") public final boolean exec() {
6588 <            final ObjectByObjectToLong<? super K, ? super V> transformer =
6589 <                this.transformer;
6590 <            final LongByLongToLong reducer = this.reducer;
6591 <            if (transformer == null || reducer == null)
6592 <                return abortOnNullFunction();
6593 <            try {
6594 <                final long id = this.basis;
6247 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6248 <                    do {} while (!casPending(c = pending, c+1));
6587 >        public final Long getRawResult() { return result; }
6588 >        @SuppressWarnings("unchecked") public final void compute() {
6589 >            final ObjectByObjectToLong<? super K, ? super V> transformer;
6590 >            final LongByLongToLong reducer;
6591 >            if ((transformer = this.transformer) != null &&
6592 >                (reducer = this.reducer) != null) {
6593 >                long r = this.basis;
6594 >                for (int b; (b = preSplit()) > 0;)
6595                      (rights = new MapReduceMappingsToLongTask<K,V>
6596 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6597 <                }
6252 <                long r = id;
6253 <                Object v;
6596 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6597 >                V v;
6598                  while ((v = advance()) != null)
6599 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6599 >                    r = reducer.apply(r, transformer.apply((K)nextKey, v));
6600                  result = r;
6601 <                for (MapReduceMappingsToLongTask<K,V> t = this, s;;) {
6602 <                    int c; BulkTask<K,V,?> par;
6603 <                    if ((c = t.pending) == 0) {
6604 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6605 <                            t.result = reducer.apply(t.result, s.result);
6606 <                        }
6607 <                        if ((par = t.parent) == null ||
6608 <                            !(par instanceof MapReduceMappingsToLongTask)) {
6265 <                            t.quietlyComplete();
6266 <                            break;
6267 <                        }
6268 <                        t = (MapReduceMappingsToLongTask<K,V>)par;
6601 >                CountedCompleter<?> c;
6602 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6603 >                    MapReduceMappingsToLongTask<K,V>
6604 >                        t = (MapReduceMappingsToLongTask<K,V>)c,
6605 >                        s = t.rights;
6606 >                    while (s != null) {
6607 >                        t.result = reducer.apply(t.result, s.result);
6608 >                        s = t.rights = s.nextRight;
6609                      }
6270                    else if (t.casPending(c, c - 1))
6271                        break;
6610                  }
6273            } catch (Throwable ex) {
6274                return tryCompleteComputation(ex);
6611              }
6276            return false;
6612          }
6278        public final Long getRawResult() { return result; }
6613      }
6614  
6615      @SuppressWarnings("serial") static final class MapReduceKeysToIntTask<K,V>
6616 <        extends BulkTask<K,V,Integer> {
6616 >        extends Traverser<K,V,Integer> {
6617          final ObjectToInt<? super K> transformer;
6618          final IntByIntToInt reducer;
6619          final int basis;
6620          int result;
6621          MapReduceKeysToIntTask<K,V> rights, nextRight;
6622          MapReduceKeysToIntTask
6623 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6623 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6624               MapReduceKeysToIntTask<K,V> nextRight,
6625               ObjectToInt<? super K> transformer,
6626               int basis,
# Line 6295 | Line 6629 | public class ConcurrentHashMapV8<K, V>
6629              this.transformer = transformer;
6630              this.basis = basis; this.reducer = reducer;
6631          }
6632 <        @SuppressWarnings("unchecked") public final boolean exec() {
6633 <            final ObjectToInt<? super K> transformer =
6634 <                this.transformer;
6635 <            final IntByIntToInt reducer = this.reducer;
6636 <            if (transformer == null || reducer == null)
6637 <                return abortOnNullFunction();
6638 <            try {
6639 <                final int id = this.basis;
6306 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6307 <                    do {} while (!casPending(c = pending, c+1));
6632 >        public final Integer getRawResult() { return result; }
6633 >        @SuppressWarnings("unchecked") public final void compute() {
6634 >            final ObjectToInt<? super K> transformer;
6635 >            final IntByIntToInt reducer;
6636 >            if ((transformer = this.transformer) != null &&
6637 >                (reducer = this.reducer) != null) {
6638 >                int r = this.basis;
6639 >                for (int b; (b = preSplit()) > 0;)
6640                      (rights = new MapReduceKeysToIntTask<K,V>
6641 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6310 <                }
6311 <                int r = id;
6641 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6642                  while (advance() != null)
6643                      r = reducer.apply(r, transformer.apply((K)nextKey));
6644                  result = r;
6645 <                for (MapReduceKeysToIntTask<K,V> t = this, s;;) {
6646 <                    int c; BulkTask<K,V,?> par;
6647 <                    if ((c = t.pending) == 0) {
6648 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6649 <                            t.result = reducer.apply(t.result, s.result);
6650 <                        }
6651 <                        if ((par = t.parent) == null ||
6652 <                            !(par instanceof MapReduceKeysToIntTask)) {
6323 <                            t.quietlyComplete();
6324 <                            break;
6325 <                        }
6326 <                        t = (MapReduceKeysToIntTask<K,V>)par;
6645 >                CountedCompleter<?> c;
6646 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6647 >                    MapReduceKeysToIntTask<K,V>
6648 >                        t = (MapReduceKeysToIntTask<K,V>)c,
6649 >                        s = t.rights;
6650 >                    while (s != null) {
6651 >                        t.result = reducer.apply(t.result, s.result);
6652 >                        s = t.rights = s.nextRight;
6653                      }
6328                    else if (t.casPending(c, c - 1))
6329                        break;
6654                  }
6331            } catch (Throwable ex) {
6332                return tryCompleteComputation(ex);
6655              }
6334            return false;
6656          }
6336        public final Integer getRawResult() { return result; }
6657      }
6658  
6659      @SuppressWarnings("serial") static final class MapReduceValuesToIntTask<K,V>
6660 <        extends BulkTask<K,V,Integer> {
6660 >        extends Traverser<K,V,Integer> {
6661          final ObjectToInt<? super V> transformer;
6662          final IntByIntToInt reducer;
6663          final int basis;
6664          int result;
6665          MapReduceValuesToIntTask<K,V> rights, nextRight;
6666          MapReduceValuesToIntTask
6667 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6667 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6668               MapReduceValuesToIntTask<K,V> nextRight,
6669               ObjectToInt<? super V> transformer,
6670               int basis,
# Line 6353 | Line 6673 | public class ConcurrentHashMapV8<K, V>
6673              this.transformer = transformer;
6674              this.basis = basis; this.reducer = reducer;
6675          }
6676 <        @SuppressWarnings("unchecked") public final boolean exec() {
6677 <            final ObjectToInt<? super V> transformer =
6678 <                this.transformer;
6679 <            final IntByIntToInt reducer = this.reducer;
6680 <            if (transformer == null || reducer == null)
6681 <                return abortOnNullFunction();
6682 <            try {
6683 <                final int id = this.basis;
6364 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6365 <                    do {} while (!casPending(c = pending, c+1));
6676 >        public final Integer getRawResult() { return result; }
6677 >        @SuppressWarnings("unchecked") public final void compute() {
6678 >            final ObjectToInt<? super V> transformer;
6679 >            final IntByIntToInt reducer;
6680 >            if ((transformer = this.transformer) != null &&
6681 >                (reducer = this.reducer) != null) {
6682 >                int r = this.basis;
6683 >                for (int b; (b = preSplit()) > 0;)
6684                      (rights = new MapReduceValuesToIntTask<K,V>
6685 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6686 <                }
6369 <                int r = id;
6370 <                Object v;
6685 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6686 >                V v;
6687                  while ((v = advance()) != null)
6688 <                    r = reducer.apply(r, transformer.apply((V)v));
6688 >                    r = reducer.apply(r, transformer.apply(v));
6689                  result = r;
6690 <                for (MapReduceValuesToIntTask<K,V> t = this, s;;) {
6691 <                    int c; BulkTask<K,V,?> par;
6692 <                    if ((c = t.pending) == 0) {
6693 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6694 <                            t.result = reducer.apply(t.result, s.result);
6695 <                        }
6696 <                        if ((par = t.parent) == null ||
6697 <                            !(par instanceof MapReduceValuesToIntTask)) {
6382 <                            t.quietlyComplete();
6383 <                            break;
6384 <                        }
6385 <                        t = (MapReduceValuesToIntTask<K,V>)par;
6690 >                CountedCompleter<?> c;
6691 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6692 >                    MapReduceValuesToIntTask<K,V>
6693 >                        t = (MapReduceValuesToIntTask<K,V>)c,
6694 >                        s = t.rights;
6695 >                    while (s != null) {
6696 >                        t.result = reducer.apply(t.result, s.result);
6697 >                        s = t.rights = s.nextRight;
6698                      }
6387                    else if (t.casPending(c, c - 1))
6388                        break;
6699                  }
6390            } catch (Throwable ex) {
6391                return tryCompleteComputation(ex);
6700              }
6393            return false;
6701          }
6395        public final Integer getRawResult() { return result; }
6702      }
6703  
6704      @SuppressWarnings("serial") static final class MapReduceEntriesToIntTask<K,V>
6705 <        extends BulkTask<K,V,Integer> {
6705 >        extends Traverser<K,V,Integer> {
6706          final ObjectToInt<Map.Entry<K,V>> transformer;
6707          final IntByIntToInt reducer;
6708          final int basis;
6709          int result;
6710          MapReduceEntriesToIntTask<K,V> rights, nextRight;
6711          MapReduceEntriesToIntTask
6712 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6712 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6713               MapReduceEntriesToIntTask<K,V> nextRight,
6714               ObjectToInt<Map.Entry<K,V>> transformer,
6715               int basis,
# Line 6412 | Line 6718 | public class ConcurrentHashMapV8<K, V>
6718              this.transformer = transformer;
6719              this.basis = basis; this.reducer = reducer;
6720          }
6721 <        @SuppressWarnings("unchecked") public final boolean exec() {
6722 <            final ObjectToInt<Map.Entry<K,V>> transformer =
6723 <                this.transformer;
6724 <            final IntByIntToInt reducer = this.reducer;
6725 <            if (transformer == null || reducer == null)
6726 <                return abortOnNullFunction();
6727 <            try {
6728 <                final int id = this.basis;
6423 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6424 <                    do {} while (!casPending(c = pending, c+1));
6721 >        public final Integer getRawResult() { return result; }
6722 >        @SuppressWarnings("unchecked") public final void compute() {
6723 >            final ObjectToInt<Map.Entry<K,V>> transformer;
6724 >            final IntByIntToInt reducer;
6725 >            if ((transformer = this.transformer) != null &&
6726 >                (reducer = this.reducer) != null) {
6727 >                int r = this.basis;
6728 >                for (int b; (b = preSplit()) > 0;)
6729                      (rights = new MapReduceEntriesToIntTask<K,V>
6730 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6731 <                }
6428 <                int r = id;
6429 <                Object v;
6730 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6731 >                V v;
6732                  while ((v = advance()) != null)
6733 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6733 >                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey,
6734 >                                                                    v)));
6735                  result = r;
6736 <                for (MapReduceEntriesToIntTask<K,V> t = this, s;;) {
6737 <                    int c; BulkTask<K,V,?> par;
6738 <                    if ((c = t.pending) == 0) {
6739 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6740 <                            t.result = reducer.apply(t.result, s.result);
6741 <                        }
6742 <                        if ((par = t.parent) == null ||
6743 <                            !(par instanceof MapReduceEntriesToIntTask)) {
6441 <                            t.quietlyComplete();
6442 <                            break;
6443 <                        }
6444 <                        t = (MapReduceEntriesToIntTask<K,V>)par;
6736 >                CountedCompleter<?> c;
6737 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6738 >                    MapReduceEntriesToIntTask<K,V>
6739 >                        t = (MapReduceEntriesToIntTask<K,V>)c,
6740 >                        s = t.rights;
6741 >                    while (s != null) {
6742 >                        t.result = reducer.apply(t.result, s.result);
6743 >                        s = t.rights = s.nextRight;
6744                      }
6446                    else if (t.casPending(c, c - 1))
6447                        break;
6745                  }
6449            } catch (Throwable ex) {
6450                return tryCompleteComputation(ex);
6746              }
6452            return false;
6747          }
6454        public final Integer getRawResult() { return result; }
6748      }
6749  
6750      @SuppressWarnings("serial") static final class MapReduceMappingsToIntTask<K,V>
6751 <        extends BulkTask<K,V,Integer> {
6751 >        extends Traverser<K,V,Integer> {
6752          final ObjectByObjectToInt<? super K, ? super V> transformer;
6753          final IntByIntToInt reducer;
6754          final int basis;
6755          int result;
6756          MapReduceMappingsToIntTask<K,V> rights, nextRight;
6757          MapReduceMappingsToIntTask
6758 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6759 <             MapReduceMappingsToIntTask<K,V> rights,
6758 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6759 >             MapReduceMappingsToIntTask<K,V> nextRight,
6760               ObjectByObjectToInt<? super K, ? super V> transformer,
6761               int basis,
6762               IntByIntToInt reducer) {
# Line 6471 | Line 6764 | public class ConcurrentHashMapV8<K, V>
6764              this.transformer = transformer;
6765              this.basis = basis; this.reducer = reducer;
6766          }
6767 <        @SuppressWarnings("unchecked") public final boolean exec() {
6768 <            final ObjectByObjectToInt<? super K, ? super V> transformer =
6769 <                this.transformer;
6770 <            final IntByIntToInt reducer = this.reducer;
6771 <            if (transformer == null || reducer == null)
6772 <                return abortOnNullFunction();
6773 <            try {
6774 <                final int id = this.basis;
6482 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6483 <                    do {} while (!casPending(c = pending, c+1));
6767 >        public final Integer getRawResult() { return result; }
6768 >        @SuppressWarnings("unchecked") public final void compute() {
6769 >            final ObjectByObjectToInt<? super K, ? super V> transformer;
6770 >            final IntByIntToInt reducer;
6771 >            if ((transformer = this.transformer) != null &&
6772 >                (reducer = this.reducer) != null) {
6773 >                int r = this.basis;
6774 >                for (int b; (b = preSplit()) > 0;)
6775                      (rights = new MapReduceMappingsToIntTask<K,V>
6776 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6777 <                }
6487 <                int r = id;
6488 <                Object v;
6776 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6777 >                V v;
6778                  while ((v = advance()) != null)
6779 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6779 >                    r = reducer.apply(r, transformer.apply((K)nextKey, v));
6780                  result = r;
6781 <                for (MapReduceMappingsToIntTask<K,V> t = this, s;;) {
6782 <                    int c; BulkTask<K,V,?> par;
6783 <                    if ((c = t.pending) == 0) {
6784 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6785 <                            t.result = reducer.apply(t.result, s.result);
6786 <                        }
6787 <                        if ((par = t.parent) == null ||
6788 <                            !(par instanceof MapReduceMappingsToIntTask)) {
6500 <                            t.quietlyComplete();
6501 <                            break;
6502 <                        }
6503 <                        t = (MapReduceMappingsToIntTask<K,V>)par;
6781 >                CountedCompleter<?> c;
6782 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6783 >                    MapReduceMappingsToIntTask<K,V>
6784 >                        t = (MapReduceMappingsToIntTask<K,V>)c,
6785 >                        s = t.rights;
6786 >                    while (s != null) {
6787 >                        t.result = reducer.apply(t.result, s.result);
6788 >                        s = t.rights = s.nextRight;
6789                      }
6505                    else if (t.casPending(c, c - 1))
6506                        break;
6790                  }
6508            } catch (Throwable ex) {
6509                return tryCompleteComputation(ex);
6791              }
6511            return false;
6792          }
6513        public final Integer getRawResult() { return result; }
6793      }
6794  
6516
6795      // Unsafe mechanics
6796 <    private static final sun.misc.Unsafe UNSAFE;
6797 <    private static final long counterOffset;
6798 <    private static final long sizeCtlOffset;
6796 >    private static final sun.misc.Unsafe U;
6797 >    private static final long SIZECTL;
6798 >    private static final long TRANSFERINDEX;
6799 >    private static final long TRANSFERORIGIN;
6800 >    private static final long BASECOUNT;
6801 >    private static final long COUNTERBUSY;
6802 >    private static final long CELLVALUE;
6803      private static final long ABASE;
6804      private static final int ASHIFT;
6805  
6806      static {
6807          int ss;
6808          try {
6809 <            UNSAFE = getUnsafe();
6809 >            U = getUnsafe();
6810              Class<?> k = ConcurrentHashMapV8.class;
6811 <            counterOffset = UNSAFE.objectFieldOffset
6530 <                (k.getDeclaredField("counter"));
6531 <            sizeCtlOffset = UNSAFE.objectFieldOffset
6811 >            SIZECTL = U.objectFieldOffset
6812                  (k.getDeclaredField("sizeCtl"));
6813 +            TRANSFERINDEX = U.objectFieldOffset
6814 +                (k.getDeclaredField("transferIndex"));
6815 +            TRANSFERORIGIN = U.objectFieldOffset
6816 +                (k.getDeclaredField("transferOrigin"));
6817 +            BASECOUNT = U.objectFieldOffset
6818 +                (k.getDeclaredField("baseCount"));
6819 +            COUNTERBUSY = U.objectFieldOffset
6820 +                (k.getDeclaredField("counterBusy"));
6821 +            Class<?> ck = CounterCell.class;
6822 +            CELLVALUE = U.objectFieldOffset
6823 +                (ck.getDeclaredField("value"));
6824              Class<?> sc = Node[].class;
6825 <            ABASE = UNSAFE.arrayBaseOffset(sc);
6826 <            ss = UNSAFE.arrayIndexScale(sc);
6825 >            ABASE = U.arrayBaseOffset(sc);
6826 >            ss = U.arrayIndexScale(sc);
6827 >            ASHIFT = 31 - Integer.numberOfLeadingZeros(ss);
6828          } catch (Exception e) {
6829              throw new Error(e);
6830          }
6831          if ((ss & (ss-1)) != 0)
6832              throw new Error("data type scale not a power of two");
6541        ASHIFT = 31 - Integer.numberOfLeadingZeros(ss);
6833      }
6834  
6835      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines