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.69 by jsr166, Sun Oct 21 06:14:11 2012 UTC vs.
Revision 1.81 by dl, Sat Dec 8 14:10:38 2012 UTC

# Line 5 | Line 5
5   */
6  
7   package jsr166e;
8 < import jsr166e.LongAdder;
9 < import jsr166e.ForkJoinPool;
10 < import jsr166e.ForkJoinTask;
8 >
9 > import java.util.Comparator;
10 > import java.util.Arrays;
11 > import java.util.Map;
12 > import java.util.Set;
13 > import java.util.Collection;
14 > import java.util.AbstractMap;
15 > import java.util.AbstractSet;
16 > import java.util.AbstractCollection;
17 > import java.util.Hashtable;
18 > import java.util.HashMap;
19 > import java.util.Iterator;
20 > 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;
26 > import java.util.concurrent.locks.AbstractQueuedSynchronizer;
27 > import java.util.concurrent.atomic.AtomicReference;
28 >
29 > import java.io.Serializable;
30  
31   import java.util.Comparator;
32   import java.util.Arrays;
# Line 43 | Line 62 | import java.io.Serializable;
62   * interoperable with {@code Hashtable} in programs that rely on its
63   * thread safety but not on its synchronization details.
64   *
65 < * <p> Retrieval operations (including {@code get}) generally do not
65 > * <p>Retrieval operations (including {@code get}) generally do not
66   * block, so may overlap with update operations (including {@code put}
67   * and {@code remove}). Retrievals reflect the results of the most
68   * recently <em>completed</em> update operations holding upon their
# Line 64 | Line 83 | import java.io.Serializable;
83   * that may be adequate for monitoring or estimation purposes, but not
84   * for program control.
85   *
86 < * <p> The table is dynamically expanded when there are too many
86 > * <p>The table is dynamically expanded when there are too many
87   * collisions (i.e., keys that have distinct hash codes but fall into
88   * the same slot modulo the table size), with the expected average
89   * effect of maintaining roughly two bins per mapping (corresponding
# Line 85 | Line 104 | import java.io.Serializable;
104   * {@code hashCode()} is a sure way to slow down performance of any
105   * hash table.
106   *
107 + * <p>A {@link Set} projection of a ConcurrentHashMapV8 may be created
108 + * (using {@link #newKeySet()} or {@link #newKeySet(int)}), or viewed
109 + * (using {@link #keySet(Object)} when only keys are of interest, and the
110 + * mapped values are (perhaps transiently) not used or all take the
111 + * same mapping value.
112 + *
113 + * <p>A ConcurrentHashMapV8 can be used as scalable frequency map (a
114 + * form of histogram or multiset) by using {@link LongAdder} values
115 + * and initializing via {@link #computeIfAbsent}. For example, to add
116 + * a count to a {@code ConcurrentHashMapV8<String,LongAdder> freqs}, you
117 + * can use {@code freqs.computeIfAbsent(k -> new
118 + * LongAdder()).increment();}
119 + *
120   * <p>This class and its views and iterators implement all of the
121   * <em>optional</em> methods of the {@link Map} and {@link Iterator}
122   * interfaces.
123   *
124 < * <p> Like {@link Hashtable} but unlike {@link HashMap}, this class
124 > * <p>Like {@link Hashtable} but unlike {@link HashMap}, this class
125   * does <em>not</em> allow {@code null} to be used as a key or value.
126   *
127 + * <p>ConcurrentHashMapV8s support parallel operations using the {@link
128 + * ForkJoinPool#commonPool}. (Tasks that may be used in other contexts
129 + * are available in class {@link ForkJoinTasks}). These operations are
130 + * designed to be safely, and often sensibly, applied even with maps
131 + * that are being concurrently updated by other threads; for example,
132 + * when computing a snapshot summary of the values in a shared
133 + * registry.  There are three kinds of operation, each with four
134 + * forms, accepting functions with Keys, Values, Entries, and (Key,
135 + * Value) arguments and/or return values. (The first three forms are
136 + * also available via the {@link #keySet()}, {@link #values()} and
137 + * {@link #entrySet()} views). Because the elements of a
138 + * ConcurrentHashMapV8 are not ordered in any particular way, and may be
139 + * processed in different orders in different parallel executions, the
140 + * correctness of supplied functions should not depend on any
141 + * ordering, or on any other objects or values that may transiently
142 + * change while computation is in progress; and except for forEach
143 + * actions, should ideally be side-effect-free.
144 + *
145 + * <ul>
146 + * <li> forEach: Perform a given action on each element.
147 + * A variant form applies a given transformation on each element
148 + * before performing the action.</li>
149 + *
150 + * <li> search: Return the first available non-null result of
151 + * applying a given function on each element; skipping further
152 + * search when a result is found.</li>
153 + *
154 + * <li> reduce: Accumulate each element.  The supplied reduction
155 + * function cannot rely on ordering (more formally, it should be
156 + * both associative and commutative).  There are five variants:
157 + *
158 + * <ul>
159 + *
160 + * <li> Plain reductions. (There is not a form of this method for
161 + * (key, value) function arguments since there is no corresponding
162 + * return type.)</li>
163 + *
164 + * <li> Mapped reductions that accumulate the results of a given
165 + * function applied to each element.</li>
166 + *
167 + * <li> Reductions to scalar doubles, longs, and ints, using a
168 + * given basis value.</li>
169 + *
170 + * </li>
171 + * </ul>
172 + * </ul>
173 + *
174 + * <p>The concurrency properties of bulk operations follow
175 + * from those of ConcurrentHashMapV8: Any non-null result returned
176 + * from {@code get(key)} and related access methods bears a
177 + * happens-before relation with the associated insertion or
178 + * update.  The result of any bulk operation reflects the
179 + * composition of these per-element relations (but is not
180 + * necessarily atomic with respect to the map as a whole unless it
181 + * is somehow known to be quiescent).  Conversely, because keys
182 + * and values in the map are never null, null serves as a reliable
183 + * atomic indicator of the current lack of any result.  To
184 + * maintain this property, null serves as an implicit basis for
185 + * all non-scalar reduction operations. For the double, long, and
186 + * int versions, the basis should be one that, when combined with
187 + * any other value, returns that other value (more formally, it
188 + * should be the identity element for the reduction). Most common
189 + * reductions have these properties; for example, computing a sum
190 + * with basis 0 or a minimum with basis MAX_VALUE.
191 + *
192 + * <p>Search and transformation functions provided as arguments
193 + * should similarly return null to indicate the lack of any result
194 + * (in which case it is not used). In the case of mapped
195 + * reductions, this also enables transformations to serve as
196 + * filters, returning null (or, in the case of primitive
197 + * specializations, the identity basis) if the element should not
198 + * be combined. You can create compound transformations and
199 + * filterings by composing them yourself under this "null means
200 + * there is nothing there now" rule before using them in search or
201 + * reduce operations.
202 + *
203 + * <p>Methods accepting and/or returning Entry arguments maintain
204 + * key-value associations. They may be useful for example when
205 + * finding the key for the greatest value. Note that "plain" Entry
206 + * arguments can be supplied using {@code new
207 + * AbstractMap.SimpleEntry(k,v)}.
208 + *
209 + * <p>Bulk operations may complete abruptly, throwing an
210 + * exception encountered in the application of a supplied
211 + * function. Bear in mind when handling such exceptions that other
212 + * concurrently executing functions could also have thrown
213 + * exceptions, or would have done so if the first exception had
214 + * not occurred.
215 + *
216 + * <p>Parallel speedups for bulk operations compared to sequential
217 + * processing are common but not guaranteed.  Operations involving
218 + * brief functions on small maps may execute more slowly than
219 + * sequential loops if the underlying work to parallelize the
220 + * computation is more expensive than the computation itself.
221 + * Similarly, parallelization may not lead to much actual parallelism
222 + * if all processors are busy performing unrelated tasks.
223 + *
224 + * <p>All arguments to all task methods must be non-null.
225 + *
226 + * <p><em>jsr166e note: During transition, this class
227 + * uses nested functional interfaces with different names but the
228 + * same forms as those expected for JDK8.</em>
229 + *
230   * <p>This class is a member of the
231   * <a href="{@docRoot}/../technotes/guides/collections/index.html">
232   * Java Collections Framework</a>.
233   *
99 * <p><em>jsr166e note: This class is a candidate replacement for
100 * java.util.concurrent.ConcurrentHashMap.  During transition, this
101 * class declares and uses nested functional interfaces with different
102 * names but the same forms as those expected for JDK8.<em>
103 *
234   * @since 1.5
235   * @author Doug Lea
236   * @param <K> the type of keys maintained by this map
# Line 117 | Line 247 | public class ConcurrentHashMapV8<K, V>
247       * portion of the elements, and so may be amenable to parallel
248       * execution.
249       *
250 <     * <p> This interface exports a subset of expected JDK8
250 >     * <p>This interface exports a subset of expected JDK8
251       * functionality.
252       *
253       * <p>Sample usage: Here is one (of the several) ways to compute
# Line 179 | Line 309 | public class ConcurrentHashMapV8<K, V>
309          Spliterator<T> split();
310      }
311  
312 +
313      /*
314       * Overview:
315       *
# Line 461 | Line 592 | public class ConcurrentHashMapV8<K, V>
592      private transient volatile int sizeCtl;
593  
594      // views
595 <    private transient KeySet<K,V> keySet;
596 <    private transient Values<K,V> values;
597 <    private transient EntrySet<K,V> entrySet;
595 >    private transient KeySetView<K,V> keySet;
596 >    private transient ValuesView<K,V> values;
597 >    private transient EntrySetView<K,V> entrySet;
598  
599      /** For serialization compatibility. Null unless serialized; see below */
600      private Segment<K,V>[] segments;
# Line 562 | Line 693 | public class ConcurrentHashMapV8<K, V>
693                                  try {
694                                      wait();
695                                  } catch (InterruptedException ie) {
696 <                                    Thread.currentThread().interrupt();
696 >                                    try {
697 >                                        Thread.currentThread().interrupt();
698 >                                    } catch (SecurityException ignore) {
699 >                                    }
700                                  }
701                              }
702                              else
# Line 733 | Line 867 | public class ConcurrentHashMapV8<K, V>
867                      if (c != (pc = pk.getClass()) ||
868                          !(k instanceof Comparable) ||
869                          (dir = ((Comparable)k).compareTo((Comparable)pk)) == 0) {
870 <                        dir = (c == pc) ? 0 : c.getName().compareTo(pc.getName());
871 <                        TreeNode r = null, s = null, pl, pr;
872 <                        if (dir >= 0) {
873 <                            if ((pl = p.left) != null && h <= pl.hash)
874 <                                s = pl;
870 >                        if ((dir = (c == pc) ? 0 :
871 >                             c.getName().compareTo(pc.getName())) == 0) {
872 >                            TreeNode r = null, pl, pr; // check both sides
873 >                            if ((pr = p.right) != null && h >= pr.hash &&
874 >                                (r = getTreeNode(h, k, pr)) != null)
875 >                                return r;
876 >                            else if ((pl = p.left) != null && h <= pl.hash)
877 >                                dir = -1;
878 >                            else // nothing there
879 >                                return null;
880                          }
742                        else if ((pr = p.right) != null && h >= pr.hash)
743                            s = pr;
744                        if (s != null && (r = getTreeNode(h, k, s)) != null)
745                            return r;
881                      }
882                  }
883                  else
# Line 797 | Line 932 | public class ConcurrentHashMapV8<K, V>
932                      if (c != (pc = pk.getClass()) ||
933                          !(k instanceof Comparable) ||
934                          (dir = ((Comparable)k).compareTo((Comparable)pk)) == 0) {
935 <                        dir = (c == pc) ? 0 : c.getName().compareTo(pc.getName());
936 <                        TreeNode r = null, s = null, pl, pr;
937 <                        if (dir >= 0) {
938 <                            if ((pl = p.left) != null && h <= pl.hash)
939 <                                s = pl;
935 >                        TreeNode s = null, r = null, pr;
936 >                        if ((dir = (c == pc) ? 0 :
937 >                             c.getName().compareTo(pc.getName())) == 0) {
938 >                            if ((pr = p.right) != null && h >= pr.hash &&
939 >                                (r = getTreeNode(h, k, pr)) != null)
940 >                                return r;
941 >                            else // continue left
942 >                                dir = -1;
943                          }
944                          else if ((pr = p.right) != null && h >= pr.hash)
945                              s = pr;
# Line 2243 | Line 2381 | public class ConcurrentHashMapV8<K, V>
2381       * change (including to null, indicating deletion), field nextVal
2382       * might not be accurate at point of use, but still maintains the
2383       * weak consistency property of holding a value that was once
2384 <     * valid.
2384 >     * valid. To support iterator.remove, the nextKey field is not
2385 >     * updated (nulled out) when the iterator cannot advance.
2386       *
2387       * Internal traversals directly access these fields, as in:
2388       * {@code while (it.advance() != null) { process(it.nextKey); }}
# Line 2270 | Line 2409 | public class ConcurrentHashMapV8<K, V>
2409       * across threads, iteration terminates if a bounds checks fails
2410       * for a table read.
2411       *
2412 <     * This class extends ForkJoinTask to streamline parallel
2413 <     * iteration in bulk operations (see BulkTask). This adds only an
2414 <     * int of space overhead, which is close enough to negligible in
2415 <     * cases where it is not needed to not worry about it.  Because
2416 <     * ForkJoinTask is Serializable, but iterators need not be, we
2417 <     * need to add warning suppressions.
2412 >     * This class extends CountedCompleter to streamline parallel
2413 >     * iteration in bulk operations. This adds only a few fields of
2414 >     * space overhead, which is small enough in cases where it is not
2415 >     * needed to not worry about it.  Because CountedCompleter is
2416 >     * Serializable, but iterators need not be, we need to add warning
2417 >     * suppressions.
2418       */
2419 <    @SuppressWarnings("serial") static class Traverser<K,V,R> extends ForkJoinTask<R> {
2419 >    @SuppressWarnings("serial") static class Traverser<K,V,R> extends CountedCompleter<R> {
2420          final ConcurrentHashMapV8<K, V> map;
2421          Node next;           // the next entry to use
2283        Node last;           // the last entry used
2422          Object nextKey;      // cached key field of next
2423          Object nextVal;      // cached val field of next
2424          Node[] tab;          // current table; updated if resized
# Line 2288 | Line 2426 | public class ConcurrentHashMapV8<K, V>
2426          int baseIndex;       // current index of initial table
2427          int baseLimit;       // index bound for initial table
2428          int baseSize;        // initial table size
2429 +        int batch;           // split control
2430  
2431          /** Creates iterator for all entries in the table. */
2432          Traverser(ConcurrentHashMapV8<K, V> map) {
2433              this.map = map;
2434          }
2435  
2436 <        /** Creates iterator for split() methods */
2437 <        Traverser(Traverser<K,V,?> it) {
2438 <            ConcurrentHashMapV8<K, V> m; Node[] t;
2439 <            if ((m = this.map = it.map) == null)
2440 <                t = null;
2441 <            else if ((t = it.tab) == null && // force parent tab initialization
2442 <                     (t = it.tab = m.table) != null)
2443 <                it.baseLimit = it.baseSize = t.length;
2444 <            this.tab = t;
2445 <            this.baseSize = it.baseSize;
2446 <            it.baseLimit = this.index = this.baseIndex =
2447 <                ((this.baseLimit = it.baseLimit) + it.baseIndex + 1) >>> 1;
2436 >        /** Creates iterator for split() methods and task constructors */
2437 >        Traverser(ConcurrentHashMapV8<K,V> map, Traverser<K,V,?> it, int batch) {
2438 >            super(it);
2439 >            this.batch = batch;
2440 >            if ((this.map = map) != null && it != null) { // split parent
2441 >                Node[] t;
2442 >                if ((t = it.tab) == null &&
2443 >                    (t = it.tab = map.table) != null)
2444 >                    it.baseLimit = it.baseSize = t.length;
2445 >                this.tab = t;
2446 >                this.baseSize = it.baseSize;
2447 >                int hi = this.baseLimit = it.baseLimit;
2448 >                it.baseLimit = this.index = this.baseIndex =
2449 >                    (hi + it.baseIndex + 1) >>> 1;
2450 >            }
2451          }
2452  
2453          /**
# Line 2313 | Line 2455 | public class ConcurrentHashMapV8<K, V>
2455           * See above for explanation.
2456           */
2457          final Object advance() {
2458 <            Node e = last = next;
2458 >            Node e = next;
2459              Object ev = null;
2460              outer: do {
2461                  if (e != null)                  // advance past used/skipped node
# Line 2347 | Line 2489 | public class ConcurrentHashMapV8<K, V>
2489          }
2490  
2491          public final void remove() {
2492 <            if (nextVal == null && last == null)
2493 <                advance();
2352 <            Node e = last;
2353 <            if (e == null)
2492 >            Object k = nextKey;
2493 >            if (k == null && (advance() == null || (k = nextKey) == null))
2494                  throw new IllegalStateException();
2495 <            last = null;
2356 <            map.remove(e.key);
2495 >            map.internalReplace(k, null, null);
2496          }
2497  
2498          public final boolean hasNext() {
# Line 2361 | Line 2500 | public class ConcurrentHashMapV8<K, V>
2500          }
2501  
2502          public final boolean hasMoreElements() { return hasNext(); }
2503 <        public final void setRawResult(Object x) { }
2504 <        public R getRawResult() { return null; }
2505 <        public boolean exec() { return true; }
2503 >
2504 >        public void compute() { } // default no-op CountedCompleter body
2505 >
2506 >        /**
2507 >         * Returns a batch value > 0 if this task should (and must) be
2508 >         * split, if so, adding to pending count, and in any case
2509 >         * updating batch value. The initial batch value is approx
2510 >         * exp2 of the number of times (minus one) to split task by
2511 >         * two before executing leaf action. This value is faster to
2512 >         * compute and more convenient to use as a guide to splitting
2513 >         * than is the depth, since it is used while dividing by two
2514 >         * anyway.
2515 >         */
2516 >        final int preSplit() {
2517 >            ConcurrentHashMapV8<K, V> m; int b; Node[] t;  ForkJoinPool pool;
2518 >            if ((b = batch) < 0 && (m = map) != null) { // force initialization
2519 >                if ((t = tab) == null && (t = tab = m.table) != null)
2520 >                    baseLimit = baseSize = t.length;
2521 >                if (t != null) {
2522 >                    long n = m.counter.sum();
2523 >                    int par = ((pool = getPool()) == null) ?
2524 >                        ForkJoinPool.getCommonPoolParallelism() :
2525 >                        pool.getParallelism();
2526 >                    int sp = par << 3; // slack of 8
2527 >                    b = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp;
2528 >                }
2529 >            }
2530 >            b = (b <= 1 || baseIndex == baseLimit) ? 0 : (b >>> 1);
2531 >            if ((batch = b) > 0)
2532 >                addToPendingCount(1);
2533 >            return b;
2534 >        }
2535 >
2536      }
2537  
2538      /* ---------------- Public operations -------------- */
# Line 2457 | Line 2626 | public class ConcurrentHashMapV8<K, V>
2626      }
2627  
2628      /**
2629 +     * Creates a new {@link Set} backed by a ConcurrentHashMapV8
2630 +     * from the given type to {@code Boolean.TRUE}.
2631 +     *
2632 +     * @return the new set
2633 +     */
2634 +    public static <K> KeySetView<K,Boolean> newKeySet() {
2635 +        return new KeySetView<K,Boolean>(new ConcurrentHashMapV8<K,Boolean>(),
2636 +                                      Boolean.TRUE);
2637 +    }
2638 +
2639 +    /**
2640 +     * Creates a new {@link Set} backed by a ConcurrentHashMapV8
2641 +     * from the given type to {@code Boolean.TRUE}.
2642 +     *
2643 +     * @param initialCapacity The implementation performs internal
2644 +     * sizing to accommodate this many elements.
2645 +     * @throws IllegalArgumentException if the initial capacity of
2646 +     * elements is negative
2647 +     * @return the new set
2648 +     */
2649 +    public static <K> KeySetView<K,Boolean> newKeySet(int initialCapacity) {
2650 +        return new KeySetView<K,Boolean>(new ConcurrentHashMapV8<K,Boolean>(initialCapacity),
2651 +                                      Boolean.TRUE);
2652 +    }
2653 +
2654 +    /**
2655       * {@inheritDoc}
2656       */
2657      public boolean isEmpty() {
# Line 2475 | Line 2670 | public class ConcurrentHashMapV8<K, V>
2670  
2671      /**
2672       * Returns the number of mappings. This method should be used
2673 <     * instead of {@link #size} because a ConcurrentHashMap may
2673 >     * instead of {@link #size} because a ConcurrentHashMapV8 may
2674       * contain more mappings than can be represented as an int. The
2675 <     * value returned is a snapshot; the actual count may differ if
2676 <     * there are ongoing concurrent insertions or removals.
2675 >     * value returned is an estimate; the actual count may differ if
2676 >     * there are concurrent insertions or removals.
2677       *
2678       * @return the number of mappings
2679       */
# Line 2581 | Line 2776 | public class ConcurrentHashMapV8<K, V>
2776       * Maps the specified key to the specified value in this table.
2777       * Neither the key nor the value can be null.
2778       *
2779 <     * <p> The value can be retrieved by calling the {@code get} method
2779 >     * <p>The value can be retrieved by calling the {@code get} method
2780       * with a key that is equal to the original key.
2781       *
2782       * @param key key with which the specified value is to be associated
# Line 2848 | Line 3043 | public class ConcurrentHashMapV8<K, V>
3043      /**
3044       * Returns a {@link Set} view of the keys contained in this map.
3045       * The set is backed by the map, so changes to the map are
3046 <     * reflected in the set, and vice-versa.  The set supports element
2852 <     * removal, which removes the corresponding mapping from this map,
2853 <     * via the {@code Iterator.remove}, {@code Set.remove},
2854 <     * {@code removeAll}, {@code retainAll}, and {@code clear}
2855 <     * operations.  It does not support the {@code add} or
2856 <     * {@code addAll} operations.
3046 >     * reflected in the set, and vice-versa.
3047       *
3048 <     * <p>The view's {@code iterator} is a "weakly consistent" iterator
2859 <     * that will never throw {@link ConcurrentModificationException},
2860 <     * and guarantees to traverse elements as they existed upon
2861 <     * construction of the iterator, and may (but is not guaranteed to)
2862 <     * reflect any modifications subsequent to construction.
3048 >     * @return the set view
3049       */
3050 <    public Set<K> keySet() {
3051 <        KeySet<K,V> ks = keySet;
3052 <        return (ks != null) ? ks : (keySet = new KeySet<K,V>(this));
3050 >    public KeySetView<K,V> keySet() {
3051 >        KeySetView<K,V> ks = keySet;
3052 >        return (ks != null) ? ks : (keySet = new KeySetView<K,V>(this, null));
3053 >    }
3054 >
3055 >    /**
3056 >     * Returns a {@link Set} view of the keys in this map, using the
3057 >     * given common mapped value for any additions (i.e., {@link
3058 >     * Collection#add} and {@link Collection#addAll}). This is of
3059 >     * course only appropriate if it is acceptable to use the same
3060 >     * value for all additions from this view.
3061 >     *
3062 >     * @param mappedValue the mapped value to use for any
3063 >     * additions.
3064 >     * @return the set view
3065 >     * @throws NullPointerException if the mappedValue is null
3066 >     */
3067 >    public KeySetView<K,V> keySet(V mappedValue) {
3068 >        if (mappedValue == null)
3069 >            throw new NullPointerException();
3070 >        return new KeySetView<K,V>(this, mappedValue);
3071      }
3072  
3073      /**
3074       * Returns a {@link Collection} view of the values contained in this map.
3075       * The collection is backed by the map, so changes to the map are
3076 <     * reflected in the collection, and vice-versa.  The collection
2873 <     * supports element removal, which removes the corresponding
2874 <     * mapping from this map, via the {@code Iterator.remove},
2875 <     * {@code Collection.remove}, {@code removeAll},
2876 <     * {@code retainAll}, and {@code clear} operations.  It does not
2877 <     * support the {@code add} or {@code addAll} operations.
2878 <     *
2879 <     * <p>The view's {@code iterator} is a "weakly consistent" iterator
2880 <     * that will never throw {@link ConcurrentModificationException},
2881 <     * and guarantees to traverse elements as they existed upon
2882 <     * construction of the iterator, and may (but is not guaranteed to)
2883 <     * reflect any modifications subsequent to construction.
3076 >     * reflected in the collection, and vice-versa.
3077       */
3078 <    public Collection<V> values() {
3079 <        Values<K,V> vs = values;
3080 <        return (vs != null) ? vs : (values = new Values<K,V>(this));
3078 >    public ValuesView<K,V> values() {
3079 >        ValuesView<K,V> vs = values;
3080 >        return (vs != null) ? vs : (values = new ValuesView<K,V>(this));
3081      }
3082  
3083      /**
# Line 2904 | Line 3097 | public class ConcurrentHashMapV8<K, V>
3097       * reflect any modifications subsequent to construction.
3098       */
3099      public Set<Map.Entry<K,V>> entrySet() {
3100 <        EntrySet<K,V> es = entrySet;
3101 <        return (es != null) ? es : (entrySet = new EntrySet<K,V>(this));
3100 >        EntrySetView<K,V> es = entrySet;
3101 >        return (es != null) ? es : (entrySet = new EntrySetView<K,V>(this));
3102      }
3103  
3104      /**
# Line 3041 | Line 3234 | public class ConcurrentHashMapV8<K, V>
3234      @SuppressWarnings("serial") static final class KeyIterator<K,V> extends Traverser<K,V,Object>
3235          implements Spliterator<K>, Enumeration<K> {
3236          KeyIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3237 <        KeyIterator(Traverser<K,V,Object> it) {
3238 <            super(it);
3237 >        KeyIterator(ConcurrentHashMapV8<K, V> map, Traverser<K,V,Object> it) {
3238 >            super(map, it, -1);
3239          }
3240          public KeyIterator<K,V> split() {
3241 <            if (last != null || (next != null && nextVal == null))
3241 >            if (nextKey != null)
3242                  throw new IllegalStateException();
3243 <            return new KeyIterator<K,V>(this);
3243 >            return new KeyIterator<K,V>(map, this);
3244          }
3245          @SuppressWarnings("unchecked") public final K next() {
3246              if (nextVal == null && advance() == null)
# Line 3063 | Line 3256 | public class ConcurrentHashMapV8<K, V>
3256      @SuppressWarnings("serial") static final class ValueIterator<K,V> extends Traverser<K,V,Object>
3257          implements Spliterator<V>, Enumeration<V> {
3258          ValueIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3259 <        ValueIterator(Traverser<K,V,Object> it) {
3260 <            super(it);
3259 >        ValueIterator(ConcurrentHashMapV8<K, V> map, Traverser<K,V,Object> it) {
3260 >            super(map, it, -1);
3261          }
3262          public ValueIterator<K,V> split() {
3263 <            if (last != null || (next != null && nextVal == null))
3263 >            if (nextKey != null)
3264                  throw new IllegalStateException();
3265 <            return new ValueIterator<K,V>(this);
3265 >            return new ValueIterator<K,V>(map, this);
3266          }
3267  
3268          @SuppressWarnings("unchecked") public final V next() {
# Line 3086 | Line 3279 | public class ConcurrentHashMapV8<K, V>
3279      @SuppressWarnings("serial") static final class EntryIterator<K,V> extends Traverser<K,V,Object>
3280          implements Spliterator<Map.Entry<K,V>> {
3281          EntryIterator(ConcurrentHashMapV8<K, V> map) { super(map); }
3282 <        EntryIterator(Traverser<K,V,Object> it) {
3283 <            super(it);
3282 >        EntryIterator(ConcurrentHashMapV8<K, V> map, Traverser<K,V,Object> it) {
3283 >            super(map, it, -1);
3284          }
3285          public EntryIterator<K,V> split() {
3286 <            if (last != null || (next != null && nextVal == null))
3286 >            if (nextKey != null)
3287                  throw new IllegalStateException();
3288 <            return new EntryIterator<K,V>(this);
3288 >            return new EntryIterator<K,V>(map, this);
3289          }
3290  
3291          @SuppressWarnings("unchecked") public final Map.Entry<K,V> next() {
# Line 3148 | Line 3341 | public class ConcurrentHashMapV8<K, V>
3341          }
3342      }
3343  
3151    /* ----------------Views -------------- */
3152
3344      /**
3345 <     * Base class for views.
3345 >     * Returns exportable snapshot entry for the given key and value
3346 >     * when write-through can't or shouldn't be used.
3347       */
3348 <    static abstract class CHMView<K, V> {
3349 <        final ConcurrentHashMapV8<K, V> map;
3158 <        CHMView(ConcurrentHashMapV8<K, V> map)  { this.map = map; }
3159 <        public final int size()                 { return map.size(); }
3160 <        public final boolean isEmpty()          { return map.isEmpty(); }
3161 <        public final void clear()               { map.clear(); }
3162 <
3163 <        // implementations below rely on concrete classes supplying these
3164 <        abstract public Iterator<?> iterator();
3165 <        abstract public boolean contains(Object o);
3166 <        abstract public boolean remove(Object o);
3167 <
3168 <        private static final String oomeMsg = "Required array size too large";
3169 <
3170 <        public final Object[] toArray() {
3171 <            long sz = map.mappingCount();
3172 <            if (sz > (long)(MAX_ARRAY_SIZE))
3173 <                throw new OutOfMemoryError(oomeMsg);
3174 <            int n = (int)sz;
3175 <            Object[] r = new Object[n];
3176 <            int i = 0;
3177 <            Iterator<?> it = iterator();
3178 <            while (it.hasNext()) {
3179 <                if (i == n) {
3180 <                    if (n >= MAX_ARRAY_SIZE)
3181 <                        throw new OutOfMemoryError(oomeMsg);
3182 <                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
3183 <                        n = MAX_ARRAY_SIZE;
3184 <                    else
3185 <                        n += (n >>> 1) + 1;
3186 <                    r = Arrays.copyOf(r, n);
3187 <                }
3188 <                r[i++] = it.next();
3189 <            }
3190 <            return (i == n) ? r : Arrays.copyOf(r, i);
3191 <        }
3192 <
3193 <        @SuppressWarnings("unchecked") public final <T> T[] toArray(T[] a) {
3194 <            long sz = map.mappingCount();
3195 <            if (sz > (long)(MAX_ARRAY_SIZE))
3196 <                throw new OutOfMemoryError(oomeMsg);
3197 <            int m = (int)sz;
3198 <            T[] r = (a.length >= m) ? a :
3199 <                (T[])java.lang.reflect.Array
3200 <                .newInstance(a.getClass().getComponentType(), m);
3201 <            int n = r.length;
3202 <            int i = 0;
3203 <            Iterator<?> it = iterator();
3204 <            while (it.hasNext()) {
3205 <                if (i == n) {
3206 <                    if (n >= MAX_ARRAY_SIZE)
3207 <                        throw new OutOfMemoryError(oomeMsg);
3208 <                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
3209 <                        n = MAX_ARRAY_SIZE;
3210 <                    else
3211 <                        n += (n >>> 1) + 1;
3212 <                    r = Arrays.copyOf(r, n);
3213 <                }
3214 <                r[i++] = (T)it.next();
3215 <            }
3216 <            if (a == r && i < n) {
3217 <                r[i] = null; // null-terminate
3218 <                return r;
3219 <            }
3220 <            return (i == n) ? r : Arrays.copyOf(r, i);
3221 <        }
3222 <
3223 <        public final int hashCode() {
3224 <            int h = 0;
3225 <            for (Iterator<?> it = iterator(); it.hasNext();)
3226 <                h += it.next().hashCode();
3227 <            return h;
3228 <        }
3229 <
3230 <        public final String toString() {
3231 <            StringBuilder sb = new StringBuilder();
3232 <            sb.append('[');
3233 <            Iterator<?> it = iterator();
3234 <            if (it.hasNext()) {
3235 <                for (;;) {
3236 <                    Object e = it.next();
3237 <                    sb.append(e == this ? "(this Collection)" : e);
3238 <                    if (!it.hasNext())
3239 <                        break;
3240 <                    sb.append(',').append(' ');
3241 <                }
3242 <            }
3243 <            return sb.append(']').toString();
3244 <        }
3245 <
3246 <        public final boolean containsAll(Collection<?> c) {
3247 <            if (c != this) {
3248 <                for (Iterator<?> it = c.iterator(); it.hasNext();) {
3249 <                    Object e = it.next();
3250 <                    if (e == null || !contains(e))
3251 <                        return false;
3252 <                }
3253 <            }
3254 <            return true;
3255 <        }
3256 <
3257 <        public final boolean removeAll(Collection<?> c) {
3258 <            boolean modified = false;
3259 <            for (Iterator<?> it = iterator(); it.hasNext();) {
3260 <                if (c.contains(it.next())) {
3261 <                    it.remove();
3262 <                    modified = true;
3263 <                }
3264 <            }
3265 <            return modified;
3266 <        }
3267 <
3268 <        public final boolean retainAll(Collection<?> c) {
3269 <            boolean modified = false;
3270 <            for (Iterator<?> it = iterator(); it.hasNext();) {
3271 <                if (!c.contains(it.next())) {
3272 <                    it.remove();
3273 <                    modified = true;
3274 <                }
3275 <            }
3276 <            return modified;
3277 <        }
3278 <
3279 <    }
3280 <
3281 <    static final class KeySet<K,V> extends CHMView<K,V> implements Set<K> {
3282 <        KeySet(ConcurrentHashMapV8<K, V> map)  {
3283 <            super(map);
3284 <        }
3285 <        public final boolean contains(Object o) { return map.containsKey(o); }
3286 <        public final boolean remove(Object o)   { return map.remove(o) != null; }
3287 <        public final Iterator<K> iterator() {
3288 <            return new KeyIterator<K,V>(map);
3289 <        }
3290 <        public final boolean add(K e) {
3291 <            throw new UnsupportedOperationException();
3292 <        }
3293 <        public final boolean addAll(Collection<? extends K> c) {
3294 <            throw new UnsupportedOperationException();
3295 <        }
3296 <        public boolean equals(Object o) {
3297 <            Set<?> c;
3298 <            return ((o instanceof Set) &&
3299 <                    ((c = (Set<?>)o) == this ||
3300 <                     (containsAll(c) && c.containsAll(this))));
3301 <        }
3302 <    }
3303 <
3304 <
3305 <    static final class Values<K,V> extends CHMView<K,V>
3306 <        implements Collection<V> {
3307 <        Values(ConcurrentHashMapV8<K, V> map)   { super(map); }
3308 <        public final boolean contains(Object o) { return map.containsValue(o); }
3309 <        public final boolean remove(Object o) {
3310 <            if (o != null) {
3311 <                Iterator<V> it = new ValueIterator<K,V>(map);
3312 <                while (it.hasNext()) {
3313 <                    if (o.equals(it.next())) {
3314 <                        it.remove();
3315 <                        return true;
3316 <                    }
3317 <                }
3318 <            }
3319 <            return false;
3320 <        }
3321 <        public final Iterator<V> iterator() {
3322 <            return new ValueIterator<K,V>(map);
3323 <        }
3324 <        public final boolean add(V e) {
3325 <            throw new UnsupportedOperationException();
3326 <        }
3327 <        public final boolean addAll(Collection<? extends V> c) {
3328 <            throw new UnsupportedOperationException();
3329 <        }
3330 <
3331 <    }
3332 <
3333 <    static final class EntrySet<K,V> extends CHMView<K,V>
3334 <        implements Set<Map.Entry<K,V>> {
3335 <        EntrySet(ConcurrentHashMapV8<K, V> map) { super(map); }
3336 <        public final boolean contains(Object o) {
3337 <            Object k, v, r; Map.Entry<?,?> e;
3338 <            return ((o instanceof Map.Entry) &&
3339 <                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
3340 <                    (r = map.get(k)) != null &&
3341 <                    (v = e.getValue()) != null &&
3342 <                    (v == r || v.equals(r)));
3343 <        }
3344 <        public final boolean remove(Object o) {
3345 <            Object k, v; Map.Entry<?,?> e;
3346 <            return ((o instanceof Map.Entry) &&
3347 <                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
3348 <                    (v = e.getValue()) != null &&
3349 <                    map.remove(k, v));
3350 <        }
3351 <        public final Iterator<Map.Entry<K,V>> iterator() {
3352 <            return new EntryIterator<K,V>(map);
3353 <        }
3354 <        public final boolean add(Entry<K,V> e) {
3355 <            throw new UnsupportedOperationException();
3356 <        }
3357 <        public final boolean addAll(Collection<? extends Entry<K,V>> c) {
3358 <            throw new UnsupportedOperationException();
3359 <        }
3360 <        public boolean equals(Object o) {
3361 <            Set<?> c;
3362 <            return ((o instanceof Set) &&
3363 <                    ((c = (Set<?>)o) == this ||
3364 <                     (containsAll(c) && c.containsAll(this))));
3365 <        }
3348 >    static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
3349 >        return new AbstractMap.SimpleEntry<K,V>(k, v);
3350      }
3351  
3352      /* ---------------- Serialization Support -------------- */
# Line 3531 | Line 3515 | public class ConcurrentHashMapV8<K, V>
3515      // -------------------------------------------------------
3516  
3517      /**
3518 <     * Returns an extended {@link Parallel} view of this map using the
3535 <     * given executor for bulk parallel operations.
3518 >     * Performs the given action for each (key, value).
3519       *
3520 <     * @param executor the executor
3538 <     * @return a parallel view
3520 >     * @param action the action
3521       */
3522 <    public Parallel parallel(ForkJoinPool executor)  {
3523 <        return new Parallel(executor);
3522 >    public void forEach(BiAction<K,V> action) {
3523 >        ForkJoinTasks.forEach
3524 >            (this, action).invoke();
3525      }
3526  
3527      /**
3528 <     * An extended view of a ConcurrentHashMap supporting bulk
3529 <     * parallel operations. These operations are designed to be
3530 <     * safely, and often sensibly, applied even with maps that are
3531 <     * being concurrently updated by other threads; for example, when
3532 <     * computing a snapshot summary of the values in a shared
3533 <     * registry.  There are three kinds of operation, each with four
3534 <     * forms, accepting functions with Keys, Values, Entries, and
3535 <     * (Key, Value) arguments and/or return values. Because the
3536 <     * elements of a ConcurrentHashMap are not ordered in any
3537 <     * particular way, and may be processed in different orders in
3538 <     * different parallel executions, the correctness of supplied
3539 <     * functions should not depend on any ordering, or on any other
3540 <     * objects or values that may transiently change while computation
3541 <     * is in progress; and except for forEach actions, should ideally
3542 <     * be side-effect-free.
3543 <     *
3544 <     * <ul>
3545 <     * <li> forEach: Perform a given action on each element.
3546 <     * A variant form applies a given transformation on each element
3547 <     * before performing the action.</li>
3548 <     *
3549 <     * <li> search: Return the first available non-null result of
3550 <     * applying a given function on each element; skipping further
3551 <     * search when a result is found.</li>
3552 <     *
3553 <     * <li> reduce: Accumulate each element.  The supplied reduction
3554 <     * function cannot rely on ordering (more formally, it should be
3555 <     * both associative and commutative).  There are five variants:
3556 <     *
3557 <     * <ul>
3558 <     *
3559 <     * <li> Plain reductions. (There is not a form of this method for
3560 <     * (key, value) function arguments since there is no corresponding
3561 <     * return type.)</li>
3562 <     *
3563 <     * <li> Mapped reductions that accumulate the results of a given
3564 <     * function applied to each element.</li>
3565 <     *
3566 <     * <li> Reductions to scalar doubles, longs, and ints, using a
3567 <     * given basis value.</li>
3568 <     *
3569 <     * </li>
3570 <     * </ul>
3571 <     * </ul>
3572 <     *
3573 <     * <p>The concurrency properties of the bulk operations follow
3574 <     * from those of ConcurrentHashMap: Any non-null result returned
3575 <     * from {@code get(key)} and related access methods bears a
3576 <     * happens-before relation with the associated insertion or
3577 <     * update.  The result of any bulk operation reflects the
3578 <     * composition of these per-element relations (but is not
3579 <     * necessarily atomic with respect to the map as a whole unless it
3580 <     * is somehow known to be quiescent).  Conversely, because keys
3581 <     * and values in the map are never null, null serves as a reliable
3582 <     * atomic indicator of the current lack of any result.  To
3583 <     * maintain this property, null serves as an implicit basis for
3584 <     * all non-scalar reduction operations. For the double, long, and
3585 <     * int versions, the basis should be one that, when combined with
3586 <     * any other value, returns that other value (more formally, it
3587 <     * should be the identity element for the reduction). Most common
3588 <     * reductions have these properties; for example, computing a sum
3589 <     * with basis 0 or a minimum with basis MAX_VALUE.
3590 <     *
3591 <     * <p>Search and transformation functions provided as arguments
3592 <     * should similarly return null to indicate the lack of any result
3593 <     * (in which case it is not used). In the case of mapped
3594 <     * reductions, this also enables transformations to serve as
3595 <     * filters, returning null (or, in the case of primitive
3596 <     * specializations, the identity basis) if the element should not
3597 <     * be combined. You can create compound transformations and
3598 <     * filterings by composing them yourself under this "null means
3599 <     * there is nothing there now" rule before using them in search or
3600 <     * reduce operations.
3601 <     *
3602 <     * <p>Methods accepting and/or returning Entry arguments maintain
3603 <     * key-value associations. They may be useful for example when
3604 <     * finding the key for the greatest value. Note that "plain" Entry
3605 <     * arguments can be supplied using {@code new
3606 <     * AbstractMap.SimpleEntry(k,v)}.
3607 <     *
3608 <     * <p> Bulk operations may complete abruptly, throwing an
3609 <     * exception encountered in the application of a supplied
3610 <     * function. Bear in mind when handling such exceptions that other
3611 <     * concurrently executing functions could also have thrown
3612 <     * exceptions, or would have done so if the first exception had
3613 <     * not occurred.
3614 <     *
3615 <     * <p>Parallel speedups compared to sequential processing are
3616 <     * common but not guaranteed.  Operations involving brief
3617 <     * functions on small maps may execute more slowly than sequential
3618 <     * loops if the underlying work to parallelize the computation is
3619 <     * more expensive than the computation itself. Similarly,
3620 <     * parallelization may not lead to much actual parallelism if all
3621 <     * processors are busy performing unrelated tasks.
3622 <     *
3623 <     * <p> All arguments to all task methods must be non-null.
3624 <     *
3625 <     * <p><em>jsr166e note: During transition, this class
3626 <     * uses nested functional interfaces with different names but the
3627 <     * same forms as those expected for JDK8.<em>
3628 <     */
3629 <    public class Parallel {
3630 <        final ForkJoinPool fjp;
3631 <
3632 <        /**
3633 <         * Returns an extended view of this map using the given
3634 <         * executor for bulk parallel operations.
3635 <         *
3636 <         * @param executor the executor
3637 <         */
3638 <        public Parallel(ForkJoinPool executor)  {
3639 <            this.fjp = executor;
3640 <        }
3528 >     * Performs the given action for each non-null transformation
3529 >     * of each (key, value).
3530 >     *
3531 >     * @param transformer a function returning the transformation
3532 >     * for an element, or null of there is no transformation (in
3533 >     * which case the action is not applied).
3534 >     * @param action the action
3535 >     */
3536 >    public <U> void forEach(BiFun<? super K, ? super V, ? extends U> transformer,
3537 >                            Action<U> action) {
3538 >        ForkJoinTasks.forEach
3539 >            (this, transformer, action).invoke();
3540 >    }
3541 >
3542 >    /**
3543 >     * Returns a non-null result from applying the given search
3544 >     * function on each (key, value), or null if none.  Upon
3545 >     * success, further element processing is suppressed and the
3546 >     * results of any other parallel invocations of the search
3547 >     * function are ignored.
3548 >     *
3549 >     * @param searchFunction a function returning a non-null
3550 >     * result on success, else null
3551 >     * @return a non-null result from applying the given search
3552 >     * function on each (key, value), or null if none
3553 >     */
3554 >    public <U> U search(BiFun<? super K, ? super V, ? extends U> searchFunction) {
3555 >        return ForkJoinTasks.search
3556 >            (this, searchFunction).invoke();
3557 >    }
3558 >
3559 >    /**
3560 >     * Returns the result of accumulating the given transformation
3561 >     * of all (key, value) pairs using the given reducer to
3562 >     * combine values, or null if none.
3563 >     *
3564 >     * @param transformer a function returning the transformation
3565 >     * for an element, or null of there is no transformation (in
3566 >     * which case it is not combined).
3567 >     * @param reducer a commutative associative combining function
3568 >     * @return the result of accumulating the given transformation
3569 >     * of all (key, value) pairs
3570 >     */
3571 >    public <U> U reduce(BiFun<? super K, ? super V, ? extends U> transformer,
3572 >                        BiFun<? super U, ? super U, ? extends U> reducer) {
3573 >        return ForkJoinTasks.reduce
3574 >            (this, transformer, reducer).invoke();
3575 >    }
3576 >
3577 >    /**
3578 >     * Returns the result of accumulating the given transformation
3579 >     * of all (key, value) pairs using the given reducer to
3580 >     * combine values, and the given basis as an identity value.
3581 >     *
3582 >     * @param transformer a function returning the transformation
3583 >     * for an element
3584 >     * @param basis the identity (initial default value) for the reduction
3585 >     * @param reducer a commutative associative combining function
3586 >     * @return the result of accumulating the given transformation
3587 >     * of all (key, value) pairs
3588 >     */
3589 >    public double reduceToDouble(ObjectByObjectToDouble<? super K, ? super V> transformer,
3590 >                                 double basis,
3591 >                                 DoubleByDoubleToDouble reducer) {
3592 >        return ForkJoinTasks.reduceToDouble
3593 >            (this, transformer, basis, reducer).invoke();
3594 >    }
3595 >
3596 >    /**
3597 >     * Returns the result of accumulating the given transformation
3598 >     * of all (key, value) pairs using the given reducer to
3599 >     * combine values, and the given basis as an identity value.
3600 >     *
3601 >     * @param transformer a function returning the transformation
3602 >     * for an element
3603 >     * @param basis the identity (initial default value) for the reduction
3604 >     * @param reducer a commutative associative combining function
3605 >     * @return the result of accumulating the given transformation
3606 >     * of all (key, value) pairs
3607 >     */
3608 >    public long reduceToLong(ObjectByObjectToLong<? super K, ? super V> transformer,
3609 >                             long basis,
3610 >                             LongByLongToLong reducer) {
3611 >        return ForkJoinTasks.reduceToLong
3612 >            (this, transformer, basis, reducer).invoke();
3613 >    }
3614 >
3615 >    /**
3616 >     * Returns the result of accumulating the given transformation
3617 >     * of all (key, value) pairs using the given reducer to
3618 >     * combine values, and the given basis as an identity value.
3619 >     *
3620 >     * @param transformer a function returning the transformation
3621 >     * for an element
3622 >     * @param basis the identity (initial default value) for the reduction
3623 >     * @param reducer a commutative associative combining function
3624 >     * @return the result of accumulating the given transformation
3625 >     * of all (key, value) pairs
3626 >     */
3627 >    public int reduceToInt(ObjectByObjectToInt<? super K, ? super V> transformer,
3628 >                           int basis,
3629 >                           IntByIntToInt reducer) {
3630 >        return ForkJoinTasks.reduceToInt
3631 >            (this, transformer, basis, reducer).invoke();
3632 >    }
3633 >
3634 >    /**
3635 >     * Performs the given action for each key.
3636 >     *
3637 >     * @param action the action
3638 >     */
3639 >    public void forEachKey(Action<K> action) {
3640 >        ForkJoinTasks.forEachKey
3641 >            (this, action).invoke();
3642 >    }
3643 >
3644 >    /**
3645 >     * Performs the given action for each non-null transformation
3646 >     * of each key.
3647 >     *
3648 >     * @param transformer a function returning the transformation
3649 >     * for an element, or null of there is no transformation (in
3650 >     * which case the action is not applied).
3651 >     * @param action the action
3652 >     */
3653 >    public <U> void forEachKey(Fun<? super K, ? extends U> transformer,
3654 >                               Action<U> action) {
3655 >        ForkJoinTasks.forEachKey
3656 >            (this, transformer, action).invoke();
3657 >    }
3658 >
3659 >    /**
3660 >     * Returns a non-null result from applying the given search
3661 >     * function on each key, or null if none. Upon success,
3662 >     * further element processing is suppressed and the results of
3663 >     * any other parallel invocations of the search function are
3664 >     * ignored.
3665 >     *
3666 >     * @param searchFunction a function returning a non-null
3667 >     * result on success, else null
3668 >     * @return a non-null result from applying the given search
3669 >     * function on each key, or null if none
3670 >     */
3671 >    public <U> U searchKeys(Fun<? super K, ? extends U> searchFunction) {
3672 >        return ForkJoinTasks.searchKeys
3673 >            (this, searchFunction).invoke();
3674 >    }
3675 >
3676 >    /**
3677 >     * Returns the result of accumulating all keys using the given
3678 >     * reducer to combine values, or null if none.
3679 >     *
3680 >     * @param reducer a commutative associative combining function
3681 >     * @return the result of accumulating all keys using the given
3682 >     * reducer to combine values, or null if none
3683 >     */
3684 >    public K reduceKeys(BiFun<? super K, ? super K, ? extends K> reducer) {
3685 >        return ForkJoinTasks.reduceKeys
3686 >            (this, reducer).invoke();
3687 >    }
3688 >
3689 >    /**
3690 >     * Returns the result of accumulating the given transformation
3691 >     * of all keys using the given reducer to combine values, or
3692 >     * null if none.
3693 >     *
3694 >     * @param transformer a function returning the transformation
3695 >     * for an element, or null of there is no transformation (in
3696 >     * which case it is not combined).
3697 >     * @param reducer a commutative associative combining function
3698 >     * @return the result of accumulating the given transformation
3699 >     * of all keys
3700 >     */
3701 >    public <U> U reduceKeys(Fun<? super K, ? extends U> transformer,
3702 >                            BiFun<? super U, ? super U, ? extends U> reducer) {
3703 >        return ForkJoinTasks.reduceKeys
3704 >            (this, transformer, reducer).invoke();
3705 >    }
3706 >
3707 >    /**
3708 >     * Returns the result of accumulating the given transformation
3709 >     * of all keys using the given reducer to combine values, and
3710 >     * the given basis as an identity value.
3711 >     *
3712 >     * @param transformer a function returning the transformation
3713 >     * for an element
3714 >     * @param basis the identity (initial default value) for the reduction
3715 >     * @param reducer a commutative associative combining function
3716 >     * @return  the result of accumulating the given transformation
3717 >     * of all keys
3718 >     */
3719 >    public double reduceKeysToDouble(ObjectToDouble<? super K> transformer,
3720 >                                     double basis,
3721 >                                     DoubleByDoubleToDouble reducer) {
3722 >        return ForkJoinTasks.reduceKeysToDouble
3723 >            (this, transformer, basis, reducer).invoke();
3724 >    }
3725 >
3726 >    /**
3727 >     * Returns the result of accumulating the given transformation
3728 >     * of all keys using the given reducer to combine values, and
3729 >     * the given basis as an identity value.
3730 >     *
3731 >     * @param transformer a function returning the transformation
3732 >     * for an element
3733 >     * @param basis the identity (initial default value) for the reduction
3734 >     * @param reducer a commutative associative combining function
3735 >     * @return the result of accumulating the given transformation
3736 >     * of all keys
3737 >     */
3738 >    public long reduceKeysToLong(ObjectToLong<? super K> transformer,
3739 >                                 long basis,
3740 >                                 LongByLongToLong reducer) {
3741 >        return ForkJoinTasks.reduceKeysToLong
3742 >            (this, transformer, basis, reducer).invoke();
3743 >    }
3744 >
3745 >    /**
3746 >     * Returns the result of accumulating the given transformation
3747 >     * of all keys using the given reducer to combine values, and
3748 >     * the given basis as an identity value.
3749 >     *
3750 >     * @param transformer a function returning the transformation
3751 >     * for an element
3752 >     * @param basis the identity (initial default value) for the reduction
3753 >     * @param reducer a commutative associative combining function
3754 >     * @return the result of accumulating the given transformation
3755 >     * of all keys
3756 >     */
3757 >    public int reduceKeysToInt(ObjectToInt<? super K> transformer,
3758 >                               int basis,
3759 >                               IntByIntToInt reducer) {
3760 >        return ForkJoinTasks.reduceKeysToInt
3761 >            (this, transformer, basis, reducer).invoke();
3762 >    }
3763 >
3764 >    /**
3765 >     * Performs the given action for each value.
3766 >     *
3767 >     * @param action the action
3768 >     */
3769 >    public void forEachValue(Action<V> action) {
3770 >        ForkJoinTasks.forEachValue
3771 >            (this, action).invoke();
3772 >    }
3773 >
3774 >    /**
3775 >     * Performs the given action for each non-null transformation
3776 >     * of each value.
3777 >     *
3778 >     * @param transformer a function returning the transformation
3779 >     * for an element, or null of there is no transformation (in
3780 >     * which case the action is not applied).
3781 >     */
3782 >    public <U> void forEachValue(Fun<? super V, ? extends U> transformer,
3783 >                                 Action<U> action) {
3784 >        ForkJoinTasks.forEachValue
3785 >            (this, transformer, action).invoke();
3786 >    }
3787 >
3788 >    /**
3789 >     * Returns a non-null result from applying the given search
3790 >     * function on each value, or null if none.  Upon success,
3791 >     * further element processing is suppressed and the results of
3792 >     * any other parallel invocations of the search function are
3793 >     * ignored.
3794 >     *
3795 >     * @param searchFunction a function returning a non-null
3796 >     * result on success, else null
3797 >     * @return a non-null result from applying the given search
3798 >     * function on each value, or null if none
3799 >     *
3800 >     */
3801 >    public <U> U searchValues(Fun<? super V, ? extends U> searchFunction) {
3802 >        return ForkJoinTasks.searchValues
3803 >            (this, searchFunction).invoke();
3804 >    }
3805 >
3806 >    /**
3807 >     * Returns the result of accumulating all values using the
3808 >     * given reducer to combine values, or null if none.
3809 >     *
3810 >     * @param reducer a commutative associative combining function
3811 >     * @return  the result of accumulating all values
3812 >     */
3813 >    public V reduceValues(BiFun<? super V, ? super V, ? extends V> reducer) {
3814 >        return ForkJoinTasks.reduceValues
3815 >            (this, reducer).invoke();
3816 >    }
3817 >
3818 >    /**
3819 >     * Returns the result of accumulating the given transformation
3820 >     * of all values using the given reducer to combine values, or
3821 >     * null if none.
3822 >     *
3823 >     * @param transformer a function returning the transformation
3824 >     * for an element, or null of there is no transformation (in
3825 >     * which case it is not combined).
3826 >     * @param reducer a commutative associative combining function
3827 >     * @return the result of accumulating the given transformation
3828 >     * of all values
3829 >     */
3830 >    public <U> U reduceValues(Fun<? super V, ? extends U> transformer,
3831 >                              BiFun<? super U, ? super U, ? extends U> reducer) {
3832 >        return ForkJoinTasks.reduceValues
3833 >            (this, transformer, reducer).invoke();
3834 >    }
3835 >
3836 >    /**
3837 >     * Returns the result of accumulating the given transformation
3838 >     * of all values using the given reducer to combine values,
3839 >     * and the given basis as an identity value.
3840 >     *
3841 >     * @param transformer a function returning the transformation
3842 >     * for an element
3843 >     * @param basis the identity (initial default value) for the reduction
3844 >     * @param reducer a commutative associative combining function
3845 >     * @return the result of accumulating the given transformation
3846 >     * of all values
3847 >     */
3848 >    public double reduceValuesToDouble(ObjectToDouble<? super V> transformer,
3849 >                                       double basis,
3850 >                                       DoubleByDoubleToDouble reducer) {
3851 >        return ForkJoinTasks.reduceValuesToDouble
3852 >            (this, transformer, basis, reducer).invoke();
3853 >    }
3854 >
3855 >    /**
3856 >     * Returns the result of accumulating the given transformation
3857 >     * of all values using the given reducer to combine values,
3858 >     * and the given basis as an identity value.
3859 >     *
3860 >     * @param transformer a function returning the transformation
3861 >     * for an element
3862 >     * @param basis the identity (initial default value) for the reduction
3863 >     * @param reducer a commutative associative combining function
3864 >     * @return the result of accumulating the given transformation
3865 >     * of all values
3866 >     */
3867 >    public long reduceValuesToLong(ObjectToLong<? super V> transformer,
3868 >                                   long basis,
3869 >                                   LongByLongToLong reducer) {
3870 >        return ForkJoinTasks.reduceValuesToLong
3871 >            (this, transformer, basis, reducer).invoke();
3872 >    }
3873 >
3874 >    /**
3875 >     * Returns the result of accumulating the given transformation
3876 >     * of all values using the given reducer to combine values,
3877 >     * and the given basis as an identity value.
3878 >     *
3879 >     * @param transformer a function returning the transformation
3880 >     * for an element
3881 >     * @param basis the identity (initial default value) for the reduction
3882 >     * @param reducer a commutative associative combining function
3883 >     * @return the result of accumulating the given transformation
3884 >     * of all values
3885 >     */
3886 >    public int reduceValuesToInt(ObjectToInt<? super V> transformer,
3887 >                                 int basis,
3888 >                                 IntByIntToInt reducer) {
3889 >        return ForkJoinTasks.reduceValuesToInt
3890 >            (this, transformer, basis, reducer).invoke();
3891 >    }
3892 >
3893 >    /**
3894 >     * Performs the given action for each entry.
3895 >     *
3896 >     * @param action the action
3897 >     */
3898 >    public void forEachEntry(Action<Map.Entry<K,V>> action) {
3899 >        ForkJoinTasks.forEachEntry
3900 >            (this, action).invoke();
3901 >    }
3902 >
3903 >    /**
3904 >     * Performs the given action for each non-null transformation
3905 >     * of each entry.
3906 >     *
3907 >     * @param transformer a function returning the transformation
3908 >     * for an element, or null of there is no transformation (in
3909 >     * which case the action is not applied).
3910 >     * @param action the action
3911 >     */
3912 >    public <U> void forEachEntry(Fun<Map.Entry<K,V>, ? extends U> transformer,
3913 >                                 Action<U> action) {
3914 >        ForkJoinTasks.forEachEntry
3915 >            (this, transformer, action).invoke();
3916 >    }
3917 >
3918 >    /**
3919 >     * Returns a non-null result from applying the given search
3920 >     * function on each entry, or null if none.  Upon success,
3921 >     * further element processing is suppressed and the results of
3922 >     * any other parallel invocations of the search function are
3923 >     * ignored.
3924 >     *
3925 >     * @param searchFunction a function returning a non-null
3926 >     * result on success, else null
3927 >     * @return a non-null result from applying the given search
3928 >     * function on each entry, or null if none
3929 >     */
3930 >    public <U> U searchEntries(Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
3931 >        return ForkJoinTasks.searchEntries
3932 >            (this, searchFunction).invoke();
3933 >    }
3934 >
3935 >    /**
3936 >     * Returns the result of accumulating all entries using the
3937 >     * given reducer to combine values, or null if none.
3938 >     *
3939 >     * @param reducer a commutative associative combining function
3940 >     * @return the result of accumulating all entries
3941 >     */
3942 >    public Map.Entry<K,V> reduceEntries(BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
3943 >        return ForkJoinTasks.reduceEntries
3944 >            (this, reducer).invoke();
3945 >    }
3946 >
3947 >    /**
3948 >     * Returns the result of accumulating the given transformation
3949 >     * of all entries using the given reducer to combine values,
3950 >     * or null if none.
3951 >     *
3952 >     * @param transformer a function returning the transformation
3953 >     * for an element, or null of there is no transformation (in
3954 >     * which case it is not combined).
3955 >     * @param reducer a commutative associative combining function
3956 >     * @return the result of accumulating the given transformation
3957 >     * of all entries
3958 >     */
3959 >    public <U> U reduceEntries(Fun<Map.Entry<K,V>, ? extends U> transformer,
3960 >                               BiFun<? super U, ? super U, ? extends U> reducer) {
3961 >        return ForkJoinTasks.reduceEntries
3962 >            (this, transformer, reducer).invoke();
3963 >    }
3964 >
3965 >    /**
3966 >     * Returns the result of accumulating the given transformation
3967 >     * of all entries using the given reducer to combine values,
3968 >     * and the given basis as an identity value.
3969 >     *
3970 >     * @param transformer a function returning the transformation
3971 >     * for an element
3972 >     * @param basis the identity (initial default value) for the reduction
3973 >     * @param reducer a commutative associative combining function
3974 >     * @return the result of accumulating the given transformation
3975 >     * of all entries
3976 >     */
3977 >    public double reduceEntriesToDouble(ObjectToDouble<Map.Entry<K,V>> transformer,
3978 >                                        double basis,
3979 >                                        DoubleByDoubleToDouble reducer) {
3980 >        return ForkJoinTasks.reduceEntriesToDouble
3981 >            (this, transformer, basis, reducer).invoke();
3982 >    }
3983 >
3984 >    /**
3985 >     * Returns the result of accumulating the given transformation
3986 >     * of all entries using the given reducer to combine values,
3987 >     * and the given basis as an identity value.
3988 >     *
3989 >     * @param transformer a function returning the transformation
3990 >     * for an element
3991 >     * @param basis the identity (initial default value) for the reduction
3992 >     * @param reducer a commutative associative combining function
3993 >     * @return  the result of accumulating the given transformation
3994 >     * of all entries
3995 >     */
3996 >    public long reduceEntriesToLong(ObjectToLong<Map.Entry<K,V>> transformer,
3997 >                                    long basis,
3998 >                                    LongByLongToLong reducer) {
3999 >        return ForkJoinTasks.reduceEntriesToLong
4000 >            (this, transformer, basis, reducer).invoke();
4001 >    }
4002 >
4003 >    /**
4004 >     * Returns the result of accumulating the given transformation
4005 >     * of all entries using the given reducer to combine values,
4006 >     * and the given basis as an identity value.
4007 >     *
4008 >     * @param transformer a function returning the transformation
4009 >     * for an element
4010 >     * @param basis the identity (initial default value) for the reduction
4011 >     * @param reducer a commutative associative combining function
4012 >     * @return the result of accumulating the given transformation
4013 >     * of all entries
4014 >     */
4015 >    public int reduceEntriesToInt(ObjectToInt<Map.Entry<K,V>> transformer,
4016 >                                  int basis,
4017 >                                  IntByIntToInt reducer) {
4018 >        return ForkJoinTasks.reduceEntriesToInt
4019 >            (this, transformer, basis, reducer).invoke();
4020 >    }
4021 >
4022 >    /* ----------------Views -------------- */
4023 >
4024 >    /**
4025 >     * Base class for views.
4026 >     */
4027 >    static abstract class CHMView<K, V> {
4028 >        final ConcurrentHashMapV8<K, V> map;
4029 >        CHMView(ConcurrentHashMapV8<K, V> map)  { this.map = map; }
4030  
4031          /**
4032 <         * Performs the given action for each (key, value).
4032 >         * Returns the map backing this view.
4033           *
4034 <         * @param action the action
4034 >         * @return the map backing this view
4035           */
4036 <        public void forEach(BiAction<K,V> action) {
4037 <            fjp.invoke(ForkJoinTasks.forEach
4038 <                       (ConcurrentHashMapV8.this, action));
4036 >        public ConcurrentHashMapV8<K,V> getMap() { return map; }
4037 >
4038 >        public final int size()                 { return map.size(); }
4039 >        public final boolean isEmpty()          { return map.isEmpty(); }
4040 >        public final void clear()               { map.clear(); }
4041 >
4042 >        // implementations below rely on concrete classes supplying these
4043 >        abstract public Iterator<?> iterator();
4044 >        abstract public boolean contains(Object o);
4045 >        abstract public boolean remove(Object o);
4046 >
4047 >        private static final String oomeMsg = "Required array size too large";
4048 >
4049 >        public final Object[] toArray() {
4050 >            long sz = map.mappingCount();
4051 >            if (sz > (long)(MAX_ARRAY_SIZE))
4052 >                throw new OutOfMemoryError(oomeMsg);
4053 >            int n = (int)sz;
4054 >            Object[] r = new Object[n];
4055 >            int i = 0;
4056 >            Iterator<?> it = iterator();
4057 >            while (it.hasNext()) {
4058 >                if (i == n) {
4059 >                    if (n >= MAX_ARRAY_SIZE)
4060 >                        throw new OutOfMemoryError(oomeMsg);
4061 >                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
4062 >                        n = MAX_ARRAY_SIZE;
4063 >                    else
4064 >                        n += (n >>> 1) + 1;
4065 >                    r = Arrays.copyOf(r, n);
4066 >                }
4067 >                r[i++] = it.next();
4068 >            }
4069 >            return (i == n) ? r : Arrays.copyOf(r, i);
4070          }
4071  
4072 <        /**
4073 <         * Performs the given action for each non-null transformation
4074 <         * of each (key, value).
4075 <         *
4076 <         * @param transformer a function returning the transformation
4077 <         * for an element, or null if there is no transformation (in
4078 <         * which case the action is not applied)
4079 <         * @param action the action
4080 <         */
4081 <        public <U> void forEach(BiFun<? super K, ? super V, ? extends U> transformer,
4082 <                                Action<U> action) {
4083 <            fjp.invoke(ForkJoinTasks.forEach
4084 <                       (ConcurrentHashMapV8.this, transformer, action));
4072 >        @SuppressWarnings("unchecked") public final <T> T[] toArray(T[] a) {
4073 >            long sz = map.mappingCount();
4074 >            if (sz > (long)(MAX_ARRAY_SIZE))
4075 >                throw new OutOfMemoryError(oomeMsg);
4076 >            int m = (int)sz;
4077 >            T[] r = (a.length >= m) ? a :
4078 >                (T[])java.lang.reflect.Array
4079 >                .newInstance(a.getClass().getComponentType(), m);
4080 >            int n = r.length;
4081 >            int i = 0;
4082 >            Iterator<?> it = iterator();
4083 >            while (it.hasNext()) {
4084 >                if (i == n) {
4085 >                    if (n >= MAX_ARRAY_SIZE)
4086 >                        throw new OutOfMemoryError(oomeMsg);
4087 >                    if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1)
4088 >                        n = MAX_ARRAY_SIZE;
4089 >                    else
4090 >                        n += (n >>> 1) + 1;
4091 >                    r = Arrays.copyOf(r, n);
4092 >                }
4093 >                r[i++] = (T)it.next();
4094 >            }
4095 >            if (a == r && i < n) {
4096 >                r[i] = null; // null-terminate
4097 >                return r;
4098 >            }
4099 >            return (i == n) ? r : Arrays.copyOf(r, i);
4100          }
4101  
4102 <        /**
4103 <         * Returns a non-null result from applying the given search
4104 <         * function on each (key, value), or null if none.  Upon
4105 <         * success, further element processing is suppressed and the
4106 <         * results of any other parallel invocations of the search
3689 <         * function are ignored.
3690 <         *
3691 <         * @param searchFunction a function returning a non-null
3692 <         * result on success, else null
3693 <         * @return a non-null result from applying the given search
3694 <         * function on each (key, value), or null if none
3695 <         */
3696 <        public <U> U search(BiFun<? super K, ? super V, ? extends U> searchFunction) {
3697 <            return fjp.invoke(ForkJoinTasks.search
3698 <                              (ConcurrentHashMapV8.this, searchFunction));
4102 >        public final int hashCode() {
4103 >            int h = 0;
4104 >            for (Iterator<?> it = iterator(); it.hasNext();)
4105 >                h += it.next().hashCode();
4106 >            return h;
4107          }
4108  
4109 <        /**
4110 <         * Returns the result of accumulating the given transformation
4111 <         * of all (key, value) pairs using the given reducer to
4112 <         * combine values, or null if none.
4113 <         *
4114 <         * @param transformer a function returning the transformation
4115 <         * for an element, or null if there is no transformation (in
4116 <         * which case it is not combined)
4117 <         * @param reducer a commutative associative combining function
4118 <         * @return the result of accumulating the given transformation
4119 <         * of all (key, value) pairs
4120 <         */
4121 <        public <U> U reduce(BiFun<? super K, ? super V, ? extends U> transformer,
4122 <                            BiFun<? super U, ? super U, ? extends U> reducer) {
3715 <            return fjp.invoke(ForkJoinTasks.reduce
3716 <                              (ConcurrentHashMapV8.this, transformer, reducer));
4109 >        public final String toString() {
4110 >            StringBuilder sb = new StringBuilder();
4111 >            sb.append('[');
4112 >            Iterator<?> it = iterator();
4113 >            if (it.hasNext()) {
4114 >                for (;;) {
4115 >                    Object e = it.next();
4116 >                    sb.append(e == this ? "(this Collection)" : e);
4117 >                    if (!it.hasNext())
4118 >                        break;
4119 >                    sb.append(',').append(' ');
4120 >                }
4121 >            }
4122 >            return sb.append(']').toString();
4123          }
4124  
4125 <        /**
4126 <         * Returns the result of accumulating the given transformation
4127 <         * of all (key, value) pairs using the given reducer to
4128 <         * combine values, and the given basis as an identity value.
4129 <         *
4130 <         * @param transformer a function returning the transformation
4131 <         * for an element
4132 <         * @param basis the identity (initial default value) for the reduction
4133 <         * @param reducer a commutative associative combining function
4134 <         * @return the result of accumulating the given transformation
4135 <         * of all (key, value) pairs
4136 <         */
4137 <        public double reduceToDouble(ObjectByObjectToDouble<? super K, ? super V> transformer,
4138 <                                     double basis,
4139 <                                     DoubleByDoubleToDouble reducer) {
4140 <            return fjp.invoke(ForkJoinTasks.reduceToDouble
4141 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4125 >        public final boolean containsAll(Collection<?> c) {
4126 >            if (c != this) {
4127 >                for (Iterator<?> it = c.iterator(); it.hasNext();) {
4128 >                    Object e = it.next();
4129 >                    if (e == null || !contains(e))
4130 >                        return false;
4131 >                }
4132 >            }
4133 >            return true;
4134 >        }
4135 >
4136 >        public final boolean removeAll(Collection<?> c) {
4137 >            boolean modified = false;
4138 >            for (Iterator<?> it = iterator(); it.hasNext();) {
4139 >                if (c.contains(it.next())) {
4140 >                    it.remove();
4141 >                    modified = true;
4142 >                }
4143 >            }
4144 >            return modified;
4145 >        }
4146 >
4147 >        public final boolean retainAll(Collection<?> c) {
4148 >            boolean modified = false;
4149 >            for (Iterator<?> it = iterator(); it.hasNext();) {
4150 >                if (!c.contains(it.next())) {
4151 >                    it.remove();
4152 >                    modified = true;
4153 >                }
4154 >            }
4155 >            return modified;
4156 >        }
4157 >
4158 >    }
4159 >
4160 >    /**
4161 >     * A view of a ConcurrentHashMapV8 as a {@link Set} of keys, in
4162 >     * which additions may optionally be enabled by mapping to a
4163 >     * common value.  This class cannot be directly instantiated. See
4164 >     * {@link #keySet}, {@link #keySet(Object)}, {@link #newKeySet()},
4165 >     * {@link #newKeySet(int)}.
4166 >     */
4167 >    public static class KeySetView<K,V> extends CHMView<K,V> implements Set<K>, java.io.Serializable {
4168 >        private static final long serialVersionUID = 7249069246763182397L;
4169 >        private final V value;
4170 >        KeySetView(ConcurrentHashMapV8<K, V> map, V value) {  // non-public
4171 >            super(map);
4172 >            this.value = value;
4173          }
4174  
4175          /**
4176 <         * Returns the result of accumulating the given transformation
4177 <         * of all (key, value) pairs using the given reducer to
3741 <         * combine values, and the given basis as an identity value.
4176 >         * Returns the default mapped value for additions,
4177 >         * or {@code null} if additions are not supported.
4178           *
4179 <         * @param transformer a function returning the transformation
4180 <         * for an element
3745 <         * @param basis the identity (initial default value) for the reduction
3746 <         * @param reducer a commutative associative combining function
3747 <         * @return the result of accumulating the given transformation
3748 <         * of all (key, value) pairs
4179 >         * @return the default mapped value for additions, or {@code null}
4180 >         * if not supported.
4181           */
4182 <        public long reduceToLong(ObjectByObjectToLong<? super K, ? super V> transformer,
4183 <                                 long basis,
4184 <                                 LongByLongToLong reducer) {
4185 <            return fjp.invoke(ForkJoinTasks.reduceToLong
4186 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4187 <        }
4182 >        public V getMappedValue() { return value; }
4183 >
4184 >        // implement Set API
4185 >
4186 >        public boolean contains(Object o) { return map.containsKey(o); }
4187 >        public boolean remove(Object o)   { return map.remove(o) != null; }
4188  
4189          /**
4190 <         * Returns the result of accumulating the given transformation
4191 <         * of all (key, value) pairs using the given reducer to
4192 <         * combine values, and the given basis as an identity value.
4190 >         * Returns a "weakly consistent" iterator that will never
4191 >         * throw {@link ConcurrentModificationException}, and
4192 >         * guarantees to traverse elements as they existed upon
4193 >         * construction of the iterator, and may (but is not
4194 >         * guaranteed to) reflect any modifications subsequent to
4195 >         * construction.
4196           *
4197 <         * @param transformer a function returning the transformation
3763 <         * for an element
3764 <         * @param basis the identity (initial default value) for the reduction
3765 <         * @param reducer a commutative associative combining function
3766 <         * @return the result of accumulating the given transformation
3767 <         * of all (key, value) pairs
4197 >         * @return an iterator over the keys of this map
4198           */
4199 <        public int reduceToInt(ObjectByObjectToInt<? super K, ? super V> transformer,
4200 <                               int basis,
4201 <                               IntByIntToInt reducer) {
4202 <            return fjp.invoke(ForkJoinTasks.reduceToInt
4203 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4199 >        public Iterator<K> iterator()     { return new KeyIterator<K,V>(map); }
4200 >        public boolean add(K e) {
4201 >            V v;
4202 >            if ((v = value) == null)
4203 >                throw new UnsupportedOperationException();
4204 >            if (e == null)
4205 >                throw new NullPointerException();
4206 >            return map.internalPutIfAbsent(e, v) == null;
4207 >        }
4208 >        public boolean addAll(Collection<? extends K> c) {
4209 >            boolean added = false;
4210 >            V v;
4211 >            if ((v = value) == null)
4212 >                throw new UnsupportedOperationException();
4213 >            for (K e : c) {
4214 >                if (e == null)
4215 >                    throw new NullPointerException();
4216 >                if (map.internalPutIfAbsent(e, v) == null)
4217 >                    added = true;
4218 >            }
4219 >            return added;
4220 >        }
4221 >        public boolean equals(Object o) {
4222 >            Set<?> c;
4223 >            return ((o instanceof Set) &&
4224 >                    ((c = (Set<?>)o) == this ||
4225 >                     (containsAll(c) && c.containsAll(this))));
4226          }
4227  
4228          /**
# Line 3778 | Line 4230 | public class ConcurrentHashMapV8<K, V>
4230           *
4231           * @param action the action
4232           */
4233 <        public void forEachKey(Action<K> action) {
4234 <            fjp.invoke(ForkJoinTasks.forEachKey
4235 <                       (ConcurrentHashMapV8.this, action));
4233 >        public void forEach(Action<K> action) {
4234 >            ForkJoinTasks.forEachKey
4235 >                (map, action).invoke();
4236          }
4237  
4238          /**
# Line 3788 | Line 4240 | public class ConcurrentHashMapV8<K, V>
4240           * of each key.
4241           *
4242           * @param transformer a function returning the transformation
4243 <         * for an element, or null if there is no transformation (in
4244 <         * which case the action is not applied)
4243 >         * for an element, or null of there is no transformation (in
4244 >         * which case the action is not applied).
4245           * @param action the action
4246           */
4247 <        public <U> void forEachKey(Fun<? super K, ? extends U> transformer,
4248 <                                   Action<U> action) {
4249 <            fjp.invoke(ForkJoinTasks.forEachKey
4250 <                       (ConcurrentHashMapV8.this, transformer, action));
4247 >        public <U> void forEach(Fun<? super K, ? extends U> transformer,
4248 >                                Action<U> action) {
4249 >            ForkJoinTasks.forEachKey
4250 >                (map, transformer, action).invoke();
4251          }
4252  
4253          /**
# Line 3810 | Line 4262 | public class ConcurrentHashMapV8<K, V>
4262           * @return a non-null result from applying the given search
4263           * function on each key, or null if none
4264           */
4265 <        public <U> U searchKeys(Fun<? super K, ? extends U> searchFunction) {
4266 <            return fjp.invoke(ForkJoinTasks.searchKeys
4267 <                              (ConcurrentHashMapV8.this, searchFunction));
4265 >        public <U> U search(Fun<? super K, ? extends U> searchFunction) {
4266 >            return ForkJoinTasks.searchKeys
4267 >                (map, searchFunction).invoke();
4268          }
4269  
4270          /**
# Line 3823 | Line 4275 | public class ConcurrentHashMapV8<K, V>
4275           * @return the result of accumulating all keys using the given
4276           * reducer to combine values, or null if none
4277           */
4278 <        public K reduceKeys(BiFun<? super K, ? super K, ? extends K> reducer) {
4279 <            return fjp.invoke(ForkJoinTasks.reduceKeys
4280 <                              (ConcurrentHashMapV8.this, reducer));
3829 <        }
3830 <
3831 <        /**
3832 <         * Returns the result of accumulating the given transformation
3833 <         * of all keys using the given reducer to combine values, or
3834 <         * null if none.
3835 <         *
3836 <         * @param transformer a function returning the transformation
3837 <         * for an element, or null if there is no transformation (in
3838 <         * which case it is not combined)
3839 <         * @param reducer a commutative associative combining function
3840 <         * @return the result of accumulating the given transformation
3841 <         * of all keys
3842 <         */
3843 <        public <U> U reduceKeys(Fun<? super K, ? extends U> transformer,
3844 <                                BiFun<? super U, ? super U, ? extends U> reducer) {
3845 <            return fjp.invoke(ForkJoinTasks.reduceKeys
3846 <                              (ConcurrentHashMapV8.this, transformer, reducer));
4278 >        public K reduce(BiFun<? super K, ? super K, ? extends K> reducer) {
4279 >            return ForkJoinTasks.reduceKeys
4280 >                (map, reducer).invoke();
4281          }
4282  
4283          /**
# Line 3858 | Line 4292 | public class ConcurrentHashMapV8<K, V>
4292           * @return  the result of accumulating the given transformation
4293           * of all keys
4294           */
4295 <        public double reduceKeysToDouble(ObjectToDouble<? super K> transformer,
4296 <                                         double basis,
4297 <                                         DoubleByDoubleToDouble reducer) {
4298 <            return fjp.invoke(ForkJoinTasks.reduceKeysToDouble
4299 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4295 >        public double reduceToDouble(ObjectToDouble<? super K> transformer,
4296 >                                     double basis,
4297 >                                     DoubleByDoubleToDouble reducer) {
4298 >            return ForkJoinTasks.reduceKeysToDouble
4299 >                (map, transformer, basis, reducer).invoke();
4300          }
4301  
4302 +
4303          /**
4304           * Returns the result of accumulating the given transformation
4305           * of all keys using the given reducer to combine values, and
# Line 3877 | Line 4312 | public class ConcurrentHashMapV8<K, V>
4312           * @return the result of accumulating the given transformation
4313           * of all keys
4314           */
4315 <        public long reduceKeysToLong(ObjectToLong<? super K> transformer,
4316 <                                     long basis,
4317 <                                     LongByLongToLong reducer) {
4318 <            return fjp.invoke(ForkJoinTasks.reduceKeysToLong
4319 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4315 >        public long reduceToLong(ObjectToLong<? super K> transformer,
4316 >                                 long basis,
4317 >                                 LongByLongToLong reducer) {
4318 >            return ForkJoinTasks.reduceKeysToLong
4319 >                (map, transformer, basis, reducer).invoke();
4320          }
4321  
4322          /**
# Line 3896 | Line 4331 | public class ConcurrentHashMapV8<K, V>
4331           * @return the result of accumulating the given transformation
4332           * of all keys
4333           */
4334 <        public int reduceKeysToInt(ObjectToInt<? super K> transformer,
4335 <                                   int basis,
4336 <                                   IntByIntToInt reducer) {
4337 <            return fjp.invoke(ForkJoinTasks.reduceKeysToInt
4338 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4334 >        public int reduceToInt(ObjectToInt<? super K> transformer,
4335 >                               int basis,
4336 >                               IntByIntToInt reducer) {
4337 >            return ForkJoinTasks.reduceKeysToInt
4338 >                (map, transformer, basis, reducer).invoke();
4339 >        }
4340 >
4341 >    }
4342 >
4343 >    /**
4344 >     * A view of a ConcurrentHashMapV8 as a {@link Collection} of
4345 >     * values, in which additions are disabled. This class cannot be
4346 >     * directly instantiated. See {@link #values},
4347 >     *
4348 >     * <p>The view's {@code iterator} is a "weakly consistent" iterator
4349 >     * that will never throw {@link ConcurrentModificationException},
4350 >     * and guarantees to traverse elements as they existed upon
4351 >     * construction of the iterator, and may (but is not guaranteed to)
4352 >     * reflect any modifications subsequent to construction.
4353 >     */
4354 >    public static final class ValuesView<K,V> extends CHMView<K,V>
4355 >        implements Collection<V> {
4356 >        ValuesView(ConcurrentHashMapV8<K, V> map)   { super(map); }
4357 >        public final boolean contains(Object o) { return map.containsValue(o); }
4358 >        public final boolean remove(Object o) {
4359 >            if (o != null) {
4360 >                Iterator<V> it = new ValueIterator<K,V>(map);
4361 >                while (it.hasNext()) {
4362 >                    if (o.equals(it.next())) {
4363 >                        it.remove();
4364 >                        return true;
4365 >                    }
4366 >                }
4367 >            }
4368 >            return false;
4369 >        }
4370 >
4371 >        /**
4372 >         * Returns a "weakly consistent" iterator that will never
4373 >         * throw {@link ConcurrentModificationException}, and
4374 >         * guarantees to traverse elements as they existed upon
4375 >         * construction of the iterator, and may (but is not
4376 >         * guaranteed to) reflect any modifications subsequent to
4377 >         * construction.
4378 >         *
4379 >         * @return an iterator over the values of this map
4380 >         */
4381 >        public final Iterator<V> iterator() {
4382 >            return new ValueIterator<K,V>(map);
4383 >        }
4384 >        public final boolean add(V e) {
4385 >            throw new UnsupportedOperationException();
4386 >        }
4387 >        public final boolean addAll(Collection<? extends V> c) {
4388 >            throw new UnsupportedOperationException();
4389          }
4390  
4391          /**
# Line 3908 | Line 4393 | public class ConcurrentHashMapV8<K, V>
4393           *
4394           * @param action the action
4395           */
4396 <        public void forEachValue(Action<V> action) {
4397 <            fjp.invoke(ForkJoinTasks.forEachValue
4398 <                       (ConcurrentHashMapV8.this, action));
4396 >        public void forEach(Action<V> action) {
4397 >            ForkJoinTasks.forEachValue
4398 >                (map, action).invoke();
4399          }
4400  
4401          /**
# Line 3918 | Line 4403 | public class ConcurrentHashMapV8<K, V>
4403           * of each value.
4404           *
4405           * @param transformer a function returning the transformation
4406 <         * for an element, or null if there is no transformation (in
4407 <         * which case the action is not applied)
4406 >         * for an element, or null of there is no transformation (in
4407 >         * which case the action is not applied).
4408           */
4409 <        public <U> void forEachValue(Fun<? super V, ? extends U> transformer,
4409 >        public <U> void forEach(Fun<? super V, ? extends U> transformer,
4410                                       Action<U> action) {
4411 <            fjp.invoke(ForkJoinTasks.forEachValue
4412 <                       (ConcurrentHashMapV8.this, transformer, action));
4411 >            ForkJoinTasks.forEachValue
4412 >                (map, transformer, action).invoke();
4413          }
4414  
4415          /**
# Line 3938 | Line 4423 | public class ConcurrentHashMapV8<K, V>
4423           * result on success, else null
4424           * @return a non-null result from applying the given search
4425           * function on each value, or null if none
4426 +         *
4427           */
4428 <        public <U> U searchValues(Fun<? super V, ? extends U> searchFunction) {
4429 <            return fjp.invoke(ForkJoinTasks.searchValues
4430 <                              (ConcurrentHashMapV8.this, searchFunction));
4428 >        public <U> U search(Fun<? super V, ? extends U> searchFunction) {
4429 >            return ForkJoinTasks.searchValues
4430 >                (map, searchFunction).invoke();
4431          }
4432  
4433          /**
# Line 3951 | Line 4437 | public class ConcurrentHashMapV8<K, V>
4437           * @param reducer a commutative associative combining function
4438           * @return  the result of accumulating all values
4439           */
4440 <        public V reduceValues(BiFun<? super V, ? super V, ? extends V> reducer) {
4441 <            return fjp.invoke(ForkJoinTasks.reduceValues
4442 <                              (ConcurrentHashMapV8.this, reducer));
4440 >        public V reduce(BiFun<? super V, ? super V, ? extends V> reducer) {
4441 >            return ForkJoinTasks.reduceValues
4442 >                (map, reducer).invoke();
4443          }
4444  
4445          /**
# Line 3962 | Line 4448 | public class ConcurrentHashMapV8<K, V>
4448           * null if none.
4449           *
4450           * @param transformer a function returning the transformation
4451 <         * for an element, or null if there is no transformation (in
4452 <         * which case it is not combined)
4451 >         * for an element, or null of there is no transformation (in
4452 >         * which case it is not combined).
4453           * @param reducer a commutative associative combining function
4454           * @return the result of accumulating the given transformation
4455           * of all values
4456           */
4457 <        public <U> U reduceValues(Fun<? super V, ? extends U> transformer,
4458 <                                  BiFun<? super U, ? super U, ? extends U> reducer) {
4459 <            return fjp.invoke(ForkJoinTasks.reduceValues
4460 <                              (ConcurrentHashMapV8.this, transformer, reducer));
4457 >        public <U> U reduce(Fun<? super V, ? extends U> transformer,
4458 >                            BiFun<? super U, ? super U, ? extends U> reducer) {
4459 >            return ForkJoinTasks.reduceValues
4460 >                (map, transformer, reducer).invoke();
4461          }
4462  
4463          /**
# Line 3986 | Line 4472 | public class ConcurrentHashMapV8<K, V>
4472           * @return the result of accumulating the given transformation
4473           * of all values
4474           */
4475 <        public double reduceValuesToDouble(ObjectToDouble<? super V> transformer,
4476 <                                           double basis,
4477 <                                           DoubleByDoubleToDouble reducer) {
4478 <            return fjp.invoke(ForkJoinTasks.reduceValuesToDouble
4479 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4475 >        public double reduceToDouble(ObjectToDouble<? super V> transformer,
4476 >                                     double basis,
4477 >                                     DoubleByDoubleToDouble reducer) {
4478 >            return ForkJoinTasks.reduceValuesToDouble
4479 >                (map, transformer, basis, reducer).invoke();
4480          }
4481  
4482          /**
# Line 4005 | Line 4491 | public class ConcurrentHashMapV8<K, V>
4491           * @return the result of accumulating the given transformation
4492           * of all values
4493           */
4494 <        public long reduceValuesToLong(ObjectToLong<? super V> transformer,
4495 <                                       long basis,
4496 <                                       LongByLongToLong reducer) {
4497 <            return fjp.invoke(ForkJoinTasks.reduceValuesToLong
4498 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4494 >        public long reduceToLong(ObjectToLong<? super V> transformer,
4495 >                                 long basis,
4496 >                                 LongByLongToLong reducer) {
4497 >            return ForkJoinTasks.reduceValuesToLong
4498 >                (map, transformer, basis, reducer).invoke();
4499          }
4500  
4501          /**
# Line 4024 | Line 4510 | public class ConcurrentHashMapV8<K, V>
4510           * @return the result of accumulating the given transformation
4511           * of all values
4512           */
4513 <        public int reduceValuesToInt(ObjectToInt<? super V> transformer,
4514 <                                     int basis,
4515 <                                     IntByIntToInt reducer) {
4516 <            return fjp.invoke(ForkJoinTasks.reduceValuesToInt
4517 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4513 >        public int reduceToInt(ObjectToInt<? super V> transformer,
4514 >                               int basis,
4515 >                               IntByIntToInt reducer) {
4516 >            return ForkJoinTasks.reduceValuesToInt
4517 >                (map, transformer, basis, reducer).invoke();
4518 >        }
4519 >
4520 >    }
4521 >
4522 >    /**
4523 >     * A view of a ConcurrentHashMapV8 as a {@link Set} of (key, value)
4524 >     * entries.  This class cannot be directly instantiated. See
4525 >     * {@link #entrySet}.
4526 >     */
4527 >    public static final class EntrySetView<K,V> extends CHMView<K,V>
4528 >        implements Set<Map.Entry<K,V>> {
4529 >        EntrySetView(ConcurrentHashMapV8<K, V> map) { super(map); }
4530 >        public final boolean contains(Object o) {
4531 >            Object k, v, r; Map.Entry<?,?> e;
4532 >            return ((o instanceof Map.Entry) &&
4533 >                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
4534 >                    (r = map.get(k)) != null &&
4535 >                    (v = e.getValue()) != null &&
4536 >                    (v == r || v.equals(r)));
4537 >        }
4538 >        public final boolean remove(Object o) {
4539 >            Object k, v; Map.Entry<?,?> e;
4540 >            return ((o instanceof Map.Entry) &&
4541 >                    (k = (e = (Map.Entry<?,?>)o).getKey()) != null &&
4542 >                    (v = e.getValue()) != null &&
4543 >                    map.remove(k, v));
4544 >        }
4545 >
4546 >        /**
4547 >         * Returns a "weakly consistent" iterator that will never
4548 >         * throw {@link ConcurrentModificationException}, and
4549 >         * guarantees to traverse elements as they existed upon
4550 >         * construction of the iterator, and may (but is not
4551 >         * guaranteed to) reflect any modifications subsequent to
4552 >         * construction.
4553 >         *
4554 >         * @return an iterator over the entries of this map
4555 >         */
4556 >        public final Iterator<Map.Entry<K,V>> iterator() {
4557 >            return new EntryIterator<K,V>(map);
4558 >        }
4559 >
4560 >        public final boolean add(Entry<K,V> e) {
4561 >            K key = e.getKey();
4562 >            V value = e.getValue();
4563 >            if (key == null || value == null)
4564 >                throw new NullPointerException();
4565 >            return map.internalPut(key, value) == null;
4566 >        }
4567 >        public final boolean addAll(Collection<? extends Entry<K,V>> c) {
4568 >            boolean added = false;
4569 >            for (Entry<K,V> e : c) {
4570 >                if (add(e))
4571 >                    added = true;
4572 >            }
4573 >            return added;
4574 >        }
4575 >        public boolean equals(Object o) {
4576 >            Set<?> c;
4577 >            return ((o instanceof Set) &&
4578 >                    ((c = (Set<?>)o) == this ||
4579 >                     (containsAll(c) && c.containsAll(this))));
4580          }
4581  
4582          /**
# Line 4036 | Line 4584 | public class ConcurrentHashMapV8<K, V>
4584           *
4585           * @param action the action
4586           */
4587 <        public void forEachEntry(Action<Map.Entry<K,V>> action) {
4588 <            fjp.invoke(ForkJoinTasks.forEachEntry
4589 <                       (ConcurrentHashMapV8.this, action));
4587 >        public void forEach(Action<Map.Entry<K,V>> action) {
4588 >            ForkJoinTasks.forEachEntry
4589 >                (map, action).invoke();
4590          }
4591  
4592          /**
# Line 4046 | Line 4594 | public class ConcurrentHashMapV8<K, V>
4594           * of each entry.
4595           *
4596           * @param transformer a function returning the transformation
4597 <         * for an element, or null if there is no transformation (in
4598 <         * which case the action is not applied)
4597 >         * for an element, or null of there is no transformation (in
4598 >         * which case the action is not applied).
4599           * @param action the action
4600           */
4601 <        public <U> void forEachEntry(Fun<Map.Entry<K,V>, ? extends U> transformer,
4602 <                                     Action<U> action) {
4603 <            fjp.invoke(ForkJoinTasks.forEachEntry
4604 <                       (ConcurrentHashMapV8.this, transformer, action));
4601 >        public <U> void forEach(Fun<Map.Entry<K,V>, ? extends U> transformer,
4602 >                                Action<U> action) {
4603 >            ForkJoinTasks.forEachEntry
4604 >                (map, transformer, action).invoke();
4605          }
4606  
4607          /**
# Line 4068 | Line 4616 | public class ConcurrentHashMapV8<K, V>
4616           * @return a non-null result from applying the given search
4617           * function on each entry, or null if none
4618           */
4619 <        public <U> U searchEntries(Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4620 <            return fjp.invoke(ForkJoinTasks.searchEntries
4621 <                              (ConcurrentHashMapV8.this, searchFunction));
4619 >        public <U> U search(Fun<Map.Entry<K,V>, ? extends U> searchFunction) {
4620 >            return ForkJoinTasks.searchEntries
4621 >                (map, searchFunction).invoke();
4622          }
4623  
4624          /**
# Line 4080 | Line 4628 | public class ConcurrentHashMapV8<K, V>
4628           * @param reducer a commutative associative combining function
4629           * @return the result of accumulating all entries
4630           */
4631 <        public Map.Entry<K,V> reduceEntries(BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4632 <            return fjp.invoke(ForkJoinTasks.reduceEntries
4633 <                              (ConcurrentHashMapV8.this, reducer));
4631 >        public Map.Entry<K,V> reduce(BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
4632 >            return ForkJoinTasks.reduceEntries
4633 >                (map, reducer).invoke();
4634          }
4635  
4636          /**
# Line 4091 | Line 4639 | public class ConcurrentHashMapV8<K, V>
4639           * or null if none.
4640           *
4641           * @param transformer a function returning the transformation
4642 <         * for an element, or null if there is no transformation (in
4642 >         * for an element, or null of there is no transformation (in
4643           * which case it is not combined).
4644           * @param reducer a commutative associative combining function
4645           * @return the result of accumulating the given transformation
4646           * of all entries
4647           */
4648 <        public <U> U reduceEntries(Fun<Map.Entry<K,V>, ? extends U> transformer,
4649 <                                   BiFun<? super U, ? super U, ? extends U> reducer) {
4650 <            return fjp.invoke(ForkJoinTasks.reduceEntries
4651 <                              (ConcurrentHashMapV8.this, transformer, reducer));
4648 >        public <U> U reduce(Fun<Map.Entry<K,V>, ? extends U> transformer,
4649 >                            BiFun<? super U, ? super U, ? extends U> reducer) {
4650 >            return ForkJoinTasks.reduceEntries
4651 >                (map, transformer, reducer).invoke();
4652          }
4653  
4654          /**
# Line 4115 | Line 4663 | public class ConcurrentHashMapV8<K, V>
4663           * @return the result of accumulating the given transformation
4664           * of all entries
4665           */
4666 <        public double reduceEntriesToDouble(ObjectToDouble<Map.Entry<K,V>> transformer,
4667 <                                            double basis,
4668 <                                            DoubleByDoubleToDouble reducer) {
4669 <            return fjp.invoke(ForkJoinTasks.reduceEntriesToDouble
4670 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4666 >        public double reduceToDouble(ObjectToDouble<Map.Entry<K,V>> transformer,
4667 >                                     double basis,
4668 >                                     DoubleByDoubleToDouble reducer) {
4669 >            return ForkJoinTasks.reduceEntriesToDouble
4670 >                (map, transformer, basis, reducer).invoke();
4671          }
4672  
4673          /**
# Line 4134 | Line 4682 | public class ConcurrentHashMapV8<K, V>
4682           * @return  the result of accumulating the given transformation
4683           * of all entries
4684           */
4685 <        public long reduceEntriesToLong(ObjectToLong<Map.Entry<K,V>> transformer,
4686 <                                        long basis,
4687 <                                        LongByLongToLong reducer) {
4688 <            return fjp.invoke(ForkJoinTasks.reduceEntriesToLong
4689 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4685 >        public long reduceToLong(ObjectToLong<Map.Entry<K,V>> transformer,
4686 >                                 long basis,
4687 >                                 LongByLongToLong reducer) {
4688 >            return ForkJoinTasks.reduceEntriesToLong
4689 >                (map, transformer, basis, reducer).invoke();
4690          }
4691  
4692          /**
# Line 4153 | Line 4701 | public class ConcurrentHashMapV8<K, V>
4701           * @return the result of accumulating the given transformation
4702           * of all entries
4703           */
4704 <        public int reduceEntriesToInt(ObjectToInt<Map.Entry<K,V>> transformer,
4705 <                                      int basis,
4706 <                                      IntByIntToInt reducer) {
4707 <            return fjp.invoke(ForkJoinTasks.reduceEntriesToInt
4708 <                              (ConcurrentHashMapV8.this, transformer, basis, reducer));
4704 >        public int reduceToInt(ObjectToInt<Map.Entry<K,V>> transformer,
4705 >                               int basis,
4706 >                               IntByIntToInt reducer) {
4707 >            return ForkJoinTasks.reduceEntriesToInt
4708 >                (map, transformer, basis, reducer).invoke();
4709          }
4710 +
4711      }
4712  
4713      // ---------------------------------------------------------------------
4714  
4715      /**
4716       * Predefined tasks for performing bulk parallel operations on
4717 <     * ConcurrentHashMaps. These tasks follow the forms and rules used
4718 <     * in class {@link Parallel}. Each method has the same name, but
4719 <     * returns a task rather than invoking it. These methods may be
4720 <     * useful in custom applications such as submitting a task without
4721 <     * waiting for completion, or combining with other tasks.
4717 >     * ConcurrentHashMapV8s. These tasks follow the forms and rules used
4718 >     * for bulk operations. Each method has the same name, but returns
4719 >     * a task rather than invoking it. These methods may be useful in
4720 >     * custom applications such as submitting a task without waiting
4721 >     * for completion, using a custom pool, or combining with other
4722 >     * tasks.
4723       */
4724      public static class ForkJoinTasks {
4725          private ForkJoinTasks() {}
# Line 4827 | Line 5377 | public class ConcurrentHashMapV8<K, V>
5377  
5378      // -------------------------------------------------------
5379  
4830    /**
4831     * Base for FJ tasks for bulk operations. This adds a variant of
4832     * CountedCompleters and some split and merge bookkeeping to
4833     * iterator functionality. The forEach and reduce methods are
4834     * similar to those illustrated in CountedCompleter documentation,
4835     * except that bottom-up reduction completions perform them within
4836     * their compute methods. The search methods are like forEach
4837     * except they continually poll for success and exit early.  Also,
4838     * exceptions are handled in a simpler manner, by just trying to
4839     * complete root task exceptionally.
4840     */
4841    @SuppressWarnings("serial") static abstract class BulkTask<K,V,R> extends Traverser<K,V,R> {
4842        final BulkTask<K,V,?> parent;  // completion target
4843        int batch;                     // split control; -1 for unknown
4844        int pending;                   // completion control
4845
4846        BulkTask(ConcurrentHashMapV8<K,V> map, BulkTask<K,V,?> parent,
4847                 int batch) {
4848            super(map);
4849            this.parent = parent;
4850            this.batch = batch;
4851            if (parent != null && map != null) { // split parent
4852                Node[] t;
4853                if ((t = parent.tab) == null &&
4854                    (t = parent.tab = map.table) != null)
4855                    parent.baseLimit = parent.baseSize = t.length;
4856                this.tab = t;
4857                this.baseSize = parent.baseSize;
4858                int hi = this.baseLimit = parent.baseLimit;
4859                parent.baseLimit = this.index = this.baseIndex =
4860                    (hi + parent.baseIndex + 1) >>> 1;
4861            }
4862        }
4863
4864        // FJ methods
4865
4866        /**
4867         * Propagates completion. Note that all reduce actions
4868         * bypass this method to combine while completing.
4869         */
4870        final void tryComplete() {
4871            BulkTask<K,V,?> a = this, s = a;
4872            for (int c;;) {
4873                if ((c = a.pending) == 0) {
4874                    if ((a = (s = a).parent) == null) {
4875                        s.quietlyComplete();
4876                        break;
4877                    }
4878                }
4879                else if (U.compareAndSwapInt(a, PENDING, c, c - 1))
4880                    break;
4881            }
4882        }
4883
4884        /**
4885         * Forces root task to complete.
4886         * @param ex if null, complete normally, else exceptionally
4887         * @return false to simplify use
4888         */
4889        final boolean tryCompleteComputation(Throwable ex) {
4890            for (BulkTask<K,V,?> a = this;;) {
4891                BulkTask<K,V,?> p = a.parent;
4892                if (p == null) {
4893                    if (ex != null)
4894                        a.completeExceptionally(ex);
4895                    else
4896                        a.quietlyComplete();
4897                    return false;
4898                }
4899                a = p;
4900            }
4901        }
4902
4903        /**
4904         * Version of tryCompleteComputation for function screening checks
4905         */
4906        final boolean abortOnNullFunction() {
4907            return tryCompleteComputation(new Error("Unexpected null function"));
4908        }
4909
4910        // utilities
4911
4912        /** CompareAndSet pending count */
4913        final boolean casPending(int cmp, int val) {
4914            return U.compareAndSwapInt(this, PENDING, cmp, val);
4915        }
4916
4917        /**
4918         * Returns approx exp2 of the number of times (minus one) to
4919         * split task by two before executing leaf action. This value
4920         * is faster to compute and more convenient to use as a guide
4921         * to splitting than is the depth, since it is used while
4922         * dividing by two anyway.
4923         */
4924        final int batch() {
4925            ConcurrentHashMapV8<K, V> m; int b; Node[] t;
4926            if ((b = batch) < 0 && (m = map) != null) { // force initialization
4927                if ((t = tab) == null && (t = tab = m.table) != null)
4928                    baseLimit = baseSize = t.length;
4929                if (t != null) {
4930                    long n = m.counter.sum();
4931                    int sp = getPool().getParallelism() << 3; // slack of 8
4932                    b = batch = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp;
4933                }
4934            }
4935            return b;
4936        }
4937
4938        /**
4939         * Returns exportable snapshot entry.
4940         */
4941        static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
4942            return new AbstractMap.SimpleEntry<K,V>(k, v);
4943        }
4944
4945        // Unsafe mechanics
4946        private static final sun.misc.Unsafe U;
4947        private static final long PENDING;
4948        static {
4949            try {
4950                U = getUnsafe();
4951                PENDING = U.objectFieldOffset
4952                    (BulkTask.class.getDeclaredField("pending"));
4953            } catch (Exception e) {
4954                throw new Error(e);
4955            }
4956        }
4957    }
4958
5380      /*
5381       * Task classes. Coded in a regular but ugly format/style to
5382       * simplify checks that each variant differs in the right way from
# Line 4963 | Line 5384 | public class ConcurrentHashMapV8<K, V>
5384       */
5385  
5386      @SuppressWarnings("serial") static final class ForEachKeyTask<K,V>
5387 <        extends BulkTask<K,V,Void> {
5387 >        extends Traverser<K,V,Void> {
5388          final Action<K> action;
5389          ForEachKeyTask
5390 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5390 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5391               Action<K> action) {
5392              super(m, p, b);
5393              this.action = action;
5394          }
5395 <        @SuppressWarnings("unchecked") public final boolean exec() {
5396 <            final Action<K> action = this.action;
5397 <            if (action == null)
5398 <                return abortOnNullFunction();
5399 <            try {
5400 <                int b = batch(), c;
5401 <                while (b > 1 && baseIndex != baseLimit) {
5402 <                    do {} while (!casPending(c = pending, c+1));
5403 <                    new ForEachKeyTask<K,V>(map, this, b >>>= 1, action).fork();
4983 <                }
4984 <                while (advance() != null)
4985 <                    action.apply((K)nextKey);
4986 <                tryComplete();
4987 <            } catch (Throwable ex) {
4988 <                return tryCompleteComputation(ex);
4989 <            }
4990 <            return false;
5395 >        @SuppressWarnings("unchecked") public final void compute() {
5396 >            final Action<K> action;
5397 >            if ((action = this.action) == null)
5398 >                throw new NullPointerException();
5399 >            for (int b; (b = preSplit()) > 0;)
5400 >                new ForEachKeyTask<K,V>(map, this, b, action).fork();
5401 >            while (advance() != null)
5402 >                action.apply((K)nextKey);
5403 >            propagateCompletion();
5404          }
5405      }
5406  
5407      @SuppressWarnings("serial") static final class ForEachValueTask<K,V>
5408 <        extends BulkTask<K,V,Void> {
5408 >        extends Traverser<K,V,Void> {
5409          final Action<V> action;
5410          ForEachValueTask
5411 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5411 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5412               Action<V> action) {
5413              super(m, p, b);
5414              this.action = action;
5415          }
5416 <        @SuppressWarnings("unchecked") public final boolean exec() {
5417 <            final Action<V> action = this.action;
5418 <            if (action == null)
5419 <                return abortOnNullFunction();
5420 <            try {
5421 <                int b = batch(), c;
5422 <                while (b > 1 && baseIndex != baseLimit) {
5423 <                    do {} while (!casPending(c = pending, c+1));
5424 <                    new ForEachValueTask<K,V>(map, this, b >>>= 1, action).fork();
5425 <                }
5013 <                Object v;
5014 <                while ((v = advance()) != null)
5015 <                    action.apply((V)v);
5016 <                tryComplete();
5017 <            } catch (Throwable ex) {
5018 <                return tryCompleteComputation(ex);
5019 <            }
5020 <            return false;
5416 >        @SuppressWarnings("unchecked") public final void compute() {
5417 >            final Action<V> action;
5418 >            if ((action = this.action) == null)
5419 >                throw new NullPointerException();
5420 >            for (int b; (b = preSplit()) > 0;)
5421 >                new ForEachValueTask<K,V>(map, this, b, action).fork();
5422 >            Object v;
5423 >            while ((v = advance()) != null)
5424 >                action.apply((V)v);
5425 >            propagateCompletion();
5426          }
5427      }
5428  
5429      @SuppressWarnings("serial") static final class ForEachEntryTask<K,V>
5430 <        extends BulkTask<K,V,Void> {
5430 >        extends Traverser<K,V,Void> {
5431          final Action<Entry<K,V>> action;
5432          ForEachEntryTask
5433 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5433 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5434               Action<Entry<K,V>> action) {
5435              super(m, p, b);
5436              this.action = action;
5437          }
5438 <        @SuppressWarnings("unchecked") public final boolean exec() {
5439 <            final Action<Entry<K,V>> action = this.action;
5440 <            if (action == null)
5441 <                return abortOnNullFunction();
5442 <            try {
5443 <                int b = batch(), c;
5444 <                while (b > 1 && baseIndex != baseLimit) {
5445 <                    do {} while (!casPending(c = pending, c+1));
5446 <                    new ForEachEntryTask<K,V>(map, this, b >>>= 1, action).fork();
5447 <                }
5043 <                Object v;
5044 <                while ((v = advance()) != null)
5045 <                    action.apply(entryFor((K)nextKey, (V)v));
5046 <                tryComplete();
5047 <            } catch (Throwable ex) {
5048 <                return tryCompleteComputation(ex);
5049 <            }
5050 <            return false;
5438 >        @SuppressWarnings("unchecked") public final void compute() {
5439 >            final Action<Entry<K,V>> action;
5440 >            if ((action = this.action) == null)
5441 >                throw new NullPointerException();
5442 >            for (int b; (b = preSplit()) > 0;)
5443 >                new ForEachEntryTask<K,V>(map, this, b, action).fork();
5444 >            Object v;
5445 >            while ((v = advance()) != null)
5446 >                action.apply(entryFor((K)nextKey, (V)v));
5447 >            propagateCompletion();
5448          }
5449      }
5450  
5451      @SuppressWarnings("serial") static final class ForEachMappingTask<K,V>
5452 <        extends BulkTask<K,V,Void> {
5452 >        extends Traverser<K,V,Void> {
5453          final BiAction<K,V> action;
5454          ForEachMappingTask
5455 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5455 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5456               BiAction<K,V> action) {
5457              super(m, p, b);
5458              this.action = action;
5459          }
5460 <        @SuppressWarnings("unchecked") public final boolean exec() {
5461 <            final BiAction<K,V> action = this.action;
5462 <            if (action == null)
5463 <                return abortOnNullFunction();
5464 <            try {
5465 <                int b = batch(), c;
5466 <                while (b > 1 && baseIndex != baseLimit) {
5467 <                    do {} while (!casPending(c = pending, c+1));
5468 <                    new ForEachMappingTask<K,V>(map, this, b >>>= 1,
5469 <                                                action).fork();
5073 <                }
5074 <                Object v;
5075 <                while ((v = advance()) != null)
5076 <                    action.apply((K)nextKey, (V)v);
5077 <                tryComplete();
5078 <            } catch (Throwable ex) {
5079 <                return tryCompleteComputation(ex);
5080 <            }
5081 <            return false;
5460 >        @SuppressWarnings("unchecked") public final void compute() {
5461 >            final BiAction<K,V> action;
5462 >            if ((action = this.action) == null)
5463 >                throw new NullPointerException();
5464 >            for (int b; (b = preSplit()) > 0;)
5465 >                new ForEachMappingTask<K,V>(map, this, b, action).fork();
5466 >            Object v;
5467 >            while ((v = advance()) != null)
5468 >                action.apply((K)nextKey, (V)v);
5469 >            propagateCompletion();
5470          }
5471      }
5472  
5473      @SuppressWarnings("serial") static final class ForEachTransformedKeyTask<K,V,U>
5474 <        extends BulkTask<K,V,Void> {
5474 >        extends Traverser<K,V,Void> {
5475          final Fun<? super K, ? extends U> transformer;
5476          final Action<U> action;
5477          ForEachTransformedKeyTask
5478 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5479 <             Fun<? super K, ? extends U> transformer,
5092 <             Action<U> action) {
5478 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5479 >             Fun<? super K, ? extends U> transformer, Action<U> action) {
5480              super(m, p, b);
5481 <            this.transformer = transformer;
5095 <            this.action = action;
5096 <
5481 >            this.transformer = transformer; this.action = action;
5482          }
5483 <        @SuppressWarnings("unchecked") public final boolean exec() {
5484 <            final Fun<? super K, ? extends U> transformer =
5485 <                this.transformer;
5486 <            final Action<U> action = this.action;
5487 <            if (transformer == null || action == null)
5488 <                return abortOnNullFunction();
5489 <            try {
5490 <                int b = batch(), c;
5491 <                while (b > 1 && baseIndex != baseLimit) {
5492 <                    do {} while (!casPending(c = pending, c+1));
5493 <                    new ForEachTransformedKeyTask<K,V,U>
5494 <                        (map, this, b >>>= 1, transformer, action).fork();
5495 <                }
5111 <                U u;
5112 <                while (advance() != null) {
5113 <                    if ((u = transformer.apply((K)nextKey)) != null)
5114 <                        action.apply(u);
5115 <                }
5116 <                tryComplete();
5117 <            } catch (Throwable ex) {
5118 <                return tryCompleteComputation(ex);
5483 >        @SuppressWarnings("unchecked") public final void compute() {
5484 >            final Fun<? super K, ? extends U> transformer;
5485 >            final Action<U> action;
5486 >            if ((transformer = this.transformer) == null ||
5487 >                (action = this.action) == null)
5488 >                throw new NullPointerException();
5489 >            for (int b; (b = preSplit()) > 0;)
5490 >                new ForEachTransformedKeyTask<K,V,U>
5491 >                     (map, this, b, transformer, action).fork();
5492 >            U u;
5493 >            while (advance() != null) {
5494 >                if ((u = transformer.apply((K)nextKey)) != null)
5495 >                    action.apply(u);
5496              }
5497 <            return false;
5497 >            propagateCompletion();
5498          }
5499      }
5500  
5501      @SuppressWarnings("serial") static final class ForEachTransformedValueTask<K,V,U>
5502 <        extends BulkTask<K,V,Void> {
5502 >        extends Traverser<K,V,Void> {
5503          final Fun<? super V, ? extends U> transformer;
5504          final Action<U> action;
5505          ForEachTransformedValueTask
5506 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5507 <             Fun<? super V, ? extends U> transformer,
5131 <             Action<U> action) {
5506 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5507 >             Fun<? super V, ? extends U> transformer, Action<U> action) {
5508              super(m, p, b);
5509 <            this.transformer = transformer;
5134 <            this.action = action;
5135 <
5509 >            this.transformer = transformer; this.action = action;
5510          }
5511 <        @SuppressWarnings("unchecked") public final boolean exec() {
5512 <            final Fun<? super V, ? extends U> transformer =
5513 <                this.transformer;
5514 <            final Action<U> action = this.action;
5515 <            if (transformer == null || action == null)
5516 <                return abortOnNullFunction();
5517 <            try {
5518 <                int b = batch(), c;
5519 <                while (b > 1 && baseIndex != baseLimit) {
5520 <                    do {} while (!casPending(c = pending, c+1));
5521 <                    new ForEachTransformedValueTask<K,V,U>
5522 <                        (map, this, b >>>= 1, transformer, action).fork();
5523 <                }
5150 <                Object v; U u;
5151 <                while ((v = advance()) != null) {
5152 <                    if ((u = transformer.apply((V)v)) != null)
5153 <                        action.apply(u);
5154 <                }
5155 <                tryComplete();
5156 <            } catch (Throwable ex) {
5157 <                return tryCompleteComputation(ex);
5511 >        @SuppressWarnings("unchecked") public final void compute() {
5512 >            final Fun<? super V, ? extends U> transformer;
5513 >            final Action<U> action;
5514 >            if ((transformer = this.transformer) == null ||
5515 >                (action = this.action) == null)
5516 >                throw new NullPointerException();
5517 >            for (int b; (b = preSplit()) > 0;)
5518 >                new ForEachTransformedValueTask<K,V,U>
5519 >                    (map, this, b, transformer, action).fork();
5520 >            Object v; U u;
5521 >            while ((v = advance()) != null) {
5522 >                if ((u = transformer.apply((V)v)) != null)
5523 >                    action.apply(u);
5524              }
5525 <            return false;
5525 >            propagateCompletion();
5526          }
5527      }
5528  
5529      @SuppressWarnings("serial") static final class ForEachTransformedEntryTask<K,V,U>
5530 <        extends BulkTask<K,V,Void> {
5530 >        extends Traverser<K,V,Void> {
5531          final Fun<Map.Entry<K,V>, ? extends U> transformer;
5532          final Action<U> action;
5533          ForEachTransformedEntryTask
5534 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5535 <             Fun<Map.Entry<K,V>, ? extends U> transformer,
5170 <             Action<U> action) {
5534 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5535 >             Fun<Map.Entry<K,V>, ? extends U> transformer, Action<U> action) {
5536              super(m, p, b);
5537 <            this.transformer = transformer;
5173 <            this.action = action;
5174 <
5537 >            this.transformer = transformer; this.action = action;
5538          }
5539 <        @SuppressWarnings("unchecked") public final boolean exec() {
5540 <            final Fun<Map.Entry<K,V>, ? extends U> transformer =
5541 <                this.transformer;
5542 <            final Action<U> action = this.action;
5543 <            if (transformer == null || action == null)
5544 <                return abortOnNullFunction();
5545 <            try {
5546 <                int b = batch(), c;
5547 <                while (b > 1 && baseIndex != baseLimit) {
5548 <                    do {} while (!casPending(c = pending, c+1));
5549 <                    new ForEachTransformedEntryTask<K,V,U>
5550 <                        (map, this, b >>>= 1, transformer, action).fork();
5551 <                }
5189 <                Object v; U u;
5190 <                while ((v = advance()) != null) {
5191 <                    if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
5192 <                        action.apply(u);
5193 <                }
5194 <                tryComplete();
5195 <            } catch (Throwable ex) {
5196 <                return tryCompleteComputation(ex);
5539 >        @SuppressWarnings("unchecked") public final void compute() {
5540 >            final Fun<Map.Entry<K,V>, ? extends U> transformer;
5541 >            final Action<U> action;
5542 >            if ((transformer = this.transformer) == null ||
5543 >                (action = this.action) == null)
5544 >                throw new NullPointerException();
5545 >            for (int b; (b = preSplit()) > 0;)
5546 >                new ForEachTransformedEntryTask<K,V,U>
5547 >                    (map, this, b, transformer, action).fork();
5548 >            Object v; U u;
5549 >            while ((v = advance()) != null) {
5550 >                if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
5551 >                    action.apply(u);
5552              }
5553 <            return false;
5553 >            propagateCompletion();
5554          }
5555      }
5556  
5557      @SuppressWarnings("serial") static final class ForEachTransformedMappingTask<K,V,U>
5558 <        extends BulkTask<K,V,Void> {
5558 >        extends Traverser<K,V,Void> {
5559          final BiFun<? super K, ? super V, ? extends U> transformer;
5560          final Action<U> action;
5561          ForEachTransformedMappingTask
5562 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5562 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5563               BiFun<? super K, ? super V, ? extends U> transformer,
5564               Action<U> action) {
5565              super(m, p, b);
5566 <            this.transformer = transformer;
5212 <            this.action = action;
5213 <
5566 >            this.transformer = transformer; this.action = action;
5567          }
5568 <        @SuppressWarnings("unchecked") public final boolean exec() {
5569 <            final BiFun<? super K, ? super V, ? extends U> transformer =
5570 <                this.transformer;
5571 <            final Action<U> action = this.action;
5572 <            if (transformer == null || action == null)
5573 <                return abortOnNullFunction();
5574 <            try {
5575 <                int b = batch(), c;
5576 <                while (b > 1 && baseIndex != baseLimit) {
5577 <                    do {} while (!casPending(c = pending, c+1));
5578 <                    new ForEachTransformedMappingTask<K,V,U>
5579 <                        (map, this, b >>>= 1, transformer, action).fork();
5580 <                }
5228 <                Object v; U u;
5229 <                while ((v = advance()) != null) {
5230 <                    if ((u = transformer.apply((K)nextKey, (V)v)) != null)
5231 <                        action.apply(u);
5232 <                }
5233 <                tryComplete();
5234 <            } catch (Throwable ex) {
5235 <                return tryCompleteComputation(ex);
5568 >        @SuppressWarnings("unchecked") public final void compute() {
5569 >            final BiFun<? super K, ? super V, ? extends U> transformer;
5570 >            final Action<U> action;
5571 >            if ((transformer = this.transformer) == null ||
5572 >                (action = this.action) == null)
5573 >                throw new NullPointerException();
5574 >            for (int b; (b = preSplit()) > 0;)
5575 >                new ForEachTransformedMappingTask<K,V,U>
5576 >                    (map, this, b, transformer, action).fork();
5577 >            Object v; U u;
5578 >            while ((v = advance()) != null) {
5579 >                if ((u = transformer.apply((K)nextKey, (V)v)) != null)
5580 >                    action.apply(u);
5581              }
5582 <            return false;
5582 >            propagateCompletion();
5583          }
5584      }
5585  
5586      @SuppressWarnings("serial") static final class SearchKeysTask<K,V,U>
5587 <        extends BulkTask<K,V,U> {
5587 >        extends Traverser<K,V,U> {
5588          final Fun<? super K, ? extends U> searchFunction;
5589          final AtomicReference<U> result;
5590          SearchKeysTask
5591 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5591 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5592               Fun<? super K, ? extends U> searchFunction,
5593               AtomicReference<U> result) {
5594              super(m, p, b);
5595              this.searchFunction = searchFunction; this.result = result;
5596          }
5597 <        @SuppressWarnings("unchecked") public final boolean exec() {
5598 <            AtomicReference<U> result = this.result;
5599 <            final Fun<? super K, ? extends U> searchFunction =
5600 <                this.searchFunction;
5601 <            if (searchFunction == null || result == null)
5602 <                return abortOnNullFunction();
5603 <            try {
5604 <                int b = batch(), c;
5605 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5606 <                    do {} while (!casPending(c = pending, c+1));
5607 <                    new SearchKeysTask<K,V,U>(map, this, b >>>= 1,
5608 <                                              searchFunction, result).fork();
5609 <                }
5597 >        public final U getRawResult() { return result.get(); }
5598 >        @SuppressWarnings("unchecked") public final void compute() {
5599 >            final Fun<? super K, ? extends U> searchFunction;
5600 >            final AtomicReference<U> result;
5601 >            if ((searchFunction = this.searchFunction) == null ||
5602 >                (result = this.result) == null)
5603 >                throw new NullPointerException();
5604 >            for (int b;;) {
5605 >                if (result.get() != null)
5606 >                    return;
5607 >                if ((b = preSplit()) <= 0)
5608 >                    break;
5609 >                new SearchKeysTask<K,V,U>
5610 >                    (map, this, b, searchFunction, result).fork();
5611 >            }
5612 >            while (result.get() == null) {
5613                  U u;
5614 <                while (result.get() == null && advance() != null) {
5615 <                    if ((u = searchFunction.apply((K)nextKey)) != null) {
5616 <                        if (result.compareAndSet(null, u))
5617 <                            tryCompleteComputation(null);
5618 <                        break;
5619 <                    }
5614 >                if (advance() == null) {
5615 >                    propagateCompletion();
5616 >                    break;
5617 >                }
5618 >                if ((u = searchFunction.apply((K)nextKey)) != null) {
5619 >                    if (result.compareAndSet(null, u))
5620 >                        quietlyCompleteRoot();
5621 >                    break;
5622                  }
5273                tryComplete();
5274            } catch (Throwable ex) {
5275                return tryCompleteComputation(ex);
5623              }
5277            return false;
5624          }
5279        public final U getRawResult() { return result.get(); }
5625      }
5626  
5627      @SuppressWarnings("serial") static final class SearchValuesTask<K,V,U>
5628 <        extends BulkTask<K,V,U> {
5628 >        extends Traverser<K,V,U> {
5629          final Fun<? super V, ? extends U> searchFunction;
5630          final AtomicReference<U> result;
5631          SearchValuesTask
5632 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5632 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5633               Fun<? super V, ? extends U> searchFunction,
5634               AtomicReference<U> result) {
5635              super(m, p, b);
5636              this.searchFunction = searchFunction; this.result = result;
5637          }
5638 <        @SuppressWarnings("unchecked") public final boolean exec() {
5639 <            AtomicReference<U> result = this.result;
5640 <            final Fun<? super V, ? extends U> searchFunction =
5641 <                this.searchFunction;
5642 <            if (searchFunction == null || result == null)
5643 <                return abortOnNullFunction();
5644 <            try {
5645 <                int b = batch(), c;
5646 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5647 <                    do {} while (!casPending(c = pending, c+1));
5648 <                    new SearchValuesTask<K,V,U>(map, this, b >>>= 1,
5649 <                                                searchFunction, result).fork();
5650 <                }
5638 >        public final U getRawResult() { return result.get(); }
5639 >        @SuppressWarnings("unchecked") public final void compute() {
5640 >            final Fun<? super V, ? extends U> searchFunction;
5641 >            final AtomicReference<U> result;
5642 >            if ((searchFunction = this.searchFunction) == null ||
5643 >                (result = this.result) == null)
5644 >                throw new NullPointerException();
5645 >            for (int b;;) {
5646 >                if (result.get() != null)
5647 >                    return;
5648 >                if ((b = preSplit()) <= 0)
5649 >                    break;
5650 >                new SearchValuesTask<K,V,U>
5651 >                    (map, this, b, searchFunction, result).fork();
5652 >            }
5653 >            while (result.get() == null) {
5654                  Object v; U u;
5655 <                while (result.get() == null && (v = advance()) != null) {
5656 <                    if ((u = searchFunction.apply((V)v)) != null) {
5657 <                        if (result.compareAndSet(null, u))
5658 <                            tryCompleteComputation(null);
5659 <                        break;
5660 <                    }
5655 >                if ((v = advance()) == null) {
5656 >                    propagateCompletion();
5657 >                    break;
5658 >                }
5659 >                if ((u = searchFunction.apply((V)v)) != null) {
5660 >                    if (result.compareAndSet(null, u))
5661 >                        quietlyCompleteRoot();
5662 >                    break;
5663                  }
5314                tryComplete();
5315            } catch (Throwable ex) {
5316                return tryCompleteComputation(ex);
5664              }
5318            return false;
5665          }
5320        public final U getRawResult() { return result.get(); }
5666      }
5667  
5668      @SuppressWarnings("serial") static final class SearchEntriesTask<K,V,U>
5669 <        extends BulkTask<K,V,U> {
5669 >        extends Traverser<K,V,U> {
5670          final Fun<Entry<K,V>, ? extends U> searchFunction;
5671          final AtomicReference<U> result;
5672          SearchEntriesTask
5673 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5673 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5674               Fun<Entry<K,V>, ? extends U> searchFunction,
5675               AtomicReference<U> result) {
5676              super(m, p, b);
5677              this.searchFunction = searchFunction; this.result = result;
5678          }
5679 <        @SuppressWarnings("unchecked") public final boolean exec() {
5680 <            AtomicReference<U> result = this.result;
5681 <            final Fun<Entry<K,V>, ? extends U> searchFunction =
5682 <                this.searchFunction;
5683 <            if (searchFunction == null || result == null)
5684 <                return abortOnNullFunction();
5685 <            try {
5686 <                int b = batch(), c;
5687 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5688 <                    do {} while (!casPending(c = pending, c+1));
5689 <                    new SearchEntriesTask<K,V,U>(map, this, b >>>= 1,
5690 <                                                 searchFunction, result).fork();
5691 <                }
5679 >        public final U getRawResult() { return result.get(); }
5680 >        @SuppressWarnings("unchecked") public final void compute() {
5681 >            final Fun<Entry<K,V>, ? extends U> searchFunction;
5682 >            final AtomicReference<U> result;
5683 >            if ((searchFunction = this.searchFunction) == null ||
5684 >                (result = this.result) == null)
5685 >                throw new NullPointerException();
5686 >            for (int b;;) {
5687 >                if (result.get() != null)
5688 >                    return;
5689 >                if ((b = preSplit()) <= 0)
5690 >                    break;
5691 >                new SearchEntriesTask<K,V,U>
5692 >                    (map, this, b, searchFunction, result).fork();
5693 >            }
5694 >            while (result.get() == null) {
5695                  Object v; U u;
5696 <                while (result.get() == null && (v = advance()) != null) {
5697 <                    if ((u = searchFunction.apply(entryFor((K)nextKey, (V)v))) != null) {
5698 <                        if (result.compareAndSet(null, u))
5699 <                            tryCompleteComputation(null);
5700 <                        break;
5701 <                    }
5696 >                if ((v = advance()) == null) {
5697 >                    propagateCompletion();
5698 >                    break;
5699 >                }
5700 >                if ((u = searchFunction.apply(entryFor((K)nextKey, (V)v))) != null) {
5701 >                    if (result.compareAndSet(null, u))
5702 >                        quietlyCompleteRoot();
5703 >                    return;
5704                  }
5355                tryComplete();
5356            } catch (Throwable ex) {
5357                return tryCompleteComputation(ex);
5705              }
5359            return false;
5706          }
5361        public final U getRawResult() { return result.get(); }
5707      }
5708  
5709      @SuppressWarnings("serial") static final class SearchMappingsTask<K,V,U>
5710 <        extends BulkTask<K,V,U> {
5710 >        extends Traverser<K,V,U> {
5711          final BiFun<? super K, ? super V, ? extends U> searchFunction;
5712          final AtomicReference<U> result;
5713          SearchMappingsTask
5714 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5714 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5715               BiFun<? super K, ? super V, ? extends U> searchFunction,
5716               AtomicReference<U> result) {
5717              super(m, p, b);
5718              this.searchFunction = searchFunction; this.result = result;
5719          }
5720 <        @SuppressWarnings("unchecked") public final boolean exec() {
5721 <            AtomicReference<U> result = this.result;
5722 <            final BiFun<? super K, ? super V, ? extends U> searchFunction =
5723 <                this.searchFunction;
5724 <            if (searchFunction == null || result == null)
5725 <                return abortOnNullFunction();
5726 <            try {
5727 <                int b = batch(), c;
5728 <                while (b > 1 && baseIndex != baseLimit && result.get() == null) {
5729 <                    do {} while (!casPending(c = pending, c+1));
5730 <                    new SearchMappingsTask<K,V,U>(map, this, b >>>= 1,
5731 <                                                  searchFunction, result).fork();
5732 <                }
5720 >        public final U getRawResult() { return result.get(); }
5721 >        @SuppressWarnings("unchecked") public final void compute() {
5722 >            final BiFun<? super K, ? super V, ? extends U> searchFunction;
5723 >            final AtomicReference<U> result;
5724 >            if ((searchFunction = this.searchFunction) == null ||
5725 >                (result = this.result) == null)
5726 >                throw new NullPointerException();
5727 >            for (int b;;) {
5728 >                if (result.get() != null)
5729 >                    return;
5730 >                if ((b = preSplit()) <= 0)
5731 >                    break;
5732 >                new SearchMappingsTask<K,V,U>
5733 >                    (map, this, b, searchFunction, result).fork();
5734 >            }
5735 >            while (result.get() == null) {
5736                  Object v; U u;
5737 <                while (result.get() == null && (v = advance()) != null) {
5738 <                    if ((u = searchFunction.apply((K)nextKey, (V)v)) != null) {
5739 <                        if (result.compareAndSet(null, u))
5740 <                            tryCompleteComputation(null);
5741 <                        break;
5742 <                    }
5737 >                if ((v = advance()) == null) {
5738 >                    propagateCompletion();
5739 >                    break;
5740 >                }
5741 >                if ((u = searchFunction.apply((K)nextKey, (V)v)) != null) {
5742 >                    if (result.compareAndSet(null, u))
5743 >                        quietlyCompleteRoot();
5744 >                    break;
5745                  }
5396                tryComplete();
5397            } catch (Throwable ex) {
5398                return tryCompleteComputation(ex);
5746              }
5400            return false;
5747          }
5402        public final U getRawResult() { return result.get(); }
5748      }
5749  
5750      @SuppressWarnings("serial") static final class ReduceKeysTask<K,V>
5751 <        extends BulkTask<K,V,K> {
5751 >        extends Traverser<K,V,K> {
5752          final BiFun<? super K, ? super K, ? extends K> reducer;
5753          K result;
5754          ReduceKeysTask<K,V> rights, nextRight;
5755          ReduceKeysTask
5756 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5756 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5757               ReduceKeysTask<K,V> nextRight,
5758               BiFun<? super K, ? super K, ? extends K> reducer) {
5759              super(m, p, b); this.nextRight = nextRight;
5760              this.reducer = reducer;
5761          }
5762 <        @SuppressWarnings("unchecked") public final boolean exec() {
5762 >        public final K getRawResult() { return result; }
5763 >        @SuppressWarnings("unchecked") public final void compute() {
5764              final BiFun<? super K, ? super K, ? extends K> reducer =
5765                  this.reducer;
5766              if (reducer == null)
5767 <                return abortOnNullFunction();
5768 <            try {
5769 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5770 <                    do {} while (!casPending(c = pending, c+1));
5771 <                    (rights = new ReduceKeysTask<K,V>
5772 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5773 <                }
5774 <                K r = null;
5775 <                while (advance() != null) {
5776 <                    K u = (K)nextKey;
5777 <                    r = (r == null) ? u : reducer.apply(r, u);
5778 <                }
5779 <                result = r;
5780 <                for (ReduceKeysTask<K,V> t = this, s;;) {
5781 <                    int c; BulkTask<K,V,?> par; K tr, sr;
5782 <                    if ((c = t.pending) == 0) {
5783 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5784 <                            if ((sr = s.result) != null)
5785 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5786 <                        }
5787 <                        if ((par = t.parent) == null ||
5442 <                            !(par instanceof ReduceKeysTask)) {
5443 <                            t.quietlyComplete();
5444 <                            break;
5445 <                        }
5446 <                        t = (ReduceKeysTask<K,V>)par;
5447 <                    }
5448 <                    else if (t.casPending(c, c - 1))
5449 <                        break;
5767 >                throw new NullPointerException();
5768 >            for (int b; (b = preSplit()) > 0;)
5769 >                (rights = new ReduceKeysTask<K,V>
5770 >                 (map, this, b, rights, reducer)).fork();
5771 >            K r = null;
5772 >            while (advance() != null) {
5773 >                K u = (K)nextKey;
5774 >                r = (r == null) ? u : reducer.apply(r, u);
5775 >            }
5776 >            result = r;
5777 >            CountedCompleter<?> c;
5778 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
5779 >                ReduceKeysTask<K,V>
5780 >                    t = (ReduceKeysTask<K,V>)c,
5781 >                    s = t.rights;
5782 >                while (s != null) {
5783 >                    K tr, sr;
5784 >                    if ((sr = s.result) != null)
5785 >                        t.result = (((tr = t.result) == null) ? sr :
5786 >                                    reducer.apply(tr, sr));
5787 >                    s = t.rights = s.nextRight;
5788                  }
5451            } catch (Throwable ex) {
5452                return tryCompleteComputation(ex);
5789              }
5454            return false;
5790          }
5456        public final K getRawResult() { return result; }
5791      }
5792  
5793      @SuppressWarnings("serial") static final class ReduceValuesTask<K,V>
5794 <        extends BulkTask<K,V,V> {
5794 >        extends Traverser<K,V,V> {
5795          final BiFun<? super V, ? super V, ? extends V> reducer;
5796          V result;
5797          ReduceValuesTask<K,V> rights, nextRight;
5798          ReduceValuesTask
5799 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5799 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5800               ReduceValuesTask<K,V> nextRight,
5801               BiFun<? super V, ? super V, ? extends V> reducer) {
5802              super(m, p, b); this.nextRight = nextRight;
5803              this.reducer = reducer;
5804          }
5805 <        @SuppressWarnings("unchecked") public final boolean exec() {
5805 >        public final V getRawResult() { return result; }
5806 >        @SuppressWarnings("unchecked") public final void compute() {
5807              final BiFun<? super V, ? super V, ? extends V> reducer =
5808                  this.reducer;
5809              if (reducer == null)
5810 <                return abortOnNullFunction();
5811 <            try {
5812 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5813 <                    do {} while (!casPending(c = pending, c+1));
5814 <                    (rights = new ReduceValuesTask<K,V>
5815 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5816 <                }
5817 <                V r = null;
5818 <                Object v;
5819 <                while ((v = advance()) != null) {
5820 <                    V u = (V)v;
5821 <                    r = (r == null) ? u : reducer.apply(r, u);
5822 <                }
5823 <                result = r;
5824 <                for (ReduceValuesTask<K,V> t = this, s;;) {
5825 <                    int c; BulkTask<K,V,?> par; V tr, sr;
5826 <                    if ((c = t.pending) == 0) {
5827 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5828 <                            if ((sr = s.result) != null)
5829 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5830 <                        }
5831 <                        if ((par = t.parent) == null ||
5497 <                            !(par instanceof ReduceValuesTask)) {
5498 <                            t.quietlyComplete();
5499 <                            break;
5500 <                        }
5501 <                        t = (ReduceValuesTask<K,V>)par;
5502 <                    }
5503 <                    else if (t.casPending(c, c - 1))
5504 <                        break;
5810 >                throw new NullPointerException();
5811 >            for (int b; (b = preSplit()) > 0;)
5812 >                (rights = new ReduceValuesTask<K,V>
5813 >                 (map, this, b, rights, reducer)).fork();
5814 >            V r = null;
5815 >            Object v;
5816 >            while ((v = advance()) != null) {
5817 >                V u = (V)v;
5818 >                r = (r == null) ? u : reducer.apply(r, u);
5819 >            }
5820 >            result = r;
5821 >            CountedCompleter<?> c;
5822 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
5823 >                ReduceValuesTask<K,V>
5824 >                    t = (ReduceValuesTask<K,V>)c,
5825 >                    s = t.rights;
5826 >                while (s != null) {
5827 >                    V tr, sr;
5828 >                    if ((sr = s.result) != null)
5829 >                        t.result = (((tr = t.result) == null) ? sr :
5830 >                                    reducer.apply(tr, sr));
5831 >                    s = t.rights = s.nextRight;
5832                  }
5506            } catch (Throwable ex) {
5507                return tryCompleteComputation(ex);
5833              }
5509            return false;
5834          }
5511        public final V getRawResult() { return result; }
5835      }
5836  
5837      @SuppressWarnings("serial") static final class ReduceEntriesTask<K,V>
5838 <        extends BulkTask<K,V,Map.Entry<K,V>> {
5838 >        extends Traverser<K,V,Map.Entry<K,V>> {
5839          final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer;
5840          Map.Entry<K,V> result;
5841          ReduceEntriesTask<K,V> rights, nextRight;
5842          ReduceEntriesTask
5843 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5843 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5844               ReduceEntriesTask<K,V> nextRight,
5845               BiFun<Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer) {
5846              super(m, p, b); this.nextRight = nextRight;
5847              this.reducer = reducer;
5848          }
5849 <        @SuppressWarnings("unchecked") public final boolean exec() {
5849 >        public final Map.Entry<K,V> getRawResult() { return result; }
5850 >        @SuppressWarnings("unchecked") public final void compute() {
5851              final BiFun<Map.Entry<K,V>, Map.Entry<K,V>, ? extends Map.Entry<K,V>> reducer =
5852                  this.reducer;
5853              if (reducer == null)
5854 <                return abortOnNullFunction();
5855 <            try {
5856 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5857 <                    do {} while (!casPending(c = pending, c+1));
5858 <                    (rights = new ReduceEntriesTask<K,V>
5859 <                     (map, this, b >>>= 1, rights, reducer)).fork();
5860 <                }
5861 <                Map.Entry<K,V> r = null;
5862 <                Object v;
5863 <                while ((v = advance()) != null) {
5864 <                    Map.Entry<K,V> u = entryFor((K)nextKey, (V)v);
5865 <                    r = (r == null) ? u : reducer.apply(r, u);
5866 <                }
5867 <                result = r;
5868 <                for (ReduceEntriesTask<K,V> t = this, s;;) {
5869 <                    int c; BulkTask<K,V,?> par; Map.Entry<K,V> tr, sr;
5870 <                    if ((c = t.pending) == 0) {
5871 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5872 <                            if ((sr = s.result) != null)
5873 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5874 <                        }
5875 <                        if ((par = t.parent) == null ||
5552 <                            !(par instanceof ReduceEntriesTask)) {
5553 <                            t.quietlyComplete();
5554 <                            break;
5555 <                        }
5556 <                        t = (ReduceEntriesTask<K,V>)par;
5557 <                    }
5558 <                    else if (t.casPending(c, c - 1))
5559 <                        break;
5854 >                throw new NullPointerException();
5855 >            for (int b; (b = preSplit()) > 0;)
5856 >                (rights = new ReduceEntriesTask<K,V>
5857 >                 (map, this, b, rights, reducer)).fork();
5858 >            Map.Entry<K,V> r = null;
5859 >            Object v;
5860 >            while ((v = advance()) != null) {
5861 >                Map.Entry<K,V> u = entryFor((K)nextKey, (V)v);
5862 >                r = (r == null) ? u : reducer.apply(r, u);
5863 >            }
5864 >            result = r;
5865 >            CountedCompleter<?> c;
5866 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
5867 >                ReduceEntriesTask<K,V>
5868 >                    t = (ReduceEntriesTask<K,V>)c,
5869 >                    s = t.rights;
5870 >                while (s != null) {
5871 >                    Map.Entry<K,V> tr, sr;
5872 >                    if ((sr = s.result) != null)
5873 >                        t.result = (((tr = t.result) == null) ? sr :
5874 >                                    reducer.apply(tr, sr));
5875 >                    s = t.rights = s.nextRight;
5876                  }
5561            } catch (Throwable ex) {
5562                return tryCompleteComputation(ex);
5877              }
5564            return false;
5878          }
5566        public final Map.Entry<K,V> getRawResult() { return result; }
5879      }
5880  
5881      @SuppressWarnings("serial") static final class MapReduceKeysTask<K,V,U>
5882 <        extends BulkTask<K,V,U> {
5882 >        extends Traverser<K,V,U> {
5883          final Fun<? super K, ? extends U> transformer;
5884          final BiFun<? super U, ? super U, ? extends U> reducer;
5885          U result;
5886          MapReduceKeysTask<K,V,U> rights, nextRight;
5887          MapReduceKeysTask
5888 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5888 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5889               MapReduceKeysTask<K,V,U> nextRight,
5890               Fun<? super K, ? extends U> transformer,
5891               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 5581 | Line 5893 | public class ConcurrentHashMapV8<K, V>
5893              this.transformer = transformer;
5894              this.reducer = reducer;
5895          }
5896 <        @SuppressWarnings("unchecked") public final boolean exec() {
5896 >        public final U getRawResult() { return result; }
5897 >        @SuppressWarnings("unchecked") public final void compute() {
5898              final Fun<? super K, ? extends U> transformer =
5899                  this.transformer;
5900              final BiFun<? super U, ? super U, ? extends U> reducer =
5901                  this.reducer;
5902              if (transformer == null || reducer == null)
5903 <                return abortOnNullFunction();
5904 <            try {
5905 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5906 <                    do {} while (!casPending(c = pending, c+1));
5907 <                    (rights = new MapReduceKeysTask<K,V,U>
5908 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
5909 <                }
5910 <                U r = null, u;
5911 <                while (advance() != null) {
5912 <                    if ((u = transformer.apply((K)nextKey)) != null)
5913 <                        r = (r == null) ? u : reducer.apply(r, u);
5914 <                }
5915 <                result = r;
5916 <                for (MapReduceKeysTask<K,V,U> t = this, s;;) {
5917 <                    int c; BulkTask<K,V,?> par; U tr, sr;
5918 <                    if ((c = t.pending) == 0) {
5919 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5920 <                            if ((sr = s.result) != null)
5921 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5922 <                        }
5923 <                        if ((par = t.parent) == null ||
5611 <                            !(par instanceof MapReduceKeysTask)) {
5612 <                            t.quietlyComplete();
5613 <                            break;
5614 <                        }
5615 <                        t = (MapReduceKeysTask<K,V,U>)par;
5616 <                    }
5617 <                    else if (t.casPending(c, c - 1))
5618 <                        break;
5903 >                throw new NullPointerException();
5904 >            for (int b; (b = preSplit()) > 0;)
5905 >                (rights = new MapReduceKeysTask<K,V,U>
5906 >                 (map, this, b, rights, transformer, reducer)).fork();
5907 >            U r = null, u;
5908 >            while (advance() != null) {
5909 >                if ((u = transformer.apply((K)nextKey)) != null)
5910 >                    r = (r == null) ? u : reducer.apply(r, u);
5911 >            }
5912 >            result = r;
5913 >            CountedCompleter<?> c;
5914 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
5915 >                MapReduceKeysTask<K,V,U>
5916 >                    t = (MapReduceKeysTask<K,V,U>)c,
5917 >                    s = t.rights;
5918 >                while (s != null) {
5919 >                    U tr, sr;
5920 >                    if ((sr = s.result) != null)
5921 >                        t.result = (((tr = t.result) == null) ? sr :
5922 >                                    reducer.apply(tr, sr));
5923 >                    s = t.rights = s.nextRight;
5924                  }
5620            } catch (Throwable ex) {
5621                return tryCompleteComputation(ex);
5925              }
5623            return false;
5926          }
5625        public final U getRawResult() { return result; }
5927      }
5928  
5929      @SuppressWarnings("serial") static final class MapReduceValuesTask<K,V,U>
5930 <        extends BulkTask<K,V,U> {
5930 >        extends Traverser<K,V,U> {
5931          final Fun<? super V, ? extends U> transformer;
5932          final BiFun<? super U, ? super U, ? extends U> reducer;
5933          U result;
5934          MapReduceValuesTask<K,V,U> rights, nextRight;
5935          MapReduceValuesTask
5936 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5936 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5937               MapReduceValuesTask<K,V,U> nextRight,
5938               Fun<? super V, ? extends U> transformer,
5939               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 5640 | Line 5941 | public class ConcurrentHashMapV8<K, V>
5941              this.transformer = transformer;
5942              this.reducer = reducer;
5943          }
5944 <        @SuppressWarnings("unchecked") public final boolean exec() {
5944 >        public final U getRawResult() { return result; }
5945 >        @SuppressWarnings("unchecked") public final void compute() {
5946              final Fun<? super V, ? extends U> transformer =
5947                  this.transformer;
5948              final BiFun<? super U, ? super U, ? extends U> reducer =
5949                  this.reducer;
5950              if (transformer == null || reducer == null)
5951 <                return abortOnNullFunction();
5952 <            try {
5953 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
5954 <                    do {} while (!casPending(c = pending, c+1));
5955 <                    (rights = new MapReduceValuesTask<K,V,U>
5956 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
5957 <                }
5958 <                U r = null, u;
5959 <                Object v;
5960 <                while ((v = advance()) != null) {
5961 <                    if ((u = transformer.apply((V)v)) != null)
5962 <                        r = (r == null) ? u : reducer.apply(r, u);
5963 <                }
5964 <                result = r;
5965 <                for (MapReduceValuesTask<K,V,U> t = this, s;;) {
5966 <                    int c; BulkTask<K,V,?> par; U tr, sr;
5967 <                    if ((c = t.pending) == 0) {
5968 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5969 <                            if ((sr = s.result) != null)
5970 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
5971 <                        }
5972 <                        if ((par = t.parent) == null ||
5671 <                            !(par instanceof MapReduceValuesTask)) {
5672 <                            t.quietlyComplete();
5673 <                            break;
5674 <                        }
5675 <                        t = (MapReduceValuesTask<K,V,U>)par;
5676 <                    }
5677 <                    else if (t.casPending(c, c - 1))
5678 <                        break;
5951 >                throw new NullPointerException();
5952 >            for (int b; (b = preSplit()) > 0;)
5953 >                (rights = new MapReduceValuesTask<K,V,U>
5954 >                 (map, this, b, rights, transformer, reducer)).fork();
5955 >            U r = null, u;
5956 >            Object v;
5957 >            while ((v = advance()) != null) {
5958 >                if ((u = transformer.apply((V)v)) != null)
5959 >                    r = (r == null) ? u : reducer.apply(r, u);
5960 >            }
5961 >            result = r;
5962 >            CountedCompleter<?> c;
5963 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
5964 >                MapReduceValuesTask<K,V,U>
5965 >                    t = (MapReduceValuesTask<K,V,U>)c,
5966 >                    s = t.rights;
5967 >                while (s != null) {
5968 >                    U tr, sr;
5969 >                    if ((sr = s.result) != null)
5970 >                        t.result = (((tr = t.result) == null) ? sr :
5971 >                                    reducer.apply(tr, sr));
5972 >                    s = t.rights = s.nextRight;
5973                  }
5680            } catch (Throwable ex) {
5681                return tryCompleteComputation(ex);
5974              }
5683            return false;
5975          }
5685        public final U getRawResult() { return result; }
5976      }
5977  
5978      @SuppressWarnings("serial") static final class MapReduceEntriesTask<K,V,U>
5979 <        extends BulkTask<K,V,U> {
5979 >        extends Traverser<K,V,U> {
5980          final Fun<Map.Entry<K,V>, ? extends U> transformer;
5981          final BiFun<? super U, ? super U, ? extends U> reducer;
5982          U result;
5983          MapReduceEntriesTask<K,V,U> rights, nextRight;
5984          MapReduceEntriesTask
5985 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
5985 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
5986               MapReduceEntriesTask<K,V,U> nextRight,
5987               Fun<Map.Entry<K,V>, ? extends U> transformer,
5988               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 5700 | Line 5990 | public class ConcurrentHashMapV8<K, V>
5990              this.transformer = transformer;
5991              this.reducer = reducer;
5992          }
5993 <        @SuppressWarnings("unchecked") public final boolean exec() {
5993 >        public final U getRawResult() { return result; }
5994 >        @SuppressWarnings("unchecked") public final void compute() {
5995              final Fun<Map.Entry<K,V>, ? extends U> transformer =
5996                  this.transformer;
5997              final BiFun<? super U, ? super U, ? extends U> reducer =
5998                  this.reducer;
5999              if (transformer == null || reducer == null)
6000 <                return abortOnNullFunction();
6001 <            try {
6002 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6003 <                    do {} while (!casPending(c = pending, c+1));
6004 <                    (rights = new MapReduceEntriesTask<K,V,U>
6005 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
6006 <                }
6007 <                U r = null, u;
6008 <                Object v;
6009 <                while ((v = advance()) != null) {
6010 <                    if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
6011 <                        r = (r == null) ? u : reducer.apply(r, u);
6012 <                }
6013 <                result = r;
6014 <                for (MapReduceEntriesTask<K,V,U> t = this, s;;) {
6015 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6016 <                    if ((c = t.pending) == 0) {
6017 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6018 <                            if ((sr = s.result) != null)
6019 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6020 <                        }
6021 <                        if ((par = t.parent) == null ||
5731 <                            !(par instanceof MapReduceEntriesTask)) {
5732 <                            t.quietlyComplete();
5733 <                            break;
5734 <                        }
5735 <                        t = (MapReduceEntriesTask<K,V,U>)par;
5736 <                    }
5737 <                    else if (t.casPending(c, c - 1))
5738 <                        break;
6000 >                throw new NullPointerException();
6001 >            for (int b; (b = preSplit()) > 0;)
6002 >                (rights = new MapReduceEntriesTask<K,V,U>
6003 >                 (map, this, b, rights, transformer, reducer)).fork();
6004 >            U r = null, u;
6005 >            Object v;
6006 >            while ((v = advance()) != null) {
6007 >                if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null)
6008 >                    r = (r == null) ? u : reducer.apply(r, u);
6009 >            }
6010 >            result = r;
6011 >            CountedCompleter<?> c;
6012 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6013 >                MapReduceEntriesTask<K,V,U>
6014 >                    t = (MapReduceEntriesTask<K,V,U>)c,
6015 >                    s = t.rights;
6016 >                while (s != null) {
6017 >                    U tr, sr;
6018 >                    if ((sr = s.result) != null)
6019 >                        t.result = (((tr = t.result) == null) ? sr :
6020 >                                    reducer.apply(tr, sr));
6021 >                    s = t.rights = s.nextRight;
6022                  }
5740            } catch (Throwable ex) {
5741                return tryCompleteComputation(ex);
6023              }
5743            return false;
6024          }
5745        public final U getRawResult() { return result; }
6025      }
6026  
6027      @SuppressWarnings("serial") static final class MapReduceMappingsTask<K,V,U>
6028 <        extends BulkTask<K,V,U> {
6028 >        extends Traverser<K,V,U> {
6029          final BiFun<? super K, ? super V, ? extends U> transformer;
6030          final BiFun<? super U, ? super U, ? extends U> reducer;
6031          U result;
6032          MapReduceMappingsTask<K,V,U> rights, nextRight;
6033          MapReduceMappingsTask
6034 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6034 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6035               MapReduceMappingsTask<K,V,U> nextRight,
6036               BiFun<? super K, ? super V, ? extends U> transformer,
6037               BiFun<? super U, ? super U, ? extends U> reducer) {
# Line 5760 | Line 6039 | public class ConcurrentHashMapV8<K, V>
6039              this.transformer = transformer;
6040              this.reducer = reducer;
6041          }
6042 <        @SuppressWarnings("unchecked") public final boolean exec() {
6042 >        public final U getRawResult() { return result; }
6043 >        @SuppressWarnings("unchecked") public final void compute() {
6044              final BiFun<? super K, ? super V, ? extends U> transformer =
6045                  this.transformer;
6046              final BiFun<? super U, ? super U, ? extends U> reducer =
6047                  this.reducer;
6048              if (transformer == null || reducer == null)
6049 <                return abortOnNullFunction();
6050 <            try {
6051 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6052 <                    do {} while (!casPending(c = pending, c+1));
6053 <                    (rights = new MapReduceMappingsTask<K,V,U>
6054 <                     (map, this, b >>>= 1, rights, transformer, reducer)).fork();
6055 <                }
6056 <                U r = null, u;
6057 <                Object v;
6058 <                while ((v = advance()) != null) {
6059 <                    if ((u = transformer.apply((K)nextKey, (V)v)) != null)
6060 <                        r = (r == null) ? u : reducer.apply(r, u);
6061 <                }
6062 <                result = r;
6063 <                for (MapReduceMappingsTask<K,V,U> t = this, s;;) {
6064 <                    int c; BulkTask<K,V,?> par; U tr, sr;
6065 <                    if ((c = t.pending) == 0) {
6066 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6067 <                            if ((sr = s.result) != null)
6068 <                                t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr);
6069 <                        }
6070 <                        if ((par = t.parent) == null ||
5791 <                            !(par instanceof MapReduceMappingsTask)) {
5792 <                            t.quietlyComplete();
5793 <                            break;
5794 <                        }
5795 <                        t = (MapReduceMappingsTask<K,V,U>)par;
5796 <                    }
5797 <                    else if (t.casPending(c, c - 1))
5798 <                        break;
6049 >                throw new NullPointerException();
6050 >            for (int b; (b = preSplit()) > 0;)
6051 >                (rights = new MapReduceMappingsTask<K,V,U>
6052 >                 (map, this, b, rights, transformer, reducer)).fork();
6053 >            U r = null, u;
6054 >            Object v;
6055 >            while ((v = advance()) != null) {
6056 >                if ((u = transformer.apply((K)nextKey, (V)v)) != null)
6057 >                    r = (r == null) ? u : reducer.apply(r, u);
6058 >            }
6059 >            result = r;
6060 >            CountedCompleter<?> c;
6061 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6062 >                MapReduceMappingsTask<K,V,U>
6063 >                    t = (MapReduceMappingsTask<K,V,U>)c,
6064 >                    s = t.rights;
6065 >                while (s != null) {
6066 >                    U tr, sr;
6067 >                    if ((sr = s.result) != null)
6068 >                        t.result = (((tr = t.result) == null) ? sr :
6069 >                                    reducer.apply(tr, sr));
6070 >                    s = t.rights = s.nextRight;
6071                  }
5800            } catch (Throwable ex) {
5801                return tryCompleteComputation(ex);
6072              }
5803            return false;
6073          }
5805        public final U getRawResult() { return result; }
6074      }
6075  
6076      @SuppressWarnings("serial") static final class MapReduceKeysToDoubleTask<K,V>
6077 <        extends BulkTask<K,V,Double> {
6077 >        extends Traverser<K,V,Double> {
6078          final ObjectToDouble<? super K> transformer;
6079          final DoubleByDoubleToDouble reducer;
6080          final double basis;
6081          double result;
6082          MapReduceKeysToDoubleTask<K,V> rights, nextRight;
6083          MapReduceKeysToDoubleTask
6084 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6084 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6085               MapReduceKeysToDoubleTask<K,V> nextRight,
6086               ObjectToDouble<? super K> transformer,
6087               double basis,
# Line 5822 | Line 6090 | public class ConcurrentHashMapV8<K, V>
6090              this.transformer = transformer;
6091              this.basis = basis; this.reducer = reducer;
6092          }
6093 <        @SuppressWarnings("unchecked") public final boolean exec() {
6093 >        public final Double getRawResult() { return result; }
6094 >        @SuppressWarnings("unchecked") public final void compute() {
6095              final ObjectToDouble<? super K> transformer =
6096                  this.transformer;
6097              final DoubleByDoubleToDouble reducer = this.reducer;
6098              if (transformer == null || reducer == null)
6099 <                return abortOnNullFunction();
6100 <            try {
6101 <                final double id = this.basis;
6102 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6103 <                    do {} while (!casPending(c = pending, c+1));
6104 <                    (rights = new MapReduceKeysToDoubleTask<K,V>
6105 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6106 <                }
6107 <                double r = id;
6108 <                while (advance() != null)
6109 <                    r = reducer.apply(r, transformer.apply((K)nextKey));
6110 <                result = r;
6111 <                for (MapReduceKeysToDoubleTask<K,V> t = this, s;;) {
6112 <                    int c; BulkTask<K,V,?> par;
6113 <                    if ((c = t.pending) == 0) {
6114 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5846 <                            t.result = reducer.apply(t.result, s.result);
5847 <                        }
5848 <                        if ((par = t.parent) == null ||
5849 <                            !(par instanceof MapReduceKeysToDoubleTask)) {
5850 <                            t.quietlyComplete();
5851 <                            break;
5852 <                        }
5853 <                        t = (MapReduceKeysToDoubleTask<K,V>)par;
5854 <                    }
5855 <                    else if (t.casPending(c, c - 1))
5856 <                        break;
6099 >                throw new NullPointerException();
6100 >            double r = this.basis;
6101 >            for (int b; (b = preSplit()) > 0;)
6102 >                (rights = new MapReduceKeysToDoubleTask<K,V>
6103 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6104 >            while (advance() != null)
6105 >                r = reducer.apply(r, transformer.apply((K)nextKey));
6106 >            result = r;
6107 >            CountedCompleter<?> c;
6108 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6109 >                MapReduceKeysToDoubleTask<K,V>
6110 >                    t = (MapReduceKeysToDoubleTask<K,V>)c,
6111 >                    s = t.rights;
6112 >                while (s != null) {
6113 >                    t.result = reducer.apply(t.result, s.result);
6114 >                    s = t.rights = s.nextRight;
6115                  }
5858            } catch (Throwable ex) {
5859                return tryCompleteComputation(ex);
6116              }
5861            return false;
6117          }
5863        public final Double getRawResult() { return result; }
6118      }
6119  
6120      @SuppressWarnings("serial") static final class MapReduceValuesToDoubleTask<K,V>
6121 <        extends BulkTask<K,V,Double> {
6121 >        extends Traverser<K,V,Double> {
6122          final ObjectToDouble<? super V> transformer;
6123          final DoubleByDoubleToDouble reducer;
6124          final double basis;
6125          double result;
6126          MapReduceValuesToDoubleTask<K,V> rights, nextRight;
6127          MapReduceValuesToDoubleTask
6128 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6128 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6129               MapReduceValuesToDoubleTask<K,V> nextRight,
6130               ObjectToDouble<? super V> transformer,
6131               double basis,
# Line 5880 | Line 6134 | public class ConcurrentHashMapV8<K, V>
6134              this.transformer = transformer;
6135              this.basis = basis; this.reducer = reducer;
6136          }
6137 <        @SuppressWarnings("unchecked") public final boolean exec() {
6137 >        public final Double getRawResult() { return result; }
6138 >        @SuppressWarnings("unchecked") public final void compute() {
6139              final ObjectToDouble<? super V> transformer =
6140                  this.transformer;
6141              final DoubleByDoubleToDouble reducer = this.reducer;
6142              if (transformer == null || reducer == null)
6143 <                return abortOnNullFunction();
6144 <            try {
6145 <                final double id = this.basis;
6146 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6147 <                    do {} while (!casPending(c = pending, c+1));
6148 <                    (rights = new MapReduceValuesToDoubleTask<K,V>
6149 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6150 <                }
6151 <                double r = id;
6152 <                Object v;
6153 <                while ((v = advance()) != null)
6154 <                    r = reducer.apply(r, transformer.apply((V)v));
6155 <                result = r;
6156 <                for (MapReduceValuesToDoubleTask<K,V> t = this, s;;) {
6157 <                    int c; BulkTask<K,V,?> par;
6158 <                    if ((c = t.pending) == 0) {
6159 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5905 <                            t.result = reducer.apply(t.result, s.result);
5906 <                        }
5907 <                        if ((par = t.parent) == null ||
5908 <                            !(par instanceof MapReduceValuesToDoubleTask)) {
5909 <                            t.quietlyComplete();
5910 <                            break;
5911 <                        }
5912 <                        t = (MapReduceValuesToDoubleTask<K,V>)par;
5913 <                    }
5914 <                    else if (t.casPending(c, c - 1))
5915 <                        break;
6143 >                throw new NullPointerException();
6144 >            double r = this.basis;
6145 >            for (int b; (b = preSplit()) > 0;)
6146 >                (rights = new MapReduceValuesToDoubleTask<K,V>
6147 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6148 >            Object v;
6149 >            while ((v = advance()) != null)
6150 >                r = reducer.apply(r, transformer.apply((V)v));
6151 >            result = r;
6152 >            CountedCompleter<?> c;
6153 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6154 >                MapReduceValuesToDoubleTask<K,V>
6155 >                    t = (MapReduceValuesToDoubleTask<K,V>)c,
6156 >                    s = t.rights;
6157 >                while (s != null) {
6158 >                    t.result = reducer.apply(t.result, s.result);
6159 >                    s = t.rights = s.nextRight;
6160                  }
5917            } catch (Throwable ex) {
5918                return tryCompleteComputation(ex);
6161              }
5920            return false;
6162          }
5922        public final Double getRawResult() { return result; }
6163      }
6164  
6165      @SuppressWarnings("serial") static final class MapReduceEntriesToDoubleTask<K,V>
6166 <        extends BulkTask<K,V,Double> {
6166 >        extends Traverser<K,V,Double> {
6167          final ObjectToDouble<Map.Entry<K,V>> transformer;
6168          final DoubleByDoubleToDouble reducer;
6169          final double basis;
6170          double result;
6171          MapReduceEntriesToDoubleTask<K,V> rights, nextRight;
6172          MapReduceEntriesToDoubleTask
6173 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6173 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6174               MapReduceEntriesToDoubleTask<K,V> nextRight,
6175               ObjectToDouble<Map.Entry<K,V>> transformer,
6176               double basis,
# Line 5939 | Line 6179 | public class ConcurrentHashMapV8<K, V>
6179              this.transformer = transformer;
6180              this.basis = basis; this.reducer = reducer;
6181          }
6182 <        @SuppressWarnings("unchecked") public final boolean exec() {
6182 >        public final Double getRawResult() { return result; }
6183 >        @SuppressWarnings("unchecked") public final void compute() {
6184              final ObjectToDouble<Map.Entry<K,V>> transformer =
6185                  this.transformer;
6186              final DoubleByDoubleToDouble reducer = this.reducer;
6187              if (transformer == null || reducer == null)
6188 <                return abortOnNullFunction();
6189 <            try {
6190 <                final double id = this.basis;
6191 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6192 <                    do {} while (!casPending(c = pending, c+1));
6193 <                    (rights = new MapReduceEntriesToDoubleTask<K,V>
6194 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6195 <                }
6196 <                double r = id;
6197 <                Object v;
6198 <                while ((v = advance()) != null)
6199 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6200 <                result = r;
6201 <                for (MapReduceEntriesToDoubleTask<K,V> t = this, s;;) {
6202 <                    int c; BulkTask<K,V,?> par;
6203 <                    if ((c = t.pending) == 0) {
6204 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
5964 <                            t.result = reducer.apply(t.result, s.result);
5965 <                        }
5966 <                        if ((par = t.parent) == null ||
5967 <                            !(par instanceof MapReduceEntriesToDoubleTask)) {
5968 <                            t.quietlyComplete();
5969 <                            break;
5970 <                        }
5971 <                        t = (MapReduceEntriesToDoubleTask<K,V>)par;
5972 <                    }
5973 <                    else if (t.casPending(c, c - 1))
5974 <                        break;
6188 >                throw new NullPointerException();
6189 >            double r = this.basis;
6190 >            for (int b; (b = preSplit()) > 0;)
6191 >                (rights = new MapReduceEntriesToDoubleTask<K,V>
6192 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6193 >            Object v;
6194 >            while ((v = advance()) != null)
6195 >                r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6196 >            result = r;
6197 >            CountedCompleter<?> c;
6198 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6199 >                MapReduceEntriesToDoubleTask<K,V>
6200 >                    t = (MapReduceEntriesToDoubleTask<K,V>)c,
6201 >                    s = t.rights;
6202 >                while (s != null) {
6203 >                    t.result = reducer.apply(t.result, s.result);
6204 >                    s = t.rights = s.nextRight;
6205                  }
5976            } catch (Throwable ex) {
5977                return tryCompleteComputation(ex);
6206              }
5979            return false;
6207          }
5981        public final Double getRawResult() { return result; }
6208      }
6209  
6210      @SuppressWarnings("serial") static final class MapReduceMappingsToDoubleTask<K,V>
6211 <        extends BulkTask<K,V,Double> {
6211 >        extends Traverser<K,V,Double> {
6212          final ObjectByObjectToDouble<? super K, ? super V> transformer;
6213          final DoubleByDoubleToDouble reducer;
6214          final double basis;
6215          double result;
6216          MapReduceMappingsToDoubleTask<K,V> rights, nextRight;
6217          MapReduceMappingsToDoubleTask
6218 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6218 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6219               MapReduceMappingsToDoubleTask<K,V> nextRight,
6220               ObjectByObjectToDouble<? super K, ? super V> transformer,
6221               double basis,
# Line 5998 | Line 6224 | public class ConcurrentHashMapV8<K, V>
6224              this.transformer = transformer;
6225              this.basis = basis; this.reducer = reducer;
6226          }
6227 <        @SuppressWarnings("unchecked") public final boolean exec() {
6227 >        public final Double getRawResult() { return result; }
6228 >        @SuppressWarnings("unchecked") public final void compute() {
6229              final ObjectByObjectToDouble<? super K, ? super V> transformer =
6230                  this.transformer;
6231              final DoubleByDoubleToDouble reducer = this.reducer;
6232              if (transformer == null || reducer == null)
6233 <                return abortOnNullFunction();
6234 <            try {
6235 <                final double id = this.basis;
6236 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6237 <                    do {} while (!casPending(c = pending, c+1));
6238 <                    (rights = new MapReduceMappingsToDoubleTask<K,V>
6239 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6240 <                }
6241 <                double r = id;
6242 <                Object v;
6243 <                while ((v = advance()) != null)
6244 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6245 <                result = r;
6246 <                for (MapReduceMappingsToDoubleTask<K,V> t = this, s;;) {
6247 <                    int c; BulkTask<K,V,?> par;
6248 <                    if ((c = t.pending) == 0) {
6249 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6023 <                            t.result = reducer.apply(t.result, s.result);
6024 <                        }
6025 <                        if ((par = t.parent) == null ||
6026 <                            !(par instanceof MapReduceMappingsToDoubleTask)) {
6027 <                            t.quietlyComplete();
6028 <                            break;
6029 <                        }
6030 <                        t = (MapReduceMappingsToDoubleTask<K,V>)par;
6031 <                    }
6032 <                    else if (t.casPending(c, c - 1))
6033 <                        break;
6233 >                throw new NullPointerException();
6234 >            double r = this.basis;
6235 >            for (int b; (b = preSplit()) > 0;)
6236 >                (rights = new MapReduceMappingsToDoubleTask<K,V>
6237 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6238 >            Object v;
6239 >            while ((v = advance()) != null)
6240 >                r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6241 >            result = r;
6242 >            CountedCompleter<?> c;
6243 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6244 >                MapReduceMappingsToDoubleTask<K,V>
6245 >                    t = (MapReduceMappingsToDoubleTask<K,V>)c,
6246 >                    s = t.rights;
6247 >                while (s != null) {
6248 >                    t.result = reducer.apply(t.result, s.result);
6249 >                    s = t.rights = s.nextRight;
6250                  }
6035            } catch (Throwable ex) {
6036                return tryCompleteComputation(ex);
6251              }
6038            return false;
6252          }
6040        public final Double getRawResult() { return result; }
6253      }
6254  
6255      @SuppressWarnings("serial") static final class MapReduceKeysToLongTask<K,V>
6256 <        extends BulkTask<K,V,Long> {
6256 >        extends Traverser<K,V,Long> {
6257          final ObjectToLong<? super K> transformer;
6258          final LongByLongToLong reducer;
6259          final long basis;
6260          long result;
6261          MapReduceKeysToLongTask<K,V> rights, nextRight;
6262          MapReduceKeysToLongTask
6263 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6263 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6264               MapReduceKeysToLongTask<K,V> nextRight,
6265               ObjectToLong<? super K> transformer,
6266               long basis,
# Line 6057 | Line 6269 | public class ConcurrentHashMapV8<K, V>
6269              this.transformer = transformer;
6270              this.basis = basis; this.reducer = reducer;
6271          }
6272 <        @SuppressWarnings("unchecked") public final boolean exec() {
6272 >        public final Long getRawResult() { return result; }
6273 >        @SuppressWarnings("unchecked") public final void compute() {
6274              final ObjectToLong<? super K> transformer =
6275                  this.transformer;
6276              final LongByLongToLong reducer = this.reducer;
6277              if (transformer == null || reducer == null)
6278 <                return abortOnNullFunction();
6279 <            try {
6280 <                final long id = this.basis;
6281 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6282 <                    do {} while (!casPending(c = pending, c+1));
6283 <                    (rights = new MapReduceKeysToLongTask<K,V>
6284 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6285 <                }
6286 <                long r = id;
6287 <                while (advance() != null)
6288 <                    r = reducer.apply(r, transformer.apply((K)nextKey));
6289 <                result = r;
6290 <                for (MapReduceKeysToLongTask<K,V> t = this, s;;) {
6291 <                    int c; BulkTask<K,V,?> par;
6292 <                    if ((c = t.pending) == 0) {
6293 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6081 <                            t.result = reducer.apply(t.result, s.result);
6082 <                        }
6083 <                        if ((par = t.parent) == null ||
6084 <                            !(par instanceof MapReduceKeysToLongTask)) {
6085 <                            t.quietlyComplete();
6086 <                            break;
6087 <                        }
6088 <                        t = (MapReduceKeysToLongTask<K,V>)par;
6089 <                    }
6090 <                    else if (t.casPending(c, c - 1))
6091 <                        break;
6278 >                throw new NullPointerException();
6279 >            long r = this.basis;
6280 >            for (int b; (b = preSplit()) > 0;)
6281 >                (rights = new MapReduceKeysToLongTask<K,V>
6282 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6283 >            while (advance() != null)
6284 >                r = reducer.apply(r, transformer.apply((K)nextKey));
6285 >            result = r;
6286 >            CountedCompleter<?> c;
6287 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6288 >                MapReduceKeysToLongTask<K,V>
6289 >                    t = (MapReduceKeysToLongTask<K,V>)c,
6290 >                    s = t.rights;
6291 >                while (s != null) {
6292 >                    t.result = reducer.apply(t.result, s.result);
6293 >                    s = t.rights = s.nextRight;
6294                  }
6093            } catch (Throwable ex) {
6094                return tryCompleteComputation(ex);
6295              }
6096            return false;
6296          }
6098        public final Long getRawResult() { return result; }
6297      }
6298  
6299      @SuppressWarnings("serial") static final class MapReduceValuesToLongTask<K,V>
6300 <        extends BulkTask<K,V,Long> {
6300 >        extends Traverser<K,V,Long> {
6301          final ObjectToLong<? super V> transformer;
6302          final LongByLongToLong reducer;
6303          final long basis;
6304          long result;
6305          MapReduceValuesToLongTask<K,V> rights, nextRight;
6306          MapReduceValuesToLongTask
6307 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6307 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6308               MapReduceValuesToLongTask<K,V> nextRight,
6309               ObjectToLong<? super V> transformer,
6310               long basis,
# Line 6115 | Line 6313 | public class ConcurrentHashMapV8<K, V>
6313              this.transformer = transformer;
6314              this.basis = basis; this.reducer = reducer;
6315          }
6316 <        @SuppressWarnings("unchecked") public final boolean exec() {
6316 >        public final Long getRawResult() { return result; }
6317 >        @SuppressWarnings("unchecked") public final void compute() {
6318              final ObjectToLong<? super V> transformer =
6319                  this.transformer;
6320              final LongByLongToLong reducer = this.reducer;
6321              if (transformer == null || reducer == null)
6322 <                return abortOnNullFunction();
6323 <            try {
6324 <                final long id = this.basis;
6325 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6326 <                    do {} while (!casPending(c = pending, c+1));
6327 <                    (rights = new MapReduceValuesToLongTask<K,V>
6328 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6329 <                }
6330 <                long r = id;
6331 <                Object v;
6332 <                while ((v = advance()) != null)
6333 <                    r = reducer.apply(r, transformer.apply((V)v));
6334 <                result = r;
6335 <                for (MapReduceValuesToLongTask<K,V> t = this, s;;) {
6336 <                    int c; BulkTask<K,V,?> par;
6337 <                    if ((c = t.pending) == 0) {
6338 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6140 <                            t.result = reducer.apply(t.result, s.result);
6141 <                        }
6142 <                        if ((par = t.parent) == null ||
6143 <                            !(par instanceof MapReduceValuesToLongTask)) {
6144 <                            t.quietlyComplete();
6145 <                            break;
6146 <                        }
6147 <                        t = (MapReduceValuesToLongTask<K,V>)par;
6148 <                    }
6149 <                    else if (t.casPending(c, c - 1))
6150 <                        break;
6322 >                throw new NullPointerException();
6323 >            long r = this.basis;
6324 >            for (int b; (b = preSplit()) > 0;)
6325 >                (rights = new MapReduceValuesToLongTask<K,V>
6326 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6327 >            Object v;
6328 >            while ((v = advance()) != null)
6329 >                r = reducer.apply(r, transformer.apply((V)v));
6330 >            result = r;
6331 >            CountedCompleter<?> c;
6332 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6333 >                MapReduceValuesToLongTask<K,V>
6334 >                    t = (MapReduceValuesToLongTask<K,V>)c,
6335 >                    s = t.rights;
6336 >                while (s != null) {
6337 >                    t.result = reducer.apply(t.result, s.result);
6338 >                    s = t.rights = s.nextRight;
6339                  }
6152            } catch (Throwable ex) {
6153                return tryCompleteComputation(ex);
6340              }
6155            return false;
6341          }
6157        public final Long getRawResult() { return result; }
6342      }
6343  
6344      @SuppressWarnings("serial") static final class MapReduceEntriesToLongTask<K,V>
6345 <        extends BulkTask<K,V,Long> {
6345 >        extends Traverser<K,V,Long> {
6346          final ObjectToLong<Map.Entry<K,V>> transformer;
6347          final LongByLongToLong reducer;
6348          final long basis;
6349          long result;
6350          MapReduceEntriesToLongTask<K,V> rights, nextRight;
6351          MapReduceEntriesToLongTask
6352 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6352 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6353               MapReduceEntriesToLongTask<K,V> nextRight,
6354               ObjectToLong<Map.Entry<K,V>> transformer,
6355               long basis,
# Line 6174 | Line 6358 | public class ConcurrentHashMapV8<K, V>
6358              this.transformer = transformer;
6359              this.basis = basis; this.reducer = reducer;
6360          }
6361 <        @SuppressWarnings("unchecked") public final boolean exec() {
6361 >        public final Long getRawResult() { return result; }
6362 >        @SuppressWarnings("unchecked") public final void compute() {
6363              final ObjectToLong<Map.Entry<K,V>> transformer =
6364                  this.transformer;
6365              final LongByLongToLong reducer = this.reducer;
6366              if (transformer == null || reducer == null)
6367 <                return abortOnNullFunction();
6368 <            try {
6369 <                final long id = this.basis;
6370 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6371 <                    do {} while (!casPending(c = pending, c+1));
6372 <                    (rights = new MapReduceEntriesToLongTask<K,V>
6373 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6374 <                }
6375 <                long r = id;
6376 <                Object v;
6377 <                while ((v = advance()) != null)
6378 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6379 <                result = r;
6380 <                for (MapReduceEntriesToLongTask<K,V> t = this, s;;) {
6381 <                    int c; BulkTask<K,V,?> par;
6382 <                    if ((c = t.pending) == 0) {
6383 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6199 <                            t.result = reducer.apply(t.result, s.result);
6200 <                        }
6201 <                        if ((par = t.parent) == null ||
6202 <                            !(par instanceof MapReduceEntriesToLongTask)) {
6203 <                            t.quietlyComplete();
6204 <                            break;
6205 <                        }
6206 <                        t = (MapReduceEntriesToLongTask<K,V>)par;
6207 <                    }
6208 <                    else if (t.casPending(c, c - 1))
6209 <                        break;
6367 >                throw new NullPointerException();
6368 >            long r = this.basis;
6369 >            for (int b; (b = preSplit()) > 0;)
6370 >                (rights = new MapReduceEntriesToLongTask<K,V>
6371 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6372 >            Object v;
6373 >            while ((v = advance()) != null)
6374 >                r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6375 >            result = r;
6376 >            CountedCompleter<?> c;
6377 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6378 >                MapReduceEntriesToLongTask<K,V>
6379 >                    t = (MapReduceEntriesToLongTask<K,V>)c,
6380 >                    s = t.rights;
6381 >                while (s != null) {
6382 >                    t.result = reducer.apply(t.result, s.result);
6383 >                    s = t.rights = s.nextRight;
6384                  }
6211            } catch (Throwable ex) {
6212                return tryCompleteComputation(ex);
6385              }
6214            return false;
6386          }
6216        public final Long getRawResult() { return result; }
6387      }
6388  
6389      @SuppressWarnings("serial") static final class MapReduceMappingsToLongTask<K,V>
6390 <        extends BulkTask<K,V,Long> {
6390 >        extends Traverser<K,V,Long> {
6391          final ObjectByObjectToLong<? super K, ? super V> transformer;
6392          final LongByLongToLong reducer;
6393          final long basis;
6394          long result;
6395          MapReduceMappingsToLongTask<K,V> rights, nextRight;
6396          MapReduceMappingsToLongTask
6397 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6397 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6398               MapReduceMappingsToLongTask<K,V> nextRight,
6399               ObjectByObjectToLong<? super K, ? super V> transformer,
6400               long basis,
# Line 6233 | Line 6403 | public class ConcurrentHashMapV8<K, V>
6403              this.transformer = transformer;
6404              this.basis = basis; this.reducer = reducer;
6405          }
6406 <        @SuppressWarnings("unchecked") public final boolean exec() {
6406 >        public final Long getRawResult() { return result; }
6407 >        @SuppressWarnings("unchecked") public final void compute() {
6408              final ObjectByObjectToLong<? super K, ? super V> transformer =
6409                  this.transformer;
6410              final LongByLongToLong reducer = this.reducer;
6411              if (transformer == null || reducer == null)
6412 <                return abortOnNullFunction();
6413 <            try {
6414 <                final long id = this.basis;
6415 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6416 <                    do {} while (!casPending(c = pending, c+1));
6417 <                    (rights = new MapReduceMappingsToLongTask<K,V>
6418 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6419 <                }
6420 <                long r = id;
6421 <                Object v;
6422 <                while ((v = advance()) != null)
6423 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6424 <                result = r;
6425 <                for (MapReduceMappingsToLongTask<K,V> t = this, s;;) {
6426 <                    int c; BulkTask<K,V,?> par;
6427 <                    if ((c = t.pending) == 0) {
6428 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6258 <                            t.result = reducer.apply(t.result, s.result);
6259 <                        }
6260 <                        if ((par = t.parent) == null ||
6261 <                            !(par instanceof MapReduceMappingsToLongTask)) {
6262 <                            t.quietlyComplete();
6263 <                            break;
6264 <                        }
6265 <                        t = (MapReduceMappingsToLongTask<K,V>)par;
6266 <                    }
6267 <                    else if (t.casPending(c, c - 1))
6268 <                        break;
6412 >                throw new NullPointerException();
6413 >            long r = this.basis;
6414 >            for (int b; (b = preSplit()) > 0;)
6415 >                (rights = new MapReduceMappingsToLongTask<K,V>
6416 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6417 >            Object v;
6418 >            while ((v = advance()) != null)
6419 >                r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6420 >            result = r;
6421 >            CountedCompleter<?> c;
6422 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6423 >                MapReduceMappingsToLongTask<K,V>
6424 >                    t = (MapReduceMappingsToLongTask<K,V>)c,
6425 >                    s = t.rights;
6426 >                while (s != null) {
6427 >                    t.result = reducer.apply(t.result, s.result);
6428 >                    s = t.rights = s.nextRight;
6429                  }
6270            } catch (Throwable ex) {
6271                return tryCompleteComputation(ex);
6430              }
6273            return false;
6431          }
6275        public final Long getRawResult() { return result; }
6432      }
6433  
6434      @SuppressWarnings("serial") static final class MapReduceKeysToIntTask<K,V>
6435 <        extends BulkTask<K,V,Integer> {
6435 >        extends Traverser<K,V,Integer> {
6436          final ObjectToInt<? super K> transformer;
6437          final IntByIntToInt reducer;
6438          final int basis;
6439          int result;
6440          MapReduceKeysToIntTask<K,V> rights, nextRight;
6441          MapReduceKeysToIntTask
6442 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6442 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6443               MapReduceKeysToIntTask<K,V> nextRight,
6444               ObjectToInt<? super K> transformer,
6445               int basis,
# Line 6292 | Line 6448 | public class ConcurrentHashMapV8<K, V>
6448              this.transformer = transformer;
6449              this.basis = basis; this.reducer = reducer;
6450          }
6451 <        @SuppressWarnings("unchecked") public final boolean exec() {
6451 >        public final Integer getRawResult() { return result; }
6452 >        @SuppressWarnings("unchecked") public final void compute() {
6453              final ObjectToInt<? super K> transformer =
6454                  this.transformer;
6455              final IntByIntToInt reducer = this.reducer;
6456              if (transformer == null || reducer == null)
6457 <                return abortOnNullFunction();
6458 <            try {
6459 <                final int id = this.basis;
6460 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6461 <                    do {} while (!casPending(c = pending, c+1));
6462 <                    (rights = new MapReduceKeysToIntTask<K,V>
6463 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6464 <                }
6465 <                int r = id;
6466 <                while (advance() != null)
6467 <                    r = reducer.apply(r, transformer.apply((K)nextKey));
6468 <                result = r;
6469 <                for (MapReduceKeysToIntTask<K,V> t = this, s;;) {
6470 <                    int c; BulkTask<K,V,?> par;
6471 <                    if ((c = t.pending) == 0) {
6472 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6316 <                            t.result = reducer.apply(t.result, s.result);
6317 <                        }
6318 <                        if ((par = t.parent) == null ||
6319 <                            !(par instanceof MapReduceKeysToIntTask)) {
6320 <                            t.quietlyComplete();
6321 <                            break;
6322 <                        }
6323 <                        t = (MapReduceKeysToIntTask<K,V>)par;
6324 <                    }
6325 <                    else if (t.casPending(c, c - 1))
6326 <                        break;
6457 >                throw new NullPointerException();
6458 >            int r = this.basis;
6459 >            for (int b; (b = preSplit()) > 0;)
6460 >                (rights = new MapReduceKeysToIntTask<K,V>
6461 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6462 >            while (advance() != null)
6463 >                r = reducer.apply(r, transformer.apply((K)nextKey));
6464 >            result = r;
6465 >            CountedCompleter<?> c;
6466 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6467 >                MapReduceKeysToIntTask<K,V>
6468 >                    t = (MapReduceKeysToIntTask<K,V>)c,
6469 >                    s = t.rights;
6470 >                while (s != null) {
6471 >                    t.result = reducer.apply(t.result, s.result);
6472 >                    s = t.rights = s.nextRight;
6473                  }
6328            } catch (Throwable ex) {
6329                return tryCompleteComputation(ex);
6474              }
6331            return false;
6475          }
6333        public final Integer getRawResult() { return result; }
6476      }
6477  
6478      @SuppressWarnings("serial") static final class MapReduceValuesToIntTask<K,V>
6479 <        extends BulkTask<K,V,Integer> {
6479 >        extends Traverser<K,V,Integer> {
6480          final ObjectToInt<? super V> transformer;
6481          final IntByIntToInt reducer;
6482          final int basis;
6483          int result;
6484          MapReduceValuesToIntTask<K,V> rights, nextRight;
6485          MapReduceValuesToIntTask
6486 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6486 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6487               MapReduceValuesToIntTask<K,V> nextRight,
6488               ObjectToInt<? super V> transformer,
6489               int basis,
# Line 6350 | Line 6492 | public class ConcurrentHashMapV8<K, V>
6492              this.transformer = transformer;
6493              this.basis = basis; this.reducer = reducer;
6494          }
6495 <        @SuppressWarnings("unchecked") public final boolean exec() {
6495 >        public final Integer getRawResult() { return result; }
6496 >        @SuppressWarnings("unchecked") public final void compute() {
6497              final ObjectToInt<? super V> transformer =
6498                  this.transformer;
6499              final IntByIntToInt reducer = this.reducer;
6500              if (transformer == null || reducer == null)
6501 <                return abortOnNullFunction();
6502 <            try {
6503 <                final int id = this.basis;
6504 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6505 <                    do {} while (!casPending(c = pending, c+1));
6506 <                    (rights = new MapReduceValuesToIntTask<K,V>
6507 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6508 <                }
6509 <                int r = id;
6510 <                Object v;
6511 <                while ((v = advance()) != null)
6512 <                    r = reducer.apply(r, transformer.apply((V)v));
6513 <                result = r;
6514 <                for (MapReduceValuesToIntTask<K,V> t = this, s;;) {
6515 <                    int c; BulkTask<K,V,?> par;
6516 <                    if ((c = t.pending) == 0) {
6517 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6375 <                            t.result = reducer.apply(t.result, s.result);
6376 <                        }
6377 <                        if ((par = t.parent) == null ||
6378 <                            !(par instanceof MapReduceValuesToIntTask)) {
6379 <                            t.quietlyComplete();
6380 <                            break;
6381 <                        }
6382 <                        t = (MapReduceValuesToIntTask<K,V>)par;
6383 <                    }
6384 <                    else if (t.casPending(c, c - 1))
6385 <                        break;
6501 >                throw new NullPointerException();
6502 >            int r = this.basis;
6503 >            for (int b; (b = preSplit()) > 0;)
6504 >                (rights = new MapReduceValuesToIntTask<K,V>
6505 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6506 >            Object v;
6507 >            while ((v = advance()) != null)
6508 >                r = reducer.apply(r, transformer.apply((V)v));
6509 >            result = r;
6510 >            CountedCompleter<?> c;
6511 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6512 >                MapReduceValuesToIntTask<K,V>
6513 >                    t = (MapReduceValuesToIntTask<K,V>)c,
6514 >                    s = t.rights;
6515 >                while (s != null) {
6516 >                    t.result = reducer.apply(t.result, s.result);
6517 >                    s = t.rights = s.nextRight;
6518                  }
6387            } catch (Throwable ex) {
6388                return tryCompleteComputation(ex);
6519              }
6390            return false;
6520          }
6392        public final Integer getRawResult() { return result; }
6521      }
6522  
6523      @SuppressWarnings("serial") static final class MapReduceEntriesToIntTask<K,V>
6524 <        extends BulkTask<K,V,Integer> {
6524 >        extends Traverser<K,V,Integer> {
6525          final ObjectToInt<Map.Entry<K,V>> transformer;
6526          final IntByIntToInt reducer;
6527          final int basis;
6528          int result;
6529          MapReduceEntriesToIntTask<K,V> rights, nextRight;
6530          MapReduceEntriesToIntTask
6531 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6531 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6532               MapReduceEntriesToIntTask<K,V> nextRight,
6533               ObjectToInt<Map.Entry<K,V>> transformer,
6534               int basis,
# Line 6409 | Line 6537 | public class ConcurrentHashMapV8<K, V>
6537              this.transformer = transformer;
6538              this.basis = basis; this.reducer = reducer;
6539          }
6540 <        @SuppressWarnings("unchecked") public final boolean exec() {
6540 >        public final Integer getRawResult() { return result; }
6541 >        @SuppressWarnings("unchecked") public final void compute() {
6542              final ObjectToInt<Map.Entry<K,V>> transformer =
6543                  this.transformer;
6544              final IntByIntToInt reducer = this.reducer;
6545              if (transformer == null || reducer == null)
6546 <                return abortOnNullFunction();
6547 <            try {
6548 <                final int id = this.basis;
6549 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6550 <                    do {} while (!casPending(c = pending, c+1));
6551 <                    (rights = new MapReduceEntriesToIntTask<K,V>
6552 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6553 <                }
6554 <                int r = id;
6555 <                Object v;
6556 <                while ((v = advance()) != null)
6557 <                    r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6558 <                result = r;
6559 <                for (MapReduceEntriesToIntTask<K,V> t = this, s;;) {
6560 <                    int c; BulkTask<K,V,?> par;
6561 <                    if ((c = t.pending) == 0) {
6562 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6434 <                            t.result = reducer.apply(t.result, s.result);
6435 <                        }
6436 <                        if ((par = t.parent) == null ||
6437 <                            !(par instanceof MapReduceEntriesToIntTask)) {
6438 <                            t.quietlyComplete();
6439 <                            break;
6440 <                        }
6441 <                        t = (MapReduceEntriesToIntTask<K,V>)par;
6442 <                    }
6443 <                    else if (t.casPending(c, c - 1))
6444 <                        break;
6546 >                throw new NullPointerException();
6547 >            int r = this.basis;
6548 >            for (int b; (b = preSplit()) > 0;)
6549 >                (rights = new MapReduceEntriesToIntTask<K,V>
6550 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6551 >            Object v;
6552 >            while ((v = advance()) != null)
6553 >                r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v)));
6554 >            result = r;
6555 >            CountedCompleter<?> c;
6556 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6557 >                MapReduceEntriesToIntTask<K,V>
6558 >                    t = (MapReduceEntriesToIntTask<K,V>)c,
6559 >                    s = t.rights;
6560 >                while (s != null) {
6561 >                    t.result = reducer.apply(t.result, s.result);
6562 >                    s = t.rights = s.nextRight;
6563                  }
6446            } catch (Throwable ex) {
6447                return tryCompleteComputation(ex);
6564              }
6449            return false;
6565          }
6451        public final Integer getRawResult() { return result; }
6566      }
6567  
6568      @SuppressWarnings("serial") static final class MapReduceMappingsToIntTask<K,V>
6569 <        extends BulkTask<K,V,Integer> {
6569 >        extends Traverser<K,V,Integer> {
6570          final ObjectByObjectToInt<? super K, ? super V> transformer;
6571          final IntByIntToInt reducer;
6572          final int basis;
6573          int result;
6574          MapReduceMappingsToIntTask<K,V> rights, nextRight;
6575          MapReduceMappingsToIntTask
6576 <            (ConcurrentHashMapV8<K,V> m, BulkTask<K,V,?> p, int b,
6577 <             MapReduceMappingsToIntTask<K,V> rights,
6576 >            (ConcurrentHashMapV8<K,V> m, Traverser<K,V,?> p, int b,
6577 >             MapReduceMappingsToIntTask<K,V> nextRight,
6578               ObjectByObjectToInt<? super K, ? super V> transformer,
6579               int basis,
6580               IntByIntToInt reducer) {
# Line 6468 | Line 6582 | public class ConcurrentHashMapV8<K, V>
6582              this.transformer = transformer;
6583              this.basis = basis; this.reducer = reducer;
6584          }
6585 <        @SuppressWarnings("unchecked") public final boolean exec() {
6585 >        public final Integer getRawResult() { return result; }
6586 >        @SuppressWarnings("unchecked") public final void compute() {
6587              final ObjectByObjectToInt<? super K, ? super V> transformer =
6588                  this.transformer;
6589              final IntByIntToInt reducer = this.reducer;
6590              if (transformer == null || reducer == null)
6591 <                return abortOnNullFunction();
6592 <            try {
6593 <                final int id = this.basis;
6594 <                for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) {
6595 <                    do {} while (!casPending(c = pending, c+1));
6596 <                    (rights = new MapReduceMappingsToIntTask<K,V>
6597 <                     (map, this, b >>>= 1, rights, transformer, id, reducer)).fork();
6598 <                }
6599 <                int r = id;
6600 <                Object v;
6601 <                while ((v = advance()) != null)
6602 <                    r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6603 <                result = r;
6604 <                for (MapReduceMappingsToIntTask<K,V> t = this, s;;) {
6605 <                    int c; BulkTask<K,V,?> par;
6606 <                    if ((c = t.pending) == 0) {
6607 <                        for (s = t.rights; s != null; s = t.rights = s.nextRight) {
6493 <                            t.result = reducer.apply(t.result, s.result);
6494 <                        }
6495 <                        if ((par = t.parent) == null ||
6496 <                            !(par instanceof MapReduceMappingsToIntTask)) {
6497 <                            t.quietlyComplete();
6498 <                            break;
6499 <                        }
6500 <                        t = (MapReduceMappingsToIntTask<K,V>)par;
6501 <                    }
6502 <                    else if (t.casPending(c, c - 1))
6503 <                        break;
6591 >                throw new NullPointerException();
6592 >            int r = this.basis;
6593 >            for (int b; (b = preSplit()) > 0;)
6594 >                (rights = new MapReduceMappingsToIntTask<K,V>
6595 >                 (map, this, b, rights, transformer, r, reducer)).fork();
6596 >            Object v;
6597 >            while ((v = advance()) != null)
6598 >                r = reducer.apply(r, transformer.apply((K)nextKey, (V)v));
6599 >            result = r;
6600 >            CountedCompleter<?> c;
6601 >            for (c = firstComplete(); c != null; c = c.nextComplete()) {
6602 >                MapReduceMappingsToIntTask<K,V>
6603 >                    t = (MapReduceMappingsToIntTask<K,V>)c,
6604 >                    s = t.rights;
6605 >                while (s != null) {
6606 >                    t.result = reducer.apply(t.result, s.result);
6607 >                    s = t.rights = s.nextRight;
6608                  }
6505            } catch (Throwable ex) {
6506                return tryCompleteComputation(ex);
6609              }
6508            return false;
6610          }
6510        public final Integer getRawResult() { return result; }
6611      }
6612  
6513
6613      // Unsafe mechanics
6614      private static final sun.misc.Unsafe UNSAFE;
6615      private static final long counterOffset;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines