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.78 by jsr166, Sun Nov 18 18:03:10 2012 UTC vs.
Revision 1.100 by jsr166, Mon Feb 18 03:15:10 2013 UTC

# Line 21 | Line 21 | import java.util.Enumeration;
21   import java.util.ConcurrentModificationException;
22   import java.util.NoSuchElementException;
23   import java.util.concurrent.ConcurrentMap;
24 import java.util.concurrent.ThreadLocalRandom;
25 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;
28
27   import java.io.Serializable;
28  
29   /**
# Line 102 | Line 100 | import java.io.Serializable;
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 parallel operations using the {@link
104 < * ForkJoinPool#commonPool}. (Tasks that may be used in other contexts
105 < * are available in class {@link ForkJoinTasks}). These operations are
106 < * designed to be safely, and often sensibly, applied even with maps
107 < * that are being concurrently updated by other threads; for example,
108 < * when computing a snapshot summary of the values in a shared
109 < * registry.  There are three kinds of operation, each with four
110 < * forms, accepting functions with Keys, Values, Entries, and (Key,
111 < * Value) arguments and/or return values. (The first three forms are
112 < * also available via the {@link #keySet()}, {@link #values()} and
113 < * {@link #entrySet()} views). Because the elements of a
114 < * ConcurrentHashMapV8 are not ordered in any particular way, and may be
115 < * processed in different orders in different parallel executions, the
116 < * correctness of supplied functions should not depend on any
117 < * ordering, or on any other objects or values that may transiently
118 < * change while computation is in progress; and except for forEach
119 < * actions, should ideally be side-effect-free.
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.
# Line 191 | Line 189 | import java.io.Serializable;
189   * exceptions, or would have done so if the first exception had
190   * not occurred.
191   *
192 < * <p>Parallel speedups for bulk operations compared to sequential
193 < * processing are common but not guaranteed.  Operations involving
194 < * brief functions on small maps may execute more slowly than
195 < * sequential loops if the underlying work to parallelize the
196 < * computation is more expensive than the computation itself.
197 < * Similarly, parallelization may not lead to much actual parallelism
198 < * if all processors are busy performing unrelated tasks.
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   *
# Line 214 | Line 212 | import java.io.Serializable;
212   * @param <K> the type of keys maintained by this map
213   * @param <V> the type of mapped values
214   */
215 < public class ConcurrentHashMapV8<K, V>
216 <    implements ConcurrentMap<K, V>, Serializable {
215 > public class ConcurrentHashMapV8<K,V>
216 >    implements ConcurrentMap<K,V>, Serializable {
217      private static final long serialVersionUID = 7249069246763182397L;
218  
219      /**
# Line 287 | Line 285 | public class ConcurrentHashMapV8<K, V>
285          Spliterator<T> split();
286      }
287  
290
288      /*
289       * Overview:
290       *
# Line 298 | 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
310 <     * variants of put-related operations). The validation-based
311 <     * 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 322 | 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
331 <     *  11 - Locked and may have a thread waiting for lock
332 <     *  10 - Node is a forwarding node
333 <     *
334 <     * The lower 30 bits of each Node's hash field contain a
335 <     * transformation of the key's hash code, except for forwarding
336 <     * nodes, for which the lower bits are zero (and so always have
337 <     * 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 343 | 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
348 <     * construction, so we overlay these by using bits of the Node
349 <     * hash field for lock control (see above), and so normally use
350 <     * builtin monitors only for blocking and signalling using
351 <     * 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 410 | 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 461 | 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 525 | Line 509 | public class ConcurrentHashMapV8<K, V>
509      private static final float LOAD_FACTOR = 0.75f;
510  
511      /**
528     * The buffer size for skipped bins during transfers. The
529     * value is arbitrary but should be large enough to avoid
530     * most locking stalls during resizes.
531     */
532    private static final int TRANSFER_BUFFER_SIZE = 32;
533
534    /**
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
543 <     * 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 553 | 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 KeySetView<K,V> keySet;
627      private transient ValuesView<K,V> values;
# Line 591 | 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 615 | 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          }
630
631        /** CompareAndSet the hash field */
632        final boolean casHash(int cmp, int val) {
633            return UNSAFE.compareAndSwapInt(this, hashOffset, cmp, val);
634        }
635
636        /** The number of spins before blocking for a lock */
637        static final int MAX_SPINS =
638            Runtime.getRuntime().availableProcessors() > 1 ? 64 : 1;
639
640        /**
641         * Spins a while if LOCKED bit set and this node is the first
642         * of its bin, and then sets WAITING bits on hash field and
643         * blocks (once) if they are still set.  It is OK for this
644         * method to return even if lock is not available upon exit,
645         * which enables these simple single-wait mechanics.
646         *
647         * The corresponding signalling operation is performed within
648         * callers: Upon detecting that WAITING has been set when
649         * unlocking lock (via a failed CAS from non-waiting LOCKED
650         * state), unlockers acquire the sync lock and perform a
651         * notifyAll.
652         *
653         * The initial sanity check on tab and bounds is not currently
654         * necessary in the only usages of this method, but enables
655         * use in other future contexts.
656         */
657        final void tryAwaitLock(Node[] tab, int i) {
658            if (tab != null && i >= 0 && i < tab.length) { // sanity check
659                int r = ThreadLocalRandom.current().nextInt(); // randomize spins
660                int spins = MAX_SPINS, h;
661                while (tabAt(tab, i) == this && ((h = hash) & LOCKED) != 0) {
662                    if (spins >= 0) {
663                        r ^= r << 1; r ^= r >>> 3; r ^= r << 10; // xorshift
664                        if (r >= 0 && --spins == 0)
665                            Thread.yield();  // yield before block
666                    }
667                    else if (casHash(h, h | WAITING)) {
668                        synchronized (this) {
669                            if (tabAt(tab, i) == this &&
670                                (hash & WAITING) == WAITING) {
671                                try {
672                                    wait();
673                                } catch (InterruptedException ie) {
674                                    Thread.currentThread().interrupt();
675                                }
676                            }
677                            else
678                                notifyAll(); // possibly won race vs signaller
679                        }
680                        break;
681                    }
682                }
683            }
684        }
685
686        // Unsafe mechanics for casHash
687        private static final sun.misc.Unsafe UNSAFE;
688        private static final long hashOffset;
689
690        static {
691            try {
692                UNSAFE = getUnsafe();
693                Class<?> k = Node.class;
694                hashOffset = UNSAFE.objectFieldOffset
695                    (k.getDeclaredField("hash"));
696            } catch (Exception e) {
697                throw new Error(e);
698            }
699        }
686      }
687  
688      /* ---------------- TreeBins -------------- */
# Line 704 | 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 760 | 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 794 | 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 811 | 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 831 | 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 842 | 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                          }
851                        else if ((pr = p.right) != null && h >= pr.hash)
852                            s = pr;
853                        if (s != null && (r = getTreeNode(h, k, s)) != null)
854                            return r;
842                      }
843                  }
844                  else
# Line 866 | 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 878 | 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 892 | 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 906 | 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 923 | 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 938 | 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 962 | 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 984 | 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 999 | 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 1048 | 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 1067 | 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 1085 | 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 1097 | 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 1113 | 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 1123 | 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 1135 | 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 1165 | 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 1183 | 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)
1195 <                t.putTreeNode(e.hash & HASH_BITS, e.key, e.val);
1196 <            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 1227 | 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 1261 | 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) {
1274 <                checkForResize();               // try resizing if can't get lock
1275 <                f.tryAwaitLock(tab, i);
1276 <            }
1277 <            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 1303 | Line 1290 | public class ConcurrentHashMapV8<K, V>
1290                                  break;
1291                          }
1292                      }
1306                } finally {
1307                    if (!f.casHash(fh | LOCKED, fh)) {
1308                        f.hash = fh;
1309                        synchronized (f) { f.notifyAll(); };
1310                    }
1293                  }
1294                  if (validated) {
1295                      if (deleted)
1296 <                        counter.add(-1L);
1296 >                        addCount(-1L, -1);
1297                      break;
1298                  }
1299              }
# Line 1320 | 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
1325 <     * 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.
1339 <     *  * compute uses the same function-call mechanics, but without
1340 <     *    the prescans
1341 <     *  * merge acts as putIfAbsent in the absent case, but invokes the
1342 <     *    update function if present
1343 <     *  * putAll attempts to pre-allocate enough table space
1344 <     *    and more lazily performs count updates and checks.
1345 <     *
1346 <     * Someday when details settle down a bit more, it might be worth
1347 <     * 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;
1394 <                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                      }
1415                } finally {                  // unlock and signal if needed
1416                    if (!f.casHash(fh | LOCKED, fh)) {
1417                        f.hash = fh;
1418                        synchronized (f) { f.notifyAll(); };
1419                    }
1390                  }
1391 <                if (count != 0) {
1391 >                if (len != 0) {
1392                      if (oldVal != null)
1393                          return oldVal;
1424                    if (tab.length <= 64)
1425                        count = 2;
1426                    break;
1427                }
1428            }
1429        }
1430        counter.add(1L);
1431        if (count > 1)
1432            checkForResize();
1433        return null;
1434    }
1435
1436    /** Implementation for putIfAbsent */
1437    private final Object internalPutIfAbsent(Object k, Object v) {
1438        int h = spread(k.hashCode());
1439        int count = 0;
1440        for (Node[] tab = table;;) {
1441            int i; Node f; int fh; Object fk, fv;
1442            if (tab == null)
1443                tab = initTable();
1444            else if ((f = tabAt(tab, i = (tab.length - 1) & h)) == null) {
1445                if (casTabAt(tab, i, null, new Node(h, k, v, null)))
1394                      break;
1447            }
1448            else if ((fh = f.hash) == MOVED) {
1449                if ((fk = f.key) instanceof TreeBin) {
1450                    TreeBin t = (TreeBin)fk;
1451                    Object oldVal = null;
1452                    t.acquire(0);
1453                    try {
1454                        if (tabAt(tab, i) == f) {
1455                            count = 2;
1456                            TreeNode p = t.putTreeNode(h, k, v);
1457                            if (p != null)
1458                                oldVal = p.val;
1459                        }
1460                    } finally {
1461                        t.release(0);
1462                    }
1463                    if (count != 0) {
1464                        if (oldVal != null)
1465                            return oldVal;
1466                        break;
1467                    }
1468                }
1469                else
1470                    tab = (Node[])fk;
1471            }
1472            else if ((fh & HASH_BITS) == h && (fv = f.val) != null &&
1473                     ((fk = f.key) == k || k.equals(fk)))
1474                return fv;
1475            else {
1476                Node g = f.next;
1477                if (g != null) { // at least 2 nodes -- search and maybe resize
1478                    for (Node e = g;;) {
1479                        Object ek, ev;
1480                        if ((e.hash & HASH_BITS) == h && (ev = e.val) != null &&
1481                            ((ek = e.key) == k || k.equals(ek)))
1482                            return ev;
1483                        if ((e = e.next) == null) {
1484                            checkForResize();
1485                            break;
1486                        }
1487                    }
1488                }
1489                if (((fh = f.hash) & LOCKED) != 0) {
1490                    checkForResize();
1491                    f.tryAwaitLock(tab, i);
1492                }
1493                else if (tabAt(tab, i) == f && f.casHash(fh, fh | LOCKED)) {
1494                    Object oldVal = null;
1495                    try {
1496                        if (tabAt(tab, i) == f) {
1497                            count = 1;
1498                            for (Node e = f;; ++count) {
1499                                Object ek, ev;
1500                                if ((e.hash & HASH_BITS) == h &&
1501                                    (ev = e.val) != null &&
1502                                    ((ek = e.key) == k || k.equals(ek))) {
1503                                    oldVal = ev;
1504                                    break;
1505                                }
1506                                Node last = e;
1507                                if ((e = e.next) == null) {
1508                                    last.next = new Node(h, k, v, null);
1509                                    if (count >= TREE_THRESHOLD)
1510                                        replaceWithTreeBin(tab, i, k);
1511                                    break;
1512                                }
1513                            }
1514                        }
1515                    } finally {
1516                        if (!f.casHash(fh | LOCKED, fh)) {
1517                            f.hash = fh;
1518                            synchronized (f) { f.notifyAll(); };
1519                        }
1520                    }
1521                    if (count != 0) {
1522                        if (oldVal != null)
1523                            return oldVal;
1524                        if (tab.length <= 64)
1525                            count = 2;
1526                        break;
1527                    }
1395                  }
1396              }
1397          }
1398 <        counter.add(1L);
1532 <        if (count > 1)
1533 <            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)) {
1558 <                            node.hash = h;
1559 <                            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              }
1595            else if ((fh & HASH_BITS) == h && (fv = f.val) != null &&
1596                     ((fk = f.key) == k || k.equals(fk)))
1597                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 &&
1604 <                            ((ek = e.key) == k || k.equals(ek)))
1605 <                            return ev;
1606 <                        if ((e = e.next) == null) {
1607 <                            checkForResize();
1608 <                            break;
1609 <                        }
1610 <                    }
1611 <                }
1612 <                if (((fh = f.hash) & LOCKED) != 0) {
1613 <                    checkForResize();
1614 <                    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)
1635 <                                            replaceWithTreeBin(tab, i, k);
1636 <                                    }
1637 <                                    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                          }
1641                    } finally {
1642                        if (!f.casHash(fh | LOCKED, fh)) {
1643                            f.hash = fh;
1644                            synchronized (f) { f.notifyAll(); };
1645                        }
1646                    }
1647                    if (count != 0) {
1648                        if (!added)
1649                            return val;
1650                        if (tab.length <= 64)
1651                            count = 2;
1652                        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);
1659 <            if (count > 1)
1660 <                checkForResize();
1661 <        }
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)) {
1691 <                            node.hash = h;
1692 <                            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 1722 | 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;
1730 <            }
1731 <            else if ((fh & LOCKED) != 0) {
1732 <                checkForResize();
1733 <                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 1756 | 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                      }
1769                } finally {
1770                    if (!f.casHash(fh | LOCKED, fh)) {
1771                        f.hash = fh;
1772                        synchronized (f) { f.notifyAll(); };
1773                    }
1608                  }
1609 <                if (count != 0) {
1776 <                    if (tab.length <= 64)
1777 <                        count = 2;
1609 >                if (len != 0)
1610                      break;
1779                }
1611              }
1612          }
1613 <        if (delta != 0) {
1614 <            counter.add((long)delta);
1784 <            if (count > 1)
1785 <                checkForResize();
1786 <        }
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 1831 | 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;
1839 <            }
1840 <            else if ((fh & LOCKED) != 0) {
1841 <                checkForResize();
1842 <                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 1866 | 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                      }
1877                } finally {
1878                    if (!f.casHash(fh | LOCKED, fh)) {
1879                        f.hash = fh;
1880                        synchronized (f) { f.notifyAll(); };
1881                    }
1703                  }
1704 <                if (count != 0) {
1884 <                    if (tab.length <= 64)
1885 <                        count = 2;
1704 >                if (len != 0)
1705                      break;
1887                }
1706              }
1707          }
1708 <        if (delta != 0) {
1709 <            counter.add((long)delta);
1892 <            if (count > 1)
1893 <                checkForResize();
1894 <        }
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 1942 | Line 1758 | public class ConcurrentHashMapV8<K, V>
1758                                  break;
1759                          }
1760                          else
1761 <                            tab = (Node[])fk;
1946 <                    }
1947 <                    else if ((fh & LOCKED) != 0) {
1948 <                        counter.add(delta);
1949 <                        delta = 0L;
1950 <                        checkForResize();
1951 <                        f.tryAwaitLock(tab, i);
1761 >                            tab = (Node<V>[])fk;
1762                      }
1763 <                    else if (f.casHash(fh, fh | LOCKED)) {
1764 <                        int count = 0;
1765 <                        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                              }
1976                        } finally {
1977                            if (!f.casHash(fh | LOCKED, fh)) {
1978                                f.hash = fh;
1979                                synchronized (f) { f.notifyAll(); };
1980                            }
1786                          }
1787 <                        if (count != 0) {
1788 <                            if (count > 1) {
1789 <                                counter.add(delta);
1787 >                        if (len != 0) {
1788 >                            if (len > 1) {
1789 >                                addCount(delta, len);
1790                                  delta = 0L;
1986                                checkForResize();
1791                              }
1792                              break;
1793                          }
# Line 1991 | Line 1795 | public class ConcurrentHashMapV8<K, V>
1795                  }
1796              }
1797          } finally {
1798 <            if (delta != 0)
1799 <                counter.add(delta);
1798 >            if (delta != 0L)
1799 >                addCount(delta, 2);
1800          }
1801          if (npe)
1802              throw new NullPointerException();
1803      }
1804  
1805 +    /**
1806 +     * Implementation for clear. Steps through each bin, removing all
1807 +     * nodes.
1808 +     */
1809 +    @SuppressWarnings("unchecked") private final void internalClear() {
1810 +        long delta = 0L; // negative number of deletions
1811 +        int i = 0;
1812 +        Node<V>[] tab = table;
1813 +        while (tab != null && i < tab.length) {
1814 +            Node<V> f = tabAt(tab, i);
1815 +            if (f == null)
1816 +                ++i;
1817 +            else if (f.hash < 0) {
1818 +                Object fk;
1819 +                if ((fk = f.key) instanceof TreeBin) {
1820 +                    TreeBin<V> t = (TreeBin<V>)fk;
1821 +                    t.acquire(0);
1822 +                    try {
1823 +                        if (tabAt(tab, i) == f) {
1824 +                            for (Node<V> p = t.first; p != null; p = p.next) {
1825 +                                if (p.val != null) { // (currently always true)
1826 +                                    p.val = null;
1827 +                                    --delta;
1828 +                                }
1829 +                            }
1830 +                            t.first = null;
1831 +                            t.root = null;
1832 +                            ++i;
1833 +                        }
1834 +                    } finally {
1835 +                        t.release(0);
1836 +                    }
1837 +                }
1838 +                else
1839 +                    tab = (Node<V>[])fk;
1840 +            }
1841 +            else {
1842 +                synchronized (f) {
1843 +                    if (tabAt(tab, i) == f) {
1844 +                        for (Node<V> e = f; e != null; e = e.next) {
1845 +                            if (e.val != null) {  // (currently always true)
1846 +                                e.val = null;
1847 +                                --delta;
1848 +                            }
1849 +                        }
1850 +                        setTabAt(tab, i, null);
1851 +                        ++i;
1852 +                    }
1853 +                }
1854 +            }
1855 +        }
1856 +        if (delta != 0L)
1857 +            addCount(delta, -1);
1858 +    }
1859 +
1860      /* ---------------- Table Initialization and Resizing -------------- */
1861  
1862      /**
# Line 2017 | Line 1876 | public class ConcurrentHashMapV8<K, V>
1876      /**
1877       * Initializes table, using the size recorded in sizeCtl.
1878       */
1879 <    private final Node[] initTable() {
1880 <        Node[] tab; int sc;
1879 >    @SuppressWarnings("unchecked") private final Node<V>[] initTable() {
1880 >        Node<V>[] tab; int sc;
1881          while ((tab = table) == null) {
1882              if ((sc = sizeCtl) < 0)
1883                  Thread.yield(); // lost initialization race; just spin
1884 <            else if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1884 >            else if (U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
1885                  try {
1886                      if ((tab = table) == null) {
1887                          int n = (sc > 0) ? sc : DEFAULT_CAPACITY;
1888 <                        tab = table = new Node[n];
1888 >                        @SuppressWarnings("rawtypes") Node[] tb = new Node[n];
1889 >                        table = tab = (Node<V>[])tb;
1890                          sc = n - (n >>> 2);
1891                      }
1892                  } finally {
# Line 2039 | Line 1899 | public class ConcurrentHashMapV8<K, V>
1899      }
1900  
1901      /**
1902 <     * If table is too small and not already resizing, creates next
1903 <     * table and transfers bins.  Rechecks occupancy after a transfer
1904 <     * to see if another resize is already needed because resizings
1905 <     * are lagging additions.
1906 <     */
1907 <    private final void checkForResize() {
1908 <        Node[] tab; int n, sc;
1909 <        while ((tab = table) != null &&
1910 <               (n = tab.length) < MAXIMUM_CAPACITY &&
1911 <               (sc = sizeCtl) >= 0 && counter.sum() >= (long)sc &&
1912 <               UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1913 <            try {
1914 <                if (tab == table) {
1915 <                    table = rebuild(tab);
1916 <                    sc = (n << 1) - (n >>> 1);
1902 >     * Adds to count, and if table is too small and not already
1903 >     * resizing, initiates transfer. If already resizing, helps
1904 >     * perform transfer if work is available.  Rechecks occupancy
1905 >     * after a transfer to see if another resize is already needed
1906 >     * because resizings are lagging additions.
1907 >     *
1908 >     * @param x the count to add
1909 >     * @param check if <0, don't check resize, if <= 1 only check if uncontended
1910 >     */
1911 >    private final void addCount(long x, int check) {
1912 >        CounterCell[] as; long b, s;
1913 >        if ((as = counterCells) != null ||
1914 >            !U.compareAndSwapLong(this, BASECOUNT, b = baseCount, s = b + x)) {
1915 >            CounterHashCode hc; CounterCell a; long v; int m;
1916 >            boolean uncontended = true;
1917 >            if ((hc = threadCounterHashCode.get()) == null ||
1918 >                as == null || (m = as.length - 1) < 0 ||
1919 >                (a = as[m & hc.code]) == null ||
1920 >                !(uncontended =
1921 >                  U.compareAndSwapLong(a, CELLVALUE, v = a.value, v + x))) {
1922 >                fullAddCount(x, hc, uncontended);
1923 >                return;
1924 >            }
1925 >            if (check <= 1)
1926 >                return;
1927 >            s = sumCount();
1928 >        }
1929 >        if (check >= 0) {
1930 >            Node<V>[] tab, nt; int sc;
1931 >            while (s >= (long)(sc = sizeCtl) && (tab = table) != null &&
1932 >                   tab.length < MAXIMUM_CAPACITY) {
1933 >                if (sc < 0) {
1934 >                    if (sc == -1 || transferIndex <= transferOrigin ||
1935 >                        (nt = nextTable) == null)
1936 >                        break;
1937 >                    if (U.compareAndSwapInt(this, SIZECTL, sc, sc - 1))
1938 >                        transfer(tab, nt);
1939                  }
1940 <            } finally {
1941 <                sizeCtl = sc;
1940 >                else if (U.compareAndSwapInt(this, SIZECTL, sc, -2))
1941 >                    transfer(tab, null);
1942 >                s = sumCount();
1943              }
1944          }
1945      }
# Line 2066 | Line 1949 | public class ConcurrentHashMapV8<K, V>
1949       *
1950       * @param size number of elements (doesn't need to be perfectly accurate)
1951       */
1952 <    private final void tryPresize(int size) {
1952 >    @SuppressWarnings("unchecked") private final void tryPresize(int size) {
1953          int c = (size >= (MAXIMUM_CAPACITY >>> 1)) ? MAXIMUM_CAPACITY :
1954              tableSizeFor(size + (size >>> 1) + 1);
1955          int sc;
1956          while ((sc = sizeCtl) >= 0) {
1957 <            Node[] tab = table; int n;
1957 >            Node<V>[] tab = table; int n;
1958              if (tab == null || (n = tab.length) == 0) {
1959                  n = (sc > c) ? sc : c;
1960 <                if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1960 >                if (U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
1961                      try {
1962                          if (table == tab) {
1963 <                            table = new Node[n];
1963 >                            @SuppressWarnings("rawtypes") Node[] tb = new Node[n];
1964 >                            table = (Node<V>[])tb;
1965                              sc = n - (n >>> 2);
1966                          }
1967                      } finally {
# Line 2087 | Line 1971 | public class ConcurrentHashMapV8<K, V>
1971              }
1972              else if (c <= sc || n >= MAXIMUM_CAPACITY)
1973                  break;
1974 <            else if (UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
1975 <                try {
1976 <                    if (table == tab) {
2093 <                        table = rebuild(tab);
2094 <                        sc = (n << 1) - (n >>> 1);
2095 <                    }
2096 <                } finally {
2097 <                    sizeCtl = sc;
2098 <                }
2099 <            }
1974 >            else if (tab == table &&
1975 >                     U.compareAndSwapInt(this, SIZECTL, sc, -2))
1976 >                transfer(tab, null);
1977          }
1978      }
1979  
1980 <    /*
1980 >    /**
1981       * Moves and/or copies the nodes in each bin to new table. See
1982       * above for explanation.
2106     *
2107     * @return the new table
1983       */
1984 <    private static final Node[] rebuild(Node[] tab) {
1985 <        int n = tab.length;
1986 <        Node[] nextTab = new Node[n << 1];
1987 <        Node fwd = new Node(MOVED, nextTab, null, null);
1988 <        int[] buffer = null;       // holds bins to revisit; null until needed
1989 <        Node rev = null;           // reverse forwarder; null until needed
1990 <        int nbuffered = 0;         // the number of bins in buffer list
1991 <        int bufferIndex = 0;       // buffer index of current buffered bin
1992 <        int bin = n - 1;           // current non-buffered bin or -1 if none
1993 <
1994 <        for (int i = bin;;) {      // start upwards sweep
1995 <            int fh; Node f;
1996 <            if ((f = tabAt(tab, i)) == null) {
1997 <                if (bin >= 0) {    // Unbuffered; no lock needed (or available)
1998 <                    if (!casTabAt(tab, i, f, fwd))
1999 <                        continue;
2000 <                }
2001 <                else {             // transiently use a locked forwarding node
2002 <                    Node g = new Node(MOVED|LOCKED, nextTab, null, null);
2003 <                    if (!casTabAt(tab, i, f, g))
2004 <                        continue;
1984 >    @SuppressWarnings("unchecked") private final void transfer
1985 >        (Node<V>[] tab, Node<V>[] nextTab) {
1986 >        int n = tab.length, stride;
1987 >        if ((stride = (NCPU > 1) ? (n >>> 3) / NCPU : n) < MIN_TRANSFER_STRIDE)
1988 >            stride = MIN_TRANSFER_STRIDE; // subdivide range
1989 >        if (nextTab == null) {            // initiating
1990 >            try {
1991 >                @SuppressWarnings("rawtypes") Node[] tb = new Node[n << 1];
1992 >                nextTab = (Node<V>[])tb;
1993 >            } catch (Throwable ex) {      // try to cope with OOME
1994 >                sizeCtl = Integer.MAX_VALUE;
1995 >                return;
1996 >            }
1997 >            nextTable = nextTab;
1998 >            transferOrigin = n;
1999 >            transferIndex = n;
2000 >            Node<V> rev = new Node<V>(MOVED, tab, null, null);
2001 >            for (int k = n; k > 0;) {    // progressively reveal ready slots
2002 >                int nextk = (k > stride) ? k - stride : 0;
2003 >                for (int m = nextk; m < k; ++m)
2004 >                    nextTab[m] = rev;
2005 >                for (int m = n + nextk; m < n + k; ++m)
2006 >                    nextTab[m] = rev;
2007 >                U.putOrderedInt(this, TRANSFERORIGIN, k = nextk);
2008 >            }
2009 >        }
2010 >        int nextn = nextTab.length;
2011 >        Node<V> fwd = new Node<V>(MOVED, nextTab, null, null);
2012 >        boolean advance = true;
2013 >        for (int i = 0, bound = 0;;) {
2014 >            int nextIndex, nextBound; Node<V> f; Object fk;
2015 >            while (advance) {
2016 >                if (--i >= bound)
2017 >                    advance = false;
2018 >                else if ((nextIndex = transferIndex) <= transferOrigin) {
2019 >                    i = -1;
2020 >                    advance = false;
2021 >                }
2022 >                else if (U.compareAndSwapInt
2023 >                         (this, TRANSFERINDEX, nextIndex,
2024 >                          nextBound = (nextIndex > stride ?
2025 >                                       nextIndex - stride : 0))) {
2026 >                    bound = nextBound;
2027 >                    i = nextIndex - 1;
2028 >                    advance = false;
2029 >                }
2030 >            }
2031 >            if (i < 0 || i >= n || i + n >= nextn) {
2032 >                for (int sc;;) {
2033 >                    if (U.compareAndSwapInt(this, SIZECTL, sc = sizeCtl, ++sc)) {
2034 >                        if (sc == -1) {
2035 >                            nextTable = null;
2036 >                            table = nextTab;
2037 >                            sizeCtl = (n << 1) - (n >>> 1);
2038 >                        }
2039 >                        return;
2040 >                    }
2041 >                }
2042 >            }
2043 >            else if ((f = tabAt(tab, i)) == null) {
2044 >                if (casTabAt(tab, i, null, fwd)) {
2045                      setTabAt(nextTab, i, null);
2046                      setTabAt(nextTab, i + n, null);
2047 <                    setTabAt(tab, i, fwd);
2133 <                    if (!g.casHash(MOVED|LOCKED, MOVED)) {
2134 <                        g.hash = MOVED;
2135 <                        synchronized (g) { g.notifyAll(); }
2136 <                    }
2047 >                    advance = true;
2048                  }
2049              }
2050 <            else if ((fh = f.hash) == MOVED) {
2051 <                Object fk = f.key;
2052 <                if (fk instanceof TreeBin) {
2053 <                    TreeBin t = (TreeBin)fk;
2054 <                    boolean validated = false;
2055 <                    t.acquire(0);
2056 <                    try {
2057 <                        if (tabAt(tab, i) == f) {
2058 <                            validated = true;
2059 <                            splitTreeBin(nextTab, i, t);
2060 <                            setTabAt(tab, i, fwd);
2050 >            else if (f.hash >= 0) {
2051 >                synchronized (f) {
2052 >                    if (tabAt(tab, i) == f) {
2053 >                        int runBit = f.hash & n;
2054 >                        Node<V> lastRun = f, lo = null, hi = null;
2055 >                        for (Node<V> p = f.next; p != null; p = p.next) {
2056 >                            int b = p.hash & n;
2057 >                            if (b != runBit) {
2058 >                                runBit = b;
2059 >                                lastRun = p;
2060 >                            }
2061                          }
2062 <                    } finally {
2063 <                        t.release(0);
2062 >                        if (runBit == 0)
2063 >                            lo = lastRun;
2064 >                        else
2065 >                            hi = lastRun;
2066 >                        for (Node<V> p = f; p != lastRun; p = p.next) {
2067 >                            int ph = p.hash;
2068 >                            Object pk = p.key; V pv = p.val;
2069 >                            if ((ph & n) == 0)
2070 >                                lo = new Node<V>(ph, pk, pv, lo);
2071 >                            else
2072 >                                hi = new Node<V>(ph, pk, pv, hi);
2073 >                        }
2074 >                        setTabAt(nextTab, i, lo);
2075 >                        setTabAt(nextTab, i + n, hi);
2076 >                        setTabAt(tab, i, fwd);
2077 >                        advance = true;
2078                      }
2154                    if (!validated)
2155                        continue;
2079                  }
2080              }
2081 <            else if ((fh & LOCKED) == 0 && f.casHash(fh, fh|LOCKED)) {
2082 <                boolean validated = false;
2083 <                try {              // split to lo and hi lists; copying as needed
2081 >            else if ((fk = f.key) instanceof TreeBin) {
2082 >                TreeBin<V> t = (TreeBin<V>)fk;
2083 >                t.acquire(0);
2084 >                try {
2085                      if (tabAt(tab, i) == f) {
2086 <                        validated = true;
2087 <                        splitBin(nextTab, i, f);
2086 >                        TreeBin<V> lt = new TreeBin<V>();
2087 >                        TreeBin<V> ht = new TreeBin<V>();
2088 >                        int lc = 0, hc = 0;
2089 >                        for (Node<V> e = t.first; e != null; e = e.next) {
2090 >                            int h = e.hash;
2091 >                            Object k = e.key; V v = e.val;
2092 >                            if ((h & n) == 0) {
2093 >                                ++lc;
2094 >                                lt.putTreeNode(h, k, v);
2095 >                            }
2096 >                            else {
2097 >                                ++hc;
2098 >                                ht.putTreeNode(h, k, v);
2099 >                            }
2100 >                        }
2101 >                        Node<V> ln, hn; // throw away trees if too small
2102 >                        if (lc < TREE_THRESHOLD) {
2103 >                            ln = null;
2104 >                            for (Node<V> p = lt.first; p != null; p = p.next)
2105 >                                ln = new Node<V>(p.hash, p.key, p.val, ln);
2106 >                        }
2107 >                        else
2108 >                            ln = new Node<V>(MOVED, lt, null, null);
2109 >                        setTabAt(nextTab, i, ln);
2110 >                        if (hc < TREE_THRESHOLD) {
2111 >                            hn = null;
2112 >                            for (Node<V> p = ht.first; p != null; p = p.next)
2113 >                                hn = new Node<V>(p.hash, p.key, p.val, hn);
2114 >                        }
2115 >                        else
2116 >                            hn = new Node<V>(MOVED, ht, null, null);
2117 >                        setTabAt(nextTab, i + n, hn);
2118                          setTabAt(tab, i, fwd);
2119 +                        advance = true;
2120                      }
2121                  } finally {
2122 <                    if (!f.casHash(fh | LOCKED, fh)) {
2168 <                        f.hash = fh;
2169 <                        synchronized (f) { f.notifyAll(); };
2170 <                    }
2122 >                    t.release(0);
2123                  }
2172                if (!validated)
2173                    continue;
2174            }
2175            else {
2176                if (buffer == null) // initialize buffer for revisits
2177                    buffer = new int[TRANSFER_BUFFER_SIZE];
2178                if (bin < 0 && bufferIndex > 0) {
2179                    int j = buffer[--bufferIndex];
2180                    buffer[bufferIndex] = i;
2181                    i = j;         // swap with another bin
2182                    continue;
2183                }
2184                if (bin < 0 || nbuffered >= TRANSFER_BUFFER_SIZE) {
2185                    f.tryAwaitLock(tab, i);
2186                    continue;      // no other options -- block
2187                }
2188                if (rev == null)   // initialize reverse-forwarder
2189                    rev = new Node(MOVED, tab, null, null);
2190                if (tabAt(tab, i) != f || (f.hash & LOCKED) == 0)
2191                    continue;      // recheck before adding to list
2192                buffer[nbuffered++] = i;
2193                setTabAt(nextTab, i, rev);     // install place-holders
2194                setTabAt(nextTab, i + n, rev);
2195            }
2196
2197            if (bin > 0)
2198                i = --bin;
2199            else if (buffer != null && nbuffered > 0) {
2200                bin = -1;
2201                i = buffer[bufferIndex = --nbuffered];
2124              }
2125              else
2126 <                return nextTab;
2126 >                advance = true; // already processed
2127          }
2128      }
2129  
2130 <    /**
2131 <     * Splits a normal bin with list headed by e into lo and hi parts;
2132 <     * installs in given table.
2133 <     */
2134 <    private static void splitBin(Node[] nextTab, int i, Node e) {
2135 <        int bit = nextTab.length >>> 1; // bit to split on
2136 <        int runBit = e.hash & bit;
2137 <        Node lastRun = e, lo = null, hi = null;
2138 <        for (Node p = e.next; p != null; p = p.next) {
2217 <            int b = p.hash & bit;
2218 <            if (b != runBit) {
2219 <                runBit = b;
2220 <                lastRun = p;
2130 >    /* ---------------- Counter support -------------- */
2131 >
2132 >    final long sumCount() {
2133 >        CounterCell[] as = counterCells; CounterCell a;
2134 >        long sum = baseCount;
2135 >        if (as != null) {
2136 >            for (int i = 0; i < as.length; ++i) {
2137 >                if ((a = as[i]) != null)
2138 >                    sum += a.value;
2139              }
2140          }
2141 <        if (runBit == 0)
2224 <            lo = lastRun;
2225 <        else
2226 <            hi = lastRun;
2227 <        for (Node p = e; p != lastRun; p = p.next) {
2228 <            int ph = p.hash & HASH_BITS;
2229 <            Object pk = p.key, pv = p.val;
2230 <            if ((ph & bit) == 0)
2231 <                lo = new Node(ph, pk, pv, lo);
2232 <            else
2233 <                hi = new Node(ph, pk, pv, hi);
2234 <        }
2235 <        setTabAt(nextTab, i, lo);
2236 <        setTabAt(nextTab, i + bit, hi);
2141 >        return sum;
2142      }
2143  
2144 <    /**
2145 <     * Splits a tree bin into lo and hi parts; installs in given table.
2146 <     */
2147 <    private static void splitTreeBin(Node[] nextTab, int i, TreeBin t) {
2148 <        int bit = nextTab.length >>> 1;
2149 <        TreeBin lt = new TreeBin();
2150 <        TreeBin ht = new TreeBin();
2151 <        int lc = 0, hc = 0;
2152 <        for (Node e = t.first; e != null; e = e.next) {
2248 <            int h = e.hash & HASH_BITS;
2249 <            Object k = e.key, v = e.val;
2250 <            if ((h & bit) == 0) {
2251 <                ++lc;
2252 <                lt.putTreeNode(h, k, v);
2253 <            }
2254 <            else {
2255 <                ++hc;
2256 <                ht.putTreeNode(h, k, v);
2257 <            }
2258 <        }
2259 <        Node ln, hn; // throw away trees if too small
2260 <        if (lc <= (TREE_THRESHOLD >>> 1)) {
2261 <            ln = null;
2262 <            for (Node p = lt.first; p != null; p = p.next)
2263 <                ln = new Node(p.hash, p.key, p.val, ln);
2144 >    // See LongAdder version for explanation
2145 >    private final void fullAddCount(long x, CounterHashCode hc,
2146 >                                    boolean wasUncontended) {
2147 >        int h;
2148 >        if (hc == null) {
2149 >            hc = new CounterHashCode();
2150 >            int s = counterHashCodeGenerator.addAndGet(SEED_INCREMENT);
2151 >            h = hc.code = (s == 0) ? 1 : s; // Avoid zero
2152 >            threadCounterHashCode.set(hc);
2153          }
2154          else
2155 <            ln = new Node(MOVED, lt, null, null);
2156 <        setTabAt(nextTab, i, ln);
2157 <        if (hc <= (TREE_THRESHOLD >>> 1)) {
2158 <            hn = null;
2159 <            for (Node p = ht.first; p != null; p = p.next)
2160 <                hn = new Node(p.hash, p.key, p.val, hn);
2161 <        }
2162 <        else
2163 <            hn = new Node(MOVED, ht, null, null);
2164 <        setTabAt(nextTab, i + bit, hn);
2165 <    }
2166 <
2167 <    /**
2168 <     * Implementation for clear. Steps through each bin, removing all
2169 <     * nodes.
2170 <     */
2171 <    private final void internalClear() {
2172 <        long delta = 0L; // negative number of deletions
2284 <        int i = 0;
2285 <        Node[] tab = table;
2286 <        while (tab != null && i < tab.length) {
2287 <            int fh; Object fk;
2288 <            Node f = tabAt(tab, i);
2289 <            if (f == null)
2290 <                ++i;
2291 <            else if ((fh = f.hash) == MOVED) {
2292 <                if ((fk = f.key) instanceof TreeBin) {
2293 <                    TreeBin t = (TreeBin)fk;
2294 <                    t.acquire(0);
2295 <                    try {
2296 <                        if (tabAt(tab, i) == f) {
2297 <                            for (Node p = t.first; p != null; p = p.next) {
2298 <                                if (p.val != null) { // (currently always true)
2299 <                                    p.val = null;
2300 <                                    --delta;
2155 >            h = hc.code;
2156 >        boolean collide = false;                // True if last slot nonempty
2157 >        for (;;) {
2158 >            CounterCell[] as; CounterCell a; int n; long v;
2159 >            if ((as = counterCells) != null && (n = as.length) > 0) {
2160 >                if ((a = as[(n - 1) & h]) == null) {
2161 >                    if (counterBusy == 0) {            // Try to attach new Cell
2162 >                        CounterCell r = new CounterCell(x); // Optimistic create
2163 >                        if (counterBusy == 0 &&
2164 >                            U.compareAndSwapInt(this, COUNTERBUSY, 0, 1)) {
2165 >                            boolean created = false;
2166 >                            try {               // Recheck under lock
2167 >                                CounterCell[] rs; int m, j;
2168 >                                if ((rs = counterCells) != null &&
2169 >                                    (m = rs.length) > 0 &&
2170 >                                    rs[j = (m - 1) & h] == null) {
2171 >                                    rs[j] = r;
2172 >                                    created = true;
2173                                  }
2174 +                            } finally {
2175 +                                counterBusy = 0;
2176                              }
2177 <                            t.first = null;
2178 <                            t.root = null;
2179 <                            ++i;
2177 >                            if (created)
2178 >                                break;
2179 >                            continue;           // Slot is now non-empty
2180                          }
2307                    } finally {
2308                        t.release(0);
2181                      }
2182 +                    collide = false;
2183                  }
2184 <                else
2185 <                    tab = (Node[])fk;
2186 <            }
2187 <            else if ((fh & LOCKED) != 0) {
2188 <                counter.add(delta); // opportunistically update count
2189 <                delta = 0L;
2190 <                f.tryAwaitLock(tab, i);
2191 <            }
2192 <            else if (f.casHash(fh, fh | LOCKED)) {
2193 <                try {
2194 <                    if (tabAt(tab, i) == f) {
2195 <                        for (Node e = f; e != null; e = e.next) {
2196 <                            if (e.val != null) {  // (currently always true)
2197 <                                e.val = null;
2198 <                                --delta;
2199 <                            }
2184 >                else if (!wasUncontended)       // CAS already known to fail
2185 >                    wasUncontended = true;      // Continue after rehash
2186 >                else if (U.compareAndSwapLong(a, CELLVALUE, v = a.value, v + x))
2187 >                    break;
2188 >                else if (counterCells != as || n >= NCPU)
2189 >                    collide = false;            // At max size or stale
2190 >                else if (!collide)
2191 >                    collide = true;
2192 >                else if (counterBusy == 0 &&
2193 >                         U.compareAndSwapInt(this, COUNTERBUSY, 0, 1)) {
2194 >                    try {
2195 >                        if (counterCells == as) {// Expand table unless stale
2196 >                            CounterCell[] rs = new CounterCell[n << 1];
2197 >                            for (int i = 0; i < n; ++i)
2198 >                                rs[i] = as[i];
2199 >                            counterCells = rs;
2200                          }
2201 <                        setTabAt(tab, i, null);
2202 <                        ++i;
2201 >                    } finally {
2202 >                        counterBusy = 0;
2203                      }
2204 <                } finally {
2205 <                    if (!f.casHash(fh | LOCKED, fh)) {
2206 <                        f.hash = fh;
2207 <                        synchronized (f) { f.notifyAll(); };
2204 >                    collide = false;
2205 >                    continue;                   // Retry with expanded table
2206 >                }
2207 >                h ^= h << 13;                   // Rehash
2208 >                h ^= h >>> 17;
2209 >                h ^= h << 5;
2210 >            }
2211 >            else if (counterBusy == 0 && counterCells == as &&
2212 >                     U.compareAndSwapInt(this, COUNTERBUSY, 0, 1)) {
2213 >                boolean init = false;
2214 >                try {                           // Initialize table
2215 >                    if (counterCells == as) {
2216 >                        CounterCell[] rs = new CounterCell[2];
2217 >                        rs[h & 1] = new CounterCell(x);
2218 >                        counterCells = rs;
2219 >                        init = true;
2220                      }
2221 +                } finally {
2222 +                    counterBusy = 0;
2223                  }
2224 +                if (init)
2225 +                    break;
2226              }
2227 +            else if (U.compareAndSwapLong(this, BASECOUNT, v = baseCount, v + x))
2228 +                break;                          // Fall back on using base
2229          }
2230 <        if (delta != 0)
2340 <            counter.add(delta);
2230 >        hc.code = h;                            // Record index for next time
2231      }
2232  
2233      /* ----------------Table Traversal -------------- */
# Line 2380 | Line 2270 | public class ConcurrentHashMapV8<K, V>
2270       * across threads, iteration terminates if a bounds checks fails
2271       * for a table read.
2272       *
2273 <     * This class extends ForkJoinTask to streamline parallel
2274 <     * iteration in bulk operations (see BulkTask). This adds only an
2275 <     * int of space overhead, which is close enough to negligible in
2276 <     * cases where it is not needed to not worry about it.  Because
2277 <     * ForkJoinTask is Serializable, but iterators need not be, we
2278 <     * need to add warning suppressions.
2279 <     */
2280 <    @SuppressWarnings("serial") static class Traverser<K,V,R> extends ForkJoinTask<R> {
2281 <        final ConcurrentHashMapV8<K, V> map;
2282 <        Node next;           // the next entry to use
2273 >     * This class extends CountedCompleter to streamline parallel
2274 >     * iteration in bulk operations. This adds only a few fields of
2275 >     * space overhead, which is small enough in cases where it is not
2276 >     * needed to not worry about it.  Because CountedCompleter is
2277 >     * Serializable, but iterators need not be, we need to add warning
2278 >     * suppressions.
2279 >     */
2280 >    @SuppressWarnings("serial") static class Traverser<K,V,R>
2281 >        extends CountedCompleter<R> {
2282 >        final ConcurrentHashMapV8<K,V> map;
2283 >        Node<V> next;        // the next entry to use
2284          Object nextKey;      // cached key field of next
2285 <        Object nextVal;      // cached val field of next
2286 <        Node[] tab;          // current table; updated if resized
2285 >        V nextVal;           // cached val field of next
2286 >        Node<V>[] tab;       // current table; updated if resized
2287          int index;           // index of bin to use next
2288          int baseIndex;       // current index of initial table
2289          int baseLimit;       // index bound for initial table
2290          int baseSize;        // initial table size
2291 +        int batch;           // split control
2292  
2293          /** Creates iterator for all entries in the table. */
2294 <        Traverser(ConcurrentHashMapV8<K, V> map) {
2294 >        Traverser(ConcurrentHashMapV8<K,V> map) {
2295              this.map = map;
2296          }
2297  
2298 <        /** Creates iterator for split() methods */
2299 <        Traverser(Traverser<K,V,?> it) {
2300 <            ConcurrentHashMapV8<K, V> m; Node[] t;
2301 <            if ((m = this.map = it.map) == null)
2302 <                t = null;
2303 <            else if ((t = it.tab) == null && // force parent tab initialization
2304 <                     (t = it.tab = m.table) != null)
2305 <                it.baseLimit = it.baseSize = t.length;
2306 <            this.tab = t;
2307 <            this.baseSize = it.baseSize;
2308 <            it.baseLimit = this.index = this.baseIndex =
2309 <                ((this.baseLimit = it.baseLimit) + it.baseIndex + 1) >>> 1;
2298 >        /** Creates iterator for split() methods and task constructors */
2299 >        Traverser(ConcurrentHashMapV8<K,V> map, Traverser<K,V,?> it, int batch) {
2300 >            super(it);
2301 >            this.batch = batch;
2302 >            if ((this.map = map) != null && it != null) { // split parent
2303 >                Node<V>[] t;
2304 >                if ((t = it.tab) == null &&
2305 >                    (t = it.tab = map.table) != null)
2306 >                    it.baseLimit = it.baseSize = t.length;
2307 >                this.tab = t;
2308 >                this.baseSize = it.baseSize;
2309 >                int hi = this.baseLimit = it.baseLimit;
2310 >                it.baseLimit = this.index = this.baseIndex =
2311 >                    (hi + it.baseIndex + 1) >>> 1;
2312 >            }
2313          }
2314  
2315          /**
2316           * Advances next; returns nextVal or null if terminated.
2317           * See above for explanation.
2318           */
2319 <        final Object advance() {
2320 <            Node e = next;
2321 <            Object ev = null;
2319 >        @SuppressWarnings("unchecked") final V advance() {
2320 >            Node<V> e = next;
2321 >            V ev = null;
2322              outer: do {
2323                  if (e != null)                  // advance past used/skipped node
2324                      e = e.next;
2325                  while (e == null) {             // get to next non-null bin
2326 <                    ConcurrentHashMapV8<K, V> m;
2327 <                    Node[] t; int b, i, n; Object ek; // checks must use locals
2326 >                    ConcurrentHashMapV8<K,V> m;
2327 >                    Node<V>[] t; int b, i, n; Object ek; //  must use locals
2328                      if ((t = tab) != null)
2329                          n = t.length;
2330                      else if ((m = map) != null && (t = tab = m.table) != null)
# Line 2439 | Line 2334 | public class ConcurrentHashMapV8<K, V>
2334                      if ((b = baseIndex) >= baseLimit ||
2335                          (i = index) < 0 || i >= n)
2336                          break outer;
2337 <                    if ((e = tabAt(t, i)) != null && e.hash == MOVED) {
2337 >                    if ((e = tabAt(t, i)) != null && e.hash < 0) {
2338                          if ((ek = e.key) instanceof TreeBin)
2339 <                            e = ((TreeBin)ek).first;
2339 >                            e = ((TreeBin<V>)ek).first;
2340                          else {
2341 <                            tab = (Node[])ek;
2341 >                            tab = (Node<V>[])ek;
2342                              continue;           // restarts due to null val
2343                          }
2344                      }                           // visit upper slots if present
# Line 2467 | Line 2362 | public class ConcurrentHashMapV8<K, V>
2362          }
2363  
2364          public final boolean hasMoreElements() { return hasNext(); }
2365 <        public final void setRawResult(Object x) { }
2366 <        public R getRawResult() { return null; }
2367 <        public boolean exec() { return true; }
2365 >
2366 >        public void compute() { } // default no-op CountedCompleter body
2367 >
2368 >        /**
2369 >         * Returns a batch value > 0 if this task should (and must) be
2370 >         * split, if so, adding to pending count, and in any case
2371 >         * updating batch value. The initial batch value is approx
2372 >         * exp2 of the number of times (minus one) to split task by
2373 >         * two before executing leaf action. This value is faster to
2374 >         * compute and more convenient to use as a guide to splitting
2375 >         * than is the depth, since it is used while dividing by two
2376 >         * anyway.
2377 >         */
2378 >        final int preSplit() {
2379 >            ConcurrentHashMapV8<K,V> m; int b; Node<V>[] t;  ForkJoinPool pool;
2380 >            if ((b = batch) < 0 && (m = map) != null) { // force initialization
2381 >                if ((t = tab) == null && (t = tab = m.table) != null)
2382 >                    baseLimit = baseSize = t.length;
2383 >                if (t != null) {
2384 >                    long n = m.sumCount();
2385 >                    int par = ((pool = getPool()) == null) ?
2386 >                        ForkJoinPool.getCommonPoolParallelism() :
2387 >                        pool.getParallelism();
2388 >                    int sp = par << 3; // slack of 8
2389 >                    b = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp;
2390 >                }
2391 >            }
2392 >            b = (b <= 1 || baseIndex == baseLimit) ? 0 : (b >>> 1);
2393 >            if ((batch = b) > 0)
2394 >                addToPendingCount(1);
2395 >            return b;
2396 >        }
2397 >
2398      }
2399  
2400      /* ---------------- Public operations -------------- */
# Line 2478 | Line 2403 | public class ConcurrentHashMapV8<K, V>
2403       * Creates a new, empty map with the default initial table size (16).
2404       */
2405      public ConcurrentHashMapV8() {
2481        this.counter = new LongAdder();
2406      }
2407  
2408      /**
# Line 2497 | Line 2421 | public class ConcurrentHashMapV8<K, V>
2421          int cap = ((initialCapacity >= (MAXIMUM_CAPACITY >>> 1)) ?
2422                     MAXIMUM_CAPACITY :
2423                     tableSizeFor(initialCapacity + (initialCapacity >>> 1) + 1));
2500        this.counter = new LongAdder();
2424          this.sizeCtl = cap;
2425      }
2426  
# Line 2507 | Line 2430 | public class ConcurrentHashMapV8<K, V>
2430       * @param m the map
2431       */
2432      public ConcurrentHashMapV8(Map<? extends K, ? extends V> m) {
2510        this.counter = new LongAdder();
2433          this.sizeCtl = DEFAULT_CAPACITY;
2434          internalPutAll(m);
2435      }
# Line 2558 | Line 2480 | public class ConcurrentHashMapV8<K, V>
2480          long size = (long)(1.0 + (long)initialCapacity / loadFactor);
2481          int cap = (size >= (long)MAXIMUM_CAPACITY) ?
2482              MAXIMUM_CAPACITY : tableSizeFor((int)size);
2561        this.counter = new LongAdder();
2483          this.sizeCtl = cap;
2484      }
2485  
# Line 2584 | Line 2505 | public class ConcurrentHashMapV8<K, V>
2505       * @return the new set
2506       */
2507      public static <K> KeySetView<K,Boolean> newKeySet(int initialCapacity) {
2508 <        return new KeySetView<K,Boolean>(new ConcurrentHashMapV8<K,Boolean>(initialCapacity),
2509 <                                      Boolean.TRUE);
2508 >        return new KeySetView<K,Boolean>
2509 >            (new ConcurrentHashMapV8<K,Boolean>(initialCapacity), Boolean.TRUE);
2510      }
2511  
2512      /**
2513       * {@inheritDoc}
2514       */
2515      public boolean isEmpty() {
2516 <        return counter.sum() <= 0L; // ignore transient negative values
2516 >        return sumCount() <= 0L; // ignore transient negative values
2517      }
2518  
2519      /**
2520       * {@inheritDoc}
2521       */
2522      public int size() {
2523 <        long n = counter.sum();
2523 >        long n = sumCount();
2524          return ((n < 0L) ? 0 :
2525                  (n > (long)Integer.MAX_VALUE) ? Integer.MAX_VALUE :
2526                  (int)n);
# Line 2609 | Line 2530 | public class ConcurrentHashMapV8<K, V>
2530       * Returns the number of mappings. This method should be used
2531       * instead of {@link #size} because a ConcurrentHashMapV8 may
2532       * contain more mappings than can be represented as an int. The
2533 <     * value returned is a snapshot; the actual count may differ if
2534 <     * there are ongoing concurrent insertions or removals.
2533 >     * value returned is an estimate; the actual count may differ if
2534 >     * there are concurrent insertions or removals.
2535       *
2536       * @return the number of mappings
2537       */
2538      public long mappingCount() {
2539 <        long n = counter.sum();
2539 >        long n = sumCount();
2540          return (n < 0L) ? 0L : n; // ignore transient negative values
2541      }
2542  
# Line 2630 | Line 2551 | public class ConcurrentHashMapV8<K, V>
2551       *
2552       * @throws NullPointerException if the specified key is null
2553       */
2554 <    @SuppressWarnings("unchecked") public V get(Object key) {
2555 <        if (key == null)
2635 <            throw new NullPointerException();
2636 <        return (V)internalGet(key);
2554 >    public V get(Object key) {
2555 >        return internalGet(key);
2556      }
2557  
2558      /**
# Line 2646 | Line 2565 | public class ConcurrentHashMapV8<K, V>
2565       * @return the mapping for the key, if present; else the defaultValue
2566       * @throws NullPointerException if the specified key is null
2567       */
2568 <    @SuppressWarnings("unchecked") public V getValueOrDefault(Object key, V defaultValue) {
2569 <        if (key == null)
2570 <            throw new NullPointerException();
2652 <        V v = (V) internalGet(key);
2653 <        return v == null ? defaultValue : v;
2568 >    public V getValueOrDefault(Object key, V defaultValue) {
2569 >        V v;
2570 >        return (v = internalGet(key)) == null ? defaultValue : v;
2571      }
2572  
2573      /**
2574       * Tests if the specified object is a key in this table.
2575       *
2576 <     * @param  key   possible key
2576 >     * @param  key possible key
2577       * @return {@code true} if and only if the specified object
2578       *         is a key in this table, as determined by the
2579       *         {@code equals} method; {@code false} otherwise
2580       * @throws NullPointerException if the specified key is null
2581       */
2582      public boolean containsKey(Object key) {
2666        if (key == null)
2667            throw new NullPointerException();
2583          return internalGet(key) != null;
2584      }
2585  
# Line 2681 | Line 2596 | public class ConcurrentHashMapV8<K, V>
2596      public boolean containsValue(Object value) {
2597          if (value == null)
2598              throw new NullPointerException();
2599 <        Object v;
2599 >        V v;
2600          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
2601          while ((v = it.advance()) != null) {
2602              if (v == value || value.equals(v))
# Line 2705 | Line 2620 | public class ConcurrentHashMapV8<K, V>
2620       *         {@code false} otherwise
2621       * @throws NullPointerException if the specified value is null
2622       */
2623 <    public boolean contains(Object value) {
2623 >    @Deprecated public boolean contains(Object value) {
2624          return containsValue(value);
2625      }
2626  
# Line 2722 | Line 2637 | public class ConcurrentHashMapV8<K, V>
2637       *         {@code null} if there was no mapping for {@code key}
2638       * @throws NullPointerException if the specified key or value is null
2639       */
2640 <    @SuppressWarnings("unchecked") public V put(K key, V value) {
2641 <        if (key == null || value == null)
2727 <            throw new NullPointerException();
2728 <        return (V)internalPut(key, value);
2640 >    public V put(K key, V value) {
2641 >        return internalPut(key, value, false);
2642      }
2643  
2644      /**
# Line 2735 | Line 2648 | public class ConcurrentHashMapV8<K, V>
2648       *         or {@code null} if there was no mapping for the key
2649       * @throws NullPointerException if the specified key or value is null
2650       */
2651 <    @SuppressWarnings("unchecked") public V putIfAbsent(K key, V value) {
2652 <        if (key == null || value == null)
2740 <            throw new NullPointerException();
2741 <        return (V)internalPutIfAbsent(key, value);
2651 >    public V putIfAbsent(K key, V value) {
2652 >        return internalPut(key, value, true);
2653      }
2654  
2655      /**
# Line 2776 | Line 2687 | public class ConcurrentHashMapV8<K, V>
2687       * memoized result, as in:
2688       *
2689       *  <pre> {@code
2690 <     * map.computeIfAbsent(key, new Fun<K, V>() {
2690 >     * map.computeIfAbsent(key, new Fun<K,V>() {
2691       *   public V map(K k) { return new Value(f(k)); }});}</pre>
2692       *
2693       * @param key key with which the specified value is to be associated
# Line 2791 | Line 2702 | public class ConcurrentHashMapV8<K, V>
2702       * @throws RuntimeException or Error if the mappingFunction does so,
2703       *         in which case the mapping is left unestablished
2704       */
2705 <    @SuppressWarnings("unchecked") public V computeIfAbsent
2705 >    public V computeIfAbsent
2706          (K key, Fun<? super K, ? extends V> mappingFunction) {
2707 <        if (key == null || mappingFunction == null)
2797 <            throw new NullPointerException();
2798 <        return (V)internalComputeIfAbsent(key, mappingFunction);
2707 >        return internalComputeIfAbsent(key, mappingFunction);
2708      }
2709  
2710      /**
# Line 2832 | Line 2741 | public class ConcurrentHashMapV8<K, V>
2741       * @throws RuntimeException or Error if the remappingFunction does so,
2742       *         in which case the mapping is unchanged
2743       */
2744 <    @SuppressWarnings("unchecked") public V computeIfPresent
2744 >    public V computeIfPresent
2745          (K key, BiFun<? super K, ? super V, ? extends V> remappingFunction) {
2746 <        if (key == null || remappingFunction == null)
2838 <            throw new NullPointerException();
2839 <        return (V)internalCompute(key, true, remappingFunction);
2746 >        return internalCompute(key, true, remappingFunction);
2747      }
2748  
2749      /**
# Line 2879 | Line 2786 | public class ConcurrentHashMapV8<K, V>
2786       * @throws RuntimeException or Error if the remappingFunction does so,
2787       *         in which case the mapping is unchanged
2788       */
2789 <    @SuppressWarnings("unchecked") public V compute
2789 >    public V compute
2790          (K key, BiFun<? super K, ? super V, ? extends V> remappingFunction) {
2791 <        if (key == null || remappingFunction == null)
2885 <            throw new NullPointerException();
2886 <        return (V)internalCompute(key, false, remappingFunction);
2791 >        return internalCompute(key, false, remappingFunction);
2792      }
2793  
2794      /**
# Line 2911 | Line 2816 | public class ConcurrentHashMapV8<K, V>
2816       * so the computation should be short and simple, and must not
2817       * attempt to update any other mappings of this Map.
2818       */
2819 <    @SuppressWarnings("unchecked") public V merge
2820 <        (K key, V value, BiFun<? super V, ? super V, ? extends V> remappingFunction) {
2821 <        if (key == null || value == null || remappingFunction == null)
2822 <            throw new NullPointerException();
2918 <        return (V)internalMerge(key, value, remappingFunction);
2819 >    public V merge
2820 >        (K key, V value,
2821 >         BiFun<? super V, ? super V, ? extends V> remappingFunction) {
2822 >        return internalMerge(key, value, remappingFunction);
2823      }
2824  
2825      /**
# Line 2927 | Line 2831 | public class ConcurrentHashMapV8<K, V>
2831       *         {@code null} if there was no mapping for {@code key}
2832       * @throws NullPointerException if the specified key is null
2833       */
2834 <    @SuppressWarnings("unchecked") public V remove(Object key) {
2835 <        if (key == null)
2932 <            throw new NullPointerException();
2933 <        return (V)internalReplace(key, null, null);
2834 >    public V remove(Object key) {
2835 >        return internalReplace(key, null, null);
2836      }
2837  
2838      /**
# Line 2939 | Line 2841 | public class ConcurrentHashMapV8<K, V>
2841       * @throws NullPointerException if the specified key is null
2842       */
2843      public boolean remove(Object key, Object value) {
2844 <        if (key == null)
2943 <            throw new NullPointerException();
2944 <        if (value == null)
2945 <            return false;
2946 <        return internalReplace(key, null, value) != null;
2844 >        return value != null && internalReplace(key, null, value) != null;
2845      }
2846  
2847      /**
# Line 2964 | Line 2862 | public class ConcurrentHashMapV8<K, V>
2862       *         or {@code null} if there was no mapping for the key
2863       * @throws NullPointerException if the specified key or value is null
2864       */
2865 <    @SuppressWarnings("unchecked") public V replace(K key, V value) {
2865 >    public V replace(K key, V value) {
2866          if (key == null || value == null)
2867              throw new NullPointerException();
2868 <        return (V)internalReplace(key, value, null);
2868 >        return internalReplace(key, value, null);
2869      }
2870  
2871      /**
# Line 2996 | Line 2894 | public class ConcurrentHashMapV8<K, V>
2894       * course only appropriate if it is acceptable to use the same
2895       * value for all additions from this view.
2896       *
2897 <     * @param mappedValue the mapped value to use for any
3000 <     * additions.
2897 >     * @param mappedValue the mapped value to use for any additions
2898       * @return the set view
2899       * @throws NullPointerException if the mappedValue is null
2900       */
# Line 3095 | Line 2992 | public class ConcurrentHashMapV8<K, V>
2992      public int hashCode() {
2993          int h = 0;
2994          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
2995 <        Object v;
2995 >        V v;
2996          while ((v = it.advance()) != null) {
2997              h += it.nextKey.hashCode() ^ v.hashCode();
2998          }
# Line 3117 | Line 3014 | public class ConcurrentHashMapV8<K, V>
3014          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3015          StringBuilder sb = new StringBuilder();
3016          sb.append('{');
3017 <        Object v;
3017 >        V v;
3018          if ((v = it.advance()) != null) {
3019              for (;;) {
3020                  Object k = it.nextKey;
# Line 3148 | Line 3045 | public class ConcurrentHashMapV8<K, V>
3045                  return false;
3046              Map<?,?> m = (Map<?,?>) o;
3047              Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3048 <            Object val;
3048 >            V val;
3049              while ((val = it.advance()) != null) {
3050                  Object v = m.get(it.nextKey);
3051                  if (v == null || (v != val && !v.equals(val)))
# Line 3168 | Line 3065 | public class ConcurrentHashMapV8<K, V>
3065  
3066      /* ----------------Iterators -------------- */
3067  
3068 <    @SuppressWarnings("serial") static final class KeyIterator<K,V> extends Traverser<K,V,Object>
3068 >    @SuppressWarnings("serial") static final class KeyIterator<K,V>
3069 >        extends Traverser<K,V,Object>
3070          implements Spliterator<K>, Enumeration<K> {
3071 <        KeyIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3072 <        KeyIterator(Traverser<K,V,Object> it) {
3073 <            super(it);
3071 >        KeyIterator(ConcurrentHashMapV8<K,V> map) { super(map); }
3072 >        KeyIterator(ConcurrentHashMapV8<K,V> map, Traverser<K,V,Object> it) {
3073 >            super(map, it, -1);
3074          }
3075          public KeyIterator<K,V> split() {
3076              if (nextKey != null)
3077                  throw new IllegalStateException();
3078 <            return new KeyIterator<K,V>(this);
3078 >            return new KeyIterator<K,V>(map, this);
3079          }
3080          @SuppressWarnings("unchecked") public final K next() {
3081              if (nextVal == null && advance() == null)
# Line 3190 | Line 3088 | public class ConcurrentHashMapV8<K, V>
3088          public final K nextElement() { return next(); }
3089      }
3090  
3091 <    @SuppressWarnings("serial") static final class ValueIterator<K,V> extends Traverser<K,V,Object>
3091 >    @SuppressWarnings("serial") static final class ValueIterator<K,V>
3092 >        extends Traverser<K,V,Object>
3093          implements Spliterator<V>, Enumeration<V> {
3094 <        ValueIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3095 <        ValueIterator(Traverser<K,V,Object> it) {
3096 <            super(it);
3094 >        ValueIterator(ConcurrentHashMapV8<K,V> map) { super(map); }
3095 >        ValueIterator(ConcurrentHashMapV8<K,V> map, Traverser<K,V,Object> it) {
3096 >            super(map, it, -1);
3097          }
3098          public ValueIterator<K,V> split() {
3099              if (nextKey != null)
3100                  throw new IllegalStateException();
3101 <            return new ValueIterator<K,V>(this);
3101 >            return new ValueIterator<K,V>(map, this);
3102          }
3103  
3104 <        @SuppressWarnings("unchecked") public final V next() {
3105 <            Object v;
3104 >        public final V next() {
3105 >            V v;
3106              if ((v = nextVal) == null && (v = advance()) == null)
3107                  throw new NoSuchElementException();
3108              nextVal = null;
3109 <            return (V) v;
3109 >            return v;
3110          }
3111  
3112          public final V nextElement() { return next(); }
3113      }
3114  
3115 <    @SuppressWarnings("serial") static final class EntryIterator<K,V> extends Traverser<K,V,Object>
3115 >    @SuppressWarnings("serial") static final class EntryIterator<K,V>
3116 >        extends Traverser<K,V,Object>
3117          implements Spliterator<Map.Entry<K,V>> {
3118 <        EntryIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3119 <        EntryIterator(Traverser<K,V,Object> it) {
3120 <            super(it);
3118 >        EntryIterator(ConcurrentHashMapV8<K,V> map) { super(map); }
3119 >        EntryIterator(ConcurrentHashMapV8<K,V> map, Traverser<K,V,Object> it) {
3120 >            super(map, it, -1);
3121          }
3122          public EntryIterator<K,V> split() {
3123              if (nextKey != null)
3124                  throw new IllegalStateException();
3125 <            return new EntryIterator<K,V>(this);
3125 >            return new EntryIterator<K,V>(map, this);
3126          }
3127  
3128          @SuppressWarnings("unchecked") public final Map.Entry<K,V> next() {
3129 <            Object v;
3129 >            V v;
3130              if ((v = nextVal) == null && (v = advance()) == null)
3131                  throw new NoSuchElementException();
3132              Object k = nextKey;
3133              nextVal = null;
3134 <            return new MapEntry<K,V>((K)k, (V)v, map);
3134 >            return new MapEntry<K,V>((K)k, v, map);
3135          }
3136      }
3137  
3138      /**
3139       * Exported Entry for iterators
3140       */
3141 <    static final class MapEntry<K,V> implements Map.Entry<K, V> {
3141 >    static final class MapEntry<K,V> implements Map.Entry<K,V> {
3142          final K key; // non-null
3143          V val;       // non-null
3144 <        final ConcurrentHashMapV8<K, V> map;
3145 <        MapEntry(K key, V val, ConcurrentHashMapV8<K, V> map) {
3144 >        final ConcurrentHashMapV8<K,V> map;
3145 >        MapEntry(K key, V val, ConcurrentHashMapV8<K,V> map) {
3146              this.key = key;
3147              this.val = val;
3148              this.map = map;
# Line 3278 | Line 3178 | public class ConcurrentHashMapV8<K, V>
3178          }
3179      }
3180  
3181 +    /**
3182 +     * Returns exportable snapshot entry for the given key and value
3183 +     * when write-through can't or shouldn't be used.
3184 +     */
3185 +    static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
3186 +        return new AbstractMap.SimpleEntry<K,V>(k, v);
3187 +    }
3188 +
3189      /* ---------------- Serialization Support -------------- */
3190  
3191      /**
# Line 3299 | Line 3207 | public class ConcurrentHashMapV8<K, V>
3207       * for each key-value mapping, followed by a null pair.
3208       * The key-value mappings are emitted in no particular order.
3209       */
3210 <    @SuppressWarnings("unchecked") private void writeObject(java.io.ObjectOutputStream s)
3210 >    @SuppressWarnings("unchecked") private void writeObject
3211 >        (java.io.ObjectOutputStream s)
3212          throws java.io.IOException {
3213          if (segments == null) { // for serialization compatibility
3214              segments = (Segment<K,V>[])
# Line 3309 | Line 3218 | public class ConcurrentHashMapV8<K, V>
3218          }
3219          s.defaultWriteObject();
3220          Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3221 <        Object v;
3221 >        V v;
3222          while ((v = it.advance()) != null) {
3223              s.writeObject(it.nextKey);
3224              s.writeObject(v);
# Line 3323 | Line 3232 | public class ConcurrentHashMapV8<K, V>
3232       * Reconstitutes the instance from a stream (that is, deserializes it).
3233       * @param s the stream
3234       */
3235 <    @SuppressWarnings("unchecked") private void readObject(java.io.ObjectInputStream s)
3235 >    @SuppressWarnings("unchecked") private void readObject
3236 >        (java.io.ObjectInputStream s)
3237          throws java.io.IOException, ClassNotFoundException {
3238          s.defaultReadObject();
3239          this.segments = null; // unneeded
3330        // initialize transient final field
3331        UNSAFE.putObjectVolatile(this, counterOffset, new LongAdder());
3240  
3241          // Create all nodes, then place in table once size is known
3242          long size = 0L;
3243 <        Node p = null;
3243 >        Node<V> p = null;
3244          for (;;) {
3245              K k = (K) s.readObject();
3246              V v = (V) s.readObject();
3247              if (k != null && v != null) {
3248                  int h = spread(k.hashCode());
3249 <                p = new Node(h, k, v, p);
3249 >                p = new Node<V>(h, k, v, p);
3250                  ++size;
3251              }
3252              else
# Line 3356 | Line 3264 | public class ConcurrentHashMapV8<K, V>
3264              int sc = sizeCtl;
3265              boolean collide = false;
3266              if (n > sc &&
3267 <                UNSAFE.compareAndSwapInt(this, sizeCtlOffset, sc, -1)) {
3267 >                U.compareAndSwapInt(this, SIZECTL, sc, -1)) {
3268                  try {
3269                      if (table == null) {
3270                          init = true;
3271 <                        Node[] tab = new Node[n];
3271 >                        @SuppressWarnings("rawtypes") Node[] rt = new Node[n];
3272 >                        Node<V>[] tab = (Node<V>[])rt;
3273                          int mask = n - 1;
3274                          while (p != null) {
3275                              int j = p.hash & mask;
3276 <                            Node next = p.next;
3277 <                            Node q = p.next = tabAt(tab, j);
3276 >                            Node<V> next = p.next;
3277 >                            Node<V> q = p.next = tabAt(tab, j);
3278                              setTabAt(tab, j, p);
3279                              if (!collide && q != null && q.hash == p.hash)
3280                                  collide = true;
3281                              p = next;
3282                          }
3283                          table = tab;
3284 <                        counter.add(size);
3284 >                        addCount(size, -1);
3285                          sc = n - (n >>> 2);
3286                      }
3287                  } finally {
3288                      sizeCtl = sc;
3289                  }
3290                  if (collide) { // rescan and convert to TreeBins
3291 <                    Node[] tab = table;
3291 >                    Node<V>[] tab = table;
3292                      for (int i = 0; i < tab.length; ++i) {
3293                          int c = 0;
3294 <                        for (Node e = tabAt(tab, i); e != null; e = e.next) {
3294 >                        for (Node<V> e = tabAt(tab, i); e != null; e = e.next) {
3295                              if (++c > TREE_THRESHOLD &&
3296                                  (e.key instanceof Comparable)) {
3297                                  replaceWithTreeBin(tab, i, e.key);
# Line 3394 | Line 3303 | public class ConcurrentHashMapV8<K, V>
3303              }
3304              if (!init) { // Can only happen if unsafely published.
3305                  while (p != null) {
3306 <                    internalPut(p.key, p.val);
3306 >                    internalPut((K)p.key, p.val, false);
3307                      p = p.next;
3308                  }
3309              }
3310          }
3311      }
3312  
3404
3313      // -------------------------------------------------------
3314  
3315      // Sams
# Line 3443 | Line 3351 | public class ConcurrentHashMapV8<K, V>
3351  
3352      // -------------------------------------------------------
3353  
3354 +    // Sequential bulk operations
3355 +
3356 +    /**
3357 +     * Performs the given action for each (key, value).
3358 +     *
3359 +     * @param action the action
3360 +     */
3361 +    @SuppressWarnings("unchecked") public void forEachSequentially
3362 +        (BiAction<K,V> action) {
3363 +        if (action == null) throw new NullPointerException();
3364 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3365 +        V v;
3366 +        while ((v = it.advance()) != null)
3367 +            action.apply((K)it.nextKey, v);
3368 +    }
3369 +
3370 +    /**
3371 +     * Performs the given action for each non-null transformation
3372 +     * of each (key, value).
3373 +     *
3374 +     * @param transformer a function returning the transformation
3375 +     * for an element, or null if there is no transformation (in
3376 +     * which case the action is not applied)
3377 +     * @param action the action
3378 +     */
3379 +    @SuppressWarnings("unchecked") public <U> void forEachSequentially
3380 +        (BiFun<? super K, ? super V, ? extends U> transformer,
3381 +         Action<U> action) {
3382 +        if (transformer == null || action == null)
3383 +            throw new NullPointerException();
3384 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3385 +        V v; U u;
3386 +        while ((v = it.advance()) != null) {
3387 +            if ((u = transformer.apply((K)it.nextKey, v)) != null)
3388 +                action.apply(u);
3389 +        }
3390 +    }
3391 +
3392 +    /**
3393 +     * Returns a non-null result from applying the given search
3394 +     * function on each (key, value), or null if none.
3395 +     *
3396 +     * @param searchFunction a function returning a non-null
3397 +     * result on success, else null
3398 +     * @return a non-null result from applying the given search
3399 +     * function on each (key, value), or null if none
3400 +     */
3401 +    @SuppressWarnings("unchecked") public <U> U searchSequentially
3402 +        (BiFun<? super K, ? super V, ? extends U> searchFunction) {
3403 +        if (searchFunction == null) throw new NullPointerException();
3404 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3405 +        V v; U u;
3406 +        while ((v = it.advance()) != null) {
3407 +            if ((u = searchFunction.apply((K)it.nextKey, v)) != null)
3408 +                return u;
3409 +        }
3410 +        return null;
3411 +    }
3412 +
3413 +    /**
3414 +     * Returns the result of accumulating the given transformation
3415 +     * of all (key, value) pairs using the given reducer to
3416 +     * combine values, or null if none.
3417 +     *
3418 +     * @param transformer a function returning the transformation
3419 +     * for an element, or null if there is no transformation (in
3420 +     * which case it is not combined)
3421 +     * @param reducer a commutative associative combining function
3422 +     * @return the result of accumulating the given transformation
3423 +     * of all (key, value) pairs
3424 +     */
3425 +    @SuppressWarnings("unchecked") public <U> U reduceSequentially
3426 +        (BiFun<? super K, ? super V, ? extends U> transformer,
3427 +         BiFun<? super U, ? super U, ? extends U> reducer) {
3428 +        if (transformer == null || reducer == null)
3429 +            throw new NullPointerException();
3430 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3431 +        U r = null, u; V v;
3432 +        while ((v = it.advance()) != null) {
3433 +            if ((u = transformer.apply((K)it.nextKey, v)) != null)
3434 +                r = (r == null) ? u : reducer.apply(r, u);
3435 +        }
3436 +        return r;
3437 +    }
3438 +
3439 +    /**
3440 +     * Returns the result of accumulating the given transformation
3441 +     * of all (key, value) pairs using the given reducer to
3442 +     * combine values, and the given basis as an identity value.
3443 +     *
3444 +     * @param transformer a function returning the transformation
3445 +     * for an element
3446 +     * @param basis the identity (initial default value) for the reduction
3447 +     * @param reducer a commutative associative combining function
3448 +     * @return the result of accumulating the given transformation
3449 +     * of all (key, value) pairs
3450 +     */
3451 +    @SuppressWarnings("unchecked") public double reduceToDoubleSequentially
3452 +        (ObjectByObjectToDouble<? super K, ? super V> transformer,
3453 +         double basis,
3454 +         DoubleByDoubleToDouble reducer) {
3455 +        if (transformer == null || reducer == null)
3456 +            throw new NullPointerException();
3457 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3458 +        double r = basis; V v;
3459 +        while ((v = it.advance()) != null)
3460 +            r = reducer.apply(r, transformer.apply((K)it.nextKey, v));
3461 +        return r;
3462 +    }
3463 +
3464 +    /**
3465 +     * Returns the result of accumulating the given transformation
3466 +     * of all (key, value) pairs using the given reducer to
3467 +     * combine values, and the given basis as an identity value.
3468 +     *
3469 +     * @param transformer a function returning the transformation
3470 +     * for an element
3471 +     * @param basis the identity (initial default value) for the reduction
3472 +     * @param reducer a commutative associative combining function
3473 +     * @return the result of accumulating the given transformation
3474 +     * of all (key, value) pairs
3475 +     */
3476 +    @SuppressWarnings("unchecked") public long reduceToLongSequentially
3477 +        (ObjectByObjectToLong<? super K, ? super V> transformer,
3478 +         long basis,
3479 +         LongByLongToLong reducer) {
3480 +        if (transformer == null || reducer == null)
3481 +            throw new NullPointerException();
3482 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3483 +        long r = basis; V v;
3484 +        while ((v = it.advance()) != null)
3485 +            r = reducer.apply(r, transformer.apply((K)it.nextKey, v));
3486 +        return r;
3487 +    }
3488 +
3489 +    /**
3490 +     * Returns the result of accumulating the given transformation
3491 +     * of all (key, value) pairs using the given reducer to
3492 +     * combine values, and the given basis as an identity value.
3493 +     *
3494 +     * @param transformer a function returning the transformation
3495 +     * for an element
3496 +     * @param basis the identity (initial default value) for the reduction
3497 +     * @param reducer a commutative associative combining function
3498 +     * @return the result of accumulating the given transformation
3499 +     * of all (key, value) pairs
3500 +     */
3501 +    @SuppressWarnings("unchecked") public int reduceToIntSequentially
3502 +        (ObjectByObjectToInt<? super K, ? super V> transformer,
3503 +         int basis,
3504 +         IntByIntToInt reducer) {
3505 +        if (transformer == null || reducer == null)
3506 +            throw new NullPointerException();
3507 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3508 +        int r = basis; V v;
3509 +        while ((v = it.advance()) != null)
3510 +            r = reducer.apply(r, transformer.apply((K)it.nextKey, v));
3511 +        return r;
3512 +    }
3513 +
3514 +    /**
3515 +     * Performs the given action for each key.
3516 +     *
3517 +     * @param action the action
3518 +     */
3519 +    @SuppressWarnings("unchecked") public void forEachKeySequentially
3520 +        (Action<K> action) {
3521 +        if (action == null) throw new NullPointerException();
3522 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3523 +        while (it.advance() != null)
3524 +            action.apply((K)it.nextKey);
3525 +    }
3526 +
3527 +    /**
3528 +     * Performs the given action for each non-null transformation
3529 +     * of each key.
3530 +     *
3531 +     * @param transformer a function returning the transformation
3532 +     * for an element, or null if there is no transformation (in
3533 +     * which case the action is not applied)
3534 +     * @param action the action
3535 +     */
3536 +    @SuppressWarnings("unchecked") public <U> void forEachKeySequentially
3537 +        (Fun<? super K, ? extends U> transformer,
3538 +         Action<U> action) {
3539 +        if (transformer == null || action == null)
3540 +            throw new NullPointerException();
3541 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3542 +        U u;
3543 +        while (it.advance() != null) {
3544 +            if ((u = transformer.apply((K)it.nextKey)) != null)
3545 +                action.apply(u);
3546 +        }
3547 +        ForkJoinTasks.forEachKey
3548 +            (this, transformer, action).invoke();
3549 +    }
3550 +
3551 +    /**
3552 +     * Returns a non-null result from applying the given search
3553 +     * function on each key, or null if none.
3554 +     *
3555 +     * @param searchFunction a function returning a non-null
3556 +     * result on success, else null
3557 +     * @return a non-null result from applying the given search
3558 +     * function on each key, or null if none
3559 +     */
3560 +    @SuppressWarnings("unchecked") public <U> U searchKeysSequentially
3561 +        (Fun<? super K, ? extends U> searchFunction) {
3562 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3563 +        U u;
3564 +        while (it.advance() != null) {
3565 +            if ((u = searchFunction.apply((K)it.nextKey)) != null)
3566 +                return u;
3567 +        }
3568 +        return null;
3569 +    }
3570 +
3571 +    /**
3572 +     * Returns the result of accumulating all keys using the given
3573 +     * reducer to combine values, or null if none.
3574 +     *
3575 +     * @param reducer a commutative associative combining function
3576 +     * @return the result of accumulating all keys using the given
3577 +     * reducer to combine values, or null if none
3578 +     */
3579 +    @SuppressWarnings("unchecked") public K reduceKeysSequentially
3580 +        (BiFun<? super K, ? super K, ? extends K> reducer) {
3581 +        if (reducer == null) throw new NullPointerException();
3582 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3583 +        K r = null;
3584 +        while (it.advance() != null) {
3585 +            K u = (K)it.nextKey;
3586 +            r = (r == null) ? u : reducer.apply(r, u);
3587 +        }
3588 +        return r;
3589 +    }
3590 +
3591 +    /**
3592 +     * Returns the result of accumulating the given transformation
3593 +     * of all keys using the given reducer to combine values, or
3594 +     * null if none.
3595 +     *
3596 +     * @param transformer a function returning the transformation
3597 +     * for an element, or null if there is no transformation (in
3598 +     * which case it is not combined)
3599 +     * @param reducer a commutative associative combining function
3600 +     * @return the result of accumulating the given transformation
3601 +     * of all keys
3602 +     */
3603 +    @SuppressWarnings("unchecked") public <U> U reduceKeysSequentially
3604 +        (Fun<? super K, ? extends U> transformer,
3605 +         BiFun<? super U, ? super U, ? extends U> reducer) {
3606 +        if (transformer == null || reducer == null)
3607 +            throw new NullPointerException();
3608 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3609 +        U r = null, u;
3610 +        while (it.advance() != null) {
3611 +            if ((u = transformer.apply((K)it.nextKey)) != null)
3612 +                r = (r == null) ? u : reducer.apply(r, u);
3613 +        }
3614 +        return r;
3615 +    }
3616 +
3617 +    /**
3618 +     * Returns the result of accumulating the given transformation
3619 +     * of all keys using the given reducer to combine values, and
3620 +     * the given basis as an identity value.
3621 +     *
3622 +     * @param transformer a function returning the transformation
3623 +     * for an element
3624 +     * @param basis the identity (initial default value) for the reduction
3625 +     * @param reducer a commutative associative combining function
3626 +     * @return  the result of accumulating the given transformation
3627 +     * of all keys
3628 +     */
3629 +    @SuppressWarnings("unchecked") public double reduceKeysToDoubleSequentially
3630 +        (ObjectToDouble<? super K> transformer,
3631 +         double basis,
3632 +         DoubleByDoubleToDouble reducer) {
3633 +        if (transformer == null || reducer == null)
3634 +            throw new NullPointerException();
3635 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3636 +        double r = basis;
3637 +        while (it.advance() != null)
3638 +            r = reducer.apply(r, transformer.apply((K)it.nextKey));
3639 +        return r;
3640 +    }
3641 +
3642 +    /**
3643 +     * Returns the result of accumulating the given transformation
3644 +     * of all keys using the given reducer to combine values, and
3645 +     * the given basis as an identity value.
3646 +     *
3647 +     * @param transformer a function returning the transformation
3648 +     * for an element
3649 +     * @param basis the identity (initial default value) for the reduction
3650 +     * @param reducer a commutative associative combining function
3651 +     * @return the result of accumulating the given transformation
3652 +     * of all keys
3653 +     */
3654 +    @SuppressWarnings("unchecked") public long reduceKeysToLongSequentially
3655 +        (ObjectToLong<? super K> transformer,
3656 +         long basis,
3657 +         LongByLongToLong reducer) {
3658 +        if (transformer == null || reducer == null)
3659 +            throw new NullPointerException();
3660 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3661 +        long r = basis;
3662 +        while (it.advance() != null)
3663 +            r = reducer.apply(r, transformer.apply((K)it.nextKey));
3664 +        return r;
3665 +    }
3666 +
3667 +    /**
3668 +     * Returns the result of accumulating the given transformation
3669 +     * of all keys using the given reducer to combine values, and
3670 +     * the given basis as an identity value.
3671 +     *
3672 +     * @param transformer a function returning the transformation
3673 +     * for an element
3674 +     * @param basis the identity (initial default value) for the reduction
3675 +     * @param reducer a commutative associative combining function
3676 +     * @return the result of accumulating the given transformation
3677 +     * of all keys
3678 +     */
3679 +    @SuppressWarnings("unchecked") public int reduceKeysToIntSequentially
3680 +        (ObjectToInt<? super K> transformer,
3681 +         int basis,
3682 +         IntByIntToInt reducer) {
3683 +        if (transformer == null || reducer == null)
3684 +            throw new NullPointerException();
3685 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3686 +        int r = basis;
3687 +        while (it.advance() != null)
3688 +            r = reducer.apply(r, transformer.apply((K)it.nextKey));
3689 +        return r;
3690 +    }
3691 +
3692 +    /**
3693 +     * Performs the given action for each value.
3694 +     *
3695 +     * @param action the action
3696 +     */
3697 +    public void forEachValueSequentially(Action<V> action) {
3698 +        if (action == null) throw new NullPointerException();
3699 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3700 +        V v;
3701 +        while ((v = it.advance()) != null)
3702 +            action.apply(v);
3703 +    }
3704 +
3705 +    /**
3706 +     * Performs the given action for each non-null transformation
3707 +     * of each value.
3708 +     *
3709 +     * @param transformer a function returning the transformation
3710 +     * for an element, or null if there is no transformation (in
3711 +     * which case the action is not applied)
3712 +     */
3713 +    public <U> void forEachValueSequentially
3714 +        (Fun<? super V, ? extends U> transformer,
3715 +         Action<U> action) {
3716 +        if (transformer == null || action == null)
3717 +            throw new NullPointerException();
3718 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3719 +        V v; U u;
3720 +        while ((v = it.advance()) != null) {
3721 +            if ((u = transformer.apply(v)) != null)
3722 +                action.apply(u);
3723 +        }
3724 +    }
3725 +
3726 +    /**
3727 +     * Returns a non-null result from applying the given search
3728 +     * function on each value, or null if none.
3729 +     *
3730 +     * @param searchFunction a function returning a non-null
3731 +     * result on success, else null
3732 +     * @return a non-null result from applying the given search
3733 +     * function on each value, or null if none
3734 +     */
3735 +    public <U> U searchValuesSequentially
3736 +        (Fun<? super V, ? extends U> searchFunction) {
3737 +        if (searchFunction == null) throw new NullPointerException();
3738 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3739 +        V v; U u;
3740 +        while ((v = it.advance()) != null) {
3741 +            if ((u = searchFunction.apply(v)) != null)
3742 +                return u;
3743 +        }
3744 +        return null;
3745 +    }
3746 +
3747 +    /**
3748 +     * Returns the result of accumulating all values using the
3749 +     * given reducer to combine values, or null if none.
3750 +     *
3751 +     * @param reducer a commutative associative combining function
3752 +     * @return  the result of accumulating all values
3753 +     */
3754 +    public V reduceValuesSequentially
3755 +        (BiFun<? super V, ? super V, ? extends V> reducer) {
3756 +        if (reducer == null) throw new NullPointerException();
3757 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3758 +        V r = null; V v;
3759 +        while ((v = it.advance()) != null)
3760 +            r = (r == null) ? v : reducer.apply(r, v);
3761 +        return r;
3762 +    }
3763 +
3764 +    /**
3765 +     * Returns the result of accumulating the given transformation
3766 +     * of all values using the given reducer to combine values, or
3767 +     * null if none.
3768 +     *
3769 +     * @param transformer a function returning the transformation
3770 +     * for an element, or null if there is no transformation (in
3771 +     * which case it is not combined)
3772 +     * @param reducer a commutative associative combining function
3773 +     * @return the result of accumulating the given transformation
3774 +     * of all values
3775 +     */
3776 +    public <U> U reduceValuesSequentially
3777 +        (Fun<? super V, ? extends U> transformer,
3778 +         BiFun<? super U, ? super U, ? extends U> reducer) {
3779 +        if (transformer == null || reducer == null)
3780 +            throw new NullPointerException();
3781 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3782 +        U r = null, u; V v;
3783 +        while ((v = it.advance()) != null) {
3784 +            if ((u = transformer.apply(v)) != null)
3785 +                r = (r == null) ? u : reducer.apply(r, u);
3786 +        }
3787 +        return r;
3788 +    }
3789 +
3790 +    /**
3791 +     * Returns the result of accumulating the given transformation
3792 +     * of all values using the given reducer to combine values,
3793 +     * and the given basis as an identity value.
3794 +     *
3795 +     * @param transformer a function returning the transformation
3796 +     * for an element
3797 +     * @param basis the identity (initial default value) for the reduction
3798 +     * @param reducer a commutative associative combining function
3799 +     * @return the result of accumulating the given transformation
3800 +     * of all values
3801 +     */
3802 +    public double reduceValuesToDoubleSequentially
3803 +        (ObjectToDouble<? super V> transformer,
3804 +         double basis,
3805 +         DoubleByDoubleToDouble reducer) {
3806 +        if (transformer == null || reducer == null)
3807 +            throw new NullPointerException();
3808 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3809 +        double r = basis; V v;
3810 +        while ((v = it.advance()) != null)
3811 +            r = reducer.apply(r, transformer.apply(v));
3812 +        return r;
3813 +    }
3814 +
3815 +    /**
3816 +     * Returns the result of accumulating the given transformation
3817 +     * of all values using the given reducer to combine values,
3818 +     * and the given basis as an identity value.
3819 +     *
3820 +     * @param transformer a function returning the transformation
3821 +     * for an element
3822 +     * @param basis the identity (initial default value) for the reduction
3823 +     * @param reducer a commutative associative combining function
3824 +     * @return the result of accumulating the given transformation
3825 +     * of all values
3826 +     */
3827 +    public long reduceValuesToLongSequentially
3828 +        (ObjectToLong<? super V> transformer,
3829 +         long basis,
3830 +         LongByLongToLong reducer) {
3831 +        if (transformer == null || reducer == null)
3832 +            throw new NullPointerException();
3833 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3834 +        long r = basis; V v;
3835 +        while ((v = it.advance()) != null)
3836 +            r = reducer.apply(r, transformer.apply(v));
3837 +        return r;
3838 +    }
3839 +
3840 +    /**
3841 +     * Returns the result of accumulating the given transformation
3842 +     * of all values using the given reducer to combine values,
3843 +     * and the given basis as an identity value.
3844 +     *
3845 +     * @param transformer a function returning the transformation
3846 +     * for an element
3847 +     * @param basis the identity (initial default value) for the reduction
3848 +     * @param reducer a commutative associative combining function
3849 +     * @return the result of accumulating the given transformation
3850 +     * of all values
3851 +     */
3852 +    public int reduceValuesToIntSequentially
3853 +        (ObjectToInt<? super V> transformer,
3854 +         int basis,
3855 +         IntByIntToInt reducer) {
3856 +        if (transformer == null || reducer == null)
3857 +            throw new NullPointerException();
3858 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3859 +        int r = basis; V v;
3860 +        while ((v = it.advance()) != null)
3861 +            r = reducer.apply(r, transformer.apply(v));
3862 +        return r;
3863 +    }
3864 +
3865 +    /**
3866 +     * Performs the given action for each entry.
3867 +     *
3868 +     * @param action the action
3869 +     */
3870 +    @SuppressWarnings("unchecked") public void forEachEntrySequentially
3871 +        (Action<Map.Entry<K,V>> action) {
3872 +        if (action == null) throw new NullPointerException();
3873 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3874 +        V v;
3875 +        while ((v = it.advance()) != null)
3876 +            action.apply(entryFor((K)it.nextKey, v));
3877 +    }
3878 +
3879 +    /**
3880 +     * Performs the given action for each non-null transformation
3881 +     * of each entry.
3882 +     *
3883 +     * @param transformer a function returning the transformation
3884 +     * for an element, or null if there is no transformation (in
3885 +     * which case the action is not applied)
3886 +     * @param action the action
3887 +     */
3888 +    @SuppressWarnings("unchecked") public <U> void forEachEntrySequentially
3889 +        (Fun<Map.Entry<K,V>, ? extends U> transformer,
3890 +         Action<U> action) {
3891 +        if (transformer == null || action == null)
3892 +            throw new NullPointerException();
3893 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3894 +        V v; U u;
3895 +        while ((v = it.advance()) != null) {
3896 +            if ((u = transformer.apply(entryFor((K)it.nextKey, v))) != null)
3897 +                action.apply(u);
3898 +        }
3899 +    }
3900 +
3901 +    /**
3902 +     * Returns a non-null result from applying the given search
3903 +     * function on each entry, or null if none.
3904 +     *
3905 +     * @param searchFunction a function returning a non-null
3906 +     * result on success, else null
3907 +     * @return a non-null result from applying the given search
3908 +     * function on each entry, or null if none
3909 +     */
3910 +    @SuppressWarnings("unchecked") public <U> U searchEntriesSequentially
3911 +        (Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
3912 +        if (searchFunction == null) throw new NullPointerException();
3913 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3914 +        V v; U u;
3915 +        while ((v = it.advance()) != null) {
3916 +            if ((u = searchFunction.apply(entryFor((K)it.nextKey, v))) != null)
3917 +                return u;
3918 +        }
3919 +        return null;
3920 +    }
3921 +
3922 +    /**
3923 +     * Returns the result of accumulating all entries using the
3924 +     * given reducer to combine values, or null if none.
3925 +     *
3926 +     * @param reducer a commutative associative combining function
3927 +     * @return the result of accumulating all entries
3928 +     */
3929 +    @SuppressWarnings("unchecked") public Map.Entry<K,V> reduceEntriesSequentially
3930 +        (BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
3931 +        if (reducer == null) throw new NullPointerException();
3932 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3933 +        Map.Entry<K,V> r = null; V v;
3934 +        while ((v = it.advance()) != null) {
3935 +            Map.Entry<K,V> u = entryFor((K)it.nextKey, v);
3936 +            r = (r == null) ? u : reducer.apply(r, u);
3937 +        }
3938 +        return r;
3939 +    }
3940 +
3941 +    /**
3942 +     * Returns the result of accumulating the given transformation
3943 +     * of all entries using the given reducer to combine values,
3944 +     * or null if none.
3945 +     *
3946 +     * @param transformer a function returning the transformation
3947 +     * for an element, or null if there is no transformation (in
3948 +     * which case it is not combined)
3949 +     * @param reducer a commutative associative combining function
3950 +     * @return the result of accumulating the given transformation
3951 +     * of all entries
3952 +     */
3953 +    @SuppressWarnings("unchecked") public <U> U reduceEntriesSequentially
3954 +        (Fun<Map.Entry<K,V>, ? extends U> transformer,
3955 +         BiFun<? super U, ? super U, ? extends U> reducer) {
3956 +        if (transformer == null || reducer == null)
3957 +            throw new NullPointerException();
3958 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3959 +        U r = null, u; V v;
3960 +        while ((v = it.advance()) != null) {
3961 +            if ((u = transformer.apply(entryFor((K)it.nextKey, v))) != null)
3962 +                r = (r == null) ? u : reducer.apply(r, u);
3963 +        }
3964 +        return r;
3965 +    }
3966 +
3967 +    /**
3968 +     * Returns the result of accumulating the given transformation
3969 +     * of all entries using the given reducer to combine values,
3970 +     * and the given basis as an identity value.
3971 +     *
3972 +     * @param transformer a function returning the transformation
3973 +     * for an element
3974 +     * @param basis the identity (initial default value) for the reduction
3975 +     * @param reducer a commutative associative combining function
3976 +     * @return the result of accumulating the given transformation
3977 +     * of all entries
3978 +     */
3979 +    @SuppressWarnings("unchecked") public double reduceEntriesToDoubleSequentially
3980 +        (ObjectToDouble<Map.Entry<K,V>> transformer,
3981 +         double basis,
3982 +         DoubleByDoubleToDouble reducer) {
3983 +        if (transformer == null || reducer == null)
3984 +            throw new NullPointerException();
3985 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
3986 +        double r = basis; V v;
3987 +        while ((v = it.advance()) != null)
3988 +            r = reducer.apply(r, transformer.apply(entryFor((K)it.nextKey, v)));
3989 +        return r;
3990 +    }
3991 +
3992 +    /**
3993 +     * Returns the result of accumulating the given transformation
3994 +     * of all entries using the given reducer to combine values,
3995 +     * and the given basis as an identity value.
3996 +     *
3997 +     * @param transformer a function returning the transformation
3998 +     * for an element
3999 +     * @param basis the identity (initial default value) for the reduction
4000 +     * @param reducer a commutative associative combining function
4001 +     * @return  the result of accumulating the given transformation
4002 +     * of all entries
4003 +     */
4004 +    @SuppressWarnings("unchecked") public long reduceEntriesToLongSequentially
4005 +        (ObjectToLong<Map.Entry<K,V>> transformer,
4006 +         long basis,
4007 +         LongByLongToLong reducer) {
4008 +        if (transformer == null || reducer == null)
4009 +            throw new NullPointerException();
4010 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
4011 +        long r = basis; V v;
4012 +        while ((v = it.advance()) != null)
4013 +            r = reducer.apply(r, transformer.apply(entryFor((K)it.nextKey, v)));
4014 +        return r;
4015 +    }
4016 +
4017 +    /**
4018 +     * Returns the result of accumulating the given transformation
4019 +     * of all entries using the given reducer to combine values,
4020 +     * and the given basis as an identity value.
4021 +     *
4022 +     * @param transformer a function returning the transformation
4023 +     * for an element
4024 +     * @param basis the identity (initial default value) for the reduction
4025 +     * @param reducer a commutative associative combining function
4026 +     * @return the result of accumulating the given transformation
4027 +     * of all entries
4028 +     */
4029 +    @SuppressWarnings("unchecked") public int reduceEntriesToIntSequentially
4030 +        (ObjectToInt<Map.Entry<K,V>> transformer,
4031 +         int basis,
4032 +         IntByIntToInt reducer) {
4033 +        if (transformer == null || reducer == null)
4034 +            throw new NullPointerException();
4035 +        Traverser<K,V,Object> it = new Traverser<K,V,Object>(this);
4036 +        int r = basis; V v;
4037 +        while ((v = it.advance()) != null)
4038 +            r = reducer.apply(r, transformer.apply(entryFor((K)it.nextKey, v)));
4039 +        return r;
4040 +    }
4041 +
4042 +    // Parallel bulk operations
4043 +
4044      /**
4045       * Performs the given action for each (key, value).
4046       *
4047       * @param action the action
4048       */
4049 <    public void forEach(BiAction<K,V> action) {
4049 >    public void forEachInParallel(BiAction<K,V> action) {
4050          ForkJoinTasks.forEach
4051              (this, action).invoke();
4052      }
# Line 3458 | Line 4056 | public class ConcurrentHashMapV8<K, V>
4056       * of each (key, value).
4057       *
4058       * @param transformer a function returning the transformation
4059 <     * for an element, or null of there is no transformation (in
4060 <     * which case the action is not applied).
4059 >     * for an element, or null if there is no transformation (in
4060 >     * which case the action is not applied)
4061       * @param action the action
4062       */
4063 <    public <U> void forEach(BiFun<? super K, ? super V, ? extends U> transformer,
4063 >    public <U> void forEachInParallel
4064 >        (BiFun<? super K, ? super V, ? extends U> transformer,
4065                              Action<U> action) {
4066          ForkJoinTasks.forEach
4067              (this, transformer, action).invoke();
# Line 3480 | Line 4079 | public class ConcurrentHashMapV8<K, V>
4079       * @return a non-null result from applying the given search
4080       * function on each (key, value), or null if none
4081       */
4082 <    public <U> U search(BiFun<? super K, ? super V, ? extends U> searchFunction) {
4082 >    public <U> U searchInParallel
4083 >        (BiFun<? super K, ? super V, ? extends U> searchFunction) {
4084          return ForkJoinTasks.search
4085              (this, searchFunction).invoke();
4086      }
# Line 3491 | Line 4091 | public class ConcurrentHashMapV8<K, V>
4091       * combine values, or null if none.
4092       *
4093       * @param transformer a function returning the transformation
4094 <     * for an element, or null of there is no transformation (in
4095 <     * which case it is not combined).
4094 >     * for an element, or null if there is no transformation (in
4095 >     * which case it is not combined)
4096       * @param reducer a commutative associative combining function
4097       * @return the result of accumulating the given transformation
4098       * of all (key, value) pairs
4099       */
4100 <    public <U> U reduce(BiFun<? super K, ? super V, ? extends U> transformer,
4101 <                        BiFun<? super U, ? super U, ? extends U> reducer) {
4100 >    public <U> U reduceInParallel
4101 >        (BiFun<? super K, ? super V, ? extends U> transformer,
4102 >         BiFun<? super U, ? super U, ? extends U> reducer) {
4103          return ForkJoinTasks.reduce
4104              (this, transformer, reducer).invoke();
4105      }
# Line 3515 | Line 4116 | public class ConcurrentHashMapV8<K, V>
4116       * @return the result of accumulating the given transformation
4117       * of all (key, value) pairs
4118       */
4119 <    public double reduceToDouble(ObjectByObjectToDouble<? super K, ? super V> transformer,
4120 <                                 double basis,
4121 <                                 DoubleByDoubleToDouble reducer) {
4119 >    public double reduceToDoubleInParallel
4120 >        (ObjectByObjectToDouble<? super K, ? super V> transformer,
4121 >         double basis,
4122 >         DoubleByDoubleToDouble reducer) {
4123          return ForkJoinTasks.reduceToDouble
4124              (this, transformer, basis, reducer).invoke();
4125      }
# Line 3534 | Line 4136 | public class ConcurrentHashMapV8<K, V>
4136       * @return the result of accumulating the given transformation
4137       * of all (key, value) pairs
4138       */
4139 <    public long reduceToLong(ObjectByObjectToLong<? super K, ? super V> transformer,
4140 <                             long basis,
4141 <                             LongByLongToLong reducer) {
4139 >    public long reduceToLongInParallel
4140 >        (ObjectByObjectToLong<? super K, ? super V> transformer,
4141 >         long basis,
4142 >         LongByLongToLong reducer) {
4143          return ForkJoinTasks.reduceToLong
4144              (this, transformer, basis, reducer).invoke();
4145      }
# Line 3553 | Line 4156 | public class ConcurrentHashMapV8<K, V>
4156       * @return the result of accumulating the given transformation
4157       * of all (key, value) pairs
4158       */
4159 <    public int reduceToInt(ObjectByObjectToInt<? super K, ? super V> transformer,
4160 <                           int basis,
4161 <                           IntByIntToInt reducer) {
4159 >    public int reduceToIntInParallel
4160 >        (ObjectByObjectToInt<? super K, ? super V> transformer,
4161 >         int basis,
4162 >         IntByIntToInt reducer) {
4163          return ForkJoinTasks.reduceToInt
4164              (this, transformer, basis, reducer).invoke();
4165      }
# Line 3565 | Line 4169 | public class ConcurrentHashMapV8<K, V>
4169       *
4170       * @param action the action
4171       */
4172 <    public void forEachKey(Action<K> action) {
4172 >    public void forEachKeyInParallel(Action<K> action) {
4173          ForkJoinTasks.forEachKey
4174              (this, action).invoke();
4175      }
# Line 3575 | Line 4179 | public class ConcurrentHashMapV8<K, V>
4179       * of each key.
4180       *
4181       * @param transformer a function returning the transformation
4182 <     * for an element, or null of there is no transformation (in
4183 <     * which case the action is not applied).
4182 >     * for an element, or null if there is no transformation (in
4183 >     * which case the action is not applied)
4184       * @param action the action
4185       */
4186 <    public <U> void forEachKey(Fun<? super K, ? extends U> transformer,
4187 <                               Action<U> action) {
4186 >    public <U> void forEachKeyInParallel
4187 >        (Fun<? super K, ? extends U> transformer,
4188 >         Action<U> action) {
4189          ForkJoinTasks.forEachKey
4190              (this, transformer, action).invoke();
4191      }
# Line 3597 | Line 4202 | public class ConcurrentHashMapV8<K, V>
4202       * @return a non-null result from applying the given search
4203       * function on each key, or null if none
4204       */
4205 <    public <U> U searchKeys(Fun<? super K, ? extends U> searchFunction) {
4205 >    public <U> U searchKeysInParallel
4206 >        (Fun<? super K, ? extends U> searchFunction) {
4207          return ForkJoinTasks.searchKeys
4208              (this, searchFunction).invoke();
4209      }
# Line 3610 | Line 4216 | public class ConcurrentHashMapV8<K, V>
4216       * @return the result of accumulating all keys using the given
4217       * reducer to combine values, or null if none
4218       */
4219 <    public K reduceKeys(BiFun<? super K, ? super K, ? extends K> reducer) {
4219 >    public K reduceKeysInParallel
4220 >        (BiFun<? super K, ? super K, ? extends K> reducer) {
4221          return ForkJoinTasks.reduceKeys
4222              (this, reducer).invoke();
4223      }
# Line 3621 | Line 4228 | public class ConcurrentHashMapV8<K, V>
4228       * null if none.
4229       *
4230       * @param transformer a function returning the transformation
4231 <     * for an element, or null of there is no transformation (in
4232 <     * which case it is not combined).
4231 >     * for an element, or null if there is no transformation (in
4232 >     * which case it is not combined)
4233       * @param reducer a commutative associative combining function
4234       * @return the result of accumulating the given transformation
4235       * of all keys
4236       */
4237 <    public <U> U reduceKeys(Fun<? super K, ? extends U> transformer,
4238 <                            BiFun<? super U, ? super U, ? extends U> reducer) {
4237 >    public <U> U reduceKeysInParallel
4238 >        (Fun<? super K, ? extends U> transformer,
4239 >         BiFun<? super U, ? super U, ? extends U> reducer) {
4240          return ForkJoinTasks.reduceKeys
4241              (this, transformer, reducer).invoke();
4242      }
# Line 3645 | Line 4253 | public class ConcurrentHashMapV8<K, V>
4253       * @return  the result of accumulating the given transformation
4254       * of all keys
4255       */
4256 <    public double reduceKeysToDouble(ObjectToDouble<? super K> transformer,
4257 <                                     double basis,
4258 <                                     DoubleByDoubleToDouble reducer) {
4256 >    public double reduceKeysToDoubleInParallel
4257 >        (ObjectToDouble<? super K> transformer,
4258 >         double basis,
4259 >         DoubleByDoubleToDouble reducer) {
4260          return ForkJoinTasks.reduceKeysToDouble
4261              (this, transformer, basis, reducer).invoke();
4262      }
# Line 3664 | Line 4273 | public class ConcurrentHashMapV8<K, V>
4273       * @return the result of accumulating the given transformation
4274       * of all keys
4275       */
4276 <    public long reduceKeysToLong(ObjectToLong<? super K> transformer,
4277 <                                 long basis,
4278 <                                 LongByLongToLong reducer) {
4276 >    public long reduceKeysToLongInParallel
4277 >        (ObjectToLong<? super K> transformer,
4278 >         long basis,
4279 >         LongByLongToLong reducer) {
4280          return ForkJoinTasks.reduceKeysToLong
4281              (this, transformer, basis, reducer).invoke();
4282      }
# Line 3683 | Line 4293 | public class ConcurrentHashMapV8<K, V>
4293       * @return the result of accumulating the given transformation
4294       * of all keys
4295       */
4296 <    public int reduceKeysToInt(ObjectToInt<? super K> transformer,
4297 <                               int basis,
4298 <                               IntByIntToInt reducer) {
4296 >    public int reduceKeysToIntInParallel
4297 >        (ObjectToInt<? super K> transformer,
4298 >         int basis,
4299 >         IntByIntToInt reducer) {
4300          return ForkJoinTasks.reduceKeysToInt
4301              (this, transformer, basis, reducer).invoke();
4302      }
# Line 3695 | Line 4306 | public class ConcurrentHashMapV8<K, V>
4306       *
4307       * @param action the action
4308       */
4309 <    public void forEachValue(Action<V> action) {
4309 >    public void forEachValueInParallel(Action<V> action) {
4310          ForkJoinTasks.forEachValue
4311              (this, action).invoke();
4312      }
# Line 3705 | Line 4316 | public class ConcurrentHashMapV8<K, V>
4316       * of each value.
4317       *
4318       * @param transformer a function returning the transformation
4319 <     * for an element, or null of there is no transformation (in
4320 <     * which case the action is not applied).
4319 >     * for an element, or null if there is no transformation (in
4320 >     * which case the action is not applied)
4321       */
4322 <    public <U> void forEachValue(Fun<? super V, ? extends U> transformer,
4323 <                                 Action<U> action) {
4322 >    public <U> void forEachValueInParallel
4323 >        (Fun<? super V, ? extends U> transformer,
4324 >         Action<U> action) {
4325          ForkJoinTasks.forEachValue
4326              (this, transformer, action).invoke();
4327      }
# Line 3725 | Line 4337 | public class ConcurrentHashMapV8<K, V>
4337       * result on success, else null
4338       * @return a non-null result from applying the given search
4339       * function on each value, or null if none
3728     *
4340       */
4341 <    public <U> U searchValues(Fun<? super V, ? extends U> searchFunction) {
4341 >    public <U> U searchValuesInParallel
4342 >        (Fun<? super V, ? extends U> searchFunction) {
4343          return ForkJoinTasks.searchValues
4344              (this, searchFunction).invoke();
4345      }
# Line 3739 | Line 4351 | public class ConcurrentHashMapV8<K, V>
4351       * @param reducer a commutative associative combining function
4352       * @return  the result of accumulating all values
4353       */
4354 <    public V reduceValues(BiFun<? super V, ? super V, ? extends V> reducer) {
4354 >    public V reduceValuesInParallel
4355 >        (BiFun<? super V, ? super V, ? extends V> reducer) {
4356          return ForkJoinTasks.reduceValues
4357              (this, reducer).invoke();
4358      }
# Line 3750 | Line 4363 | public class ConcurrentHashMapV8<K, V>
4363       * null if none.
4364       *
4365       * @param transformer a function returning the transformation
4366 <     * for an element, or null of there is no transformation (in
4367 <     * which case it is not combined).
4366 >     * for an element, or null if there is no transformation (in
4367 >     * which case it is not combined)
4368       * @param reducer a commutative associative combining function
4369       * @return the result of accumulating the given transformation
4370       * of all values
4371       */
4372 <    public <U> U reduceValues(Fun<? super V, ? extends U> transformer,
4373 <                              BiFun<? super U, ? super U, ? extends U> reducer) {
4372 >    public <U> U reduceValuesInParallel
4373 >        (Fun<? super V, ? extends U> transformer,
4374 >         BiFun<? super U, ? super U, ? extends U> reducer) {
4375          return ForkJoinTasks.reduceValues
4376              (this, transformer, reducer).invoke();
4377      }
# Line 3774 | Line 4388 | public class ConcurrentHashMapV8<K, V>
4388       * @return the result of accumulating the given transformation
4389       * of all values
4390       */
4391 <    public double reduceValuesToDouble(ObjectToDouble<? super V> transformer,
4392 <                                       double basis,
4393 <                                       DoubleByDoubleToDouble reducer) {
4391 >    public double reduceValuesToDoubleInParallel
4392 >        (ObjectToDouble<? super V> transformer,
4393 >         double basis,
4394 >         DoubleByDoubleToDouble reducer) {
4395          return ForkJoinTasks.reduceValuesToDouble
4396              (this, transformer, basis, reducer).invoke();
4397      }
# Line 3793 | Line 4408 | public class ConcurrentHashMapV8<K, V>
4408       * @return the result of accumulating the given transformation
4409       * of all values
4410       */
4411 <    public long reduceValuesToLong(ObjectToLong<? super V> transformer,
4412 <                                   long basis,
4413 <                                   LongByLongToLong reducer) {
4411 >    public long reduceValuesToLongInParallel
4412 >        (ObjectToLong<? super V> transformer,
4413 >         long basis,
4414 >         LongByLongToLong reducer) {
4415          return ForkJoinTasks.reduceValuesToLong
4416              (this, transformer, basis, reducer).invoke();
4417      }
# Line 3812 | Line 4428 | public class ConcurrentHashMapV8<K, V>
4428       * @return the result of accumulating the given transformation
4429       * of all values
4430       */
4431 <    public int reduceValuesToInt(ObjectToInt<? super V> transformer,
4432 <                                 int basis,
4433 <                                 IntByIntToInt reducer) {
4431 >    public int reduceValuesToIntInParallel
4432 >        (ObjectToInt<? super V> transformer,
4433 >         int basis,
4434 >         IntByIntToInt reducer) {
4435          return ForkJoinTasks.reduceValuesToInt
4436              (this, transformer, basis, reducer).invoke();
4437      }
# Line 3824 | Line 4441 | public class ConcurrentHashMapV8<K, V>
4441       *
4442       * @param action the action
4443       */
4444 <    public void forEachEntry(Action<Map.Entry<K,V>> action) {
4444 >    public void forEachEntryInParallel(Action<Map.Entry<K,V>> action) {
4445          ForkJoinTasks.forEachEntry
4446              (this, action).invoke();
4447      }
# Line 3834 | Line 4451 | public class ConcurrentHashMapV8<K, V>
4451       * of each entry.
4452       *
4453       * @param transformer a function returning the transformation
4454 <     * for an element, or null of there is no transformation (in
4455 <     * which case the action is not applied).
4454 >     * for an element, or null if there is no transformation (in
4455 >     * which case the action is not applied)
4456       * @param action the action
4457       */
4458 <    public <U> void forEachEntry(Fun<Map.Entry<K,V>, ? extends U> transformer,
4459 <                                 Action<U> action) {
4458 >    public <U> void forEachEntryInParallel
4459 >        (Fun<Map.Entry<K,V>, ? extends U> transformer,
4460 >         Action<U> action) {
4461          ForkJoinTasks.forEachEntry
4462              (this, transformer, action).invoke();
4463      }
# Line 3856 | Line 4474 | public class ConcurrentHashMapV8<K, V>
4474       * @return a non-null result from applying the given search
4475       * function on each entry, or null if none
4476       */
4477 <    public <U> U searchEntries(Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4477 >    public <U> U searchEntriesInParallel
4478 >        (Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4479          return ForkJoinTasks.searchEntries
4480              (this, searchFunction).invoke();
4481      }
# Line 3868 | Line 4487 | public class ConcurrentHashMapV8<K, V>
4487       * @param reducer a commutative associative combining function
4488       * @return the result of accumulating all entries
4489       */
4490 <    public Map.Entry<K,V> reduceEntries(BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4490 >    public Map.Entry<K,V> reduceEntriesInParallel
4491 >        (BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4492          return ForkJoinTasks.reduceEntries
4493              (this, reducer).invoke();
4494      }
# Line 3879 | Line 4499 | public class ConcurrentHashMapV8<K, V>
4499       * or null if none.
4500       *
4501       * @param transformer a function returning the transformation
4502 <     * for an element, or null of there is no transformation (in
4503 <     * which case it is not combined).
4502 >     * for an element, or null if there is no transformation (in
4503 >     * which case it is not combined)
4504       * @param reducer a commutative associative combining function
4505       * @return the result of accumulating the given transformation
4506       * of all entries
4507       */
4508 <    public <U> U reduceEntries(Fun<Map.Entry<K,V>, ? extends U> transformer,
4509 <                               BiFun<? super U, ? super U, ? extends U> reducer) {
4508 >    public <U> U reduceEntriesInParallel
4509 >        (Fun<Map.Entry<K,V>, ? extends U> transformer,
4510 >         BiFun<? super U, ? super U, ? extends U> reducer) {
4511          return ForkJoinTasks.reduceEntries
4512              (this, transformer, reducer).invoke();
4513      }
# Line 3903 | Line 4524 | public class ConcurrentHashMapV8<K, V>
4524       * @return the result of accumulating the given transformation
4525       * of all entries
4526       */
4527 <    public double reduceEntriesToDouble(ObjectToDouble<Map.Entry<K,V>> transformer,
4528 <                                        double basis,
4529 <                                        DoubleByDoubleToDouble reducer) {
4527 >    public double reduceEntriesToDoubleInParallel
4528 >        (ObjectToDouble<Map.Entry<K,V>> transformer,
4529 >         double basis,
4530 >         DoubleByDoubleToDouble reducer) {
4531          return ForkJoinTasks.reduceEntriesToDouble
4532              (this, transformer, basis, reducer).invoke();
4533      }
# Line 3922 | Line 4544 | public class ConcurrentHashMapV8<K, V>
4544       * @return  the result of accumulating the given transformation
4545       * of all entries
4546       */
4547 <    public long reduceEntriesToLong(ObjectToLong<Map.Entry<K,V>> transformer,
4548 <                                    long basis,
4549 <                                    LongByLongToLong reducer) {
4547 >    public long reduceEntriesToLongInParallel
4548 >        (ObjectToLong<Map.Entry<K,V>> transformer,
4549 >         long basis,
4550 >         LongByLongToLong reducer) {
4551          return ForkJoinTasks.reduceEntriesToLong
4552              (this, transformer, basis, reducer).invoke();
4553      }
# Line 3941 | Line 4564 | public class ConcurrentHashMapV8<K, V>
4564       * @return the result of accumulating the given transformation
4565       * of all entries
4566       */
4567 <    public int reduceEntriesToInt(ObjectToInt<Map.Entry<K,V>> transformer,
4568 <                                  int basis,
4569 <                                  IntByIntToInt reducer) {
4567 >    public int reduceEntriesToIntInParallel
4568 >        (ObjectToInt<Map.Entry<K,V>> transformer,
4569 >         int basis,
4570 >         IntByIntToInt reducer) {
4571          return ForkJoinTasks.reduceEntriesToInt
4572              (this, transformer, basis, reducer).invoke();
4573      }
4574  
4575 +
4576      /* ----------------Views -------------- */
4577  
4578      /**
4579       * Base class for views.
4580       */
4581 <    static abstract class CHMView<K, V> {
4582 <        final ConcurrentHashMapV8<K, V> map;
4583 <        CHMView(ConcurrentHashMapV8<K, V> map)  { this.map = map; }
4581 >    abstract static class CHMView<K,V> {
4582 >        final ConcurrentHashMapV8<K,V> map;
4583 >        CHMView(ConcurrentHashMapV8<K,V> map)  { this.map = map; }
4584  
4585          /**
4586           * Returns the map backing this view.
# Line 3969 | Line 4594 | public class ConcurrentHashMapV8<K, V>
4594          public final void clear()               { map.clear(); }
4595  
4596          // implementations below rely on concrete classes supplying these
4597 <        abstract public Iterator<?> iterator();
4598 <        abstract public boolean contains(Object o);
4599 <        abstract public boolean remove(Object o);
4597 >        public abstract Iterator<?> iterator();
4598 >        public abstract boolean contains(Object o);
4599 >        public abstract boolean remove(Object o);
4600  
4601          private static final String oomeMsg = "Required array size too large";
4602  
# Line 4090 | Line 4715 | public class ConcurrentHashMapV8<K, V>
4715       * A view of a ConcurrentHashMapV8 as a {@link Set} of keys, in
4716       * which additions may optionally be enabled by mapping to a
4717       * common value.  This class cannot be directly instantiated. See
4718 <     * {@link #keySet}, {@link #keySet(Object)}, {@link #newKeySet()},
4718 >     * {@link #keySet()}, {@link #keySet(Object)}, {@link #newKeySet()},
4719       * {@link #newKeySet(int)}.
4720       */
4721 <    public static class KeySetView<K,V> extends CHMView<K,V> implements Set<K>, java.io.Serializable {
4721 >    public static class KeySetView<K,V> extends CHMView<K,V>
4722 >        implements Set<K>, java.io.Serializable {
4723          private static final long serialVersionUID = 7249069246763182397L;
4724          private final V value;
4725 <        KeySetView(ConcurrentHashMapV8<K, V> map, V value) {  // non-public
4725 >        KeySetView(ConcurrentHashMapV8<K,V> map, V value) {  // non-public
4726              super(map);
4727              this.value = value;
4728          }
# Line 4106 | Line 4732 | public class ConcurrentHashMapV8<K, V>
4732           * or {@code null} if additions are not supported.
4733           *
4734           * @return the default mapped value for additions, or {@code null}
4735 <         * if not supported.
4735 >         * if not supported
4736           */
4737          public V getMappedValue() { return value; }
4738  
# Line 4130 | Line 4756 | public class ConcurrentHashMapV8<K, V>
4756              V v;
4757              if ((v = value) == null)
4758                  throw new UnsupportedOperationException();
4759 <            if (e == null)
4134 <                throw new NullPointerException();
4135 <            return map.internalPutIfAbsent(e, v) == null;
4759 >            return map.internalPut(e, v, true) == null;
4760          }
4761          public boolean addAll(Collection<? extends K> c) {
4762              boolean added = false;
# Line 4140 | Line 4764 | public class ConcurrentHashMapV8<K, V>
4764              if ((v = value) == null)
4765                  throw new UnsupportedOperationException();
4766              for (K e : c) {
4767 <                if (e == null)
4144 <                    throw new NullPointerException();
4145 <                if (map.internalPutIfAbsent(e, v) == null)
4767 >                if (map.internalPut(e, v, true) == null)
4768                      added = true;
4769              }
4770              return added;
# Line 4153 | Line 4775 | public class ConcurrentHashMapV8<K, V>
4775                      ((c = (Set<?>)o) == this ||
4776                       (containsAll(c) && c.containsAll(this))));
4777          }
4156
4157        /**
4158         * Performs the given action for each key.
4159         *
4160         * @param action the action
4161         */
4162        public void forEach(Action<K> action) {
4163            ForkJoinTasks.forEachKey
4164                (map, action).invoke();
4165        }
4166
4167        /**
4168         * Performs the given action for each non-null transformation
4169         * of each key.
4170         *
4171         * @param transformer a function returning the transformation
4172         * for an element, or null of there is no transformation (in
4173         * which case the action is not applied).
4174         * @param action the action
4175         */
4176        public <U> void forEach(Fun<? super K, ? extends U> transformer,
4177                                Action<U> action) {
4178            ForkJoinTasks.forEachKey
4179                (map, transformer, action).invoke();
4180        }
4181
4182        /**
4183         * Returns a non-null result from applying the given search
4184         * function on each key, or null if none. Upon success,
4185         * further element processing is suppressed and the results of
4186         * any other parallel invocations of the search function are
4187         * ignored.
4188         *
4189         * @param searchFunction a function returning a non-null
4190         * result on success, else null
4191         * @return a non-null result from applying the given search
4192         * function on each key, or null if none
4193         */
4194        public <U> U search(Fun<? super K, ? extends U> searchFunction) {
4195            return ForkJoinTasks.searchKeys
4196                (map, searchFunction).invoke();
4197        }
4198
4199        /**
4200         * Returns the result of accumulating all keys using the given
4201         * reducer to combine values, or null if none.
4202         *
4203         * @param reducer a commutative associative combining function
4204         * @return the result of accumulating all keys using the given
4205         * reducer to combine values, or null if none
4206         */
4207        public K reduce(BiFun<? super K, ? super K, ? extends K> reducer) {
4208            return ForkJoinTasks.reduceKeys
4209                (map, reducer).invoke();
4210        }
4211
4212        /**
4213         * Returns the result of accumulating the given transformation
4214         * of all keys using the given reducer to combine values, and
4215         * the given basis as an identity value.
4216         *
4217         * @param transformer a function returning the transformation
4218         * for an element
4219         * @param basis the identity (initial default value) for the reduction
4220         * @param reducer a commutative associative combining function
4221         * @return  the result of accumulating the given transformation
4222         * of all keys
4223         */
4224        public double reduceToDouble(ObjectToDouble<? super K> transformer,
4225                                     double basis,
4226                                     DoubleByDoubleToDouble reducer) {
4227            return ForkJoinTasks.reduceKeysToDouble
4228                (map, transformer, basis, reducer).invoke();
4229        }
4230
4231
4232        /**
4233         * Returns the result of accumulating the given transformation
4234         * of all keys using the given reducer to combine values, and
4235         * the given basis as an identity value.
4236         *
4237         * @param transformer a function returning the transformation
4238         * for an element
4239         * @param basis the identity (initial default value) for the reduction
4240         * @param reducer a commutative associative combining function
4241         * @return the result of accumulating the given transformation
4242         * of all keys
4243         */
4244        public long reduceToLong(ObjectToLong<? super K> transformer,
4245                                 long basis,
4246                                 LongByLongToLong reducer) {
4247            return ForkJoinTasks.reduceKeysToLong
4248                (map, transformer, basis, reducer).invoke();
4249        }
4250
4251        /**
4252         * Returns the result of accumulating the given transformation
4253         * of all keys using the given reducer to combine values, and
4254         * the given basis as an identity value.
4255         *
4256         * @param transformer a function returning the transformation
4257         * for an element
4258         * @param basis the identity (initial default value) for the reduction
4259         * @param reducer a commutative associative combining function
4260         * @return the result of accumulating the given transformation
4261         * of all keys
4262         */
4263        public int reduceToInt(ObjectToInt<? super K> transformer,
4264                               int basis,
4265                               IntByIntToInt reducer) {
4266            return ForkJoinTasks.reduceKeysToInt
4267                (map, transformer, basis, reducer).invoke();
4268        }
4269
4778      }
4779  
4780      /**
4781       * A view of a ConcurrentHashMapV8 as a {@link Collection} of
4782       * values, in which additions are disabled. This class cannot be
4783 <     * directly instantiated. See {@link #values},
4783 >     * directly instantiated. See {@link #values()}.
4784       *
4785       * <p>The view's {@code iterator} is a "weakly consistent" iterator
4786       * that will never throw {@link ConcurrentModificationException},
# Line 4282 | Line 4790 | public class ConcurrentHashMapV8<K, V>
4790       */
4791      public static final class ValuesView<K,V> extends CHMView<K,V>
4792          implements Collection<V> {
4793 <        ValuesView(ConcurrentHashMapV8<K, V> map)   { super(map); }
4793 >        ValuesView(ConcurrentHashMapV8<K,V> map)   { super(map); }
4794          public final boolean contains(Object o) { return map.containsValue(o); }
4795          public final boolean remove(Object o) {
4796              if (o != null) {
# Line 4317 | Line 4825 | public class ConcurrentHashMapV8<K, V>
4825              throw new UnsupportedOperationException();
4826          }
4827  
4320        /**
4321         * Performs the given action for each value.
4322         *
4323         * @param action the action
4324         */
4325        public void forEach(Action<V> action) {
4326            ForkJoinTasks.forEachValue
4327                (map, action).invoke();
4328        }
4329
4330        /**
4331         * Performs the given action for each non-null transformation
4332         * of each value.
4333         *
4334         * @param transformer a function returning the transformation
4335         * for an element, or null of there is no transformation (in
4336         * which case the action is not applied).
4337         */
4338        public <U> void forEach(Fun<? super V, ? extends U> transformer,
4339                                     Action<U> action) {
4340            ForkJoinTasks.forEachValue
4341                (map, transformer, action).invoke();
4342        }
4343
4344        /**
4345         * Returns a non-null result from applying the given search
4346         * function on each value, or null if none.  Upon success,
4347         * further element processing is suppressed and the results of
4348         * any other parallel invocations of the search function are
4349         * ignored.
4350         *
4351         * @param searchFunction a function returning a non-null
4352         * result on success, else null
4353         * @return a non-null result from applying the given search
4354         * function on each value, or null if none
4355         *
4356         */
4357        public <U> U search(Fun<? super V, ? extends U> searchFunction) {
4358            return ForkJoinTasks.searchValues
4359                (map, searchFunction).invoke();
4360        }
4361
4362        /**
4363         * Returns the result of accumulating all values using the
4364         * given reducer to combine values, or null if none.
4365         *
4366         * @param reducer a commutative associative combining function
4367         * @return  the result of accumulating all values
4368         */
4369        public V reduce(BiFun<? super V, ? super V, ? extends V> reducer) {
4370            return ForkJoinTasks.reduceValues
4371                (map, reducer).invoke();
4372        }
4373
4374        /**
4375         * Returns the result of accumulating the given transformation
4376         * of all values using the given reducer to combine values, or
4377         * null if none.
4378         *
4379         * @param transformer a function returning the transformation
4380         * for an element, or null of there is no transformation (in
4381         * which case it is not combined).
4382         * @param reducer a commutative associative combining function
4383         * @return the result of accumulating the given transformation
4384         * of all values
4385         */
4386        public <U> U reduce(Fun<? super V, ? extends U> transformer,
4387                            BiFun<? super U, ? super U, ? extends U> reducer) {
4388            return ForkJoinTasks.reduceValues
4389                (map, transformer, reducer).invoke();
4390        }
4391
4392        /**
4393         * Returns the result of accumulating the given transformation
4394         * of all values using the given reducer to combine values,
4395         * and the given basis as an identity value.
4396         *
4397         * @param transformer a function returning the transformation
4398         * for an element
4399         * @param basis the identity (initial default value) for the reduction
4400         * @param reducer a commutative associative combining function
4401         * @return the result of accumulating the given transformation
4402         * of all values
4403         */
4404        public double reduceToDouble(ObjectToDouble<? super V> transformer,
4405                                     double basis,
4406                                     DoubleByDoubleToDouble reducer) {
4407            return ForkJoinTasks.reduceValuesToDouble
4408                (map, transformer, basis, reducer).invoke();
4409        }
4410
4411        /**
4412         * Returns the result of accumulating the given transformation
4413         * of all values using the given reducer to combine values,
4414         * and the given basis as an identity value.
4415         *
4416         * @param transformer a function returning the transformation
4417         * for an element
4418         * @param basis the identity (initial default value) for the reduction
4419         * @param reducer a commutative associative combining function
4420         * @return the result of accumulating the given transformation
4421         * of all values
4422         */
4423        public long reduceToLong(ObjectToLong<? super V> transformer,
4424                                 long basis,
4425                                 LongByLongToLong reducer) {
4426            return ForkJoinTasks.reduceValuesToLong
4427                (map, transformer, basis, reducer).invoke();
4428        }
4429
4430        /**
4431         * Returns the result of accumulating the given transformation
4432         * of all values using the given reducer to combine values,
4433         * and the given basis as an identity value.
4434         *
4435         * @param transformer a function returning the transformation
4436         * for an element
4437         * @param basis the identity (initial default value) for the reduction
4438         * @param reducer a commutative associative combining function
4439         * @return the result of accumulating the given transformation
4440         * of all values
4441         */
4442        public int reduceToInt(ObjectToInt<? super V> transformer,
4443                               int basis,
4444                               IntByIntToInt reducer) {
4445            return ForkJoinTasks.reduceValuesToInt
4446                (map, transformer, basis, reducer).invoke();
4447        }
4448
4828      }
4829  
4830      /**
4831       * A view of a ConcurrentHashMapV8 as a {@link Set} of (key, value)
4832       * entries.  This class cannot be directly instantiated. See
4833 <     * {@link #entrySet}.
4833 >     * {@link #entrySet()}.
4834       */
4835      public static final class EntrySetView<K,V> extends CHMView<K,V>
4836          implements Set<Map.Entry<K,V>> {
4837 <        EntrySetView(ConcurrentHashMapV8<K, V> map) { super(map); }
4837 >        EntrySetView(ConcurrentHashMapV8<K,V> map) { super(map); }
4838          public final boolean contains(Object o) {
4839              Object k, v, r; Map.Entry<?,?> e;
4840              return ((o instanceof Map.Entry) &&
# Line 4487 | Line 4866 | public class ConcurrentHashMapV8<K, V>
4866          }
4867  
4868          public final boolean add(Entry<K,V> e) {
4869 <            K key = e.getKey();
4491 <            V value = e.getValue();
4492 <            if (key == null || value == null)
4493 <                throw new NullPointerException();
4494 <            return map.internalPut(key, value) == null;
4869 >            return map.internalPut(e.getKey(), e.getValue(), false) == null;
4870          }
4871          public final boolean addAll(Collection<? extends Entry<K,V>> c) {
4872              boolean added = false;
# Line 4507 | Line 4882 | public class ConcurrentHashMapV8<K, V>
4882                      ((c = (Set<?>)o) == this ||
4883                       (containsAll(c) && c.containsAll(this))));
4884          }
4510
4511        /**
4512         * Performs the given action for each entry.
4513         *
4514         * @param action the action
4515         */
4516        public void forEach(Action<Map.Entry<K,V>> action) {
4517            ForkJoinTasks.forEachEntry
4518                (map, action).invoke();
4519        }
4520
4521        /**
4522         * Performs the given action for each non-null transformation
4523         * of each entry.
4524         *
4525         * @param transformer a function returning the transformation
4526         * for an element, or null of there is no transformation (in
4527         * which case the action is not applied).
4528         * @param action the action
4529         */
4530        public <U> void forEach(Fun<Map.Entry<K,V>, ? extends U> transformer,
4531                                Action<U> action) {
4532            ForkJoinTasks.forEachEntry
4533                (map, transformer, action).invoke();
4534        }
4535
4536        /**
4537         * Returns a non-null result from applying the given search
4538         * function on each entry, or null if none.  Upon success,
4539         * further element processing is suppressed and the results of
4540         * any other parallel invocations of the search function are
4541         * ignored.
4542         *
4543         * @param searchFunction a function returning a non-null
4544         * result on success, else null
4545         * @return a non-null result from applying the given search
4546         * function on each entry, or null if none
4547         */
4548        public <U> U search(Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4549            return ForkJoinTasks.searchEntries
4550                (map, searchFunction).invoke();
4551        }
4552
4553        /**
4554         * Returns the result of accumulating all entries using the
4555         * given reducer to combine values, or null if none.
4556         *
4557         * @param reducer a commutative associative combining function
4558         * @return the result of accumulating all entries
4559         */
4560        public Map.Entry<K,V> reduce(BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4561            return ForkJoinTasks.reduceEntries
4562                (map, reducer).invoke();
4563        }
4564
4565        /**
4566         * Returns the result of accumulating the given transformation
4567         * of all entries using the given reducer to combine values,
4568         * or null if none.
4569         *
4570         * @param transformer a function returning the transformation
4571         * for an element, or null of there is no transformation (in
4572         * which case it is not combined).
4573         * @param reducer a commutative associative combining function
4574         * @return the result of accumulating the given transformation
4575         * of all entries
4576         */
4577        public <U> U reduce(Fun<Map.Entry<K,V>, ? extends U> transformer,
4578                            BiFun<? super U, ? super U, ? extends U> reducer) {
4579            return ForkJoinTasks.reduceEntries
4580                (map, transformer, reducer).invoke();
4581        }
4582
4583        /**
4584         * Returns the result of accumulating the given transformation
4585         * of all entries using the given reducer to combine values,
4586         * and the given basis as an identity value.
4587         *
4588         * @param transformer a function returning the transformation
4589         * for an element
4590         * @param basis the identity (initial default value) for the reduction
4591         * @param reducer a commutative associative combining function
4592         * @return the result of accumulating the given transformation
4593         * of all entries
4594         */
4595        public double reduceToDouble(ObjectToDouble<Map.Entry<K,V>> transformer,
4596                                     double basis,
4597                                     DoubleByDoubleToDouble reducer) {
4598            return ForkJoinTasks.reduceEntriesToDouble
4599                (map, transformer, basis, reducer).invoke();
4600        }
4601
4602        /**
4603         * Returns the result of accumulating the given transformation
4604         * of all entries using the given reducer to combine values,
4605         * and the given basis as an identity value.
4606         *
4607         * @param transformer a function returning the transformation
4608         * for an element
4609         * @param basis the identity (initial default value) for the reduction
4610         * @param reducer a commutative associative combining function
4611         * @return  the result of accumulating the given transformation
4612         * of all entries
4613         */
4614        public long reduceToLong(ObjectToLong<Map.Entry<K,V>> transformer,
4615                                 long basis,
4616                                 LongByLongToLong reducer) {
4617            return ForkJoinTasks.reduceEntriesToLong
4618                (map, transformer, basis, reducer).invoke();
4619        }
4620
4621        /**
4622         * Returns the result of accumulating the given transformation
4623         * of all entries using the given reducer to combine values,
4624         * and the given basis as an identity value.
4625         *
4626         * @param transformer a function returning the transformation
4627         * for an element
4628         * @param basis the identity (initial default value) for the reduction
4629         * @param reducer a commutative associative combining function
4630         * @return the result of accumulating the given transformation
4631         * of all entries
4632         */
4633        public int reduceToInt(ObjectToInt<Map.Entry<K,V>> transformer,
4634                               int basis,
4635                               IntByIntToInt reducer) {
4636            return ForkJoinTasks.reduceEntriesToInt
4637                (map, transformer, basis, reducer).invoke();
4638        }
4639
4885      }
4886  
4887      // ---------------------------------------------------------------------
# Line 4665 | Line 4910 | public class ConcurrentHashMapV8<K, V>
4910              (ConcurrentHashMapV8<K,V> map,
4911               BiAction<K,V> action) {
4912              if (action == null) throw new NullPointerException();
4913 <            return new ForEachMappingTask<K,V>(map, null, -1, null, action);
4913 >            return new ForEachMappingTask<K,V>(map, null, -1, action);
4914          }
4915  
4916          /**
# Line 4686 | Line 4931 | public class ConcurrentHashMapV8<K, V>
4931              if (transformer == null || action == null)
4932                  throw new NullPointerException();
4933              return new ForEachTransformedMappingTask<K,V,U>
4934 <                (map, null, -1, null, transformer, action);
4934 >                (map, null, -1, transformer, action);
4935          }
4936  
4937          /**
# Line 4706 | Line 4951 | public class ConcurrentHashMapV8<K, V>
4951               BiFun<? super K, ? super V, ? extends U> searchFunction) {
4952              if (searchFunction == null) throw new NullPointerException();
4953              return new SearchMappingsTask<K,V,U>
4954 <                (map, null, -1, null, searchFunction,
4954 >                (map, null, -1, searchFunction,
4955                   new AtomicReference<U>());
4956          }
4957  
# Line 4718 | Line 4963 | public class ConcurrentHashMapV8<K, V>
4963           * @param map the map
4964           * @param transformer a function returning the transformation
4965           * for an element, or null if there is no transformation (in
4966 <         * which case it is not combined).
4966 >         * which case it is not combined)
4967           * @param reducer a commutative associative combining function
4968           * @return the task
4969           */
# Line 4815 | Line 5060 | public class ConcurrentHashMapV8<K, V>
5060              (ConcurrentHashMapV8<K,V> map,
5061               Action<K> action) {
5062              if (action == null) throw new NullPointerException();
5063 <            return new ForEachKeyTask<K,V>(map, null, -1, null, action);
5063 >            return new ForEachKeyTask<K,V>(map, null, -1, action);
5064          }
5065  
5066          /**
# Line 4836 | Line 5081 | public class ConcurrentHashMapV8<K, V>
5081              if (transformer == null || action == null)
5082                  throw new NullPointerException();
5083              return new ForEachTransformedKeyTask<K,V,U>
5084 <                (map, null, -1, null, transformer, action);
5084 >                (map, null, -1, transformer, action);
5085          }
5086  
5087          /**
# Line 4856 | Line 5101 | public class ConcurrentHashMapV8<K, V>
5101               Fun<? super K, ? extends U> searchFunction) {
5102              if (searchFunction == null) throw new NullPointerException();
5103              return new SearchKeysTask<K,V,U>
5104 <                (map, null, -1, null, searchFunction,
5104 >                (map, null, -1, searchFunction,
5105                   new AtomicReference<U>());
5106          }
5107  
# Line 4885 | Line 5130 | public class ConcurrentHashMapV8<K, V>
5130           * @param map the map
5131           * @param transformer a function returning the transformation
5132           * for an element, or null if there is no transformation (in
5133 <         * which case it is not combined).
5133 >         * which case it is not combined)
5134           * @param reducer a commutative associative combining function
5135           * @return the task
5136           */
# Line 4982 | Line 5227 | public class ConcurrentHashMapV8<K, V>
5227              (ConcurrentHashMapV8<K,V> map,
5228               Action<V> action) {
5229              if (action == null) throw new NullPointerException();
5230 <            return new ForEachValueTask<K,V>(map, null, -1, null, action);
5230 >            return new ForEachValueTask<K,V>(map, null, -1, action);
5231          }
5232  
5233          /**
# Line 5002 | Line 5247 | public class ConcurrentHashMapV8<K, V>
5247              if (transformer == null || action == null)
5248                  throw new NullPointerException();
5249              return new ForEachTransformedValueTask<K,V,U>
5250 <                (map, null, -1, null, transformer, action);
5250 >                (map, null, -1, transformer, action);
5251          }
5252  
5253          /**
# Line 5022 | Line 5267 | public class ConcurrentHashMapV8<K, V>
5267               Fun<? super V, ? extends U> searchFunction) {
5268              if (searchFunction == null) throw new NullPointerException();
5269              return new SearchValuesTask<K,V,U>
5270 <                (map, null, -1, null, searchFunction,
5270 >                (map, null, -1, searchFunction,
5271                   new AtomicReference<U>());
5272          }
5273  
# Line 5051 | Line 5296 | public class ConcurrentHashMapV8<K, V>
5296           * @param map the map
5297           * @param transformer a function returning the transformation
5298           * for an element, or null if there is no transformation (in
5299 <         * which case it is not combined).
5299 >         * which case it is not combined)
5300           * @param reducer a commutative associative combining function
5301           * @return the task
5302           */
# Line 5148 | Line 5393 | public class ConcurrentHashMapV8<K, V>
5393              (ConcurrentHashMapV8<K,V> map,
5394               Action<Map.Entry<K,V>> action) {
5395              if (action == null) throw new NullPointerException();
5396 <            return new ForEachEntryTask<K,V>(map, null, -1, null, action);
5396 >            return new ForEachEntryTask<K,V>(map, null, -1, action);
5397          }
5398  
5399          /**
# Line 5168 | Line 5413 | public class ConcurrentHashMapV8<K, V>
5413              if (transformer == null || action == null)
5414                  throw new NullPointerException();
5415              return new ForEachTransformedEntryTask<K,V,U>
5416 <                (map, null, -1, null, transformer, action);
5416 >                (map, null, -1, transformer, action);
5417          }
5418  
5419          /**
# Line 5188 | Line 5433 | public class ConcurrentHashMapV8<K, V>
5433               Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
5434              if (searchFunction == null) throw new NullPointerException();
5435              return new SearchEntriesTask<K,V,U>
5436 <                (map, null, -1, null, searchFunction,
5436 >                (map, null, -1, searchFunction,
5437                   new AtomicReference<U>());
5438          }
5439  
# Line 5217 | Line 5462 | public class ConcurrentHashMapV8<K, V>
5462           * @param map the map
5463           * @param transformer a function returning the transformation
5464           * for an element, or null if there is no transformation (in
5465 <         * which case it is not combined).
5465 >         * which case it is not combined)
5466           * @param reducer a commutative associative combining function
5467           * @return the task
5468           */
# Line 5306 | Line 5551 | public class ConcurrentHashMapV8<K, V>
5551  
5552      // -------------------------------------------------------
5553  
5309    /**
5310     * Base for FJ tasks for bulk operations. This adds a variant of
5311     * CountedCompleters and some split and merge bookkeeping to
5312     * iterator functionality. The forEach and reduce methods are
5313     * similar to those illustrated in CountedCompleter documentation,
5314     * except that bottom-up reduction completions perform them within
5315     * their compute methods. The search methods are like forEach
5316     * except they continually poll for success and exit early.  Also,
5317     * exceptions are handled in a simpler manner, by just trying to
5318     * complete root task exceptionally.
5319     */
5320    @SuppressWarnings("serial") static abstract class BulkTask<K,V,R> extends Traverser<K,V,R> {
5321        final BulkTask<K,V,?> parent;  // completion target
5322        int batch;                     // split control; -1 for unknown
5323        int pending;                   // completion control
5324
5325        BulkTask(ConcurrentHashMapV8<K,V> map, BulkTask<K,V,?> parent,
5326                 int batch) {
5327            super(map);
5328            this.parent = parent;
5329            this.batch = batch;
5330            if (parent != null && map != null) { // split parent
5331                Node[] t;
5332                if ((t = parent.tab) == null &&
5333                    (t = parent.tab = map.table) != null)
5334                    parent.baseLimit = parent.baseSize = t.length;
5335                this.tab = t;
5336                this.baseSize = parent.baseSize;
5337                int hi = this.baseLimit = parent.baseLimit;
5338                parent.baseLimit = this.index = this.baseIndex =
5339                    (hi + parent.baseIndex + 1) >>> 1;
5340            }
5341        }
5342
5343        /**
5344         * Forces root task to complete.
5345         * @param ex if null, complete normally, else exceptionally
5346         * @return false to simplify use
5347         */
5348        final boolean tryCompleteComputation(Throwable ex) {
5349            for (BulkTask<K,V,?> a = this;;) {
5350                BulkTask<K,V,?> p = a.parent;
5351                if (p == null) {
5352                    if (ex != null)
5353                        a.completeExceptionally(ex);
5354                    else
5355                        a.quietlyComplete();
5356                    return false;
5357                }
5358                a = p;
5359            }
5360        }
5361
5362        /**
5363         * Version of tryCompleteComputation for function screening checks
5364         */
5365        final boolean abortOnNullFunction() {
5366            return tryCompleteComputation(new Error("Unexpected null function"));
5367        }
5368
5369        // utilities
5370
5371        /** CompareAndSet pending count */
5372        final boolean casPending(int cmp, int val) {
5373            return U.compareAndSwapInt(this, PENDING, cmp, val);
5374        }
5375
5376        /**
5377         * Returns approx exp2 of the number of times (minus one) to
5378         * split task by two before executing leaf action. This value
5379         * is faster to compute and more convenient to use as a guide
5380         * to splitting than is the depth, since it is used while
5381         * dividing by two anyway.
5382         */
5383        final int batch() {
5384            ConcurrentHashMapV8<K, V> m; int b; Node[] t;  ForkJoinPool pool;
5385            if ((b = batch) < 0 && (m = map) != null) { // force initialization
5386                if ((t = tab) == null && (t = tab = m.table) != null)
5387                    baseLimit = baseSize = t.length;
5388                if (t != null) {
5389                    long n = m.counter.sum();
5390                    int par = ((pool = getPool()) == null) ?
5391                        ForkJoinPool.getCommonPoolParallelism() :
5392                        pool.getParallelism();
5393                    int sp = par << 3; // slack of 8
5394                    b = batch = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp;
5395                }
5396            }
5397            return b;
5398        }
5399
5400        /**
5401         * Returns exportable snapshot entry.
5402         */
5403        static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
5404            return new AbstractMap.SimpleEntry<K,V>(k, v);
5405        }
5406
5407        // Unsafe mechanics
5408        private static final sun.misc.Unsafe U;
5409        private static final long PENDING;
5410        static {
5411            try {
5412                U = getUnsafe();
5413                PENDING = U.objectFieldOffset
5414                    (BulkTask.class.getDeclaredField("pending"));
5415            } catch (Exception e) {
5416                throw new Error(e);
5417            }
5418        }
5419    }
5420
5421    /**
5422     * Base class for non-reductive actions
5423     */
5424    @SuppressWarnings("serial") static abstract class BulkAction<K,V,R> extends BulkTask<K,V,R> {
5425        BulkAction<K,V,?> nextTask;
5426        BulkAction(ConcurrentHashMapV8<K,V> map, BulkTask<K,V,?> parent,
5427                   int batch, BulkAction<K,V,?> nextTask) {
5428            super(map, parent, batch);
5429            this.nextTask = nextTask;
5430        }
5431
5432        /**
5433         * Try to complete task and upward parents. Upon hitting
5434         * non-completed parent, if a non-FJ task, try to help out the
5435         * computation.
5436         */
5437        final void tryComplete(BulkAction<K,V,?> subtasks) {
5438            BulkTask<K,V,?> a = this, s = a;
5439            for (int c;;) {
5440                if ((c = a.pending) == 0) {
5441                    if ((a = (s = a).parent) == null) {
5442                        s.quietlyComplete();
5443                        break;
5444                    }
5445                }
5446                else if (a.casPending(c, c - 1)) {
5447                    if (subtasks != null && !inForkJoinPool()) {
5448                        while ((s = a.parent) != null)
5449                            a = s;
5450                        while (!a.isDone()) {
5451                            BulkAction<K,V,?> next = subtasks.nextTask;
5452                            if (subtasks.tryUnfork())
5453                                subtasks.exec();
5454                            if ((subtasks = next) == null)
5455                                break;
5456                        }
5457                    }
5458                    break;
5459                }
5460            }
5461        }
5462
5463    }
5464
5554      /*
5555       * Task classes. Coded in a regular but ugly format/style to
5556       * simplify checks that each variant differs in the right way from
5557 <     * others.
5557 >     * others. The null screenings exist because compilers cannot tell
5558 >     * that we've already null-checked task arguments, so we force
5559 >     * simplest hoisted bypass to help avoid convoluted traps.
5560       */
5561  
5562      @SuppressWarnings("serial") static final class ForEachKeyTask<K,V>
5563 <        extends BulkAction<K,V,Void> {
5563 >        extends Traverser<K,V,Void> {
5564          final Action<K> action;
5565          ForEachKeyTask
5566 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5476 <             ForEachKeyTask<K,V> nextTask,
5566 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5567               Action<K> action) {
5568 <            super(m, p, b, nextTask);
5568 >            super(m, p, b);
5569              this.action = action;
5570          }
5571 <        @SuppressWarnings("unchecked") public final boolean exec() {
5572 <            final Action<K> action = this.action;
5573 <            if (action == null)
5574 <                return abortOnNullFunction();
5575 <            ForEachKeyTask<K,V> subtasks = null;
5486 <            try {
5487 <                int b = batch(), c;
5488 <                while (b > 1 && baseIndex != baseLimit) {
5489 <                    do {} while (!casPending(c = pending, c+1));
5490 <                    (subtasks = new ForEachKeyTask<K,V>
5491 <                     (map, this, b >>>= 1, subtasks, action)).fork();
5492 <                }
5571 >        @SuppressWarnings("unchecked") public final void compute() {
5572 >            final Action<K> action;
5573 >            if ((action = this.action) != null) {
5574 >                for (int b; (b = preSplit()) > 0;)
5575 >                    new ForEachKeyTask<K,V>(map, this, b, action).fork();
5576                  while (advance() != null)
5577                      action.apply((K)nextKey);
5578 <            } catch (Throwable ex) {
5496 <                return tryCompleteComputation(ex);
5578 >                propagateCompletion();
5579              }
5498            tryComplete(subtasks);
5499            return false;
5580          }
5581      }
5582  
5583      @SuppressWarnings("serial") static final class ForEachValueTask<K,V>
5584 <        extends BulkAction<K,V,Void> {
5584 >        extends Traverser<K,V,Void> {
5585          final Action<V> action;
5586          ForEachValueTask
5587 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5508 <             ForEachValueTask<K,V> nextTask,
5587 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5588               Action<V> action) {
5589 <            super(m, p, b, nextTask);
5589 >            super(m, p, b);
5590              this.action = action;
5591          }
5592 <        @SuppressWarnings("unchecked") public final boolean exec() {
5593 <            final Action<V> action = this.action;
5594 <            if (action == null)
5595 <                return abortOnNullFunction();
5596 <            ForEachValueTask<K,V> subtasks = null;
5597 <            try {
5519 <                int b = batch(), c;
5520 <                while (b > 1 && baseIndex != baseLimit) {
5521 <                    do {} while (!casPending(c = pending, c+1));
5522 <                    (subtasks = new ForEachValueTask<K,V>
5523 <                     (map, this, b >>>= 1, subtasks, action)).fork();
5524 <                }
5525 <                Object v;
5592 >        @SuppressWarnings("unchecked") public final void compute() {
5593 >            final Action<V> action;
5594 >            if ((action = this.action) != null) {
5595 >                for (int b; (b = preSplit()) > 0;)
5596 >                    new ForEachValueTask<K,V>(map, this, b, action).fork();
5597 >                V v;
5598                  while ((v = advance()) != null)
5599 <                    action.apply((V)v);
5600 <            } catch (Throwable ex) {
5529 <                return tryCompleteComputation(ex);
5599 >                    action.apply(v);
5600 >                propagateCompletion();
5601              }
5531            tryComplete(subtasks);
5532            return false;
5602          }
5603      }
5604  
5605      @SuppressWarnings("serial") static final class ForEachEntryTask<K,V>
5606 <        extends BulkAction<K,V,Void> {
5606 >        extends Traverser<K,V,Void> {
5607          final Action<Entry<K,V>> action;
5608          ForEachEntryTask
5609 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5541 <             ForEachEntryTask<K,V> nextTask,
5609 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5610               Action<Entry<K,V>> action) {
5611 <            super(m, p, b, nextTask);
5611 >            super(m, p, b);
5612              this.action = action;
5613          }
5614 <        @SuppressWarnings("unchecked") public final boolean exec() {
5615 <            final Action<Entry<K,V>> action = this.action;
5616 <            if (action == null)
5617 <                return abortOnNullFunction();
5618 <            ForEachEntryTask<K,V> subtasks = null;
5619 <            try {
5552 <                int b = batch(), c;
5553 <                while (b > 1 && baseIndex != baseLimit) {
5554 <                    do {} while (!casPending(c = pending, c+1));
5555 <                    (subtasks = new ForEachEntryTask<K,V>
5556 <                     (map, this, b >>>= 1, subtasks, action)).fork();
5557 <                }
5558 <                Object v;
5614 >        @SuppressWarnings("unchecked") public final void compute() {
5615 >            final Action<Entry<K,V>> action;
5616 >            if ((action = this.action) != null) {
5617 >                for (int b; (b = preSplit()) > 0;)
5618 >                    new ForEachEntryTask<K,V>(map, this, b, action).fork();
5619 >                V v;
5620                  while ((v = advance()) != null)
5621 <                    action.apply(entryFor((K)nextKey, (V)v));
5622 <            } catch (Throwable ex) {
5562 <                return tryCompleteComputation(ex);
5621 >                    action.apply(entryFor((K)nextKey, v));
5622 >                propagateCompletion();
5623              }
5564            tryComplete(subtasks);
5565            return false;
5624          }
5625      }
5626  
5627      @SuppressWarnings("serial") static final class ForEachMappingTask<K,V>
5628 <        extends BulkAction<K,V,Void> {
5628 >        extends Traverser<K,V,Void> {
5629          final BiAction<K,V> action;
5630          ForEachMappingTask
5631 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5574 <             ForEachMappingTask<K,V> nextTask,
5631 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5632               BiAction<K,V> action) {
5633 <            super(m, p, b, nextTask);
5633 >            super(m, p, b);
5634              this.action = action;
5635          }
5636 <        @SuppressWarnings("unchecked") public final boolean exec() {
5637 <            final BiAction<K,V> action = this.action;
5638 <            if (action == null)
5639 <                return abortOnNullFunction();
5640 <            ForEachMappingTask<K,V> subtasks = null;
5641 <            try {
5585 <                int b = batch(), c;
5586 <                while (b > 1 && baseIndex != baseLimit) {
5587 <                    do {} while (!casPending(c = pending, c+1));
5588 <                    (subtasks = new ForEachMappingTask<K,V>
5589 <                     (map, this, b >>>= 1, subtasks, action)).fork();
5590 <                }
5591 <                Object v;
5636 >        @SuppressWarnings("unchecked") public final void compute() {
5637 >            final BiAction<K,V> action;
5638 >            if ((action = this.action) != null) {
5639 >                for (int b; (b = preSplit()) > 0;)
5640 >                    new ForEachMappingTask<K,V>(map, this, b, action).fork();
5641 >                V v;
5642                  while ((v = advance()) != null)
5643 <                    action.apply((K)nextKey, (V)v);
5644 <            } catch (Throwable ex) {
5595 <                return tryCompleteComputation(ex);
5643 >                    action.apply((K)nextKey, v);
5644 >                propagateCompletion();
5645              }
5597            tryComplete(subtasks);
5598            return false;
5646          }
5647      }
5648  
5649      @SuppressWarnings("serial") static final class ForEachTransformedKeyTask<K,V,U>
5650 <        extends BulkAction<K,V,Void> {
5650 >        extends Traverser<K,V,Void> {
5651          final Fun<? super K, ? extends U> transformer;
5652          final Action<U> action;
5653          ForEachTransformedKeyTask
5654 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5655 <             ForEachTransformedKeyTask<K,V,U> nextTask,
5656 <             Fun<? super K, ? extends U> transformer,
5657 <             Action<U> action) {
5658 <            super(m, p, b, nextTask);
5659 <            this.transformer = transformer;
5660 <            this.action = action;
5661 <
5662 <        }
5663 <        @SuppressWarnings("unchecked") public final boolean exec() {
5664 <            final Fun<? super K, ? extends U> transformer =
5665 <                this.transformer;
5666 <            final Action<U> action = this.action;
5620 <            if (transformer == null || action == null)
5621 <                return abortOnNullFunction();
5622 <            ForEachTransformedKeyTask<K,V,U> subtasks = null;
5623 <            try {
5624 <                int b = batch(), c;
5625 <                while (b > 1 && baseIndex != baseLimit) {
5626 <                    do {} while (!casPending(c = pending, c+1));
5627 <                    (subtasks = new ForEachTransformedKeyTask<K,V,U>
5628 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5629 <                }
5654 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5655 >             Fun<? super K, ? extends U> transformer, Action<U> action) {
5656 >            super(m, p, b);
5657 >            this.transformer = transformer; this.action = action;
5658 >        }
5659 >        @SuppressWarnings("unchecked") public final void compute() {
5660 >            final Fun<? super K, ? extends U> transformer;
5661 >            final Action<U> action;
5662 >            if ((transformer = this.transformer) != null &&
5663 >                (action = this.action) != null) {
5664 >                for (int b; (b = preSplit()) > 0;)
5665 >                    new ForEachTransformedKeyTask<K,V,U>
5666 >                        (map, this, b, transformer, action).fork();
5667                  U u;
5668                  while (advance() != null) {
5669                      if ((u = transformer.apply((K)nextKey)) != null)
5670                          action.apply(u);
5671                  }
5672 <            } catch (Throwable ex) {
5636 <                return tryCompleteComputation(ex);
5672 >                propagateCompletion();
5673              }
5638            tryComplete(subtasks);
5639            return false;
5674          }
5675      }
5676  
5677      @SuppressWarnings("serial") static final class ForEachTransformedValueTask<K,V,U>
5678 <        extends BulkAction<K,V,Void> {
5678 >        extends Traverser<K,V,Void> {
5679          final Fun<? super V, ? extends U> transformer;
5680          final Action<U> action;
5681          ForEachTransformedValueTask
5682 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5683 <             ForEachTransformedValueTask<K,V,U> nextTask,
5684 <             Fun<? super V, ? extends U> transformer,
5685 <             Action<U> action) {
5686 <            super(m, p, b, nextTask);
5687 <            this.transformer = transformer;
5688 <            this.action = action;
5689 <
5690 <        }
5691 <        @SuppressWarnings("unchecked") public final boolean exec() {
5692 <            final Fun<? super V, ? extends U> transformer =
5693 <                this.transformer;
5694 <            final Action<U> action = this.action;
5695 <            if (transformer == null || action == null)
5662 <                return abortOnNullFunction();
5663 <            ForEachTransformedValueTask<K,V,U> subtasks = null;
5664 <            try {
5665 <                int b = batch(), c;
5666 <                while (b > 1 && baseIndex != baseLimit) {
5667 <                    do {} while (!casPending(c = pending, c+1));
5668 <                    (subtasks = new ForEachTransformedValueTask<K,V,U>
5669 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5670 <                }
5671 <                Object v; U u;
5682 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5683 >             Fun<? super V, ? extends U> transformer, Action<U> action) {
5684 >            super(m, p, b);
5685 >            this.transformer = transformer; this.action = action;
5686 >        }
5687 >        @SuppressWarnings("unchecked") public final void compute() {
5688 >            final Fun<? super V, ? extends U> transformer;
5689 >            final Action<U> action;
5690 >            if ((transformer = this.transformer) != null &&
5691 >                (action = this.action) != null) {
5692 >                for (int b; (b = preSplit()) > 0;)
5693 >                    new ForEachTransformedValueTask<K,V,U>
5694 >                        (map, this, b, transformer, action).fork();
5695 >                V v; U u;
5696                  while ((v = advance()) != null) {
5697 <                    if ((u = transformer.apply((V)v)) != null)
5697 >                    if ((u = transformer.apply(v)) != null)
5698                          action.apply(u);
5699                  }
5700 <            } catch (Throwable ex) {
5677 <                return tryCompleteComputation(ex);
5700 >                propagateCompletion();
5701              }
5679            tryComplete(subtasks);
5680            return false;
5702          }
5703      }
5704  
5705      @SuppressWarnings("serial") static final class ForEachTransformedEntryTask<K,V,U>
5706 <        extends BulkAction<K,V,Void> {
5706 >        extends Traverser<K,V,Void> {
5707          final Fun<Map.Entry<K,V>, ? extends U> transformer;
5708          final Action<U> action;
5709          ForEachTransformedEntryTask
5710 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5711 <             ForEachTransformedEntryTask<K,V,U> nextTask,
5712 <             Fun<Map.Entry<K,V>, ? extends U> transformer,
5713 <             Action<U> action) {
5714 <            super(m, p, b, nextTask);
5715 <            this.transformer = transformer;
5716 <            this.action = action;
5717 <
5718 <        }
5719 <        @SuppressWarnings("unchecked") public final boolean exec() {
5720 <            final Fun<Map.Entry<K,V>, ? extends U> transformer =
5721 <                this.transformer;
5722 <            final Action<U> action = this.action;
5723 <            if (transformer == null || action == null)
5703 <                return abortOnNullFunction();
5704 <            ForEachTransformedEntryTask<K,V,U> subtasks = null;
5705 <            try {
5706 <                int b = batch(), c;
5707 <                while (b > 1 && baseIndex != baseLimit) {
5708 <                    do {} while (!casPending(c = pending, c+1));
5709 <                    (subtasks = new ForEachTransformedEntryTask<K,V,U>
5710 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5711 <                }
5712 <                Object v; U u;
5710 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5711 >             Fun<Map.Entry<K,V>, ? extends U> transformer, Action<U> action) {
5712 >            super(m, p, b);
5713 >            this.transformer = transformer; this.action = action;
5714 >        }
5715 >        @SuppressWarnings("unchecked") public final void compute() {
5716 >            final Fun<Map.Entry<K,V>, ? extends U> transformer;
5717 >            final Action<U> action;
5718 >            if ((transformer = this.transformer) != null &&
5719 >                (action = this.action) != null) {
5720 >                for (int b; (b = preSplit()) > 0;)
5721 >                    new ForEachTransformedEntryTask<K,V,U>
5722 >                        (map, this, b, transformer, action).fork();
5723 >                V v; U u;
5724                  while ((v = advance()) != null) {
5725 <                    if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
5725 >                    if ((u = transformer.apply(entryFor((K)nextKey,
5726 >                                                        v))) != null)
5727                          action.apply(u);
5728                  }
5729 <            } catch (Throwable ex) {
5718 <                return tryCompleteComputation(ex);
5729 >                propagateCompletion();
5730              }
5720            tryComplete(subtasks);
5721            return false;
5731          }
5732      }
5733  
5734      @SuppressWarnings("serial") static final class ForEachTransformedMappingTask<K,V,U>
5735 <        extends BulkAction<K,V,Void> {
5735 >        extends Traverser<K,V,Void> {
5736          final BiFun<? super K, ? super V, ? extends U> transformer;
5737          final Action<U> action;
5738          ForEachTransformedMappingTask
5739 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5731 <             ForEachTransformedMappingTask<K,V,U> nextTask,
5739 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5740               BiFun<? super K, ? super V, ? extends U> transformer,
5741               Action<U> action) {
5742 <            super(m, p, b, nextTask);
5743 <            this.transformer = transformer;
5736 <            this.action = action;
5737 <
5742 >            super(m, p, b);
5743 >            this.transformer = transformer; this.action = action;
5744          }
5745 <        @SuppressWarnings("unchecked") public final boolean exec() {
5746 <            final BiFun<? super K, ? super V, ? extends U> transformer =
5747 <                this.transformer;
5748 <            final Action<U> action = this.action;
5749 <            if (transformer == null || action == null)
5750 <                return abortOnNullFunction();
5751 <            ForEachTransformedMappingTask<K,V,U> subtasks = null;
5752 <            try {
5753 <                int b = batch(), c;
5748 <                while (b > 1 && baseIndex != baseLimit) {
5749 <                    do {} while (!casPending(c = pending, c+1));
5750 <                    (subtasks = new ForEachTransformedMappingTask<K,V,U>
5751 <                     (map, this, b >>>= 1, subtasks, transformer, action)).fork();
5752 <                }
5753 <                Object v; U u;
5745 >        @SuppressWarnings("unchecked") public final void compute() {
5746 >            final BiFun<? super K, ? super V, ? extends U> transformer;
5747 >            final Action<U> action;
5748 >            if ((transformer = this.transformer) != null &&
5749 >                (action = this.action) != null) {
5750 >                for (int b; (b = preSplit()) > 0;)
5751 >                    new ForEachTransformedMappingTask<K,V,U>
5752 >                        (map, this, b, transformer, action).fork();
5753 >                V v; U u;
5754                  while ((v = advance()) != null) {
5755 <                    if ((u = transformer.apply((K)nextKey, (V)v)) != null)
5755 >                    if ((u = transformer.apply((K)nextKey, v)) != null)
5756                          action.apply(u);
5757                  }
5758 <            } catch (Throwable ex) {
5759 <                return tryCompleteComputation(ex);
5758 >                propagateCompletion();
5759              }
5761            tryComplete(subtasks);
5762            return false;
5760          }
5761      }
5762  
5763      @SuppressWarnings("serial") static final class SearchKeysTask<K,V,U>
5764 <        extends BulkAction<K,V,U> {
5764 >        extends Traverser<K,V,U> {
5765          final Fun<? super K, ? extends U> searchFunction;
5766          final AtomicReference<U> result;
5767          SearchKeysTask
5768 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5772 <             SearchKeysTask<K,V,U> nextTask,
5768 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5769               Fun<? super K, ? extends U> searchFunction,
5770               AtomicReference<U> result) {
5771 <            super(m, p, b, nextTask);
5771 >            super(m, p, b);
5772              this.searchFunction = searchFunction; this.result = result;
5773          }
5774 <        @SuppressWarnings("unchecked") public final boolean exec() {
5775 <            AtomicReference<U> result = this.result;
5776 <            final Fun<? super K, ? extends U> searchFunction =
5777 <                this.searchFunction;
5778 <            if (searchFunction == null || result == null)
5779 <                return abortOnNullFunction();
5780 <            SearchKeysTask<K,V,U> subtasks = null;
5781 <            try {
5782 <                int b = batch(), c;
5783 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5784 <                    do {} while (!casPending(c = pending, c+1));
5785 <                    (subtasks = new SearchKeysTask<K,V,U>
5786 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5774 >        public final U getRawResult() { return result.get(); }
5775 >        @SuppressWarnings("unchecked") public final void compute() {
5776 >            final Fun<? super K, ? extends U> searchFunction;
5777 >            final AtomicReference<U> result;
5778 >            if ((searchFunction = this.searchFunction) != null &&
5779 >                (result = this.result) != null) {
5780 >                for (int b;;) {
5781 >                    if (result.get() != null)
5782 >                        return;
5783 >                    if ((b = preSplit()) <= 0)
5784 >                        break;
5785 >                    new SearchKeysTask<K,V,U>
5786 >                        (map, this, b, searchFunction, result).fork();
5787                  }
5788 <                U u;
5789 <                while (result.get() == null && advance() != null) {
5788 >                while (result.get() == null) {
5789 >                    U u;
5790 >                    if (advance() == null) {
5791 >                        propagateCompletion();
5792 >                        break;
5793 >                    }
5794                      if ((u = searchFunction.apply((K)nextKey)) != null) {
5795                          if (result.compareAndSet(null, u))
5796 <                            tryCompleteComputation(null);
5796 >                            quietlyCompleteRoot();
5797                          break;
5798                      }
5799                  }
5800            } catch (Throwable ex) {
5801                return tryCompleteComputation(ex);
5800              }
5803            tryComplete(subtasks);
5804            return false;
5801          }
5806        public final U getRawResult() { return result.get(); }
5802      }
5803  
5804      @SuppressWarnings("serial") static final class SearchValuesTask<K,V,U>
5805 <        extends BulkAction<K,V,U> {
5805 >        extends Traverser<K,V,U> {
5806          final Fun<? super V, ? extends U> searchFunction;
5807          final AtomicReference<U> result;
5808          SearchValuesTask
5809 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5815 <             SearchValuesTask<K,V,U> nextTask,
5809 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5810               Fun<? super V, ? extends U> searchFunction,
5811               AtomicReference<U> result) {
5812 <            super(m, p, b, nextTask);
5812 >            super(m, p, b);
5813              this.searchFunction = searchFunction; this.result = result;
5814          }
5815 <        @SuppressWarnings("unchecked") public final boolean exec() {
5816 <            AtomicReference<U> result = this.result;
5817 <            final Fun<? super V, ? extends U> searchFunction =
5818 <                this.searchFunction;
5819 <            if (searchFunction == null || result == null)
5820 <                return abortOnNullFunction();
5821 <            SearchValuesTask<K,V,U> subtasks = null;
5822 <            try {
5823 <                int b = batch(), c;
5824 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5825 <                    do {} while (!casPending(c = pending, c+1));
5826 <                    (subtasks = new SearchValuesTask<K,V,U>
5827 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5828 <                }
5829 <                Object v; U u;
5830 <                while (result.get() == null && (v = advance()) != null) {
5831 <                    if ((u = searchFunction.apply((V)v)) != null) {
5815 >        public final U getRawResult() { return result.get(); }
5816 >        @SuppressWarnings("unchecked") public final void compute() {
5817 >            final Fun<? super V, ? extends U> searchFunction;
5818 >            final AtomicReference<U> result;
5819 >            if ((searchFunction = this.searchFunction) != null &&
5820 >                (result = this.result) != null) {
5821 >                for (int b;;) {
5822 >                    if (result.get() != null)
5823 >                        return;
5824 >                    if ((b = preSplit()) <= 0)
5825 >                        break;
5826 >                    new SearchValuesTask<K,V,U>
5827 >                        (map, this, b, searchFunction, result).fork();
5828 >                }
5829 >                while (result.get() == null) {
5830 >                    V v; U u;
5831 >                    if ((v = advance()) == null) {
5832 >                        propagateCompletion();
5833 >                        break;
5834 >                    }
5835 >                    if ((u = searchFunction.apply(v)) != null) {
5836                          if (result.compareAndSet(null, u))
5837 <                            tryCompleteComputation(null);
5837 >                            quietlyCompleteRoot();
5838                          break;
5839                      }
5840                  }
5843            } catch (Throwable ex) {
5844                return tryCompleteComputation(ex);
5841              }
5846            tryComplete(subtasks);
5847            return false;
5842          }
5849        public final U getRawResult() { return result.get(); }
5843      }
5844  
5845      @SuppressWarnings("serial") static final class SearchEntriesTask<K,V,U>
5846 <        extends BulkAction<K,V,U> {
5846 >        extends Traverser<K,V,U> {
5847          final Fun<Entry<K,V>, ? extends U> searchFunction;
5848          final AtomicReference<U> result;
5849          SearchEntriesTask
5850 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5858 <             SearchEntriesTask<K,V,U> nextTask,
5850 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5851               Fun<Entry<K,V>, ? extends U> searchFunction,
5852               AtomicReference<U> result) {
5853 <            super(m, p, b, nextTask);
5853 >            super(m, p, b);
5854              this.searchFunction = searchFunction; this.result = result;
5855          }
5856 <        @SuppressWarnings("unchecked") public final boolean exec() {
5857 <            AtomicReference<U> result = this.result;
5858 <            final Fun<Entry<K,V>, ? extends U> searchFunction =
5859 <                this.searchFunction;
5860 <            if (searchFunction == null || result == null)
5861 <                return abortOnNullFunction();
5862 <            SearchEntriesTask<K,V,U> subtasks = null;
5863 <            try {
5864 <                int b = batch(), c;
5865 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5866 <                    do {} while (!casPending(c = pending, c+1));
5867 <                    (subtasks = new SearchEntriesTask<K,V,U>
5868 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5869 <                }
5870 <                Object v; U u;
5871 <                while (result.get() == null && (v = advance()) != null) {
5872 <                    if ((u = searchFunction.apply(entryFor((K)nextKey, (V)v))) != null) {
5873 <                        if (result.compareAndSet(null, u))
5882 <                            tryCompleteComputation(null);
5856 >        public final U getRawResult() { return result.get(); }
5857 >        @SuppressWarnings("unchecked") public final void compute() {
5858 >            final Fun<Entry<K,V>, ? extends U> searchFunction;
5859 >            final AtomicReference<U> result;
5860 >            if ((searchFunction = this.searchFunction) != null &&
5861 >                (result = this.result) != null) {
5862 >                for (int b;;) {
5863 >                    if (result.get() != null)
5864 >                        return;
5865 >                    if ((b = preSplit()) <= 0)
5866 >                        break;
5867 >                    new SearchEntriesTask<K,V,U>
5868 >                        (map, this, b, searchFunction, result).fork();
5869 >                }
5870 >                while (result.get() == null) {
5871 >                    V v; U u;
5872 >                    if ((v = advance()) == null) {
5873 >                        propagateCompletion();
5874                          break;
5875                      }
5876 +                    if ((u = searchFunction.apply(entryFor((K)nextKey,
5877 +                                                           v))) != null) {
5878 +                        if (result.compareAndSet(null, u))
5879 +                            quietlyCompleteRoot();
5880 +                        return;
5881 +                    }
5882                  }
5886            } catch (Throwable ex) {
5887                return tryCompleteComputation(ex);
5883              }
5889            tryComplete(subtasks);
5890            return false;
5884          }
5892        public final U getRawResult() { return result.get(); }
5885      }
5886  
5887      @SuppressWarnings("serial") static final class SearchMappingsTask<K,V,U>
5888 <        extends BulkAction<K,V,U> {
5888 >        extends Traverser<K,V,U> {
5889          final BiFun<? super K, ? super V, ? extends U> searchFunction;
5890          final AtomicReference<U> result;
5891          SearchMappingsTask
5892 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5901 <             SearchMappingsTask<K,V,U> nextTask,
5892 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5893               BiFun<? super K, ? super V, ? extends U> searchFunction,
5894               AtomicReference<U> result) {
5895 <            super(m, p, b, nextTask);
5895 >            super(m, p, b);
5896              this.searchFunction = searchFunction; this.result = result;
5897          }
5898 <        @SuppressWarnings("unchecked") public final boolean exec() {
5899 <            AtomicReference<U> result = this.result;
5900 <            final BiFun<? super K, ? super V, ? extends U> searchFunction =
5901 <                this.searchFunction;
5902 <            if (searchFunction == null || result == null)
5903 <                return abortOnNullFunction();
5904 <            SearchMappingsTask<K,V,U> subtasks = null;
5905 <            try {
5906 <                int b = batch(), c;
5907 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5908 <                    do {} while (!casPending(c = pending, c+1));
5909 <                    (subtasks = new SearchMappingsTask<K,V,U>
5910 <                     (map, this, b >>>= 1, subtasks, searchFunction, result)).fork();
5911 <                }
5912 <                Object v; U u;
5913 <                while (result.get() == null && (v = advance()) != null) {
5914 <                    if ((u = searchFunction.apply((K)nextKey, (V)v)) != null) {
5898 >        public final U getRawResult() { return result.get(); }
5899 >        @SuppressWarnings("unchecked") public final void compute() {
5900 >            final BiFun<? super K, ? super V, ? extends U> searchFunction;
5901 >            final AtomicReference<U> result;
5902 >            if ((searchFunction = this.searchFunction) != null &&
5903 >                (result = this.result) != null) {
5904 >                for (int b;;) {
5905 >                    if (result.get() != null)
5906 >                        return;
5907 >                    if ((b = preSplit()) <= 0)
5908 >                        break;
5909 >                    new SearchMappingsTask<K,V,U>
5910 >                        (map, this, b, searchFunction, result).fork();
5911 >                }
5912 >                while (result.get() == null) {
5913 >                    V v; U u;
5914 >                    if ((v = advance()) == null) {
5915 >                        propagateCompletion();
5916 >                        break;
5917 >                    }
5918 >                    if ((u = searchFunction.apply((K)nextKey, v)) != null) {
5919                          if (result.compareAndSet(null, u))
5920 <                            tryCompleteComputation(null);
5920 >                            quietlyCompleteRoot();
5921                          break;
5922                      }
5923                  }
5929            } catch (Throwable ex) {
5930                return tryCompleteComputation(ex);
5924              }
5932            tryComplete(subtasks);
5933            return false;
5925          }
5935        public final U getRawResult() { return result.get(); }
5926      }
5927  
5928      @SuppressWarnings("serial") static final class ReduceKeysTask<K,V>
5929 <        extends BulkTask<K,V,K> {
5929 >        extends Traverser<K,V,K> {
5930          final BiFun<? super K, ? super K, ? extends K> reducer;
5931          K result;
5932          ReduceKeysTask<K,V> rights, nextRight;
5933          ReduceKeysTask
5934 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5934 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5935               ReduceKeysTask<K,V> nextRight,
5936               BiFun<? super K, ? super K, ? extends K> reducer) {
5937              super(m, p, b); this.nextRight = nextRight;
5938              this.reducer = reducer;
5939          }
5940 <        @SuppressWarnings("unchecked") public final boolean exec() {
5941 <            final BiFun<? super K, ? super K, ? extends K> reducer =
5942 <                this.reducer;
5943 <            if (reducer == null)
5944 <                return abortOnNullFunction();
5955 <            try {
5956 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5957 <                    do {} while (!casPending(c = pending, c+1));
5940 >        public final K getRawResult() { return result; }
5941 >        @SuppressWarnings("unchecked") public final void compute() {
5942 >            final BiFun<? super K, ? super K, ? extends K> reducer;
5943 >            if ((reducer = this.reducer) != null) {
5944 >                for (int b; (b = preSplit()) > 0;)
5945                      (rights = new ReduceKeysTask<K,V>
5946 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5960 <                }
5946 >                     (map, this, b, rights, reducer)).fork();
5947                  K r = null;
5948                  while (advance() != null) {
5949                      K u = (K)nextKey;
5950                      r = (r == null) ? u : reducer.apply(r, u);
5951                  }
5952                  result = r;
5953 <                for (ReduceKeysTask<K,V> t = this, s;;) {
5954 <                    int c; BulkTask<K,V,?> par; K tr, sr;
5955 <                    if ((c = t.pending) == 0) {
5956 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5957 <                            if ((sr = s.result) != null)
5958 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5959 <                        }
5960 <                        if ((par = t.parent) == null ||
5961 <                            !(par instanceof ReduceKeysTask)) {
5962 <                            t.quietlyComplete();
5963 <                            break;
5978 <                        }
5979 <                        t = (ReduceKeysTask<K,V>)par;
5953 >                CountedCompleter<?> c;
5954 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5955 >                    ReduceKeysTask<K,V>
5956 >                        t = (ReduceKeysTask<K,V>)c,
5957 >                        s = t.rights;
5958 >                    while (s != null) {
5959 >                        K tr, sr;
5960 >                        if ((sr = s.result) != null)
5961 >                            t.result = (((tr = t.result) == null) ? sr :
5962 >                                        reducer.apply(tr, sr));
5963 >                        s = t.rights = s.nextRight;
5964                      }
5981                    else if (t.casPending(c, c - 1))
5982                        break;
5965                  }
5984            } catch (Throwable ex) {
5985                return tryCompleteComputation(ex);
5966              }
5987            ReduceKeysTask<K,V> s = rights;
5988            if (s != null && !inForkJoinPool()) {
5989                do  {
5990                    if (s.tryUnfork())
5991                        s.exec();
5992                } while ((s = s.nextRight) != null);
5993            }
5994            return false;
5967          }
5996        public final K getRawResult() { return result; }
5968      }
5969  
5970      @SuppressWarnings("serial") static final class ReduceValuesTask<K,V>
5971 <        extends BulkTask<K,V,V> {
5971 >        extends Traverser<K,V,V> {
5972          final BiFun<? super V, ? super V, ? extends V> reducer;
5973          V result;
5974          ReduceValuesTask<K,V> rights, nextRight;
5975          ReduceValuesTask
5976 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5976 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5977               ReduceValuesTask<K,V> nextRight,
5978               BiFun<? super V, ? super V, ? extends V> reducer) {
5979              super(m, p, b); this.nextRight = nextRight;
5980              this.reducer = reducer;
5981          }
5982 <        @SuppressWarnings("unchecked") public final boolean exec() {
5983 <            final BiFun<? super V, ? super V, ? extends V> reducer =
5984 <                this.reducer;
5985 <            if (reducer == null)
5986 <                return abortOnNullFunction();
6016 <            try {
6017 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6018 <                    do {} while (!casPending(c = pending, c+1));
5982 >        public final V getRawResult() { return result; }
5983 >        @SuppressWarnings("unchecked") public final void compute() {
5984 >            final BiFun<? super V, ? super V, ? extends V> reducer;
5985 >            if ((reducer = this.reducer) != null) {
5986 >                for (int b; (b = preSplit()) > 0;)
5987                      (rights = new ReduceValuesTask<K,V>
5988 <                     (map, this, b >>>= 1, rights, reducer)).fork();
6021 <                }
5988 >                     (map, this, b, rights, reducer)).fork();
5989                  V r = null;
5990 <                Object v;
5990 >                V v;
5991                  while ((v = advance()) != null) {
5992 <                    V u = (V)v;
5992 >                    V u = v;
5993                      r = (r == null) ? u : reducer.apply(r, u);
5994                  }
5995                  result = r;
5996 <                for (ReduceValuesTask<K,V> t = this, s;;) {
5997 <                    int c; BulkTask<K,V,?> par; V tr, sr;
5998 <                    if ((c = t.pending) == 0) {
5999 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6000 <                            if ((sr = s.result) != null)
6001 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6002 <                        }
6003 <                        if ((par = t.parent) == null ||
6004 <                            !(par instanceof ReduceValuesTask)) {
6005 <                            t.quietlyComplete();
6006 <                            break;
6040 <                        }
6041 <                        t = (ReduceValuesTask<K,V>)par;
5996 >                CountedCompleter<?> c;
5997 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
5998 >                    ReduceValuesTask<K,V>
5999 >                        t = (ReduceValuesTask<K,V>)c,
6000 >                        s = t.rights;
6001 >                    while (s != null) {
6002 >                        V tr, sr;
6003 >                        if ((sr = s.result) != null)
6004 >                            t.result = (((tr = t.result) == null) ? sr :
6005 >                                        reducer.apply(tr, sr));
6006 >                        s = t.rights = s.nextRight;
6007                      }
6043                    else if (t.casPending(c, c - 1))
6044                        break;
6008                  }
6046            } catch (Throwable ex) {
6047                return tryCompleteComputation(ex);
6009              }
6049            ReduceValuesTask<K,V> s = rights;
6050            if (s != null && !inForkJoinPool()) {
6051                do  {
6052                    if (s.tryUnfork())
6053                        s.exec();
6054                } while ((s = s.nextRight) != null);
6055            }
6056            return false;
6010          }
6058        public final V getRawResult() { return result; }
6011      }
6012  
6013      @SuppressWarnings("serial") static final class ReduceEntriesTask<K,V>
6014 <        extends BulkTask<K,V,Map.Entry<K,V>> {
6014 >        extends Traverser<K,V,Map.Entry<K,V>> {
6015          final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer;
6016          Map.Entry<K,V> result;
6017          ReduceEntriesTask<K,V> rights, nextRight;
6018          ReduceEntriesTask
6019 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6019 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6020               ReduceEntriesTask<K,V> nextRight,
6021               BiFun<Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
6022              super(m, p, b); this.nextRight = nextRight;
6023              this.reducer = reducer;
6024          }
6025 <        @SuppressWarnings("unchecked") public final boolean exec() {
6026 <            final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer =
6027 <                this.reducer;
6028 <            if (reducer == null)
6029 <                return abortOnNullFunction();
6078 <            try {
6079 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6080 <                    do {} while (!casPending(c = pending, c+1));
6025 >        public final Map.Entry<K,V> getRawResult() { return result; }
6026 >        @SuppressWarnings("unchecked") public final void compute() {
6027 >            final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer;
6028 >            if ((reducer = this.reducer) != null) {
6029 >                for (int b; (b = preSplit()) > 0;)
6030                      (rights = new ReduceEntriesTask<K,V>
6031 <                     (map, this, b >>>= 1, rights, reducer)).fork();
6083 <                }
6031 >                     (map, this, b, rights, reducer)).fork();
6032                  Map.Entry<K,V> r = null;
6033 <                Object v;
6033 >                V v;
6034                  while ((v = advance()) != null) {
6035 <                    Map.Entry<K,V> u = entryFor((K)nextKey, (V)v);
6035 >                    Map.Entry<K,V> u = entryFor((K)nextKey, v);
6036                      r = (r == null) ? u : reducer.apply(r, u);
6037                  }
6038                  result = r;
6039 <                for (ReduceEntriesTask<K,V> t = this, s;;) {
6040 <                    int c; BulkTask<K,V,?> par; Map.Entry<K,V> tr, sr;
6041 <                    if ((c = t.pending) == 0) {
6042 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6043 <                            if ((sr = s.result) != null)
6044 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6045 <                        }
6046 <                        if ((par = t.parent) == null ||
6047 <                            !(par instanceof ReduceEntriesTask)) {
6048 <                            t.quietlyComplete();
6049 <                            break;
6102 <                        }
6103 <                        t = (ReduceEntriesTask<K,V>)par;
6039 >                CountedCompleter<?> c;
6040 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6041 >                    ReduceEntriesTask<K,V>
6042 >                        t = (ReduceEntriesTask<K,V>)c,
6043 >                        s = t.rights;
6044 >                    while (s != null) {
6045 >                        Map.Entry<K,V> tr, sr;
6046 >                        if ((sr = s.result) != null)
6047 >                            t.result = (((tr = t.result) == null) ? sr :
6048 >                                        reducer.apply(tr, sr));
6049 >                        s = t.rights = s.nextRight;
6050                      }
6105                    else if (t.casPending(c, c - 1))
6106                        break;
6051                  }
6108            } catch (Throwable ex) {
6109                return tryCompleteComputation(ex);
6110            }
6111            ReduceEntriesTask<K,V> s = rights;
6112            if (s != null && !inForkJoinPool()) {
6113                do  {
6114                    if (s.tryUnfork())
6115                        s.exec();
6116                } while ((s = s.nextRight) != null);
6052              }
6118            return false;
6053          }
6120        public final Map.Entry<K,V> getRawResult() { return result; }
6054      }
6055  
6056      @SuppressWarnings("serial") static final class MapReduceKeysTask<K,V,U>
6057 <        extends BulkTask<K,V,U> {
6057 >        extends Traverser<K,V,U> {
6058          final Fun<? super K, ? extends U> transformer;
6059          final BiFun<? super U, ? super U, ? extends U> reducer;
6060          U result;
6061          MapReduceKeysTask<K,V,U> rights, nextRight;
6062          MapReduceKeysTask
6063 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6063 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6064               MapReduceKeysTask<K,V,U> nextRight,
6065               Fun<? super K, ? extends U> transformer,
6066               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 6135 | Line 6068 | public class ConcurrentHashMapV8<K, V>
6068              this.transformer = transformer;
6069              this.reducer = reducer;
6070          }
6071 <        @SuppressWarnings("unchecked") public final boolean exec() {
6072 <            final Fun<? super K, ? extends U> transformer =
6073 <                this.transformer;
6074 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6075 <                this.reducer;
6076 <            if (transformer == null || reducer == null)
6077 <                return abortOnNullFunction();
6145 <            try {
6146 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6147 <                    do {} while (!casPending(c = pending, c+1));
6071 >        public final U getRawResult() { return result; }
6072 >        @SuppressWarnings("unchecked") public final void compute() {
6073 >            final Fun<? super K, ? extends U> transformer;
6074 >            final BiFun<? super U, ? super U, ? extends U> reducer;
6075 >            if ((transformer = this.transformer) != null &&
6076 >                (reducer = this.reducer) != null) {
6077 >                for (int b; (b = preSplit()) > 0;)
6078                      (rights = new MapReduceKeysTask<K,V,U>
6079 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
6150 <                }
6079 >                     (map, this, b, rights, transformer, reducer)).fork();
6080                  U r = null, u;
6081                  while (advance() != null) {
6082                      if ((u = transformer.apply((K)nextKey)) != null)
6083                          r = (r == null) ? u : reducer.apply(r, u);
6084                  }
6085                  result = r;
6086 <                for (MapReduceKeysTask<K,V,U> t = this, s;;) {
6087 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6088 <                    if ((c = t.pending) == 0) {
6089 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6090 <                            if ((sr = s.result) != null)
6091 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6092 <                        }
6093 <                        if ((par = t.parent) == null ||
6094 <                            !(par instanceof MapReduceKeysTask)) {
6095 <                            t.quietlyComplete();
6096 <                            break;
6168 <                        }
6169 <                        t = (MapReduceKeysTask<K,V,U>)par;
6086 >                CountedCompleter<?> c;
6087 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6088 >                    MapReduceKeysTask<K,V,U>
6089 >                        t = (MapReduceKeysTask<K,V,U>)c,
6090 >                        s = t.rights;
6091 >                    while (s != null) {
6092 >                        U tr, sr;
6093 >                        if ((sr = s.result) != null)
6094 >                            t.result = (((tr = t.result) == null) ? sr :
6095 >                                        reducer.apply(tr, sr));
6096 >                        s = t.rights = s.nextRight;
6097                      }
6171                    else if (t.casPending(c, c - 1))
6172                        break;
6098                  }
6174            } catch (Throwable ex) {
6175                return tryCompleteComputation(ex);
6099              }
6177            MapReduceKeysTask<K,V,U> s = rights;
6178            if (s != null && !inForkJoinPool()) {
6179                do  {
6180                    if (s.tryUnfork())
6181                        s.exec();
6182                } while ((s = s.nextRight) != null);
6183            }
6184            return false;
6100          }
6186        public final U getRawResult() { return result; }
6101      }
6102  
6103      @SuppressWarnings("serial") static final class MapReduceValuesTask<K,V,U>
6104 <        extends BulkTask<K,V,U> {
6104 >        extends Traverser<K,V,U> {
6105          final Fun<? super V, ? extends U> transformer;
6106          final BiFun<? super U, ? super U, ? extends U> reducer;
6107          U result;
6108          MapReduceValuesTask<K,V,U> rights, nextRight;
6109          MapReduceValuesTask
6110 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6110 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6111               MapReduceValuesTask<K,V,U> nextRight,
6112               Fun<? super V, ? extends U> transformer,
6113               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 6201 | Line 6115 | public class ConcurrentHashMapV8<K, V>
6115              this.transformer = transformer;
6116              this.reducer = reducer;
6117          }
6118 <        @SuppressWarnings("unchecked") public final boolean exec() {
6119 <            final Fun<? super V, ? extends U> transformer =
6120 <                this.transformer;
6121 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6122 <                this.reducer;
6123 <            if (transformer == null || reducer == null)
6124 <                return abortOnNullFunction();
6211 <            try {
6212 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6213 <                    do {} while (!casPending(c = pending, c+1));
6118 >        public final U getRawResult() { return result; }
6119 >        @SuppressWarnings("unchecked") public final void compute() {
6120 >            final Fun<? super V, ? extends U> transformer;
6121 >            final BiFun<? super U, ? super U, ? extends U> reducer;
6122 >            if ((transformer = this.transformer) != null &&
6123 >                (reducer = this.reducer) != null) {
6124 >                for (int b; (b = preSplit()) > 0;)
6125                      (rights = new MapReduceValuesTask<K,V,U>
6126 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
6216 <                }
6126 >                     (map, this, b, rights, transformer, reducer)).fork();
6127                  U r = null, u;
6128 <                Object v;
6128 >                V v;
6129                  while ((v = advance()) != null) {
6130 <                    if ((u = transformer.apply((V)v)) != null)
6130 >                    if ((u = transformer.apply(v)) != null)
6131                          r = (r == null) ? u : reducer.apply(r, u);
6132                  }
6133                  result = r;
6134 <                for (MapReduceValuesTask<K,V,U> t = this, s;;) {
6135 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6136 <                    if ((c = t.pending) == 0) {
6137 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6138 <                            if ((sr = s.result) != null)
6139 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6140 <                        }
6141 <                        if ((par = t.parent) == null ||
6142 <                            !(par instanceof MapReduceValuesTask)) {
6143 <                            t.quietlyComplete();
6144 <                            break;
6235 <                        }
6236 <                        t = (MapReduceValuesTask<K,V,U>)par;
6134 >                CountedCompleter<?> c;
6135 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6136 >                    MapReduceValuesTask<K,V,U>
6137 >                        t = (MapReduceValuesTask<K,V,U>)c,
6138 >                        s = t.rights;
6139 >                    while (s != null) {
6140 >                        U tr, sr;
6141 >                        if ((sr = s.result) != null)
6142 >                            t.result = (((tr = t.result) == null) ? sr :
6143 >                                        reducer.apply(tr, sr));
6144 >                        s = t.rights = s.nextRight;
6145                      }
6238                    else if (t.casPending(c, c - 1))
6239                        break;
6146                  }
6241            } catch (Throwable ex) {
6242                return tryCompleteComputation(ex);
6147              }
6244            MapReduceValuesTask<K,V,U> s = rights;
6245            if (s != null && !inForkJoinPool()) {
6246                do  {
6247                    if (s.tryUnfork())
6248                        s.exec();
6249                } while ((s = s.nextRight) != null);
6250            }
6251            return false;
6148          }
6253        public final U getRawResult() { return result; }
6149      }
6150  
6151      @SuppressWarnings("serial") static final class MapReduceEntriesTask<K,V,U>
6152 <        extends BulkTask<K,V,U> {
6152 >        extends Traverser<K,V,U> {
6153          final Fun<Map.Entry<K,V>, ? extends U> transformer;
6154          final BiFun<? super U, ? super U, ? extends U> reducer;
6155          U result;
6156          MapReduceEntriesTask<K,V,U> rights, nextRight;
6157          MapReduceEntriesTask
6158 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6158 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6159               MapReduceEntriesTask<K,V,U> nextRight,
6160               Fun<Map.Entry<K,V>, ? extends U> transformer,
6161               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 6268 | Line 6163 | public class ConcurrentHashMapV8<K, V>
6163              this.transformer = transformer;
6164              this.reducer = reducer;
6165          }
6166 <        @SuppressWarnings("unchecked") public final boolean exec() {
6167 <            final Fun<Map.Entry<K,V>, ? extends U> transformer =
6168 <                this.transformer;
6169 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6170 <                this.reducer;
6171 <            if (transformer == null || reducer == null)
6172 <                return abortOnNullFunction();
6278 <            try {
6279 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6280 <                    do {} while (!casPending(c = pending, c+1));
6166 >        public final U getRawResult() { return result; }
6167 >        @SuppressWarnings("unchecked") public final void compute() {
6168 >            final Fun<Map.Entry<K,V>, ? extends U> transformer;
6169 >            final BiFun<? super U, ? super U, ? extends U> reducer;
6170 >            if ((transformer = this.transformer) != null &&
6171 >                (reducer = this.reducer) != null) {
6172 >                for (int b; (b = preSplit()) > 0;)
6173                      (rights = new MapReduceEntriesTask<K,V,U>
6174 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
6283 <                }
6174 >                     (map, this, b, rights, transformer, reducer)).fork();
6175                  U r = null, u;
6176 <                Object v;
6176 >                V v;
6177                  while ((v = advance()) != null) {
6178 <                    if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
6178 >                    if ((u = transformer.apply(entryFor((K)nextKey,
6179 >                                                        v))) != null)
6180                          r = (r == null) ? u : reducer.apply(r, u);
6181                  }
6182                  result = r;
6183 <                for (MapReduceEntriesTask<K,V,U> t = this, s;;) {
6184 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6185 <                    if ((c = t.pending) == 0) {
6186 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6187 <                            if ((sr = s.result) != null)
6188 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6189 <                        }
6190 <                        if ((par = t.parent) == null ||
6191 <                            !(par instanceof MapReduceEntriesTask)) {
6192 <                            t.quietlyComplete();
6193 <                            break;
6302 <                        }
6303 <                        t = (MapReduceEntriesTask<K,V,U>)par;
6183 >                CountedCompleter<?> c;
6184 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6185 >                    MapReduceEntriesTask<K,V,U>
6186 >                        t = (MapReduceEntriesTask<K,V,U>)c,
6187 >                        s = t.rights;
6188 >                    while (s != null) {
6189 >                        U tr, sr;
6190 >                        if ((sr = s.result) != null)
6191 >                            t.result = (((tr = t.result) == null) ? sr :
6192 >                                        reducer.apply(tr, sr));
6193 >                        s = t.rights = s.nextRight;
6194                      }
6305                    else if (t.casPending(c, c - 1))
6306                        break;
6195                  }
6308            } catch (Throwable ex) {
6309                return tryCompleteComputation(ex);
6196              }
6311            MapReduceEntriesTask<K,V,U> s = rights;
6312            if (s != null && !inForkJoinPool()) {
6313                do  {
6314                    if (s.tryUnfork())
6315                        s.exec();
6316                } while ((s = s.nextRight) != null);
6317            }
6318            return false;
6197          }
6320        public final U getRawResult() { return result; }
6198      }
6199  
6200      @SuppressWarnings("serial") static final class MapReduceMappingsTask<K,V,U>
6201 <        extends BulkTask<K,V,U> {
6201 >        extends Traverser<K,V,U> {
6202          final BiFun<? super K, ? super V, ? extends U> transformer;
6203          final BiFun<? super U, ? super U, ? extends U> reducer;
6204          U result;
6205          MapReduceMappingsTask<K,V,U> rights, nextRight;
6206          MapReduceMappingsTask
6207 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6207 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6208               MapReduceMappingsTask<K,V,U> nextRight,
6209               BiFun<? super K, ? super V, ? extends U> transformer,
6210               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 6335 | Line 6212 | public class ConcurrentHashMapV8<K, V>
6212              this.transformer = transformer;
6213              this.reducer = reducer;
6214          }
6215 <        @SuppressWarnings("unchecked") public final boolean exec() {
6216 <            final BiFun<? super K, ? super V, ? extends U> transformer =
6217 <                this.transformer;
6218 <            final BiFun<? super U, ? super U, ? extends U> reducer =
6219 <                this.reducer;
6220 <            if (transformer == null || reducer == null)
6221 <                return abortOnNullFunction();
6345 <            try {
6346 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6347 <                    do {} while (!casPending(c = pending, c+1));
6215 >        public final U getRawResult() { return result; }
6216 >        @SuppressWarnings("unchecked") public final void compute() {
6217 >            final BiFun<? super K, ? super V, ? extends U> transformer;
6218 >            final BiFun<? super U, ? super U, ? extends U> reducer;
6219 >            if ((transformer = this.transformer) != null &&
6220 >                (reducer = this.reducer) != null) {
6221 >                for (int b; (b = preSplit()) > 0;)
6222                      (rights = new MapReduceMappingsTask<K,V,U>
6223 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
6350 <                }
6223 >                     (map, this, b, rights, transformer, reducer)).fork();
6224                  U r = null, u;
6225 <                Object v;
6225 >                V v;
6226                  while ((v = advance()) != null) {
6227 <                    if ((u = transformer.apply((K)nextKey, (V)v)) != null)
6227 >                    if ((u = transformer.apply((K)nextKey, v)) != null)
6228                          r = (r == null) ? u : reducer.apply(r, u);
6229                  }
6230                  result = r;
6231 <                for (MapReduceMappingsTask<K,V,U> t = this, s;;) {
6232 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6233 <                    if ((c = t.pending) == 0) {
6234 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6235 <                            if ((sr = s.result) != null)
6236 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6237 <                        }
6238 <                        if ((par = t.parent) == null ||
6239 <                            !(par instanceof MapReduceMappingsTask)) {
6240 <                            t.quietlyComplete();
6241 <                            break;
6369 <                        }
6370 <                        t = (MapReduceMappingsTask<K,V,U>)par;
6231 >                CountedCompleter<?> c;
6232 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6233 >                    MapReduceMappingsTask<K,V,U>
6234 >                        t = (MapReduceMappingsTask<K,V,U>)c,
6235 >                        s = t.rights;
6236 >                    while (s != null) {
6237 >                        U tr, sr;
6238 >                        if ((sr = s.result) != null)
6239 >                            t.result = (((tr = t.result) == null) ? sr :
6240 >                                        reducer.apply(tr, sr));
6241 >                        s = t.rights = s.nextRight;
6242                      }
6372                    else if (t.casPending(c, c - 1))
6373                        break;
6243                  }
6375            } catch (Throwable ex) {
6376                return tryCompleteComputation(ex);
6244              }
6378            MapReduceMappingsTask<K,V,U> s = rights;
6379            if (s != null && !inForkJoinPool()) {
6380                do  {
6381                    if (s.tryUnfork())
6382                        s.exec();
6383                } while ((s = s.nextRight) != null);
6384            }
6385            return false;
6245          }
6387        public final U getRawResult() { return result; }
6246      }
6247  
6248      @SuppressWarnings("serial") static final class MapReduceKeysToDoubleTask<K,V>
6249 <        extends BulkTask<K,V,Double> {
6249 >        extends Traverser<K,V,Double> {
6250          final ObjectToDouble<? super K> transformer;
6251          final DoubleByDoubleToDouble reducer;
6252          final double basis;
6253          double result;
6254          MapReduceKeysToDoubleTask<K,V> rights, nextRight;
6255          MapReduceKeysToDoubleTask
6256 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6256 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6257               MapReduceKeysToDoubleTask<K,V> nextRight,
6258               ObjectToDouble<? super K> transformer,
6259               double basis,
# Line 6404 | Line 6262 | public class ConcurrentHashMapV8<K, V>
6262              this.transformer = transformer;
6263              this.basis = basis; this.reducer = reducer;
6264          }
6265 <        @SuppressWarnings("unchecked") public final boolean exec() {
6266 <            final ObjectToDouble<? super K> transformer =
6267 <                this.transformer;
6268 <            final DoubleByDoubleToDouble reducer = this.reducer;
6269 <            if (transformer == null || reducer == null)
6270 <                return abortOnNullFunction();
6271 <            try {
6272 <                final double id = this.basis;
6415 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6416 <                    do {} while (!casPending(c = pending, c+1));
6265 >        public final Double getRawResult() { return result; }
6266 >        @SuppressWarnings("unchecked") public final void compute() {
6267 >            final ObjectToDouble<? super K> transformer;
6268 >            final DoubleByDoubleToDouble reducer;
6269 >            if ((transformer = this.transformer) != null &&
6270 >                (reducer = this.reducer) != null) {
6271 >                double r = this.basis;
6272 >                for (int b; (b = preSplit()) > 0;)
6273                      (rights = new MapReduceKeysToDoubleTask<K,V>
6274 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6419 <                }
6420 <                double r = id;
6274 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6275                  while (advance() != null)
6276                      r = reducer.apply(r, transformer.apply((K)nextKey));
6277                  result = r;
6278 <                for (MapReduceKeysToDoubleTask<K,V> t = this, s;;) {
6279 <                    int c; BulkTask<K,V,?> par;
6280 <                    if ((c = t.pending) == 0) {
6281 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6282 <                            t.result = reducer.apply(t.result, s.result);
6283 <                        }
6284 <                        if ((par = t.parent) == null ||
6285 <                            !(par instanceof MapReduceKeysToDoubleTask)) {
6432 <                            t.quietlyComplete();
6433 <                            break;
6434 <                        }
6435 <                        t = (MapReduceKeysToDoubleTask<K,V>)par;
6278 >                CountedCompleter<?> c;
6279 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6280 >                    MapReduceKeysToDoubleTask<K,V>
6281 >                        t = (MapReduceKeysToDoubleTask<K,V>)c,
6282 >                        s = t.rights;
6283 >                    while (s != null) {
6284 >                        t.result = reducer.apply(t.result, s.result);
6285 >                        s = t.rights = s.nextRight;
6286                      }
6437                    else if (t.casPending(c, c - 1))
6438                        break;
6287                  }
6440            } catch (Throwable ex) {
6441                return tryCompleteComputation(ex);
6442            }
6443            MapReduceKeysToDoubleTask<K,V> s = rights;
6444            if (s != null && !inForkJoinPool()) {
6445                do  {
6446                    if (s.tryUnfork())
6447                        s.exec();
6448                } while ((s = s.nextRight) != null);
6288              }
6450            return false;
6289          }
6452        public final Double getRawResult() { return result; }
6290      }
6291  
6292      @SuppressWarnings("serial") static final class MapReduceValuesToDoubleTask<K,V>
6293 <        extends BulkTask<K,V,Double> {
6293 >        extends Traverser<K,V,Double> {
6294          final ObjectToDouble<? super V> transformer;
6295          final DoubleByDoubleToDouble reducer;
6296          final double basis;
6297          double result;
6298          MapReduceValuesToDoubleTask<K,V> rights, nextRight;
6299          MapReduceValuesToDoubleTask
6300 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6300 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6301               MapReduceValuesToDoubleTask<K,V> nextRight,
6302               ObjectToDouble<? super V> transformer,
6303               double basis,
# Line 6469 | Line 6306 | public class ConcurrentHashMapV8<K, V>
6306              this.transformer = transformer;
6307              this.basis = basis; this.reducer = reducer;
6308          }
6309 <        @SuppressWarnings("unchecked") public final boolean exec() {
6310 <            final ObjectToDouble<? super V> transformer =
6311 <                this.transformer;
6312 <            final DoubleByDoubleToDouble reducer = this.reducer;
6313 <            if (transformer == null || reducer == null)
6314 <                return abortOnNullFunction();
6315 <            try {
6316 <                final double id = this.basis;
6480 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6481 <                    do {} while (!casPending(c = pending, c+1));
6309 >        public final Double getRawResult() { return result; }
6310 >        @SuppressWarnings("unchecked") public final void compute() {
6311 >            final ObjectToDouble<? super V> transformer;
6312 >            final DoubleByDoubleToDouble reducer;
6313 >            if ((transformer = this.transformer) != null &&
6314 >                (reducer = this.reducer) != null) {
6315 >                double r = this.basis;
6316 >                for (int b; (b = preSplit()) > 0;)
6317                      (rights = new MapReduceValuesToDoubleTask<K,V>
6318 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6319 <                }
6485 <                double r = id;
6486 <                Object v;
6318 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6319 >                V v;
6320                  while ((v = advance()) != null)
6321 <                    r = reducer.apply(r, transformer.apply((V)v));
6321 >                    r = reducer.apply(r, transformer.apply(v));
6322                  result = r;
6323 <                for (MapReduceValuesToDoubleTask<K,V> t = this, s;;) {
6324 <                    int c; BulkTask<K,V,?> par;
6325 <                    if ((c = t.pending) == 0) {
6326 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6327 <                            t.result = reducer.apply(t.result, s.result);
6328 <                        }
6329 <                        if ((par = t.parent) == null ||
6330 <                            !(par instanceof MapReduceValuesToDoubleTask)) {
6498 <                            t.quietlyComplete();
6499 <                            break;
6500 <                        }
6501 <                        t = (MapReduceValuesToDoubleTask<K,V>)par;
6323 >                CountedCompleter<?> c;
6324 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6325 >                    MapReduceValuesToDoubleTask<K,V>
6326 >                        t = (MapReduceValuesToDoubleTask<K,V>)c,
6327 >                        s = t.rights;
6328 >                    while (s != null) {
6329 >                        t.result = reducer.apply(t.result, s.result);
6330 >                        s = t.rights = s.nextRight;
6331                      }
6503                    else if (t.casPending(c, c - 1))
6504                        break;
6332                  }
6506            } catch (Throwable ex) {
6507                return tryCompleteComputation(ex);
6508            }
6509            MapReduceValuesToDoubleTask<K,V> s = rights;
6510            if (s != null && !inForkJoinPool()) {
6511                do  {
6512                    if (s.tryUnfork())
6513                        s.exec();
6514                } while ((s = s.nextRight) != null);
6333              }
6516            return false;
6334          }
6518        public final Double getRawResult() { return result; }
6335      }
6336  
6337      @SuppressWarnings("serial") static final class MapReduceEntriesToDoubleTask<K,V>
6338 <        extends BulkTask<K,V,Double> {
6338 >        extends Traverser<K,V,Double> {
6339          final ObjectToDouble<Map.Entry<K,V>> transformer;
6340          final DoubleByDoubleToDouble reducer;
6341          final double basis;
6342          double result;
6343          MapReduceEntriesToDoubleTask<K,V> rights, nextRight;
6344          MapReduceEntriesToDoubleTask
6345 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6345 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6346               MapReduceEntriesToDoubleTask<K,V> nextRight,
6347               ObjectToDouble<Map.Entry<K,V>> transformer,
6348               double basis,
# Line 6535 | Line 6351 | public class ConcurrentHashMapV8<K, V>
6351              this.transformer = transformer;
6352              this.basis = basis; this.reducer = reducer;
6353          }
6354 <        @SuppressWarnings("unchecked") public final boolean exec() {
6355 <            final ObjectToDouble<Map.Entry<K,V>> transformer =
6356 <                this.transformer;
6357 <            final DoubleByDoubleToDouble reducer = this.reducer;
6358 <            if (transformer == null || reducer == null)
6359 <                return abortOnNullFunction();
6360 <            try {
6361 <                final double id = this.basis;
6546 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6547 <                    do {} while (!casPending(c = pending, c+1));
6354 >        public final Double getRawResult() { return result; }
6355 >        @SuppressWarnings("unchecked") public final void compute() {
6356 >            final ObjectToDouble<Map.Entry<K,V>> transformer;
6357 >            final DoubleByDoubleToDouble reducer;
6358 >            if ((transformer = this.transformer) != null &&
6359 >                (reducer = this.reducer) != null) {
6360 >                double r = this.basis;
6361 >                for (int b; (b = preSplit()) > 0;)
6362                      (rights = new MapReduceEntriesToDoubleTask<K,V>
6363 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6364 <                }
6551 <                double r = id;
6552 <                Object v;
6363 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6364 >                V v;
6365                  while ((v = advance()) != null)
6366 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6366 >                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey,
6367 >                                                                    v)));
6368                  result = r;
6369 <                for (MapReduceEntriesToDoubleTask<K,V> t = this, s;;) {
6370 <                    int c; BulkTask<K,V,?> par;
6371 <                    if ((c = t.pending) == 0) {
6372 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6373 <                            t.result = reducer.apply(t.result, s.result);
6374 <                        }
6375 <                        if ((par = t.parent) == null ||
6376 <                            !(par instanceof MapReduceEntriesToDoubleTask)) {
6564 <                            t.quietlyComplete();
6565 <                            break;
6566 <                        }
6567 <                        t = (MapReduceEntriesToDoubleTask<K,V>)par;
6369 >                CountedCompleter<?> c;
6370 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6371 >                    MapReduceEntriesToDoubleTask<K,V>
6372 >                        t = (MapReduceEntriesToDoubleTask<K,V>)c,
6373 >                        s = t.rights;
6374 >                    while (s != null) {
6375 >                        t.result = reducer.apply(t.result, s.result);
6376 >                        s = t.rights = s.nextRight;
6377                      }
6569                    else if (t.casPending(c, c - 1))
6570                        break;
6378                  }
6572            } catch (Throwable ex) {
6573                return tryCompleteComputation(ex);
6379              }
6575            MapReduceEntriesToDoubleTask<K,V> s = rights;
6576            if (s != null && !inForkJoinPool()) {
6577                do  {
6578                    if (s.tryUnfork())
6579                        s.exec();
6580                } while ((s = s.nextRight) != null);
6581            }
6582            return false;
6380          }
6584        public final Double getRawResult() { return result; }
6381      }
6382  
6383      @SuppressWarnings("serial") static final class MapReduceMappingsToDoubleTask<K,V>
6384 <        extends BulkTask<K,V,Double> {
6384 >        extends Traverser<K,V,Double> {
6385          final ObjectByObjectToDouble<? super K, ? super V> transformer;
6386          final DoubleByDoubleToDouble reducer;
6387          final double basis;
6388          double result;
6389          MapReduceMappingsToDoubleTask<K,V> rights, nextRight;
6390          MapReduceMappingsToDoubleTask
6391 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6391 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6392               MapReduceMappingsToDoubleTask<K,V> nextRight,
6393               ObjectByObjectToDouble<? super K, ? super V> transformer,
6394               double basis,
# Line 6601 | Line 6397 | public class ConcurrentHashMapV8<K, V>
6397              this.transformer = transformer;
6398              this.basis = basis; this.reducer = reducer;
6399          }
6400 <        @SuppressWarnings("unchecked") public final boolean exec() {
6401 <            final ObjectByObjectToDouble<? super K, ? super V> transformer =
6402 <                this.transformer;
6403 <            final DoubleByDoubleToDouble reducer = this.reducer;
6404 <            if (transformer == null || reducer == null)
6405 <                return abortOnNullFunction();
6406 <            try {
6407 <                final double id = this.basis;
6612 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6613 <                    do {} while (!casPending(c = pending, c+1));
6400 >        public final Double getRawResult() { return result; }
6401 >        @SuppressWarnings("unchecked") public final void compute() {
6402 >            final ObjectByObjectToDouble<? super K, ? super V> transformer;
6403 >            final DoubleByDoubleToDouble reducer;
6404 >            if ((transformer = this.transformer) != null &&
6405 >                (reducer = this.reducer) != null) {
6406 >                double r = this.basis;
6407 >                for (int b; (b = preSplit()) > 0;)
6408                      (rights = new MapReduceMappingsToDoubleTask<K,V>
6409 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6410 <                }
6617 <                double r = id;
6618 <                Object v;
6409 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6410 >                V v;
6411                  while ((v = advance()) != null)
6412 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6412 >                    r = reducer.apply(r, transformer.apply((K)nextKey, v));
6413                  result = r;
6414 <                for (MapReduceMappingsToDoubleTask<K,V> t = this, s;;) {
6415 <                    int c; BulkTask<K,V,?> par;
6416 <                    if ((c = t.pending) == 0) {
6417 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6418 <                            t.result = reducer.apply(t.result, s.result);
6419 <                        }
6420 <                        if ((par = t.parent) == null ||
6421 <                            !(par instanceof MapReduceMappingsToDoubleTask)) {
6630 <                            t.quietlyComplete();
6631 <                            break;
6632 <                        }
6633 <                        t = (MapReduceMappingsToDoubleTask<K,V>)par;
6414 >                CountedCompleter<?> c;
6415 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6416 >                    MapReduceMappingsToDoubleTask<K,V>
6417 >                        t = (MapReduceMappingsToDoubleTask<K,V>)c,
6418 >                        s = t.rights;
6419 >                    while (s != null) {
6420 >                        t.result = reducer.apply(t.result, s.result);
6421 >                        s = t.rights = s.nextRight;
6422                      }
6635                    else if (t.casPending(c, c - 1))
6636                        break;
6423                  }
6638            } catch (Throwable ex) {
6639                return tryCompleteComputation(ex);
6424              }
6641            MapReduceMappingsToDoubleTask<K,V> s = rights;
6642            if (s != null && !inForkJoinPool()) {
6643                do  {
6644                    if (s.tryUnfork())
6645                        s.exec();
6646                } while ((s = s.nextRight) != null);
6647            }
6648            return false;
6425          }
6650        public final Double getRawResult() { return result; }
6426      }
6427  
6428      @SuppressWarnings("serial") static final class MapReduceKeysToLongTask<K,V>
6429 <        extends BulkTask<K,V,Long> {
6429 >        extends Traverser<K,V,Long> {
6430          final ObjectToLong<? super K> transformer;
6431          final LongByLongToLong reducer;
6432          final long basis;
6433          long result;
6434          MapReduceKeysToLongTask<K,V> rights, nextRight;
6435          MapReduceKeysToLongTask
6436 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6436 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6437               MapReduceKeysToLongTask<K,V> nextRight,
6438               ObjectToLong<? super K> transformer,
6439               long basis,
# Line 6667 | Line 6442 | public class ConcurrentHashMapV8<K, V>
6442              this.transformer = transformer;
6443              this.basis = basis; this.reducer = reducer;
6444          }
6445 <        @SuppressWarnings("unchecked") public final boolean exec() {
6446 <            final ObjectToLong<? super K> transformer =
6447 <                this.transformer;
6448 <            final LongByLongToLong reducer = this.reducer;
6449 <            if (transformer == null || reducer == null)
6450 <                return abortOnNullFunction();
6451 <            try {
6452 <                final long id = this.basis;
6678 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6679 <                    do {} while (!casPending(c = pending, c+1));
6445 >        public final Long getRawResult() { return result; }
6446 >        @SuppressWarnings("unchecked") public final void compute() {
6447 >            final ObjectToLong<? super K> transformer;
6448 >            final LongByLongToLong reducer;
6449 >            if ((transformer = this.transformer) != null &&
6450 >                (reducer = this.reducer) != null) {
6451 >                long r = this.basis;
6452 >                for (int b; (b = preSplit()) > 0;)
6453                      (rights = new MapReduceKeysToLongTask<K,V>
6454 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6682 <                }
6683 <                long r = id;
6454 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6455                  while (advance() != null)
6456                      r = reducer.apply(r, transformer.apply((K)nextKey));
6457                  result = r;
6458 <                for (MapReduceKeysToLongTask<K,V> t = this, s;;) {
6459 <                    int c; BulkTask<K,V,?> par;
6460 <                    if ((c = t.pending) == 0) {
6461 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6462 <                            t.result = reducer.apply(t.result, s.result);
6463 <                        }
6464 <                        if ((par = t.parent) == null ||
6465 <                            !(par instanceof MapReduceKeysToLongTask)) {
6695 <                            t.quietlyComplete();
6696 <                            break;
6697 <                        }
6698 <                        t = (MapReduceKeysToLongTask<K,V>)par;
6458 >                CountedCompleter<?> c;
6459 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6460 >                    MapReduceKeysToLongTask<K,V>
6461 >                        t = (MapReduceKeysToLongTask<K,V>)c,
6462 >                        s = t.rights;
6463 >                    while (s != null) {
6464 >                        t.result = reducer.apply(t.result, s.result);
6465 >                        s = t.rights = s.nextRight;
6466                      }
6700                    else if (t.casPending(c, c - 1))
6701                        break;
6467                  }
6703            } catch (Throwable ex) {
6704                return tryCompleteComputation(ex);
6705            }
6706            MapReduceKeysToLongTask<K,V> s = rights;
6707            if (s != null && !inForkJoinPool()) {
6708                do  {
6709                    if (s.tryUnfork())
6710                        s.exec();
6711                } while ((s = s.nextRight) != null);
6468              }
6713            return false;
6469          }
6715        public final Long getRawResult() { return result; }
6470      }
6471  
6472      @SuppressWarnings("serial") static final class MapReduceValuesToLongTask<K,V>
6473 <        extends BulkTask<K,V,Long> {
6473 >        extends Traverser<K,V,Long> {
6474          final ObjectToLong<? super V> transformer;
6475          final LongByLongToLong reducer;
6476          final long basis;
6477          long result;
6478          MapReduceValuesToLongTask<K,V> rights, nextRight;
6479          MapReduceValuesToLongTask
6480 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6480 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6481               MapReduceValuesToLongTask<K,V> nextRight,
6482               ObjectToLong<? super V> transformer,
6483               long basis,
# Line 6732 | Line 6486 | public class ConcurrentHashMapV8<K, V>
6486              this.transformer = transformer;
6487              this.basis = basis; this.reducer = reducer;
6488          }
6489 <        @SuppressWarnings("unchecked") public final boolean exec() {
6490 <            final ObjectToLong<? super V> transformer =
6491 <                this.transformer;
6492 <            final LongByLongToLong reducer = this.reducer;
6493 <            if (transformer == null || reducer == null)
6494 <                return abortOnNullFunction();
6495 <            try {
6496 <                final long id = this.basis;
6743 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6744 <                    do {} while (!casPending(c = pending, c+1));
6489 >        public final Long getRawResult() { return result; }
6490 >        @SuppressWarnings("unchecked") public final void compute() {
6491 >            final ObjectToLong<? super V> transformer;
6492 >            final LongByLongToLong reducer;
6493 >            if ((transformer = this.transformer) != null &&
6494 >                (reducer = this.reducer) != null) {
6495 >                long r = this.basis;
6496 >                for (int b; (b = preSplit()) > 0;)
6497                      (rights = new MapReduceValuesToLongTask<K,V>
6498 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6499 <                }
6748 <                long r = id;
6749 <                Object v;
6498 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6499 >                V v;
6500                  while ((v = advance()) != null)
6501 <                    r = reducer.apply(r, transformer.apply((V)v));
6501 >                    r = reducer.apply(r, transformer.apply(v));
6502                  result = r;
6503 <                for (MapReduceValuesToLongTask<K,V> t = this, s;;) {
6504 <                    int c; BulkTask<K,V,?> par;
6505 <                    if ((c = t.pending) == 0) {
6506 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6507 <                            t.result = reducer.apply(t.result, s.result);
6508 <                        }
6509 <                        if ((par = t.parent) == null ||
6510 <                            !(par instanceof MapReduceValuesToLongTask)) {
6761 <                            t.quietlyComplete();
6762 <                            break;
6763 <                        }
6764 <                        t = (MapReduceValuesToLongTask<K,V>)par;
6503 >                CountedCompleter<?> c;
6504 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6505 >                    MapReduceValuesToLongTask<K,V>
6506 >                        t = (MapReduceValuesToLongTask<K,V>)c,
6507 >                        s = t.rights;
6508 >                    while (s != null) {
6509 >                        t.result = reducer.apply(t.result, s.result);
6510 >                        s = t.rights = s.nextRight;
6511                      }
6766                    else if (t.casPending(c, c - 1))
6767                        break;
6512                  }
6769            } catch (Throwable ex) {
6770                return tryCompleteComputation(ex);
6771            }
6772            MapReduceValuesToLongTask<K,V> s = rights;
6773            if (s != null && !inForkJoinPool()) {
6774                do  {
6775                    if (s.tryUnfork())
6776                        s.exec();
6777                } while ((s = s.nextRight) != null);
6513              }
6779            return false;
6514          }
6781        public final Long getRawResult() { return result; }
6515      }
6516  
6517      @SuppressWarnings("serial") static final class MapReduceEntriesToLongTask<K,V>
6518 <        extends BulkTask<K,V,Long> {
6518 >        extends Traverser<K,V,Long> {
6519          final ObjectToLong<Map.Entry<K,V>> transformer;
6520          final LongByLongToLong reducer;
6521          final long basis;
6522          long result;
6523          MapReduceEntriesToLongTask<K,V> rights, nextRight;
6524          MapReduceEntriesToLongTask
6525 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6525 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6526               MapReduceEntriesToLongTask<K,V> nextRight,
6527               ObjectToLong<Map.Entry<K,V>> transformer,
6528               long basis,
# Line 6798 | Line 6531 | public class ConcurrentHashMapV8<K, V>
6531              this.transformer = transformer;
6532              this.basis = basis; this.reducer = reducer;
6533          }
6534 <        @SuppressWarnings("unchecked") public final boolean exec() {
6535 <            final ObjectToLong<Map.Entry<K,V>> transformer =
6536 <                this.transformer;
6537 <            final LongByLongToLong reducer = this.reducer;
6538 <            if (transformer == null || reducer == null)
6539 <                return abortOnNullFunction();
6540 <            try {
6541 <                final long id = this.basis;
6809 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6810 <                    do {} while (!casPending(c = pending, c+1));
6534 >        public final Long getRawResult() { return result; }
6535 >        @SuppressWarnings("unchecked") public final void compute() {
6536 >            final ObjectToLong<Map.Entry<K,V>> transformer;
6537 >            final LongByLongToLong reducer;
6538 >            if ((transformer = this.transformer) != null &&
6539 >                (reducer = this.reducer) != null) {
6540 >                long r = this.basis;
6541 >                for (int b; (b = preSplit()) > 0;)
6542                      (rights = new MapReduceEntriesToLongTask<K,V>
6543 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6544 <                }
6814 <                long r = id;
6815 <                Object v;
6543 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6544 >                V v;
6545                  while ((v = advance()) != null)
6546 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6546 >                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey,
6547 >                                                                    v)));
6548                  result = r;
6549 <                for (MapReduceEntriesToLongTask<K,V> t = this, s;;) {
6550 <                    int c; BulkTask<K,V,?> par;
6551 <                    if ((c = t.pending) == 0) {
6552 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6553 <                            t.result = reducer.apply(t.result, s.result);
6554 <                        }
6555 <                        if ((par = t.parent) == null ||
6556 <                            !(par instanceof MapReduceEntriesToLongTask)) {
6827 <                            t.quietlyComplete();
6828 <                            break;
6829 <                        }
6830 <                        t = (MapReduceEntriesToLongTask<K,V>)par;
6549 >                CountedCompleter<?> c;
6550 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6551 >                    MapReduceEntriesToLongTask<K,V>
6552 >                        t = (MapReduceEntriesToLongTask<K,V>)c,
6553 >                        s = t.rights;
6554 >                    while (s != null) {
6555 >                        t.result = reducer.apply(t.result, s.result);
6556 >                        s = t.rights = s.nextRight;
6557                      }
6832                    else if (t.casPending(c, c - 1))
6833                        break;
6558                  }
6835            } catch (Throwable ex) {
6836                return tryCompleteComputation(ex);
6837            }
6838            MapReduceEntriesToLongTask<K,V> s = rights;
6839            if (s != null && !inForkJoinPool()) {
6840                do  {
6841                    if (s.tryUnfork())
6842                        s.exec();
6843                } while ((s = s.nextRight) != null);
6559              }
6845            return false;
6560          }
6847        public final Long getRawResult() { return result; }
6561      }
6562  
6563      @SuppressWarnings("serial") static final class MapReduceMappingsToLongTask<K,V>
6564 <        extends BulkTask<K,V,Long> {
6564 >        extends Traverser<K,V,Long> {
6565          final ObjectByObjectToLong<? super K, ? super V> transformer;
6566          final LongByLongToLong reducer;
6567          final long basis;
6568          long result;
6569          MapReduceMappingsToLongTask<K,V> rights, nextRight;
6570          MapReduceMappingsToLongTask
6571 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6571 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6572               MapReduceMappingsToLongTask<K,V> nextRight,
6573               ObjectByObjectToLong<? super K, ? super V> transformer,
6574               long basis,
# Line 6864 | Line 6577 | public class ConcurrentHashMapV8<K, V>
6577              this.transformer = transformer;
6578              this.basis = basis; this.reducer = reducer;
6579          }
6580 <        @SuppressWarnings("unchecked") public final boolean exec() {
6581 <            final ObjectByObjectToLong<? super K, ? super V> transformer =
6582 <                this.transformer;
6583 <            final LongByLongToLong reducer = this.reducer;
6584 <            if (transformer == null || reducer == null)
6585 <                return abortOnNullFunction();
6586 <            try {
6587 <                final long id = this.basis;
6875 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6876 <                    do {} while (!casPending(c = pending, c+1));
6580 >        public final Long getRawResult() { return result; }
6581 >        @SuppressWarnings("unchecked") public final void compute() {
6582 >            final ObjectByObjectToLong<? super K, ? super V> transformer;
6583 >            final LongByLongToLong reducer;
6584 >            if ((transformer = this.transformer) != null &&
6585 >                (reducer = this.reducer) != null) {
6586 >                long r = this.basis;
6587 >                for (int b; (b = preSplit()) > 0;)
6588                      (rights = new MapReduceMappingsToLongTask<K,V>
6589 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6590 <                }
6880 <                long r = id;
6881 <                Object v;
6589 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6590 >                V v;
6591                  while ((v = advance()) != null)
6592 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6592 >                    r = reducer.apply(r, transformer.apply((K)nextKey, v));
6593                  result = r;
6594 <                for (MapReduceMappingsToLongTask<K,V> t = this, s;;) {
6595 <                    int c; BulkTask<K,V,?> par;
6596 <                    if ((c = t.pending) == 0) {
6597 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6598 <                            t.result = reducer.apply(t.result, s.result);
6599 <                        }
6600 <                        if ((par = t.parent) == null ||
6601 <                            !(par instanceof MapReduceMappingsToLongTask)) {
6893 <                            t.quietlyComplete();
6894 <                            break;
6895 <                        }
6896 <                        t = (MapReduceMappingsToLongTask<K,V>)par;
6594 >                CountedCompleter<?> c;
6595 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6596 >                    MapReduceMappingsToLongTask<K,V>
6597 >                        t = (MapReduceMappingsToLongTask<K,V>)c,
6598 >                        s = t.rights;
6599 >                    while (s != null) {
6600 >                        t.result = reducer.apply(t.result, s.result);
6601 >                        s = t.rights = s.nextRight;
6602                      }
6898                    else if (t.casPending(c, c - 1))
6899                        break;
6603                  }
6901            } catch (Throwable ex) {
6902                return tryCompleteComputation(ex);
6903            }
6904            MapReduceMappingsToLongTask<K,V> s = rights;
6905            if (s != null && !inForkJoinPool()) {
6906                do  {
6907                    if (s.tryUnfork())
6908                        s.exec();
6909                } while ((s = s.nextRight) != null);
6604              }
6911            return false;
6605          }
6913        public final Long getRawResult() { return result; }
6606      }
6607  
6608      @SuppressWarnings("serial") static final class MapReduceKeysToIntTask<K,V>
6609 <        extends BulkTask<K,V,Integer> {
6609 >        extends Traverser<K,V,Integer> {
6610          final ObjectToInt<? super K> transformer;
6611          final IntByIntToInt reducer;
6612          final int basis;
6613          int result;
6614          MapReduceKeysToIntTask<K,V> rights, nextRight;
6615          MapReduceKeysToIntTask
6616 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6616 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6617               MapReduceKeysToIntTask<K,V> nextRight,
6618               ObjectToInt<? super K> transformer,
6619               int basis,
# Line 6930 | Line 6622 | public class ConcurrentHashMapV8<K, V>
6622              this.transformer = transformer;
6623              this.basis = basis; this.reducer = reducer;
6624          }
6625 <        @SuppressWarnings("unchecked") public final boolean exec() {
6626 <            final ObjectToInt<? super K> transformer =
6627 <                this.transformer;
6628 <            final IntByIntToInt reducer = this.reducer;
6629 <            if (transformer == null || reducer == null)
6630 <                return abortOnNullFunction();
6631 <            try {
6632 <                final int id = this.basis;
6941 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6942 <                    do {} while (!casPending(c = pending, c+1));
6625 >        public final Integer getRawResult() { return result; }
6626 >        @SuppressWarnings("unchecked") public final void compute() {
6627 >            final ObjectToInt<? super K> transformer;
6628 >            final IntByIntToInt reducer;
6629 >            if ((transformer = this.transformer) != null &&
6630 >                (reducer = this.reducer) != null) {
6631 >                int r = this.basis;
6632 >                for (int b; (b = preSplit()) > 0;)
6633                      (rights = new MapReduceKeysToIntTask<K,V>
6634 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6945 <                }
6946 <                int r = id;
6634 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6635                  while (advance() != null)
6636                      r = reducer.apply(r, transformer.apply((K)nextKey));
6637                  result = r;
6638 <                for (MapReduceKeysToIntTask<K,V> t = this, s;;) {
6639 <                    int c; BulkTask<K,V,?> par;
6640 <                    if ((c = t.pending) == 0) {
6641 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6642 <                            t.result = reducer.apply(t.result, s.result);
6643 <                        }
6644 <                        if ((par = t.parent) == null ||
6645 <                            !(par instanceof MapReduceKeysToIntTask)) {
6958 <                            t.quietlyComplete();
6959 <                            break;
6960 <                        }
6961 <                        t = (MapReduceKeysToIntTask<K,V>)par;
6638 >                CountedCompleter<?> c;
6639 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6640 >                    MapReduceKeysToIntTask<K,V>
6641 >                        t = (MapReduceKeysToIntTask<K,V>)c,
6642 >                        s = t.rights;
6643 >                    while (s != null) {
6644 >                        t.result = reducer.apply(t.result, s.result);
6645 >                        s = t.rights = s.nextRight;
6646                      }
6963                    else if (t.casPending(c, c - 1))
6964                        break;
6647                  }
6966            } catch (Throwable ex) {
6967                return tryCompleteComputation(ex);
6648              }
6969            MapReduceKeysToIntTask<K,V> s = rights;
6970            if (s != null && !inForkJoinPool()) {
6971                do  {
6972                    if (s.tryUnfork())
6973                        s.exec();
6974                } while ((s = s.nextRight) != null);
6975            }
6976            return false;
6649          }
6978        public final Integer getRawResult() { return result; }
6650      }
6651  
6652      @SuppressWarnings("serial") static final class MapReduceValuesToIntTask<K,V>
6653 <        extends BulkTask<K,V,Integer> {
6653 >        extends Traverser<K,V,Integer> {
6654          final ObjectToInt<? super V> transformer;
6655          final IntByIntToInt reducer;
6656          final int basis;
6657          int result;
6658          MapReduceValuesToIntTask<K,V> rights, nextRight;
6659          MapReduceValuesToIntTask
6660 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6660 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6661               MapReduceValuesToIntTask<K,V> nextRight,
6662               ObjectToInt<? super V> transformer,
6663               int basis,
# Line 6995 | Line 6666 | public class ConcurrentHashMapV8<K, V>
6666              this.transformer = transformer;
6667              this.basis = basis; this.reducer = reducer;
6668          }
6669 <        @SuppressWarnings("unchecked") public final boolean exec() {
6670 <            final ObjectToInt<? super V> transformer =
6671 <                this.transformer;
6672 <            final IntByIntToInt reducer = this.reducer;
6673 <            if (transformer == null || reducer == null)
6674 <                return abortOnNullFunction();
6675 <            try {
6676 <                final int id = this.basis;
7006 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
7007 <                    do {} while (!casPending(c = pending, c+1));
6669 >        public final Integer getRawResult() { return result; }
6670 >        @SuppressWarnings("unchecked") public final void compute() {
6671 >            final ObjectToInt<? super V> transformer;
6672 >            final IntByIntToInt reducer;
6673 >            if ((transformer = this.transformer) != null &&
6674 >                (reducer = this.reducer) != null) {
6675 >                int r = this.basis;
6676 >                for (int b; (b = preSplit()) > 0;)
6677                      (rights = new MapReduceValuesToIntTask<K,V>
6678 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6679 <                }
7011 <                int r = id;
7012 <                Object v;
6678 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6679 >                V v;
6680                  while ((v = advance()) != null)
6681 <                    r = reducer.apply(r, transformer.apply((V)v));
6681 >                    r = reducer.apply(r, transformer.apply(v));
6682                  result = r;
6683 <                for (MapReduceValuesToIntTask<K,V> t = this, s;;) {
6684 <                    int c; BulkTask<K,V,?> par;
6685 <                    if ((c = t.pending) == 0) {
6686 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6687 <                            t.result = reducer.apply(t.result, s.result);
6688 <                        }
6689 <                        if ((par = t.parent) == null ||
6690 <                            !(par instanceof MapReduceValuesToIntTask)) {
7024 <                            t.quietlyComplete();
7025 <                            break;
7026 <                        }
7027 <                        t = (MapReduceValuesToIntTask<K,V>)par;
6683 >                CountedCompleter<?> c;
6684 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6685 >                    MapReduceValuesToIntTask<K,V>
6686 >                        t = (MapReduceValuesToIntTask<K,V>)c,
6687 >                        s = t.rights;
6688 >                    while (s != null) {
6689 >                        t.result = reducer.apply(t.result, s.result);
6690 >                        s = t.rights = s.nextRight;
6691                      }
7029                    else if (t.casPending(c, c - 1))
7030                        break;
6692                  }
7032            } catch (Throwable ex) {
7033                return tryCompleteComputation(ex);
6693              }
7035            MapReduceValuesToIntTask<K,V> s = rights;
7036            if (s != null && !inForkJoinPool()) {
7037                do  {
7038                    if (s.tryUnfork())
7039                        s.exec();
7040                } while ((s = s.nextRight) != null);
7041            }
7042            return false;
6694          }
7044        public final Integer getRawResult() { return result; }
6695      }
6696  
6697      @SuppressWarnings("serial") static final class MapReduceEntriesToIntTask<K,V>
6698 <        extends BulkTask<K,V,Integer> {
6698 >        extends Traverser<K,V,Integer> {
6699          final ObjectToInt<Map.Entry<K,V>> transformer;
6700          final IntByIntToInt reducer;
6701          final int basis;
6702          int result;
6703          MapReduceEntriesToIntTask<K,V> rights, nextRight;
6704          MapReduceEntriesToIntTask
6705 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6705 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6706               MapReduceEntriesToIntTask<K,V> nextRight,
6707               ObjectToInt<Map.Entry<K,V>> transformer,
6708               int basis,
# Line 7061 | Line 6711 | public class ConcurrentHashMapV8<K, V>
6711              this.transformer = transformer;
6712              this.basis = basis; this.reducer = reducer;
6713          }
6714 <        @SuppressWarnings("unchecked") public final boolean exec() {
6715 <            final ObjectToInt<Map.Entry<K,V>> transformer =
6716 <                this.transformer;
6717 <            final IntByIntToInt reducer = this.reducer;
6718 <            if (transformer == null || reducer == null)
6719 <                return abortOnNullFunction();
6720 <            try {
6721 <                final int id = this.basis;
7072 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
7073 <                    do {} while (!casPending(c = pending, c+1));
6714 >        public final Integer getRawResult() { return result; }
6715 >        @SuppressWarnings("unchecked") public final void compute() {
6716 >            final ObjectToInt<Map.Entry<K,V>> transformer;
6717 >            final IntByIntToInt reducer;
6718 >            if ((transformer = this.transformer) != null &&
6719 >                (reducer = this.reducer) != null) {
6720 >                int r = this.basis;
6721 >                for (int b; (b = preSplit()) > 0;)
6722                      (rights = new MapReduceEntriesToIntTask<K,V>
6723 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6724 <                }
7077 <                int r = id;
7078 <                Object v;
6723 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6724 >                V v;
6725                  while ((v = advance()) != null)
6726 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6726 >                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey,
6727 >                                                                    v)));
6728                  result = r;
6729 <                for (MapReduceEntriesToIntTask<K,V> t = this, s;;) {
6730 <                    int c; BulkTask<K,V,?> par;
6731 <                    if ((c = t.pending) == 0) {
6732 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6733 <                            t.result = reducer.apply(t.result, s.result);
6734 <                        }
6735 <                        if ((par = t.parent) == null ||
6736 <                            !(par instanceof MapReduceEntriesToIntTask)) {
7090 <                            t.quietlyComplete();
7091 <                            break;
7092 <                        }
7093 <                        t = (MapReduceEntriesToIntTask<K,V>)par;
6729 >                CountedCompleter<?> c;
6730 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6731 >                    MapReduceEntriesToIntTask<K,V>
6732 >                        t = (MapReduceEntriesToIntTask<K,V>)c,
6733 >                        s = t.rights;
6734 >                    while (s != null) {
6735 >                        t.result = reducer.apply(t.result, s.result);
6736 >                        s = t.rights = s.nextRight;
6737                      }
7095                    else if (t.casPending(c, c - 1))
7096                        break;
6738                  }
7098            } catch (Throwable ex) {
7099                return tryCompleteComputation(ex);
7100            }
7101            MapReduceEntriesToIntTask<K,V> s = rights;
7102            if (s != null && !inForkJoinPool()) {
7103                do  {
7104                    if (s.tryUnfork())
7105                        s.exec();
7106                } while ((s = s.nextRight) != null);
6739              }
7108            return false;
6740          }
7110        public final Integer getRawResult() { return result; }
6741      }
6742  
6743      @SuppressWarnings("serial") static final class MapReduceMappingsToIntTask<K,V>
6744 <        extends BulkTask<K,V,Integer> {
6744 >        extends Traverser<K,V,Integer> {
6745          final ObjectByObjectToInt<? super K, ? super V> transformer;
6746          final IntByIntToInt reducer;
6747          final int basis;
6748          int result;
6749          MapReduceMappingsToIntTask<K,V> rights, nextRight;
6750          MapReduceMappingsToIntTask
6751 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6752 <             MapReduceMappingsToIntTask<K,V> rights,
6751 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6752 >             MapReduceMappingsToIntTask<K,V> nextRight,
6753               ObjectByObjectToInt<? super K, ? super V> transformer,
6754               int basis,
6755               IntByIntToInt reducer) {
# Line 7127 | Line 6757 | public class ConcurrentHashMapV8<K, V>
6757              this.transformer = transformer;
6758              this.basis = basis; this.reducer = reducer;
6759          }
6760 <        @SuppressWarnings("unchecked") public final boolean exec() {
6761 <            final ObjectByObjectToInt<? super K, ? super V> transformer =
6762 <                this.transformer;
6763 <            final IntByIntToInt reducer = this.reducer;
6764 <            if (transformer == null || reducer == null)
6765 <                return abortOnNullFunction();
6766 <            try {
6767 <                final int id = this.basis;
7138 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
7139 <                    do {} while (!casPending(c = pending, c+1));
6760 >        public final Integer getRawResult() { return result; }
6761 >        @SuppressWarnings("unchecked") public final void compute() {
6762 >            final ObjectByObjectToInt<? super K, ? super V> transformer;
6763 >            final IntByIntToInt reducer;
6764 >            if ((transformer = this.transformer) != null &&
6765 >                (reducer = this.reducer) != null) {
6766 >                int r = this.basis;
6767 >                for (int b; (b = preSplit()) > 0;)
6768                      (rights = new MapReduceMappingsToIntTask<K,V>
6769 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6770 <                }
7143 <                int r = id;
7144 <                Object v;
6769 >                     (map, this, b, rights, transformer, r, reducer)).fork();
6770 >                V v;
6771                  while ((v = advance()) != null)
6772 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6772 >                    r = reducer.apply(r, transformer.apply((K)nextKey, v));
6773                  result = r;
6774 <                for (MapReduceMappingsToIntTask<K,V> t = this, s;;) {
6775 <                    int c; BulkTask<K,V,?> par;
6776 <                    if ((c = t.pending) == 0) {
6777 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6778 <                            t.result = reducer.apply(t.result, s.result);
6779 <                        }
6780 <                        if ((par = t.parent) == null ||
6781 <                            !(par instanceof MapReduceMappingsToIntTask)) {
7156 <                            t.quietlyComplete();
7157 <                            break;
7158 <                        }
7159 <                        t = (MapReduceMappingsToIntTask<K,V>)par;
6774 >                CountedCompleter<?> c;
6775 >                for (c = firstComplete(); c != null; c = c.nextComplete()) {
6776 >                    MapReduceMappingsToIntTask<K,V>
6777 >                        t = (MapReduceMappingsToIntTask<K,V>)c,
6778 >                        s = t.rights;
6779 >                    while (s != null) {
6780 >                        t.result = reducer.apply(t.result, s.result);
6781 >                        s = t.rights = s.nextRight;
6782                      }
7161                    else if (t.casPending(c, c - 1))
7162                        break;
6783                  }
7164            } catch (Throwable ex) {
7165                return tryCompleteComputation(ex);
7166            }
7167            MapReduceMappingsToIntTask<K,V> s = rights;
7168            if (s != null && !inForkJoinPool()) {
7169                do  {
7170                    if (s.tryUnfork())
7171                        s.exec();
7172                } while ((s = s.nextRight) != null);
6784              }
7174            return false;
6785          }
7176        public final Integer getRawResult() { return result; }
6786      }
6787  
6788      // Unsafe mechanics
6789 <    private static final sun.misc.Unsafe UNSAFE;
6790 <    private static final long counterOffset;
6791 <    private static final long sizeCtlOffset;
6789 >    private static final sun.misc.Unsafe U;
6790 >    private static final long SIZECTL;
6791 >    private static final long TRANSFERINDEX;
6792 >    private static final long TRANSFERORIGIN;
6793 >    private static final long BASECOUNT;
6794 >    private static final long COUNTERBUSY;
6795 >    private static final long CELLVALUE;
6796      private static final long ABASE;
6797      private static final int ASHIFT;
6798  
6799      static {
7187        int ss;
6800          try {
6801 <            UNSAFE = getUnsafe();
6801 >            U = getUnsafe();
6802              Class<?> k = ConcurrentHashMapV8.class;
6803 <            counterOffset = UNSAFE.objectFieldOffset
7192 <                (k.getDeclaredField("counter"));
7193 <            sizeCtlOffset = UNSAFE.objectFieldOffset
6803 >            SIZECTL = U.objectFieldOffset
6804                  (k.getDeclaredField("sizeCtl"));
6805 +            TRANSFERINDEX = U.objectFieldOffset
6806 +                (k.getDeclaredField("transferIndex"));
6807 +            TRANSFERORIGIN = U.objectFieldOffset
6808 +                (k.getDeclaredField("transferOrigin"));
6809 +            BASECOUNT = U.objectFieldOffset
6810 +                (k.getDeclaredField("baseCount"));
6811 +            COUNTERBUSY = U.objectFieldOffset
6812 +                (k.getDeclaredField("counterBusy"));
6813 +            Class<?> ck = CounterCell.class;
6814 +            CELLVALUE = U.objectFieldOffset
6815 +                (ck.getDeclaredField("value"));
6816              Class<?> sc = Node[].class;
6817 <            ABASE = UNSAFE.arrayBaseOffset(sc);
6818 <            ss = UNSAFE.arrayIndexScale(sc);
6817 >            ABASE = U.arrayBaseOffset(sc);
6818 >            int scale = U.arrayIndexScale(sc);
6819 >            if ((scale & (scale - 1)) != 0)
6820 >                throw new Error("data type scale not a power of two");
6821 >            ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
6822          } catch (Exception e) {
6823              throw new Error(e);
6824          }
7201        if ((ss & (ss-1)) != 0)
7202            throw new Error("data type scale not a power of two");
7203        ASHIFT = 31 - Integer.numberOfLeadingZeros(ss);
6825      }
6826  
6827      /**
# Line 7213 | Line 6834 | public class ConcurrentHashMapV8<K, V>
6834      private static sun.misc.Unsafe getUnsafe() {
6835          try {
6836              return sun.misc.Unsafe.getUnsafe();
6837 <        } catch (SecurityException se) {
6838 <            try {
6839 <                return java.security.AccessController.doPrivileged
6840 <                    (new java.security
6841 <                     .PrivilegedExceptionAction<sun.misc.Unsafe>() {
6842 <                        public sun.misc.Unsafe run() throws Exception {
6843 <                            java.lang.reflect.Field f = sun.misc
6844 <                                .Unsafe.class.getDeclaredField("theUnsafe");
6845 <                            f.setAccessible(true);
6846 <                            return (sun.misc.Unsafe) f.get(null);
6847 <                        }});
6848 <            } catch (java.security.PrivilegedActionException e) {
6849 <                throw new RuntimeException("Could not initialize intrinsics",
6850 <                                           e.getCause());
6851 <            }
6837 >        } catch (SecurityException tryReflectionInstead) {}
6838 >        try {
6839 >            return java.security.AccessController.doPrivileged
6840 >            (new java.security.PrivilegedExceptionAction<sun.misc.Unsafe>() {
6841 >                public sun.misc.Unsafe run() throws Exception {
6842 >                    Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class;
6843 >                    for (java.lang.reflect.Field f : k.getDeclaredFields()) {
6844 >                        f.setAccessible(true);
6845 >                        Object x = f.get(null);
6846 >                        if (k.isInstance(x))
6847 >                            return k.cast(x);
6848 >                    }
6849 >                    throw new NoSuchFieldError("the Unsafe");
6850 >                }});
6851 >        } catch (java.security.PrivilegedActionException e) {
6852 >            throw new RuntimeException("Could not initialize intrinsics",
6853 >                                       e.getCause());
6854          }
6855      }
6856   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines