--- jsr166/src/jsr166e/ConcurrentHashMapV8.java 2012/09/21 18:41:30 1.62 +++ jsr166/src/jsr166e/ConcurrentHashMapV8.java 2012/11/18 03:07:22 1.77 @@ -5,9 +5,6 @@ */ package jsr166e; -import jsr166e.LongAdder; -import jsr166e.ForkJoinPool; -import jsr166e.ForkJoinTask; import java.util.Comparator; import java.util.Arrays; @@ -85,6 +82,19 @@ import java.io.Serializable; * {@code hashCode()} is a sure way to slow down performance of any * hash table. * + *

A {@link Set} projection of a ConcurrentHashMapV8 may be created + * (using {@link #newKeySet()} or {@link #newKeySet(int)}), or viewed + * (using {@link #keySet(Object)} when only keys are of interest, and the + * mapped values are (perhaps transiently) not used or all take the + * same mapping value. + * + *

A ConcurrentHashMapV8 can be used as scalable frequency map (a + * form of histogram or multiset) by using {@link LongAdder} values + * and initializing via {@link #computeIfAbsent}. For example, to add + * a count to a {@code ConcurrentHashMapV8 freqs}, you + * can use {@code freqs.computeIfAbsent(k -> new + * LongAdder()).increment();} + * *

This class and its views and iterators implement all of the * optional methods of the {@link Map} and {@link Iterator} * interfaces. @@ -92,15 +102,113 @@ import java.io.Serializable; *

Like {@link Hashtable} but unlike {@link HashMap}, this class * does not allow {@code null} to be used as a key or value. * + *

ConcurrentHashMapV8s support parallel operations using the {@link + * ForkJoinPool#commonPool}. (Tasks that may be used in other contexts + * are available in class {@link ForkJoinTasks}). These operations are + * designed to be safely, and often sensibly, applied even with maps + * that are being concurrently updated by other threads; for example, + * when computing a snapshot summary of the values in a shared + * registry. There are three kinds of operation, each with four + * forms, accepting functions with Keys, Values, Entries, and (Key, + * Value) arguments and/or return values. (The first three forms are + * also available via the {@link #keySet()}, {@link #values()} and + * {@link #entrySet()} views). Because the elements of a + * ConcurrentHashMapV8 are not ordered in any particular way, and may be + * processed in different orders in different parallel executions, the + * correctness of supplied functions should not depend on any + * ordering, or on any other objects or values that may transiently + * change while computation is in progress; and except for forEach + * actions, should ideally be side-effect-free. + * + *

+ * + *

The concurrency properties of bulk operations follow + * from those of ConcurrentHashMapV8: Any non-null result returned + * from {@code get(key)} and related access methods bears a + * happens-before relation with the associated insertion or + * update. The result of any bulk operation reflects the + * composition of these per-element relations (but is not + * necessarily atomic with respect to the map as a whole unless it + * is somehow known to be quiescent). Conversely, because keys + * and values in the map are never null, null serves as a reliable + * atomic indicator of the current lack of any result. To + * maintain this property, null serves as an implicit basis for + * all non-scalar reduction operations. For the double, long, and + * int versions, the basis should be one that, when combined with + * any other value, returns that other value (more formally, it + * should be the identity element for the reduction). Most common + * reductions have these properties; for example, computing a sum + * with basis 0 or a minimum with basis MAX_VALUE. + * + *

Search and transformation functions provided as arguments + * should similarly return null to indicate the lack of any result + * (in which case it is not used). In the case of mapped + * reductions, this also enables transformations to serve as + * filters, returning null (or, in the case of primitive + * specializations, the identity basis) if the element should not + * be combined. You can create compound transformations and + * filterings by composing them yourself under this "null means + * there is nothing there now" rule before using them in search or + * reduce operations. + * + *

Methods accepting and/or returning Entry arguments maintain + * key-value associations. They may be useful for example when + * finding the key for the greatest value. Note that "plain" Entry + * arguments can be supplied using {@code new + * AbstractMap.SimpleEntry(k,v)}. + * + *

Bulk operations may complete abruptly, throwing an + * exception encountered in the application of a supplied + * function. Bear in mind when handling such exceptions that other + * concurrently executing functions could also have thrown + * exceptions, or would have done so if the first exception had + * not occurred. + * + *

Parallel speedups for bulk operations compared to sequential + * processing are common but not guaranteed. Operations involving + * brief functions on small maps may execute more slowly than + * sequential loops if the underlying work to parallelize the + * computation is more expensive than the computation itself. + * Similarly, parallelization may not lead to much actual parallelism + * if all processors are busy performing unrelated tasks. + * + *

All arguments to all task methods must be non-null. + * + *

jsr166e note: During transition, this class + * uses nested functional interfaces with different names but the + * same forms as those expected for JDK8. + * *

This class is a member of the * * Java Collections Framework. * - *

jsr166e note: This class is a candidate replacement for - * java.util.concurrent.ConcurrentHashMap. During transition, this - * class declares and uses nested functional interfaces with different - * names but the same forms as those expected for JDK8. - * * @since 1.5 * @author Doug Lea * @param the type of keys maintained by this map @@ -179,6 +287,7 @@ public class ConcurrentHashMapV8 Spliterator split(); } + /* * Overview: * @@ -461,9 +570,9 @@ public class ConcurrentHashMapV8 private transient volatile int sizeCtl; // views - private transient KeySet keySet; - private transient Values values; - private transient EntrySet entrySet; + private transient KeySetView keySet; + private transient ValuesView values; + private transient EntrySetView entrySet; /** For serialization compatibility. Null unless serialized; see below */ private Segment[] segments; @@ -2243,7 +2352,8 @@ public class ConcurrentHashMapV8 * change (including to null, indicating deletion), field nextVal * might not be accurate at point of use, but still maintains the * weak consistency property of holding a value that was once - * valid. + * valid. To support iterator.remove, the nextKey field is not + * updated (nulled out) when the iterator cannot advance. * * Internal traversals directly access these fields, as in: * {@code while (it.advance() != null) { process(it.nextKey); }} @@ -2280,25 +2390,28 @@ public class ConcurrentHashMapV8 @SuppressWarnings("serial") static class Traverser extends ForkJoinTask { final ConcurrentHashMapV8 map; Node next; // the next entry to use - Node last; // the last entry used Object nextKey; // cached key field of next Object nextVal; // cached val field of next Node[] tab; // current table; updated if resized int index; // index of bin to use next int baseIndex; // current index of initial table int baseLimit; // index bound for initial table - final int baseSize; // initial table size + int baseSize; // initial table size /** Creates iterator for all entries in the table. */ Traverser(ConcurrentHashMapV8 map) { - this.tab = (this.map = map).table; - baseLimit = baseSize = (tab == null) ? 0 : tab.length; + this.map = map; } /** Creates iterator for split() methods */ Traverser(Traverser it) { - this.map = it.map; - this.tab = it.tab; + ConcurrentHashMapV8 m; Node[] t; + if ((m = this.map = it.map) == null) + t = null; + else if ((t = it.tab) == null && // force parent tab initialization + (t = it.tab = m.table) != null) + it.baseLimit = it.baseSize = t.length; + this.tab = t; this.baseSize = it.baseSize; it.baseLimit = this.index = this.baseIndex = ((this.baseLimit = it.baseLimit) + it.baseIndex + 1) >>> 1; @@ -2309,17 +2422,24 @@ public class ConcurrentHashMapV8 * See above for explanation. */ final Object advance() { - Node e = last = next; + Node e = next; Object ev = null; outer: do { if (e != null) // advance past used/skipped node e = e.next; while (e == null) { // get to next non-null bin + ConcurrentHashMapV8 m; Node[] t; int b, i, n; Object ek; // checks must use locals - if ((b = baseIndex) >= baseLimit || (i = index) < 0 || - (t = tab) == null || i >= (n = t.length)) + if ((t = tab) != null) + n = t.length; + else if ((m = map) != null && (t = tab = m.table) != null) + n = baseLimit = baseSize = t.length; + else break outer; - else if ((e = tabAt(t, i)) != null && e.hash == MOVED) { + if ((b = baseIndex) >= baseLimit || + (i = index) < 0 || i >= n) + break outer; + if ((e = tabAt(t, i)) != null && e.hash == MOVED) { if ((ek = e.key) instanceof TreeBin) e = ((TreeBin)ek).first; else { @@ -2336,13 +2456,10 @@ public class ConcurrentHashMapV8 } public final void remove() { - if (nextVal == null && last == null) - advance(); - Node e = last; - if (e == null) + Object k = nextKey; + if (k == null && (advance() == null || (k = nextKey) == null)) throw new IllegalStateException(); - last = null; - map.remove(e.key); + map.internalReplace(k, null, null); } public final boolean hasNext() { @@ -2446,6 +2563,32 @@ public class ConcurrentHashMapV8 } /** + * Creates a new {@link Set} backed by a ConcurrentHashMapV8 + * from the given type to {@code Boolean.TRUE}. + * + * @return the new set + */ + public static KeySetView newKeySet() { + return new KeySetView(new ConcurrentHashMapV8(), + Boolean.TRUE); + } + + /** + * Creates a new {@link Set} backed by a ConcurrentHashMapV8 + * from the given type to {@code Boolean.TRUE}. + * + * @param initialCapacity The implementation performs internal + * sizing to accommodate this many elements. + * @throws IllegalArgumentException if the initial capacity of + * elements is negative + * @return the new set + */ + public static KeySetView newKeySet(int initialCapacity) { + return new KeySetView(new ConcurrentHashMapV8(initialCapacity), + Boolean.TRUE); + } + + /** * {@inheritDoc} */ public boolean isEmpty() { @@ -2464,7 +2607,7 @@ public class ConcurrentHashMapV8 /** * Returns the number of mappings. This method should be used - * instead of {@link #size} because a ConcurrentHashMap may + * instead of {@link #size} because a ConcurrentHashMapV8 may * contain more mappings than can be represented as an int. The * value returned is a snapshot; the actual count may differ if * there are ongoing concurrent insertions or removals. @@ -2495,11 +2638,11 @@ public class ConcurrentHashMapV8 /** * Returns the value to which the specified key is mapped, - * or the gieven defaultValue if this map contains no mapping for the key. + * or the given defaultValue if this map contains no mapping for the key. * * @param key the key * @param defaultValue the value to return if this map contains - * no mapping for the given key. + * no mapping for the given key * @return the mapping for the key, if present; else the defaultValue * @throws NullPointerException if the specified key is null */ @@ -2639,7 +2782,7 @@ public class ConcurrentHashMapV8 * @param key key with which the specified value is to be associated * @param mappingFunction the function to compute a value * @return the current (existing or computed) value associated with - * the specified key, or null if the computed value is null. + * the specified key, or null if the computed value is null * @throws NullPointerException if the specified key or mappingFunction * is null * @throws IllegalStateException if the computation detectably @@ -2837,43 +2980,41 @@ public class ConcurrentHashMapV8 /** * Returns a {@link Set} view of the keys contained in this map. * The set is backed by the map, so changes to the map are - * reflected in the set, and vice-versa. The set supports element - * removal, which removes the corresponding mapping from this map, - * via the {@code Iterator.remove}, {@code Set.remove}, - * {@code removeAll}, {@code retainAll}, and {@code clear} - * operations. It does not support the {@code add} or - * {@code addAll} operations. + * reflected in the set, and vice-versa. * - *

The view's {@code iterator} is a "weakly consistent" iterator - * that will never throw {@link ConcurrentModificationException}, - * and guarantees to traverse elements as they existed upon - * construction of the iterator, and may (but is not guaranteed to) - * reflect any modifications subsequent to construction. + * @return the set view + */ + public KeySetView keySet() { + KeySetView ks = keySet; + return (ks != null) ? ks : (keySet = new KeySetView(this, null)); + } + + /** + * Returns a {@link Set} view of the keys in this map, using the + * given common mapped value for any additions (i.e., {@link + * Collection#add} and {@link Collection#addAll}). This is of + * course only appropriate if it is acceptable to use the same + * value for all additions from this view. + * + * @param mappedValue the mapped value to use for any + * additions. + * @return the set view + * @throws NullPointerException if the mappedValue is null */ - public Set keySet() { - KeySet ks = keySet; - return (ks != null) ? ks : (keySet = new KeySet(this)); + public KeySetView keySet(V mappedValue) { + if (mappedValue == null) + throw new NullPointerException(); + return new KeySetView(this, mappedValue); } /** * Returns a {@link Collection} view of the values contained in this map. * The collection is backed by the map, so changes to the map are - * reflected in the collection, and vice-versa. The collection - * supports element removal, which removes the corresponding - * mapping from this map, via the {@code Iterator.remove}, - * {@code Collection.remove}, {@code removeAll}, - * {@code retainAll}, and {@code clear} operations. It does not - * support the {@code add} or {@code addAll} operations. - * - *

The view's {@code iterator} is a "weakly consistent" iterator - * that will never throw {@link ConcurrentModificationException}, - * and guarantees to traverse elements as they existed upon - * construction of the iterator, and may (but is not guaranteed to) - * reflect any modifications subsequent to construction. + * reflected in the collection, and vice-versa. */ - public Collection values() { - Values vs = values; - return (vs != null) ? vs : (values = new Values(this)); + public ValuesView values() { + ValuesView vs = values; + return (vs != null) ? vs : (values = new ValuesView(this)); } /** @@ -2893,8 +3034,8 @@ public class ConcurrentHashMapV8 * reflect any modifications subsequent to construction. */ public Set> entrySet() { - EntrySet es = entrySet; - return (es != null) ? es : (entrySet = new EntrySet(this)); + EntrySetView es = entrySet; + return (es != null) ? es : (entrySet = new EntrySetView(this)); } /** @@ -3034,7 +3175,7 @@ public class ConcurrentHashMapV8 super(it); } public KeyIterator split() { - if (last != null || (next != null && nextVal == null)) + if (nextKey != null) throw new IllegalStateException(); return new KeyIterator(this); } @@ -3056,7 +3197,7 @@ public class ConcurrentHashMapV8 super(it); } public ValueIterator split() { - if (last != null || (next != null && nextVal == null)) + if (nextKey != null) throw new IllegalStateException(); return new ValueIterator(this); } @@ -3079,7 +3220,7 @@ public class ConcurrentHashMapV8 super(it); } public EntryIterator split() { - if (last != null || (next != null && nextVal == null)) + if (nextKey != null) throw new IllegalStateException(); return new EntryIterator(this); } @@ -3137,223 +3278,6 @@ public class ConcurrentHashMapV8 } } - /* ----------------Views -------------- */ - - /** - * Base class for views. - */ - static abstract class CHMView { - final ConcurrentHashMapV8 map; - CHMView(ConcurrentHashMapV8 map) { this.map = map; } - public final int size() { return map.size(); } - public final boolean isEmpty() { return map.isEmpty(); } - public final void clear() { map.clear(); } - - // implementations below rely on concrete classes supplying these - abstract public Iterator iterator(); - abstract public boolean contains(Object o); - abstract public boolean remove(Object o); - - private static final String oomeMsg = "Required array size too large"; - - public final Object[] toArray() { - long sz = map.mappingCount(); - if (sz > (long)(MAX_ARRAY_SIZE)) - throw new OutOfMemoryError(oomeMsg); - int n = (int)sz; - Object[] r = new Object[n]; - int i = 0; - Iterator it = iterator(); - while (it.hasNext()) { - if (i == n) { - if (n >= MAX_ARRAY_SIZE) - throw new OutOfMemoryError(oomeMsg); - if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1) - n = MAX_ARRAY_SIZE; - else - n += (n >>> 1) + 1; - r = Arrays.copyOf(r, n); - } - r[i++] = it.next(); - } - return (i == n) ? r : Arrays.copyOf(r, i); - } - - @SuppressWarnings("unchecked") public final T[] toArray(T[] a) { - long sz = map.mappingCount(); - if (sz > (long)(MAX_ARRAY_SIZE)) - throw new OutOfMemoryError(oomeMsg); - int m = (int)sz; - T[] r = (a.length >= m) ? a : - (T[])java.lang.reflect.Array - .newInstance(a.getClass().getComponentType(), m); - int n = r.length; - int i = 0; - Iterator it = iterator(); - while (it.hasNext()) { - if (i == n) { - if (n >= MAX_ARRAY_SIZE) - throw new OutOfMemoryError(oomeMsg); - if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1) - n = MAX_ARRAY_SIZE; - else - n += (n >>> 1) + 1; - r = Arrays.copyOf(r, n); - } - r[i++] = (T)it.next(); - } - if (a == r && i < n) { - r[i] = null; // null-terminate - return r; - } - return (i == n) ? r : Arrays.copyOf(r, i); - } - - public final int hashCode() { - int h = 0; - for (Iterator it = iterator(); it.hasNext();) - h += it.next().hashCode(); - return h; - } - - public final String toString() { - StringBuilder sb = new StringBuilder(); - sb.append('['); - Iterator it = iterator(); - if (it.hasNext()) { - for (;;) { - Object e = it.next(); - sb.append(e == this ? "(this Collection)" : e); - if (!it.hasNext()) - break; - sb.append(',').append(' '); - } - } - return sb.append(']').toString(); - } - - public final boolean containsAll(Collection c) { - if (c != this) { - for (Iterator it = c.iterator(); it.hasNext();) { - Object e = it.next(); - if (e == null || !contains(e)) - return false; - } - } - return true; - } - - public final boolean removeAll(Collection c) { - boolean modified = false; - for (Iterator it = iterator(); it.hasNext();) { - if (c.contains(it.next())) { - it.remove(); - modified = true; - } - } - return modified; - } - - public final boolean retainAll(Collection c) { - boolean modified = false; - for (Iterator it = iterator(); it.hasNext();) { - if (!c.contains(it.next())) { - it.remove(); - modified = true; - } - } - return modified; - } - - } - - static final class KeySet extends CHMView implements Set { - KeySet(ConcurrentHashMapV8 map) { - super(map); - } - public final boolean contains(Object o) { return map.containsKey(o); } - public final boolean remove(Object o) { return map.remove(o) != null; } - public final Iterator iterator() { - return new KeyIterator(map); - } - public final boolean add(K e) { - throw new UnsupportedOperationException(); - } - public final boolean addAll(Collection c) { - throw new UnsupportedOperationException(); - } - public boolean equals(Object o) { - Set c; - return ((o instanceof Set) && - ((c = (Set)o) == this || - (containsAll(c) && c.containsAll(this)))); - } - } - - - static final class Values extends CHMView - implements Collection { - Values(ConcurrentHashMapV8 map) { super(map); } - public final boolean contains(Object o) { return map.containsValue(o); } - public final boolean remove(Object o) { - if (o != null) { - Iterator it = new ValueIterator(map); - while (it.hasNext()) { - if (o.equals(it.next())) { - it.remove(); - return true; - } - } - } - return false; - } - public final Iterator iterator() { - return new ValueIterator(map); - } - public final boolean add(V e) { - throw new UnsupportedOperationException(); - } - public final boolean addAll(Collection c) { - throw new UnsupportedOperationException(); - } - - } - - static final class EntrySet extends CHMView - implements Set> { - EntrySet(ConcurrentHashMapV8 map) { super(map); } - public final boolean contains(Object o) { - Object k, v, r; Map.Entry e; - return ((o instanceof Map.Entry) && - (k = (e = (Map.Entry)o).getKey()) != null && - (r = map.get(k)) != null && - (v = e.getValue()) != null && - (v == r || v.equals(r))); - } - public final boolean remove(Object o) { - Object k, v; Map.Entry e; - return ((o instanceof Map.Entry) && - (k = (e = (Map.Entry)o).getKey()) != null && - (v = e.getValue()) != null && - map.remove(k, v)); - } - public final Iterator> iterator() { - return new EntryIterator(map); - } - public final boolean add(Entry e) { - throw new UnsupportedOperationException(); - } - public final boolean addAll(Collection> c) { - throw new UnsupportedOperationException(); - } - public boolean equals(Object o) { - Set c; - return ((o instanceof Set) && - ((c = (Set)o) == this || - (containsAll(c) && c.containsAll(this)))); - } - } - /* ---------------- Serialization Support -------------- */ /** @@ -3520,246 +3444,714 @@ public class ConcurrentHashMapV8 // ------------------------------------------------------- /** - * Returns an extended {@link Parallel} view of this map using the - * given executor for bulk parallel operations. + * Performs the given action for each (key, value). * - * @param executor the executor - * @return a parallel view + * @param action the action */ - public Parallel parallel(ForkJoinPool executor) { - return new Parallel(executor); + public void forEach(BiAction action) { + ForkJoinTasks.forEach + (this, action).invoke(); } /** - * An extended view of a ConcurrentHashMap supporting bulk - * parallel operations. These operations are designed to be - * safely, and often sensibly, applied even with maps that are - * being concurrently updated by other threads; for example, when - * computing a snapshot summary of the values in a shared - * registry. There are three kinds of operation, each with four - * forms, accepting functions with Keys, Values, Entries, and - * (Key, Value) arguments and/or return values. Because the - * elements of a ConcurrentHashMap are not ordered in any - * particular way, and may be processed in different orders in - * different parallel executions, the correctness of supplied - * functions should not depend on any ordering, or on any other - * objects or values that may transiently change while computation - * is in progress; and except for forEach actions, should ideally - * be side-effect-free. - * - *

- * - *

The concurrency properties of the bulk operations follow - * from those of ConcurrentHashMap: Any non-null result returned - * from {@code get(key)} and related access methods bears a - * happens-before relation with the associated insertion or - * update. The result of any bulk operation reflects the - * composition of these per-element relations (but is not - * necessarily atomic with respect to the map as a whole unless it - * is somehow known to be quiescent). Conversely, because keys - * and values in the map are never null, null serves as a reliable - * atomic indicator of the current lack of any result. To - * maintain this property, null serves as an implicit basis for - * all non-scalar reduction operations. For the double, long, and - * int versions, the basis should be one that, when combined with - * any other value, returns that other value (more formally, it - * should be the identity element for the reduction). Most common - * reductions have these properties; for example, computing a sum - * with basis 0 or a minimum with basis MAX_VALUE. - * - *

Search and transformation functions provided as arguments - * should similarly return null to indicate the lack of any result - * (in which case it is not used). In the case of mapped - * reductions, this also enables transformations to serve as - * filters, returning null (or, in the case of primitive - * specializations, the identity basis) if the element should not - * be combined. You can create compound transformations and - * filterings by composing them yourself under this "null means - * there is nothing there now" rule before using them in search or - * reduce operations. - * - *

Methods accepting and/or returning Entry arguments maintain - * key-value associations. They may be useful for example when - * finding the key for the greatest value. Note that "plain" Entry - * arguments can be supplied using {@code new - * AbstractMap.SimpleEntry(k,v)}. - * - *

Bulk operations may complete abruptly, throwing an - * exception encountered in the application of a supplied - * function. Bear in mind when handling such exceptions that other - * concurrently executing functions could also have thrown - * exceptions, or would have done so if the first exception had - * not occurred. - * - *

Parallel speedups compared to sequential processing are - * common but not guaranteed. Operations involving brief - * functions on small maps may execute more slowly than sequential - * loops if the underlying work to parallelize the computation is - * more expensive than the computation itself. Similarly, - * parallelization may not lead to much actual parallelism if all - * processors are busy performing unrelated tasks. - * - *

All arguments to all task methods must be non-null. - * - *

jsr166e note: During transition, this class - * uses nested functional interfaces with different names but the - * same forms as those expected for JDK8. - */ - public class Parallel { - final ForkJoinPool fjp; - - /** - * Returns an extended view of this map using the given - * executor for bulk parallel operations. - * - * @param executor the executor - */ - public Parallel(ForkJoinPool executor) { - this.fjp = executor; - } + * Performs the given action for each non-null transformation + * of each (key, value). + * + * @param transformer a function returning the transformation + * for an element, or null of there is no transformation (in + * which case the action is not applied). + * @param action the action + */ + public void forEach(BiFun transformer, + Action action) { + ForkJoinTasks.forEach + (this, transformer, action).invoke(); + } + + /** + * Returns a non-null result from applying the given search + * function on each (key, value), or null if none. Upon + * success, further element processing is suppressed and the + * results of any other parallel invocations of the search + * function are ignored. + * + * @param searchFunction a function returning a non-null + * result on success, else null + * @return a non-null result from applying the given search + * function on each (key, value), or null if none + */ + public U search(BiFun searchFunction) { + return ForkJoinTasks.search + (this, searchFunction).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all (key, value) pairs using the given reducer to + * combine values, or null if none. + * + * @param transformer a function returning the transformation + * for an element, or null of there is no transformation (in + * which case it is not combined). + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all (key, value) pairs + */ + public U reduce(BiFun transformer, + BiFun reducer) { + return ForkJoinTasks.reduce + (this, transformer, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all (key, value) pairs using the given reducer to + * combine values, and the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all (key, value) pairs + */ + public double reduceToDouble(ObjectByObjectToDouble transformer, + double basis, + DoubleByDoubleToDouble reducer) { + return ForkJoinTasks.reduceToDouble + (this, transformer, basis, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all (key, value) pairs using the given reducer to + * combine values, and the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all (key, value) pairs + */ + public long reduceToLong(ObjectByObjectToLong transformer, + long basis, + LongByLongToLong reducer) { + return ForkJoinTasks.reduceToLong + (this, transformer, basis, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all (key, value) pairs using the given reducer to + * combine values, and the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all (key, value) pairs + */ + public int reduceToInt(ObjectByObjectToInt transformer, + int basis, + IntByIntToInt reducer) { + return ForkJoinTasks.reduceToInt + (this, transformer, basis, reducer).invoke(); + } + + /** + * Performs the given action for each key. + * + * @param action the action + */ + public void forEachKey(Action action) { + ForkJoinTasks.forEachKey + (this, action).invoke(); + } + + /** + * Performs the given action for each non-null transformation + * of each key. + * + * @param transformer a function returning the transformation + * for an element, or null of there is no transformation (in + * which case the action is not applied). + * @param action the action + */ + public void forEachKey(Fun transformer, + Action action) { + ForkJoinTasks.forEachKey + (this, transformer, action).invoke(); + } + + /** + * Returns a non-null result from applying the given search + * function on each key, or null if none. Upon success, + * further element processing is suppressed and the results of + * any other parallel invocations of the search function are + * ignored. + * + * @param searchFunction a function returning a non-null + * result on success, else null + * @return a non-null result from applying the given search + * function on each key, or null if none + */ + public U searchKeys(Fun searchFunction) { + return ForkJoinTasks.searchKeys + (this, searchFunction).invoke(); + } + + /** + * Returns the result of accumulating all keys using the given + * reducer to combine values, or null if none. + * + * @param reducer a commutative associative combining function + * @return the result of accumulating all keys using the given + * reducer to combine values, or null if none + */ + public K reduceKeys(BiFun reducer) { + return ForkJoinTasks.reduceKeys + (this, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all keys using the given reducer to combine values, or + * null if none. + * + * @param transformer a function returning the transformation + * for an element, or null of there is no transformation (in + * which case it is not combined). + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all keys + */ + public U reduceKeys(Fun transformer, + BiFun reducer) { + return ForkJoinTasks.reduceKeys + (this, transformer, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all keys using the given reducer to combine values, and + * the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all keys + */ + public double reduceKeysToDouble(ObjectToDouble transformer, + double basis, + DoubleByDoubleToDouble reducer) { + return ForkJoinTasks.reduceKeysToDouble + (this, transformer, basis, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all keys using the given reducer to combine values, and + * the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all keys + */ + public long reduceKeysToLong(ObjectToLong transformer, + long basis, + LongByLongToLong reducer) { + return ForkJoinTasks.reduceKeysToLong + (this, transformer, basis, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all keys using the given reducer to combine values, and + * the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all keys + */ + public int reduceKeysToInt(ObjectToInt transformer, + int basis, + IntByIntToInt reducer) { + return ForkJoinTasks.reduceKeysToInt + (this, transformer, basis, reducer).invoke(); + } + + /** + * Performs the given action for each value. + * + * @param action the action + */ + public void forEachValue(Action action) { + ForkJoinTasks.forEachValue + (this, action).invoke(); + } + + /** + * Performs the given action for each non-null transformation + * of each value. + * + * @param transformer a function returning the transformation + * for an element, or null of there is no transformation (in + * which case the action is not applied). + */ + public void forEachValue(Fun transformer, + Action action) { + ForkJoinTasks.forEachValue + (this, transformer, action).invoke(); + } + + /** + * Returns a non-null result from applying the given search + * function on each value, or null if none. Upon success, + * further element processing is suppressed and the results of + * any other parallel invocations of the search function are + * ignored. + * + * @param searchFunction a function returning a non-null + * result on success, else null + * @return a non-null result from applying the given search + * function on each value, or null if none + * + */ + public U searchValues(Fun searchFunction) { + return ForkJoinTasks.searchValues + (this, searchFunction).invoke(); + } + + /** + * Returns the result of accumulating all values using the + * given reducer to combine values, or null if none. + * + * @param reducer a commutative associative combining function + * @return the result of accumulating all values + */ + public V reduceValues(BiFun reducer) { + return ForkJoinTasks.reduceValues + (this, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all values using the given reducer to combine values, or + * null if none. + * + * @param transformer a function returning the transformation + * for an element, or null of there is no transformation (in + * which case it is not combined). + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all values + */ + public U reduceValues(Fun transformer, + BiFun reducer) { + return ForkJoinTasks.reduceValues + (this, transformer, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all values using the given reducer to combine values, + * and the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all values + */ + public double reduceValuesToDouble(ObjectToDouble transformer, + double basis, + DoubleByDoubleToDouble reducer) { + return ForkJoinTasks.reduceValuesToDouble + (this, transformer, basis, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all values using the given reducer to combine values, + * and the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all values + */ + public long reduceValuesToLong(ObjectToLong transformer, + long basis, + LongByLongToLong reducer) { + return ForkJoinTasks.reduceValuesToLong + (this, transformer, basis, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all values using the given reducer to combine values, + * and the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all values + */ + public int reduceValuesToInt(ObjectToInt transformer, + int basis, + IntByIntToInt reducer) { + return ForkJoinTasks.reduceValuesToInt + (this, transformer, basis, reducer).invoke(); + } + + /** + * Performs the given action for each entry. + * + * @param action the action + */ + public void forEachEntry(Action> action) { + ForkJoinTasks.forEachEntry + (this, action).invoke(); + } + + /** + * Performs the given action for each non-null transformation + * of each entry. + * + * @param transformer a function returning the transformation + * for an element, or null of there is no transformation (in + * which case the action is not applied). + * @param action the action + */ + public void forEachEntry(Fun, ? extends U> transformer, + Action action) { + ForkJoinTasks.forEachEntry + (this, transformer, action).invoke(); + } + + /** + * Returns a non-null result from applying the given search + * function on each entry, or null if none. Upon success, + * further element processing is suppressed and the results of + * any other parallel invocations of the search function are + * ignored. + * + * @param searchFunction a function returning a non-null + * result on success, else null + * @return a non-null result from applying the given search + * function on each entry, or null if none + */ + public U searchEntries(Fun, ? extends U> searchFunction) { + return ForkJoinTasks.searchEntries + (this, searchFunction).invoke(); + } + + /** + * Returns the result of accumulating all entries using the + * given reducer to combine values, or null if none. + * + * @param reducer a commutative associative combining function + * @return the result of accumulating all entries + */ + public Map.Entry reduceEntries(BiFun, Map.Entry, ? extends Map.Entry> reducer) { + return ForkJoinTasks.reduceEntries + (this, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all entries using the given reducer to combine values, + * or null if none. + * + * @param transformer a function returning the transformation + * for an element, or null of there is no transformation (in + * which case it is not combined). + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all entries + */ + public U reduceEntries(Fun, ? extends U> transformer, + BiFun reducer) { + return ForkJoinTasks.reduceEntries + (this, transformer, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all entries using the given reducer to combine values, + * and the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all entries + */ + public double reduceEntriesToDouble(ObjectToDouble> transformer, + double basis, + DoubleByDoubleToDouble reducer) { + return ForkJoinTasks.reduceEntriesToDouble + (this, transformer, basis, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all entries using the given reducer to combine values, + * and the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all entries + */ + public long reduceEntriesToLong(ObjectToLong> transformer, + long basis, + LongByLongToLong reducer) { + return ForkJoinTasks.reduceEntriesToLong + (this, transformer, basis, reducer).invoke(); + } + + /** + * Returns the result of accumulating the given transformation + * of all entries using the given reducer to combine values, + * and the given basis as an identity value. + * + * @param transformer a function returning the transformation + * for an element + * @param basis the identity (initial default value) for the reduction + * @param reducer a commutative associative combining function + * @return the result of accumulating the given transformation + * of all entries + */ + public int reduceEntriesToInt(ObjectToInt> transformer, + int basis, + IntByIntToInt reducer) { + return ForkJoinTasks.reduceEntriesToInt + (this, transformer, basis, reducer).invoke(); + } + + /* ----------------Views -------------- */ + + /** + * Base class for views. + */ + static abstract class CHMView { + final ConcurrentHashMapV8 map; + CHMView(ConcurrentHashMapV8 map) { this.map = map; } /** - * Performs the given action for each (key, value). + * Returns the map backing this view. * - * @param action the action + * @return the map backing this view */ - public void forEach(BiAction action) { - fjp.invoke(ForkJoinTasks.forEach - (ConcurrentHashMapV8.this, action)); + public ConcurrentHashMapV8 getMap() { return map; } + + public final int size() { return map.size(); } + public final boolean isEmpty() { return map.isEmpty(); } + public final void clear() { map.clear(); } + + // implementations below rely on concrete classes supplying these + abstract public Iterator iterator(); + abstract public boolean contains(Object o); + abstract public boolean remove(Object o); + + private static final String oomeMsg = "Required array size too large"; + + public final Object[] toArray() { + long sz = map.mappingCount(); + if (sz > (long)(MAX_ARRAY_SIZE)) + throw new OutOfMemoryError(oomeMsg); + int n = (int)sz; + Object[] r = new Object[n]; + int i = 0; + Iterator it = iterator(); + while (it.hasNext()) { + if (i == n) { + if (n >= MAX_ARRAY_SIZE) + throw new OutOfMemoryError(oomeMsg); + if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1) + n = MAX_ARRAY_SIZE; + else + n += (n >>> 1) + 1; + r = Arrays.copyOf(r, n); + } + r[i++] = it.next(); + } + return (i == n) ? r : Arrays.copyOf(r, i); } - /** - * Performs the given action for each non-null transformation - * of each (key, value). - * - * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in - * which case the action is not applied). - * @param action the action - */ - public void forEach(BiFun transformer, - Action action) { - fjp.invoke(ForkJoinTasks.forEach - (ConcurrentHashMapV8.this, transformer, action)); + @SuppressWarnings("unchecked") public final T[] toArray(T[] a) { + long sz = map.mappingCount(); + if (sz > (long)(MAX_ARRAY_SIZE)) + throw new OutOfMemoryError(oomeMsg); + int m = (int)sz; + T[] r = (a.length >= m) ? a : + (T[])java.lang.reflect.Array + .newInstance(a.getClass().getComponentType(), m); + int n = r.length; + int i = 0; + Iterator it = iterator(); + while (it.hasNext()) { + if (i == n) { + if (n >= MAX_ARRAY_SIZE) + throw new OutOfMemoryError(oomeMsg); + if (n >= MAX_ARRAY_SIZE - (MAX_ARRAY_SIZE >>> 1) - 1) + n = MAX_ARRAY_SIZE; + else + n += (n >>> 1) + 1; + r = Arrays.copyOf(r, n); + } + r[i++] = (T)it.next(); + } + if (a == r && i < n) { + r[i] = null; // null-terminate + return r; + } + return (i == n) ? r : Arrays.copyOf(r, i); } - /** - * Returns a non-null result from applying the given search - * function on each (key, value), or null if none. Upon - * success, further element processing is suppressed and the - * results of any other parallel invocations of the search - * function are ignored. - * - * @param searchFunction a function returning a non-null - * result on success, else null - * @return a non-null result from applying the given search - * function on each (key, value), or null if none - */ - public U search(BiFun searchFunction) { - return fjp.invoke(ForkJoinTasks.search - (ConcurrentHashMapV8.this, searchFunction)); + public final int hashCode() { + int h = 0; + for (Iterator it = iterator(); it.hasNext();) + h += it.next().hashCode(); + return h; } - /** - * Returns the result of accumulating the given transformation - * of all (key, value) pairs using the given reducer to - * combine values, or null if none. - * - * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in - * which case it is not combined). - * @param reducer a commutative associative combining function - * @return the result of accumulating the given transformation - * of all (key, value) pairs - */ - public U reduce(BiFun transformer, - BiFun reducer) { - return fjp.invoke(ForkJoinTasks.reduce - (ConcurrentHashMapV8.this, transformer, reducer)); + public final String toString() { + StringBuilder sb = new StringBuilder(); + sb.append('['); + Iterator it = iterator(); + if (it.hasNext()) { + for (;;) { + Object e = it.next(); + sb.append(e == this ? "(this Collection)" : e); + if (!it.hasNext()) + break; + sb.append(',').append(' '); + } + } + return sb.append(']').toString(); } - /** - * Returns the result of accumulating the given transformation - * of all (key, value) pairs using the given reducer to - * combine values, and the given basis as an identity value. - * - * @param transformer a function returning the transformation - * for an element - * @param basis the identity (initial default value) for the reduction - * @param reducer a commutative associative combining function - * @return the result of accumulating the given transformation - * of all (key, value) pairs - */ - public double reduceToDouble(ObjectByObjectToDouble transformer, - double basis, - DoubleByDoubleToDouble reducer) { - return fjp.invoke(ForkJoinTasks.reduceToDouble - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public final boolean containsAll(Collection c) { + if (c != this) { + for (Iterator it = c.iterator(); it.hasNext();) { + Object e = it.next(); + if (e == null || !contains(e)) + return false; + } + } + return true; + } + + public final boolean removeAll(Collection c) { + boolean modified = false; + for (Iterator it = iterator(); it.hasNext();) { + if (c.contains(it.next())) { + it.remove(); + modified = true; + } + } + return modified; + } + + public final boolean retainAll(Collection c) { + boolean modified = false; + for (Iterator it = iterator(); it.hasNext();) { + if (!c.contains(it.next())) { + it.remove(); + modified = true; + } + } + return modified; + } + + } + + /** + * A view of a ConcurrentHashMapV8 as a {@link Set} of keys, in + * which additions may optionally be enabled by mapping to a + * common value. This class cannot be directly instantiated. See + * {@link #keySet}, {@link #keySet(Object)}, {@link #newKeySet()}, + * {@link #newKeySet(int)}. + */ + public static class KeySetView extends CHMView implements Set, java.io.Serializable { + private static final long serialVersionUID = 7249069246763182397L; + private final V value; + KeySetView(ConcurrentHashMapV8 map, V value) { // non-public + super(map); + this.value = value; } /** - * Returns the result of accumulating the given transformation - * of all (key, value) pairs using the given reducer to - * combine values, and the given basis as an identity value. + * Returns the default mapped value for additions, + * or {@code null} if additions are not supported. * - * @param transformer a function returning the transformation - * for an element - * @param basis the identity (initial default value) for the reduction - * @param reducer a commutative associative combining function - * @return the result of accumulating the given transformation - * of all (key, value) pairs + * @return the default mapped value for additions, or {@code null} + * if not supported. */ - public long reduceToLong(ObjectByObjectToLong transformer, - long basis, - LongByLongToLong reducer) { - return fjp.invoke(ForkJoinTasks.reduceToLong - (ConcurrentHashMapV8.this, transformer, basis, reducer)); - } + public V getMappedValue() { return value; } + + // implement Set API + + public boolean contains(Object o) { return map.containsKey(o); } + public boolean remove(Object o) { return map.remove(o) != null; } /** - * Returns the result of accumulating the given transformation - * of all (key, value) pairs using the given reducer to - * combine values, and the given basis as an identity value. + * Returns a "weakly consistent" iterator that will never + * throw {@link ConcurrentModificationException}, and + * guarantees to traverse elements as they existed upon + * construction of the iterator, and may (but is not + * guaranteed to) reflect any modifications subsequent to + * construction. * - * @param transformer a function returning the transformation - * for an element - * @param basis the identity (initial default value) for the reduction - * @param reducer a commutative associative combining function - * @return the result of accumulating the given transformation - * of all (key, value) pairs + * @return an iterator over the keys of this map */ - public int reduceToInt(ObjectByObjectToInt transformer, - int basis, - IntByIntToInt reducer) { - return fjp.invoke(ForkJoinTasks.reduceToInt - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public Iterator iterator() { return new KeyIterator(map); } + public boolean add(K e) { + V v; + if ((v = value) == null) + throw new UnsupportedOperationException(); + if (e == null) + throw new NullPointerException(); + return map.internalPutIfAbsent(e, v) == null; + } + public boolean addAll(Collection c) { + boolean added = false; + V v; + if ((v = value) == null) + throw new UnsupportedOperationException(); + for (K e : c) { + if (e == null) + throw new NullPointerException(); + if (map.internalPutIfAbsent(e, v) == null) + added = true; + } + return added; + } + public boolean equals(Object o) { + Set c; + return ((o instanceof Set) && + ((c = (Set)o) == this || + (containsAll(c) && c.containsAll(this)))); } /** @@ -3767,9 +4159,9 @@ public class ConcurrentHashMapV8 * * @param action the action */ - public void forEachKey(Action action) { - fjp.invoke(ForkJoinTasks.forEachKey - (ConcurrentHashMapV8.this, action)); + public void forEach(Action action) { + ForkJoinTasks.forEachKey + (map, action).invoke(); } /** @@ -3781,10 +4173,10 @@ public class ConcurrentHashMapV8 * which case the action is not applied). * @param action the action */ - public void forEachKey(Fun transformer, - Action action) { - fjp.invoke(ForkJoinTasks.forEachKey - (ConcurrentHashMapV8.this, transformer, action)); + public void forEach(Fun transformer, + Action action) { + ForkJoinTasks.forEachKey + (map, transformer, action).invoke(); } /** @@ -3799,9 +4191,9 @@ public class ConcurrentHashMapV8 * @return a non-null result from applying the given search * function on each key, or null if none */ - public U searchKeys(Fun searchFunction) { - return fjp.invoke(ForkJoinTasks.searchKeys - (ConcurrentHashMapV8.this, searchFunction)); + public U search(Fun searchFunction) { + return ForkJoinTasks.searchKeys + (map, searchFunction).invoke(); } /** @@ -3812,27 +4204,9 @@ public class ConcurrentHashMapV8 * @return the result of accumulating all keys using the given * reducer to combine values, or null if none */ - public K reduceKeys(BiFun reducer) { - return fjp.invoke(ForkJoinTasks.reduceKeys - (ConcurrentHashMapV8.this, reducer)); - } - - /** - * Returns the result of accumulating the given transformation - * of all keys using the given reducer to combine values, or - * null if none. - * - * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in - * which case it is not combined). - * @param reducer a commutative associative combining function - * @return the result of accumulating the given transformation - * of all keys - */ - public U reduceKeys(Fun transformer, - BiFun reducer) { - return fjp.invoke(ForkJoinTasks.reduceKeys - (ConcurrentHashMapV8.this, transformer, reducer)); + public K reduce(BiFun reducer) { + return ForkJoinTasks.reduceKeys + (map, reducer).invoke(); } /** @@ -3847,13 +4221,14 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all keys */ - public double reduceKeysToDouble(ObjectToDouble transformer, - double basis, - DoubleByDoubleToDouble reducer) { - return fjp.invoke(ForkJoinTasks.reduceKeysToDouble - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public double reduceToDouble(ObjectToDouble transformer, + double basis, + DoubleByDoubleToDouble reducer) { + return ForkJoinTasks.reduceKeysToDouble + (map, transformer, basis, reducer).invoke(); } + /** * Returns the result of accumulating the given transformation * of all keys using the given reducer to combine values, and @@ -3866,11 +4241,11 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all keys */ - public long reduceKeysToLong(ObjectToLong transformer, - long basis, - LongByLongToLong reducer) { - return fjp.invoke(ForkJoinTasks.reduceKeysToLong - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public long reduceToLong(ObjectToLong transformer, + long basis, + LongByLongToLong reducer) { + return ForkJoinTasks.reduceKeysToLong + (map, transformer, basis, reducer).invoke(); } /** @@ -3885,11 +4260,61 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all keys */ - public int reduceKeysToInt(ObjectToInt transformer, - int basis, - IntByIntToInt reducer) { - return fjp.invoke(ForkJoinTasks.reduceKeysToInt - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public int reduceToInt(ObjectToInt transformer, + int basis, + IntByIntToInt reducer) { + return ForkJoinTasks.reduceKeysToInt + (map, transformer, basis, reducer).invoke(); + } + + } + + /** + * A view of a ConcurrentHashMapV8 as a {@link Collection} of + * values, in which additions are disabled. This class cannot be + * directly instantiated. See {@link #values}, + * + *

The view's {@code iterator} is a "weakly consistent" iterator + * that will never throw {@link ConcurrentModificationException}, + * and guarantees to traverse elements as they existed upon + * construction of the iterator, and may (but is not guaranteed to) + * reflect any modifications subsequent to construction. + */ + public static final class ValuesView extends CHMView + implements Collection { + ValuesView(ConcurrentHashMapV8 map) { super(map); } + public final boolean contains(Object o) { return map.containsValue(o); } + public final boolean remove(Object o) { + if (o != null) { + Iterator it = new ValueIterator(map); + while (it.hasNext()) { + if (o.equals(it.next())) { + it.remove(); + return true; + } + } + } + return false; + } + + /** + * Returns a "weakly consistent" iterator that will never + * throw {@link ConcurrentModificationException}, and + * guarantees to traverse elements as they existed upon + * construction of the iterator, and may (but is not + * guaranteed to) reflect any modifications subsequent to + * construction. + * + * @return an iterator over the values of this map + */ + public final Iterator iterator() { + return new ValueIterator(map); + } + public final boolean add(V e) { + throw new UnsupportedOperationException(); + } + public final boolean addAll(Collection c) { + throw new UnsupportedOperationException(); } /** @@ -3897,9 +4322,9 @@ public class ConcurrentHashMapV8 * * @param action the action */ - public void forEachValue(Action action) { - fjp.invoke(ForkJoinTasks.forEachValue - (ConcurrentHashMapV8.this, action)); + public void forEach(Action action) { + ForkJoinTasks.forEachValue + (map, action).invoke(); } /** @@ -3910,10 +4335,10 @@ public class ConcurrentHashMapV8 * for an element, or null of there is no transformation (in * which case the action is not applied). */ - public void forEachValue(Fun transformer, + public void forEach(Fun transformer, Action action) { - fjp.invoke(ForkJoinTasks.forEachValue - (ConcurrentHashMapV8.this, transformer, action)); + ForkJoinTasks.forEachValue + (map, transformer, action).invoke(); } /** @@ -3929,9 +4354,9 @@ public class ConcurrentHashMapV8 * function on each value, or null if none * */ - public U searchValues(Fun searchFunction) { - return fjp.invoke(ForkJoinTasks.searchValues - (ConcurrentHashMapV8.this, searchFunction)); + public U search(Fun searchFunction) { + return ForkJoinTasks.searchValues + (map, searchFunction).invoke(); } /** @@ -3941,9 +4366,9 @@ public class ConcurrentHashMapV8 * @param reducer a commutative associative combining function * @return the result of accumulating all values */ - public V reduceValues(BiFun reducer) { - return fjp.invoke(ForkJoinTasks.reduceValues - (ConcurrentHashMapV8.this, reducer)); + public V reduce(BiFun reducer) { + return ForkJoinTasks.reduceValues + (map, reducer).invoke(); } /** @@ -3958,10 +4383,10 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all values */ - public U reduceValues(Fun transformer, - BiFun reducer) { - return fjp.invoke(ForkJoinTasks.reduceValues - (ConcurrentHashMapV8.this, transformer, reducer)); + public U reduce(Fun transformer, + BiFun reducer) { + return ForkJoinTasks.reduceValues + (map, transformer, reducer).invoke(); } /** @@ -3976,11 +4401,11 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all values */ - public double reduceValuesToDouble(ObjectToDouble transformer, - double basis, - DoubleByDoubleToDouble reducer) { - return fjp.invoke(ForkJoinTasks.reduceValuesToDouble - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public double reduceToDouble(ObjectToDouble transformer, + double basis, + DoubleByDoubleToDouble reducer) { + return ForkJoinTasks.reduceValuesToDouble + (map, transformer, basis, reducer).invoke(); } /** @@ -3995,11 +4420,11 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all values */ - public long reduceValuesToLong(ObjectToLong transformer, - long basis, - LongByLongToLong reducer) { - return fjp.invoke(ForkJoinTasks.reduceValuesToLong - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public long reduceToLong(ObjectToLong transformer, + long basis, + LongByLongToLong reducer) { + return ForkJoinTasks.reduceValuesToLong + (map, transformer, basis, reducer).invoke(); } /** @@ -4014,11 +4439,73 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all values */ - public int reduceValuesToInt(ObjectToInt transformer, - int basis, - IntByIntToInt reducer) { - return fjp.invoke(ForkJoinTasks.reduceValuesToInt - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public int reduceToInt(ObjectToInt transformer, + int basis, + IntByIntToInt reducer) { + return ForkJoinTasks.reduceValuesToInt + (map, transformer, basis, reducer).invoke(); + } + + } + + /** + * A view of a ConcurrentHashMapV8 as a {@link Set} of (key, value) + * entries. This class cannot be directly instantiated. See + * {@link #entrySet}. + */ + public static final class EntrySetView extends CHMView + implements Set> { + EntrySetView(ConcurrentHashMapV8 map) { super(map); } + public final boolean contains(Object o) { + Object k, v, r; Map.Entry e; + return ((o instanceof Map.Entry) && + (k = (e = (Map.Entry)o).getKey()) != null && + (r = map.get(k)) != null && + (v = e.getValue()) != null && + (v == r || v.equals(r))); + } + public final boolean remove(Object o) { + Object k, v; Map.Entry e; + return ((o instanceof Map.Entry) && + (k = (e = (Map.Entry)o).getKey()) != null && + (v = e.getValue()) != null && + map.remove(k, v)); + } + + /** + * Returns a "weakly consistent" iterator that will never + * throw {@link ConcurrentModificationException}, and + * guarantees to traverse elements as they existed upon + * construction of the iterator, and may (but is not + * guaranteed to) reflect any modifications subsequent to + * construction. + * + * @return an iterator over the entries of this map + */ + public final Iterator> iterator() { + return new EntryIterator(map); + } + + public final boolean add(Entry e) { + K key = e.getKey(); + V value = e.getValue(); + if (key == null || value == null) + throw new NullPointerException(); + return map.internalPut(key, value) == null; + } + public final boolean addAll(Collection> c) { + boolean added = false; + for (Entry e : c) { + if (add(e)) + added = true; + } + return added; + } + public boolean equals(Object o) { + Set c; + return ((o instanceof Set) && + ((c = (Set)o) == this || + (containsAll(c) && c.containsAll(this)))); } /** @@ -4026,9 +4513,9 @@ public class ConcurrentHashMapV8 * * @param action the action */ - public void forEachEntry(Action> action) { - fjp.invoke(ForkJoinTasks.forEachEntry - (ConcurrentHashMapV8.this, action)); + public void forEach(Action> action) { + ForkJoinTasks.forEachEntry + (map, action).invoke(); } /** @@ -4040,10 +4527,10 @@ public class ConcurrentHashMapV8 * which case the action is not applied). * @param action the action */ - public void forEachEntry(Fun, ? extends U> transformer, - Action action) { - fjp.invoke(ForkJoinTasks.forEachEntry - (ConcurrentHashMapV8.this, transformer, action)); + public void forEach(Fun, ? extends U> transformer, + Action action) { + ForkJoinTasks.forEachEntry + (map, transformer, action).invoke(); } /** @@ -4058,9 +4545,9 @@ public class ConcurrentHashMapV8 * @return a non-null result from applying the given search * function on each entry, or null if none */ - public U searchEntries(Fun, ? extends U> searchFunction) { - return fjp.invoke(ForkJoinTasks.searchEntries - (ConcurrentHashMapV8.this, searchFunction)); + public U search(Fun, ? extends U> searchFunction) { + return ForkJoinTasks.searchEntries + (map, searchFunction).invoke(); } /** @@ -4070,9 +4557,9 @@ public class ConcurrentHashMapV8 * @param reducer a commutative associative combining function * @return the result of accumulating all entries */ - public Map.Entry reduceEntries(BiFun, Map.Entry, ? extends Map.Entry> reducer) { - return fjp.invoke(ForkJoinTasks.reduceEntries - (ConcurrentHashMapV8.this, reducer)); + public Map.Entry reduce(BiFun, Map.Entry, ? extends Map.Entry> reducer) { + return ForkJoinTasks.reduceEntries + (map, reducer).invoke(); } /** @@ -4087,10 +4574,10 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all entries */ - public U reduceEntries(Fun, ? extends U> transformer, - BiFun reducer) { - return fjp.invoke(ForkJoinTasks.reduceEntries - (ConcurrentHashMapV8.this, transformer, reducer)); + public U reduce(Fun, ? extends U> transformer, + BiFun reducer) { + return ForkJoinTasks.reduceEntries + (map, transformer, reducer).invoke(); } /** @@ -4105,11 +4592,11 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all entries */ - public double reduceEntriesToDouble(ObjectToDouble> transformer, - double basis, - DoubleByDoubleToDouble reducer) { - return fjp.invoke(ForkJoinTasks.reduceEntriesToDouble - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public double reduceToDouble(ObjectToDouble> transformer, + double basis, + DoubleByDoubleToDouble reducer) { + return ForkJoinTasks.reduceEntriesToDouble + (map, transformer, basis, reducer).invoke(); } /** @@ -4124,11 +4611,11 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all entries */ - public long reduceEntriesToLong(ObjectToLong> transformer, - long basis, - LongByLongToLong reducer) { - return fjp.invoke(ForkJoinTasks.reduceEntriesToLong - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public long reduceToLong(ObjectToLong> transformer, + long basis, + LongByLongToLong reducer) { + return ForkJoinTasks.reduceEntriesToLong + (map, transformer, basis, reducer).invoke(); } /** @@ -4143,23 +4630,25 @@ public class ConcurrentHashMapV8 * @return the result of accumulating the given transformation * of all entries */ - public int reduceEntriesToInt(ObjectToInt> transformer, - int basis, - IntByIntToInt reducer) { - return fjp.invoke(ForkJoinTasks.reduceEntriesToInt - (ConcurrentHashMapV8.this, transformer, basis, reducer)); + public int reduceToInt(ObjectToInt> transformer, + int basis, + IntByIntToInt reducer) { + return ForkJoinTasks.reduceEntriesToInt + (map, transformer, basis, reducer).invoke(); } + } // --------------------------------------------------------------------- /** * Predefined tasks for performing bulk parallel operations on - * ConcurrentHashMaps. These tasks follow the forms and rules used - * in class {@link Parallel}. Each method has the same name, but - * returns a task rather than invoking it. These methods may be - * useful in custom applications such as submitting a task without - * waiting for completion, or combining with other tasks. + * ConcurrentHashMapV8s. These tasks follow the forms and rules used + * for bulk operations. Each method has the same name, but returns + * a task rather than invoking it. These methods may be useful in + * custom applications such as submitting a task without waiting + * for completion, using a custom pool, or combining with other + * tasks. */ public static class ForkJoinTasks { private ForkJoinTasks() {} @@ -4176,7 +4665,7 @@ public class ConcurrentHashMapV8 (ConcurrentHashMapV8 map, BiAction action) { if (action == null) throw new NullPointerException(); - return new ForEachMappingTask(map, action); + return new ForEachMappingTask(map, null, -1, null, action); } /** @@ -4185,8 +4674,8 @@ public class ConcurrentHashMapV8 * * @param map the map * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in - * which case the action is not applied). + * for an element, or null if there is no transformation (in + * which case the action is not applied) * @param action the action * @return the task */ @@ -4197,7 +4686,7 @@ public class ConcurrentHashMapV8 if (transformer == null || action == null) throw new NullPointerException(); return new ForEachTransformedMappingTask - (map, transformer, action); + (map, null, -1, null, transformer, action); } /** @@ -4217,7 +4706,7 @@ public class ConcurrentHashMapV8 BiFun searchFunction) { if (searchFunction == null) throw new NullPointerException(); return new SearchMappingsTask - (map, searchFunction, + (map, null, -1, null, searchFunction, new AtomicReference()); } @@ -4228,7 +4717,7 @@ public class ConcurrentHashMapV8 * * @param map the map * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case it is not combined). * @param reducer a commutative associative combining function * @return the task @@ -4240,7 +4729,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceMappingsTask - (map, transformer, reducer); + (map, null, -1, null, transformer, reducer); } /** @@ -4264,7 +4753,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceMappingsToDoubleTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4288,7 +4777,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceMappingsToLongTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4311,7 +4800,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceMappingsToIntTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4326,7 +4815,7 @@ public class ConcurrentHashMapV8 (ConcurrentHashMapV8 map, Action action) { if (action == null) throw new NullPointerException(); - return new ForEachKeyTask(map, action); + return new ForEachKeyTask(map, null, -1, null, action); } /** @@ -4335,8 +4824,8 @@ public class ConcurrentHashMapV8 * * @param map the map * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in - * which case the action is not applied). + * for an element, or null if there is no transformation (in + * which case the action is not applied) * @param action the action * @return the task */ @@ -4347,7 +4836,7 @@ public class ConcurrentHashMapV8 if (transformer == null || action == null) throw new NullPointerException(); return new ForEachTransformedKeyTask - (map, transformer, action); + (map, null, -1, null, transformer, action); } /** @@ -4367,7 +4856,7 @@ public class ConcurrentHashMapV8 Fun searchFunction) { if (searchFunction == null) throw new NullPointerException(); return new SearchKeysTask - (map, searchFunction, + (map, null, -1, null, searchFunction, new AtomicReference()); } @@ -4385,7 +4874,7 @@ public class ConcurrentHashMapV8 BiFun reducer) { if (reducer == null) throw new NullPointerException(); return new ReduceKeysTask - (map, reducer); + (map, null, -1, null, reducer); } /** @@ -4395,7 +4884,7 @@ public class ConcurrentHashMapV8 * * @param map the map * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case it is not combined). * @param reducer a commutative associative combining function * @return the task @@ -4407,7 +4896,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceKeysTask - (map, transformer, reducer); + (map, null, -1, null, transformer, reducer); } /** @@ -4431,7 +4920,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceKeysToDoubleTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4455,7 +4944,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceKeysToLongTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4479,7 +4968,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceKeysToIntTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4493,7 +4982,7 @@ public class ConcurrentHashMapV8 (ConcurrentHashMapV8 map, Action action) { if (action == null) throw new NullPointerException(); - return new ForEachValueTask(map, action); + return new ForEachValueTask(map, null, -1, null, action); } /** @@ -4502,8 +4991,8 @@ public class ConcurrentHashMapV8 * * @param map the map * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in - * which case the action is not applied). + * for an element, or null if there is no transformation (in + * which case the action is not applied) * @param action the action */ public static ForkJoinTask forEachValue @@ -4513,7 +5002,7 @@ public class ConcurrentHashMapV8 if (transformer == null || action == null) throw new NullPointerException(); return new ForEachTransformedValueTask - (map, transformer, action); + (map, null, -1, null, transformer, action); } /** @@ -4527,14 +5016,13 @@ public class ConcurrentHashMapV8 * @param searchFunction a function returning a non-null * result on success, else null * @return the task - * */ public static ForkJoinTask searchValues (ConcurrentHashMapV8 map, Fun searchFunction) { if (searchFunction == null) throw new NullPointerException(); return new SearchValuesTask - (map, searchFunction, + (map, null, -1, null, searchFunction, new AtomicReference()); } @@ -4552,7 +5040,7 @@ public class ConcurrentHashMapV8 BiFun reducer) { if (reducer == null) throw new NullPointerException(); return new ReduceValuesTask - (map, reducer); + (map, null, -1, null, reducer); } /** @@ -4562,7 +5050,7 @@ public class ConcurrentHashMapV8 * * @param map the map * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case it is not combined). * @param reducer a commutative associative combining function * @return the task @@ -4574,7 +5062,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceValuesTask - (map, transformer, reducer); + (map, null, -1, null, transformer, reducer); } /** @@ -4598,7 +5086,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceValuesToDoubleTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4622,7 +5110,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceValuesToLongTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4646,7 +5134,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceValuesToIntTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4660,7 +5148,7 @@ public class ConcurrentHashMapV8 (ConcurrentHashMapV8 map, Action> action) { if (action == null) throw new NullPointerException(); - return new ForEachEntryTask(map, action); + return new ForEachEntryTask(map, null, -1, null, action); } /** @@ -4669,8 +5157,8 @@ public class ConcurrentHashMapV8 * * @param map the map * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in - * which case the action is not applied). + * for an element, or null if there is no transformation (in + * which case the action is not applied) * @param action the action */ public static ForkJoinTask forEachEntry @@ -4680,7 +5168,7 @@ public class ConcurrentHashMapV8 if (transformer == null || action == null) throw new NullPointerException(); return new ForEachTransformedEntryTask - (map, transformer, action); + (map, null, -1, null, transformer, action); } /** @@ -4694,14 +5182,13 @@ public class ConcurrentHashMapV8 * @param searchFunction a function returning a non-null * result on success, else null * @return the task - * */ public static ForkJoinTask searchEntries (ConcurrentHashMapV8 map, Fun, ? extends U> searchFunction) { if (searchFunction == null) throw new NullPointerException(); return new SearchEntriesTask - (map, searchFunction, + (map, null, -1, null, searchFunction, new AtomicReference()); } @@ -4719,7 +5206,7 @@ public class ConcurrentHashMapV8 BiFun, Map.Entry, ? extends Map.Entry> reducer) { if (reducer == null) throw new NullPointerException(); return new ReduceEntriesTask - (map, reducer); + (map, null, -1, null, reducer); } /** @@ -4729,7 +5216,7 @@ public class ConcurrentHashMapV8 * * @param map the map * @param transformer a function returning the transformation - * for an element, or null of there is no transformation (in + * for an element, or null if there is no transformation (in * which case it is not combined). * @param reducer a commutative associative combining function * @return the task @@ -4741,7 +5228,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceEntriesTask - (map, transformer, reducer); + (map, null, -1, null, transformer, reducer); } /** @@ -4765,7 +5252,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceEntriesToDoubleTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4789,7 +5276,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceEntriesToLongTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } /** @@ -4813,7 +5300,7 @@ public class ConcurrentHashMapV8 if (transformer == null || reducer == null) throw new NullPointerException(); return new MapReduceEntriesToIntTask - (map, transformer, basis, reducer); + (map, null, -1, null, transformer, basis, reducer); } } @@ -4832,40 +5319,24 @@ public class ConcurrentHashMapV8 */ @SuppressWarnings("serial") static abstract class BulkTask extends Traverser { final BulkTask parent; // completion target - int batch; // split control + int batch; // split control; -1 for unknown int pending; // completion control - /** Constructor for root tasks */ - BulkTask(ConcurrentHashMapV8 map) { + BulkTask(ConcurrentHashMapV8 map, BulkTask parent, + int batch) { super(map); - this.parent = null; - this.batch = -1; // force call to batch() on execution - } - - /** Constructor for subtasks */ - BulkTask(BulkTask parent, int batch) { - super(parent); this.parent = parent; this.batch = batch; - } - - // FJ methods - - /** - * Propagates completion. Note that all reduce actions - * bypass this method to combine while completing. - */ - final void tryComplete() { - BulkTask a = this, s = a; - for (int c;;) { - if ((c = a.pending) == 0) { - if ((a = (s = a).parent) == null) { - s.quietlyComplete(); - break; - } - } - else if (U.compareAndSwapInt(a, PENDING, c, c - 1)) - break; + if (parent != null && map != null) { // split parent + Node[] t; + if ((t = parent.tab) == null && + (t = parent.tab = map.table) != null) + parent.baseLimit = parent.baseSize = t.length; + this.tab = t; + this.baseSize = parent.baseSize; + int hi = this.baseLimit = parent.baseLimit; + parent.baseLimit = this.index = this.baseIndex = + (hi + parent.baseIndex + 1) >>> 1; } } @@ -4910,11 +5381,18 @@ public class ConcurrentHashMapV8 * dividing by two anyway. */ final int batch() { - int b = batch; - if (b < 0) { - long n = map.counter.sum(); - int sp = getPool().getParallelism() << 3; // slack of 8 - b = batch = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp; + ConcurrentHashMapV8 m; int b; Node[] t; ForkJoinPool pool; + if ((b = batch) < 0 && (m = map) != null) { // force initialization + if ((t = tab) == null && (t = tab = m.table) != null) + baseLimit = baseSize = t.length; + if (t != null) { + long n = m.counter.sum(); + int par = ((pool = getPool()) == null) ? + ForkJoinPool.getCommonPoolParallelism() : + pool.getParallelism(); + int sp = par << 3; // slack of 8 + b = batch = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp; + } } return b; } @@ -4940,6 +5418,50 @@ public class ConcurrentHashMapV8 } } + /** + * Base class for non-reductive actions + */ + @SuppressWarnings("serial") static abstract class BulkAction extends BulkTask { + BulkAction nextTask; + BulkAction(ConcurrentHashMapV8 map, BulkTask parent, + int batch, BulkAction nextTask) { + super(map, parent, batch); + this.nextTask = nextTask; + } + + /** + * Try to complete task and upward parents. Upon hitting + * non-completed parent, if a non-FJ task, try to help out the + * computation. + */ + final void tryComplete(BulkAction subtasks) { + BulkTask a = this, s = a; + for (int c;;) { + if ((c = a.pending) == 0) { + if ((a = (s = a).parent) == null) { + s.quietlyComplete(); + break; + } + } + else if (a.casPending(c, c - 1)) { + if (subtasks != null && !inForkJoinPool()) { + while ((s = a.parent) != null) + a = s; + while (!a.isDone()) { + BulkAction next = subtasks.nextTask; + if (subtasks.tryUnfork()) + subtasks.exec(); + if ((subtasks = next) == null) + break; + } + } + break; + } + } + } + + } + /* * Task classes. Coded in a regular but ugly format/style to * simplify checks that each variant differs in the right way from @@ -4947,354 +5469,310 @@ public class ConcurrentHashMapV8 */ @SuppressWarnings("serial") static final class ForEachKeyTask - extends BulkTask { + extends BulkAction { final Action action; ForEachKeyTask - (ConcurrentHashMapV8 m, + (ConcurrentHashMapV8 m, BulkTask p, int b, + ForEachKeyTask nextTask, Action action) { - super(m); - this.action = action; - } - ForEachKeyTask - (BulkTask p, int b, - Action action) { - super(p, b); + super(m, p, b, nextTask); this.action = action; } @SuppressWarnings("unchecked") public final boolean exec() { final Action action = this.action; if (action == null) return abortOnNullFunction(); + ForEachKeyTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit) { do {} while (!casPending(c = pending, c+1)); - new ForEachKeyTask(this, b >>>= 1, action).fork(); + (subtasks = new ForEachKeyTask + (map, this, b >>>= 1, subtasks, action)).fork(); } while (advance() != null) action.apply((K)nextKey); - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } } @SuppressWarnings("serial") static final class ForEachValueTask - extends BulkTask { + extends BulkAction { final Action action; ForEachValueTask - (ConcurrentHashMapV8 m, - Action action) { - super(m); - this.action = action; - } - ForEachValueTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, + ForEachValueTask nextTask, Action action) { - super(p, b); + super(m, p, b, nextTask); this.action = action; } @SuppressWarnings("unchecked") public final boolean exec() { final Action action = this.action; if (action == null) return abortOnNullFunction(); + ForEachValueTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit) { do {} while (!casPending(c = pending, c+1)); - new ForEachValueTask(this, b >>>= 1, action).fork(); + (subtasks = new ForEachValueTask + (map, this, b >>>= 1, subtasks, action)).fork(); } Object v; while ((v = advance()) != null) action.apply((V)v); - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } } @SuppressWarnings("serial") static final class ForEachEntryTask - extends BulkTask { + extends BulkAction { final Action> action; ForEachEntryTask - (ConcurrentHashMapV8 m, + (ConcurrentHashMapV8 m, BulkTask p, int b, + ForEachEntryTask nextTask, Action> action) { - super(m); - this.action = action; - } - ForEachEntryTask - (BulkTask p, int b, - Action> action) { - super(p, b); + super(m, p, b, nextTask); this.action = action; } @SuppressWarnings("unchecked") public final boolean exec() { final Action> action = this.action; if (action == null) return abortOnNullFunction(); + ForEachEntryTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit) { do {} while (!casPending(c = pending, c+1)); - new ForEachEntryTask(this, b >>>= 1, action).fork(); + (subtasks = new ForEachEntryTask + (map, this, b >>>= 1, subtasks, action)).fork(); } Object v; while ((v = advance()) != null) action.apply(entryFor((K)nextKey, (V)v)); - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } } @SuppressWarnings("serial") static final class ForEachMappingTask - extends BulkTask { + extends BulkAction { final BiAction action; ForEachMappingTask - (ConcurrentHashMapV8 m, - BiAction action) { - super(m); - this.action = action; - } - ForEachMappingTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, + ForEachMappingTask nextTask, BiAction action) { - super(p, b); + super(m, p, b, nextTask); this.action = action; } - @SuppressWarnings("unchecked") public final boolean exec() { final BiAction action = this.action; if (action == null) return abortOnNullFunction(); + ForEachMappingTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit) { do {} while (!casPending(c = pending, c+1)); - new ForEachMappingTask(this, b >>>= 1, - action).fork(); + (subtasks = new ForEachMappingTask + (map, this, b >>>= 1, subtasks, action)).fork(); } Object v; while ((v = advance()) != null) action.apply((K)nextKey, (V)v); - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } } @SuppressWarnings("serial") static final class ForEachTransformedKeyTask - extends BulkTask { + extends BulkAction { final Fun transformer; final Action action; ForEachTransformedKeyTask - (ConcurrentHashMapV8 m, + (ConcurrentHashMapV8 m, BulkTask p, int b, + ForEachTransformedKeyTask nextTask, Fun transformer, Action action) { - super(m); + super(m, p, b, nextTask); this.transformer = transformer; this.action = action; } - ForEachTransformedKeyTask - (BulkTask p, int b, - Fun transformer, - Action action) { - super(p, b); - this.transformer = transformer; - this.action = action; - } @SuppressWarnings("unchecked") public final boolean exec() { final Fun transformer = this.transformer; final Action action = this.action; if (transformer == null || action == null) return abortOnNullFunction(); + ForEachTransformedKeyTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit) { do {} while (!casPending(c = pending, c+1)); - new ForEachTransformedKeyTask - (this, b >>>= 1, transformer, action).fork(); + (subtasks = new ForEachTransformedKeyTask + (map, this, b >>>= 1, subtasks, transformer, action)).fork(); } U u; while (advance() != null) { if ((u = transformer.apply((K)nextKey)) != null) action.apply(u); } - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } } @SuppressWarnings("serial") static final class ForEachTransformedValueTask - extends BulkTask { + extends BulkAction { final Fun transformer; final Action action; ForEachTransformedValueTask - (ConcurrentHashMapV8 m, + (ConcurrentHashMapV8 m, BulkTask p, int b, + ForEachTransformedValueTask nextTask, Fun transformer, Action action) { - super(m); + super(m, p, b, nextTask); this.transformer = transformer; this.action = action; } - ForEachTransformedValueTask - (BulkTask p, int b, - Fun transformer, - Action action) { - super(p, b); - this.transformer = transformer; - this.action = action; - } @SuppressWarnings("unchecked") public final boolean exec() { final Fun transformer = this.transformer; final Action action = this.action; if (transformer == null || action == null) return abortOnNullFunction(); + ForEachTransformedValueTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit) { do {} while (!casPending(c = pending, c+1)); - new ForEachTransformedValueTask - (this, b >>>= 1, transformer, action).fork(); + (subtasks = new ForEachTransformedValueTask + (map, this, b >>>= 1, subtasks, transformer, action)).fork(); } Object v; U u; while ((v = advance()) != null) { if ((u = transformer.apply((V)v)) != null) action.apply(u); } - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } } @SuppressWarnings("serial") static final class ForEachTransformedEntryTask - extends BulkTask { + extends BulkAction { final Fun, ? extends U> transformer; final Action action; ForEachTransformedEntryTask - (ConcurrentHashMapV8 m, + (ConcurrentHashMapV8 m, BulkTask p, int b, + ForEachTransformedEntryTask nextTask, Fun, ? extends U> transformer, Action action) { - super(m); + super(m, p, b, nextTask); this.transformer = transformer; this.action = action; } - ForEachTransformedEntryTask - (BulkTask p, int b, - Fun, ? extends U> transformer, - Action action) { - super(p, b); - this.transformer = transformer; - this.action = action; - } @SuppressWarnings("unchecked") public final boolean exec() { final Fun, ? extends U> transformer = this.transformer; final Action action = this.action; if (transformer == null || action == null) return abortOnNullFunction(); + ForEachTransformedEntryTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit) { do {} while (!casPending(c = pending, c+1)); - new ForEachTransformedEntryTask - (this, b >>>= 1, transformer, action).fork(); + (subtasks = new ForEachTransformedEntryTask + (map, this, b >>>= 1, subtasks, transformer, action)).fork(); } Object v; U u; while ((v = advance()) != null) { if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null) action.apply(u); } - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } } @SuppressWarnings("serial") static final class ForEachTransformedMappingTask - extends BulkTask { + extends BulkAction { final BiFun transformer; final Action action; ForEachTransformedMappingTask - (ConcurrentHashMapV8 m, + (ConcurrentHashMapV8 m, BulkTask p, int b, + ForEachTransformedMappingTask nextTask, BiFun transformer, Action action) { - super(m); + super(m, p, b, nextTask); this.transformer = transformer; this.action = action; } - ForEachTransformedMappingTask - (BulkTask p, int b, - BiFun transformer, - Action action) { - super(p, b); - this.transformer = transformer; - this.action = action; - } @SuppressWarnings("unchecked") public final boolean exec() { final BiFun transformer = this.transformer; final Action action = this.action; if (transformer == null || action == null) return abortOnNullFunction(); + ForEachTransformedMappingTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit) { do {} while (!casPending(c = pending, c+1)); - new ForEachTransformedMappingTask - (this, b >>>= 1, transformer, action).fork(); + (subtasks = new ForEachTransformedMappingTask + (map, this, b >>>= 1, subtasks, transformer, action)).fork(); } Object v; U u; while ((v = advance()) != null) { if ((u = transformer.apply((K)nextKey, (V)v)) != null) action.apply(u); } - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } } @SuppressWarnings("serial") static final class SearchKeysTask - extends BulkTask { + extends BulkAction { final Fun searchFunction; final AtomicReference result; SearchKeysTask - (ConcurrentHashMapV8 m, - Fun searchFunction, - AtomicReference result) { - super(m); - this.searchFunction = searchFunction; this.result = result; - } - SearchKeysTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, + SearchKeysTask nextTask, Fun searchFunction, AtomicReference result) { - super(p, b); + super(m, p, b, nextTask); this.searchFunction = searchFunction; this.result = result; } @SuppressWarnings("unchecked") public final boolean exec() { @@ -5303,12 +5781,13 @@ public class ConcurrentHashMapV8 this.searchFunction; if (searchFunction == null || result == null) return abortOnNullFunction(); + SearchKeysTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit && result.get() == null) { do {} while (!casPending(c = pending, c+1)); - new SearchKeysTask(this, b >>>= 1, - searchFunction, result).fork(); + (subtasks = new SearchKeysTask + (map, this, b >>>= 1, subtasks, searchFunction, result)).fork(); } U u; while (result.get() == null && advance() != null) { @@ -5318,31 +5797,25 @@ public class ConcurrentHashMapV8 break; } } - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } public final U getRawResult() { return result.get(); } } @SuppressWarnings("serial") static final class SearchValuesTask - extends BulkTask { + extends BulkAction { final Fun searchFunction; final AtomicReference result; SearchValuesTask - (ConcurrentHashMapV8 m, + (ConcurrentHashMapV8 m, BulkTask p, int b, + SearchValuesTask nextTask, Fun searchFunction, AtomicReference result) { - super(m); - this.searchFunction = searchFunction; this.result = result; - } - SearchValuesTask - (BulkTask p, int b, - Fun searchFunction, - AtomicReference result) { - super(p, b); + super(m, p, b, nextTask); this.searchFunction = searchFunction; this.result = result; } @SuppressWarnings("unchecked") public final boolean exec() { @@ -5351,12 +5824,13 @@ public class ConcurrentHashMapV8 this.searchFunction; if (searchFunction == null || result == null) return abortOnNullFunction(); + SearchValuesTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit && result.get() == null) { do {} while (!casPending(c = pending, c+1)); - new SearchValuesTask(this, b >>>= 1, - searchFunction, result).fork(); + (subtasks = new SearchValuesTask + (map, this, b >>>= 1, subtasks, searchFunction, result)).fork(); } Object v; U u; while (result.get() == null && (v = advance()) != null) { @@ -5366,31 +5840,25 @@ public class ConcurrentHashMapV8 break; } } - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } public final U getRawResult() { return result.get(); } } @SuppressWarnings("serial") static final class SearchEntriesTask - extends BulkTask { + extends BulkAction { final Fun, ? extends U> searchFunction; final AtomicReference result; SearchEntriesTask - (ConcurrentHashMapV8 m, + (ConcurrentHashMapV8 m, BulkTask p, int b, + SearchEntriesTask nextTask, Fun, ? extends U> searchFunction, AtomicReference result) { - super(m); - this.searchFunction = searchFunction; this.result = result; - } - SearchEntriesTask - (BulkTask p, int b, - Fun, ? extends U> searchFunction, - AtomicReference result) { - super(p, b); + super(m, p, b, nextTask); this.searchFunction = searchFunction; this.result = result; } @SuppressWarnings("unchecked") public final boolean exec() { @@ -5399,12 +5867,13 @@ public class ConcurrentHashMapV8 this.searchFunction; if (searchFunction == null || result == null) return abortOnNullFunction(); + SearchEntriesTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit && result.get() == null) { do {} while (!casPending(c = pending, c+1)); - new SearchEntriesTask(this, b >>>= 1, - searchFunction, result).fork(); + (subtasks = new SearchEntriesTask + (map, this, b >>>= 1, subtasks, searchFunction, result)).fork(); } Object v; U u; while (result.get() == null && (v = advance()) != null) { @@ -5414,31 +5883,25 @@ public class ConcurrentHashMapV8 break; } } - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } public final U getRawResult() { return result.get(); } } @SuppressWarnings("serial") static final class SearchMappingsTask - extends BulkTask { + extends BulkAction { final BiFun searchFunction; final AtomicReference result; SearchMappingsTask - (ConcurrentHashMapV8 m, - BiFun searchFunction, - AtomicReference result) { - super(m); - this.searchFunction = searchFunction; this.result = result; - } - SearchMappingsTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, + SearchMappingsTask nextTask, BiFun searchFunction, AtomicReference result) { - super(p, b); + super(m, p, b, nextTask); this.searchFunction = searchFunction; this.result = result; } @SuppressWarnings("unchecked") public final boolean exec() { @@ -5447,12 +5910,13 @@ public class ConcurrentHashMapV8 this.searchFunction; if (searchFunction == null || result == null) return abortOnNullFunction(); + SearchMappingsTask subtasks = null; try { int b = batch(), c; while (b > 1 && baseIndex != baseLimit && result.get() == null) { do {} while (!casPending(c = pending, c+1)); - new SearchMappingsTask(this, b >>>= 1, - searchFunction, result).fork(); + (subtasks = new SearchMappingsTask + (map, this, b >>>= 1, subtasks, searchFunction, result)).fork(); } Object v; U u; while (result.get() == null && (v = advance()) != null) { @@ -5462,10 +5926,10 @@ public class ConcurrentHashMapV8 break; } } - tryComplete(); } catch (Throwable ex) { return tryCompleteComputation(ex); } + tryComplete(subtasks); return false; } public final U getRawResult() { return result.get(); } @@ -5477,19 +5941,12 @@ public class ConcurrentHashMapV8 K result; ReduceKeysTask rights, nextRight; ReduceKeysTask - (ConcurrentHashMapV8 m, - BiFun reducer) { - super(m); - this.reducer = reducer; - } - ReduceKeysTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, ReduceKeysTask nextRight, BiFun reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { final BiFun reducer = this.reducer; @@ -5499,7 +5956,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new ReduceKeysTask - (this, b >>>= 1, rights, reducer)).fork(); + (map, this, b >>>= 1, rights, reducer)).fork(); } K r = null; while (advance() != null) { @@ -5512,7 +5969,7 @@ public class ConcurrentHashMapV8 if ((c = t.pending) == 0) { for (s = t.rights; s != null; s = t.rights = s.nextRight) { if ((sr = s.result) != null) - t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr); + t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr); } if ((par = t.parent) == null || !(par instanceof ReduceKeysTask)) { @@ -5527,6 +5984,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + ReduceKeysTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final K getRawResult() { return result; } @@ -5538,19 +6002,12 @@ public class ConcurrentHashMapV8 V result; ReduceValuesTask rights, nextRight; ReduceValuesTask - (ConcurrentHashMapV8 m, - BiFun reducer) { - super(m); - this.reducer = reducer; - } - ReduceValuesTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, ReduceValuesTask nextRight, BiFun reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { final BiFun reducer = this.reducer; @@ -5560,7 +6017,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new ReduceValuesTask - (this, b >>>= 1, rights, reducer)).fork(); + (map, this, b >>>= 1, rights, reducer)).fork(); } V r = null; Object v; @@ -5574,7 +6031,7 @@ public class ConcurrentHashMapV8 if ((c = t.pending) == 0) { for (s = t.rights; s != null; s = t.rights = s.nextRight) { if ((sr = s.result) != null) - t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr); + t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr); } if ((par = t.parent) == null || !(par instanceof ReduceValuesTask)) { @@ -5589,6 +6046,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + ReduceValuesTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final V getRawResult() { return result; } @@ -5600,19 +6064,12 @@ public class ConcurrentHashMapV8 Map.Entry result; ReduceEntriesTask rights, nextRight; ReduceEntriesTask - (ConcurrentHashMapV8 m, - BiFun, Map.Entry, ? extends Map.Entry> reducer) { - super(m); - this.reducer = reducer; - } - ReduceEntriesTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, ReduceEntriesTask nextRight, - BiFun, Map.Entry, ? extends Map.Entry> reducer) { - super(p, b); this.nextRight = nextRight; + BiFun, Map.Entry, ? extends Map.Entry> reducer) { + super(m, p, b); this.nextRight = nextRight; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { final BiFun, Map.Entry, ? extends Map.Entry> reducer = this.reducer; @@ -5622,7 +6079,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new ReduceEntriesTask - (this, b >>>= 1, rights, reducer)).fork(); + (map, this, b >>>= 1, rights, reducer)).fork(); } Map.Entry r = null; Object v; @@ -5636,7 +6093,7 @@ public class ConcurrentHashMapV8 if ((c = t.pending) == 0) { for (s = t.rights; s != null; s = t.rights = s.nextRight) { if ((sr = s.result) != null) - t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr); + t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr); } if ((par = t.parent) == null || !(par instanceof ReduceEntriesTask)) { @@ -5651,6 +6108,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + ReduceEntriesTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Map.Entry getRawResult() { return result; } @@ -5663,19 +6127,11 @@ public class ConcurrentHashMapV8 U result; MapReduceKeysTask rights, nextRight; MapReduceKeysTask - (ConcurrentHashMapV8 m, - Fun transformer, - BiFun reducer) { - super(m); - this.transformer = transformer; - this.reducer = reducer; - } - MapReduceKeysTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceKeysTask nextRight, Fun transformer, BiFun reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.reducer = reducer; } @@ -5690,7 +6146,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceKeysTask - (this, b >>>= 1, rights, transformer, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, reducer)).fork(); } U r = null, u; while (advance() != null) { @@ -5703,7 +6159,7 @@ public class ConcurrentHashMapV8 if ((c = t.pending) == 0) { for (s = t.rights; s != null; s = t.rights = s.nextRight) { if ((sr = s.result) != null) - t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr); + t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr); } if ((par = t.parent) == null || !(par instanceof MapReduceKeysTask)) { @@ -5718,6 +6174,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceKeysTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final U getRawResult() { return result; } @@ -5730,19 +6193,11 @@ public class ConcurrentHashMapV8 U result; MapReduceValuesTask rights, nextRight; MapReduceValuesTask - (ConcurrentHashMapV8 m, - Fun transformer, - BiFun reducer) { - super(m); - this.transformer = transformer; - this.reducer = reducer; - } - MapReduceValuesTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceValuesTask nextRight, Fun transformer, BiFun reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.reducer = reducer; } @@ -5757,7 +6212,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceValuesTask - (this, b >>>= 1, rights, transformer, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, reducer)).fork(); } U r = null, u; Object v; @@ -5771,7 +6226,7 @@ public class ConcurrentHashMapV8 if ((c = t.pending) == 0) { for (s = t.rights; s != null; s = t.rights = s.nextRight) { if ((sr = s.result) != null) - t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr); + t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr); } if ((par = t.parent) == null || !(par instanceof MapReduceValuesTask)) { @@ -5786,6 +6241,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceValuesTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final U getRawResult() { return result; } @@ -5798,19 +6260,11 @@ public class ConcurrentHashMapV8 U result; MapReduceEntriesTask rights, nextRight; MapReduceEntriesTask - (ConcurrentHashMapV8 m, - Fun, ? extends U> transformer, - BiFun reducer) { - super(m); - this.transformer = transformer; - this.reducer = reducer; - } - MapReduceEntriesTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceEntriesTask nextRight, Fun, ? extends U> transformer, BiFun reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.reducer = reducer; } @@ -5825,7 +6279,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceEntriesTask - (this, b >>>= 1, rights, transformer, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, reducer)).fork(); } U r = null, u; Object v; @@ -5839,7 +6293,7 @@ public class ConcurrentHashMapV8 if ((c = t.pending) == 0) { for (s = t.rights; s != null; s = t.rights = s.nextRight) { if ((sr = s.result) != null) - t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr); + t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr); } if ((par = t.parent) == null || !(par instanceof MapReduceEntriesTask)) { @@ -5854,6 +6308,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceEntriesTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final U getRawResult() { return result; } @@ -5866,19 +6327,11 @@ public class ConcurrentHashMapV8 U result; MapReduceMappingsTask rights, nextRight; MapReduceMappingsTask - (ConcurrentHashMapV8 m, - BiFun transformer, - BiFun reducer) { - super(m); - this.transformer = transformer; - this.reducer = reducer; - } - MapReduceMappingsTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceMappingsTask nextRight, BiFun transformer, BiFun reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.reducer = reducer; } @@ -5893,7 +6346,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceMappingsTask - (this, b >>>= 1, rights, transformer, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, reducer)).fork(); } U r = null, u; Object v; @@ -5907,7 +6360,7 @@ public class ConcurrentHashMapV8 if ((c = t.pending) == 0) { for (s = t.rights; s != null; s = t.rights = s.nextRight) { if ((sr = s.result) != null) - t.result = (tr = t.result) == null? sr : reducer.apply(tr, sr); + t.result = ((tr = t.result) == null) ? sr : reducer.apply(tr, sr); } if ((par = t.parent) == null || !(par instanceof MapReduceMappingsTask)) { @@ -5922,6 +6375,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceMappingsTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final U getRawResult() { return result; } @@ -5935,21 +6395,12 @@ public class ConcurrentHashMapV8 double result; MapReduceKeysToDoubleTask rights, nextRight; MapReduceKeysToDoubleTask - (ConcurrentHashMapV8 m, - ObjectToDouble transformer, - double basis, - DoubleByDoubleToDouble reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceKeysToDoubleTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceKeysToDoubleTask nextRight, ObjectToDouble transformer, double basis, DoubleByDoubleToDouble reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -5964,7 +6415,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceKeysToDoubleTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } double r = id; while (advance() != null) @@ -5989,6 +6440,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceKeysToDoubleTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Double getRawResult() { return result; } @@ -6002,21 +6460,12 @@ public class ConcurrentHashMapV8 double result; MapReduceValuesToDoubleTask rights, nextRight; MapReduceValuesToDoubleTask - (ConcurrentHashMapV8 m, - ObjectToDouble transformer, - double basis, - DoubleByDoubleToDouble reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceValuesToDoubleTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceValuesToDoubleTask nextRight, ObjectToDouble transformer, double basis, DoubleByDoubleToDouble reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6031,7 +6480,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceValuesToDoubleTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } double r = id; Object v; @@ -6057,6 +6506,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceValuesToDoubleTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Double getRawResult() { return result; } @@ -6070,21 +6526,12 @@ public class ConcurrentHashMapV8 double result; MapReduceEntriesToDoubleTask rights, nextRight; MapReduceEntriesToDoubleTask - (ConcurrentHashMapV8 m, - ObjectToDouble> transformer, - double basis, - DoubleByDoubleToDouble reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceEntriesToDoubleTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceEntriesToDoubleTask nextRight, ObjectToDouble> transformer, double basis, DoubleByDoubleToDouble reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6099,7 +6546,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceEntriesToDoubleTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } double r = id; Object v; @@ -6125,6 +6572,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceEntriesToDoubleTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Double getRawResult() { return result; } @@ -6138,21 +6592,12 @@ public class ConcurrentHashMapV8 double result; MapReduceMappingsToDoubleTask rights, nextRight; MapReduceMappingsToDoubleTask - (ConcurrentHashMapV8 m, - ObjectByObjectToDouble transformer, - double basis, - DoubleByDoubleToDouble reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceMappingsToDoubleTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceMappingsToDoubleTask nextRight, ObjectByObjectToDouble transformer, double basis, DoubleByDoubleToDouble reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6167,7 +6612,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceMappingsToDoubleTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } double r = id; Object v; @@ -6193,6 +6638,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceMappingsToDoubleTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Double getRawResult() { return result; } @@ -6206,21 +6658,12 @@ public class ConcurrentHashMapV8 long result; MapReduceKeysToLongTask rights, nextRight; MapReduceKeysToLongTask - (ConcurrentHashMapV8 m, - ObjectToLong transformer, - long basis, - LongByLongToLong reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceKeysToLongTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceKeysToLongTask nextRight, ObjectToLong transformer, long basis, LongByLongToLong reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6235,7 +6678,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceKeysToLongTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } long r = id; while (advance() != null) @@ -6260,6 +6703,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceKeysToLongTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Long getRawResult() { return result; } @@ -6273,21 +6723,12 @@ public class ConcurrentHashMapV8 long result; MapReduceValuesToLongTask rights, nextRight; MapReduceValuesToLongTask - (ConcurrentHashMapV8 m, - ObjectToLong transformer, - long basis, - LongByLongToLong reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceValuesToLongTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceValuesToLongTask nextRight, ObjectToLong transformer, long basis, LongByLongToLong reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6302,7 +6743,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceValuesToLongTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } long r = id; Object v; @@ -6328,6 +6769,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceValuesToLongTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Long getRawResult() { return result; } @@ -6341,21 +6789,12 @@ public class ConcurrentHashMapV8 long result; MapReduceEntriesToLongTask rights, nextRight; MapReduceEntriesToLongTask - (ConcurrentHashMapV8 m, - ObjectToLong> transformer, - long basis, - LongByLongToLong reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceEntriesToLongTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceEntriesToLongTask nextRight, ObjectToLong> transformer, long basis, LongByLongToLong reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6370,7 +6809,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceEntriesToLongTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } long r = id; Object v; @@ -6396,6 +6835,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceEntriesToLongTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Long getRawResult() { return result; } @@ -6409,21 +6855,12 @@ public class ConcurrentHashMapV8 long result; MapReduceMappingsToLongTask rights, nextRight; MapReduceMappingsToLongTask - (ConcurrentHashMapV8 m, - ObjectByObjectToLong transformer, - long basis, - LongByLongToLong reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceMappingsToLongTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceMappingsToLongTask nextRight, ObjectByObjectToLong transformer, long basis, LongByLongToLong reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6438,7 +6875,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceMappingsToLongTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } long r = id; Object v; @@ -6464,6 +6901,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceMappingsToLongTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Long getRawResult() { return result; } @@ -6477,21 +6921,12 @@ public class ConcurrentHashMapV8 int result; MapReduceKeysToIntTask rights, nextRight; MapReduceKeysToIntTask - (ConcurrentHashMapV8 m, - ObjectToInt transformer, - int basis, - IntByIntToInt reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceKeysToIntTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceKeysToIntTask nextRight, ObjectToInt transformer, int basis, IntByIntToInt reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6506,7 +6941,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceKeysToIntTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } int r = id; while (advance() != null) @@ -6531,6 +6966,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceKeysToIntTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Integer getRawResult() { return result; } @@ -6544,21 +6986,12 @@ public class ConcurrentHashMapV8 int result; MapReduceValuesToIntTask rights, nextRight; MapReduceValuesToIntTask - (ConcurrentHashMapV8 m, - ObjectToInt transformer, - int basis, - IntByIntToInt reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceValuesToIntTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceValuesToIntTask nextRight, ObjectToInt transformer, int basis, IntByIntToInt reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6573,7 +7006,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceValuesToIntTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } int r = id; Object v; @@ -6599,6 +7032,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceValuesToIntTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Integer getRawResult() { return result; } @@ -6612,21 +7052,12 @@ public class ConcurrentHashMapV8 int result; MapReduceEntriesToIntTask rights, nextRight; MapReduceEntriesToIntTask - (ConcurrentHashMapV8 m, - ObjectToInt> transformer, - int basis, - IntByIntToInt reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceEntriesToIntTask - (BulkTask p, int b, + (ConcurrentHashMapV8 m, BulkTask p, int b, MapReduceEntriesToIntTask nextRight, ObjectToInt> transformer, int basis, IntByIntToInt reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6641,7 +7072,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceEntriesToIntTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } int r = id; Object v; @@ -6667,6 +7098,13 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceEntriesToIntTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Integer getRawResult() { return result; } @@ -6680,21 +7118,12 @@ public class ConcurrentHashMapV8 int result; MapReduceMappingsToIntTask rights, nextRight; MapReduceMappingsToIntTask - (ConcurrentHashMapV8 m, + (ConcurrentHashMapV8 m, BulkTask p, int b, + MapReduceMappingsToIntTask rights, ObjectByObjectToInt transformer, int basis, IntByIntToInt reducer) { - super(m); - this.transformer = transformer; - this.basis = basis; this.reducer = reducer; - } - MapReduceMappingsToIntTask - (BulkTask p, int b, - MapReduceMappingsToIntTask nextRight, - ObjectByObjectToInt transformer, - int basis, - IntByIntToInt reducer) { - super(p, b); this.nextRight = nextRight; + super(m, p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } @@ -6709,7 +7138,7 @@ public class ConcurrentHashMapV8 for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { do {} while (!casPending(c = pending, c+1)); (rights = new MapReduceMappingsToIntTask - (this, b >>>= 1, rights, transformer, id, reducer)).fork(); + (map, this, b >>>= 1, rights, transformer, id, reducer)).fork(); } int r = id; Object v; @@ -6735,12 +7164,18 @@ public class ConcurrentHashMapV8 } catch (Throwable ex) { return tryCompleteComputation(ex); } + MapReduceMappingsToIntTask s = rights; + if (s != null && !inForkJoinPool()) { + do { + if (s.tryUnfork()) + s.exec(); + } while ((s = s.nextRight) != null); + } return false; } public final Integer getRawResult() { return result; } } - // Unsafe mechanics private static final sun.misc.Unsafe UNSAFE; private static final long counterOffset;