--- jsr166/src/jsr166e/ConcurrentHashMapV8.java 2012/08/13 18:15:39 1.54 +++ jsr166/src/jsr166e/ConcurrentHashMapV8.java 2012/09/13 10:41:37 1.61 @@ -47,19 +47,22 @@ import java.io.Serializable; * block, so may overlap with update operations (including {@code put} * and {@code remove}). Retrievals reflect the results of the most * recently completed update operations holding upon their - * onset. For aggregate operations such as {@code putAll} and {@code - * clear}, concurrent retrievals may reflect insertion or removal of - * only some entries. Similarly, Iterators and Enumerations return - * elements reflecting the state of the hash table at some point at or - * since the creation of the iterator/enumeration. They do - * not throw {@link ConcurrentModificationException}. - * However, iterators are designed to be used by only one thread at a - * time. Bear in mind that the results of aggregate status methods - * including {@code size}, {@code isEmpty}, and {@code containsValue} - * are typically useful only when a map is not undergoing concurrent - * updates in other threads. Otherwise the results of these methods - * reflect transient states that may be adequate for monitoring - * or estimation purposes, but not for program control. + * onset. (More formally, an update operation for a given key bears a + * happens-before relation with any (non-null) retrieval for + * that key reporting the updated value.) For aggregate operations + * such as {@code putAll} and {@code clear}, concurrent retrievals may + * reflect insertion or removal of only some entries. Similarly, + * Iterators and Enumerations return elements reflecting the state of + * the hash table at some point at or since the creation of the + * iterator/enumeration. They do not throw {@link + * ConcurrentModificationException}. However, iterators are designed + * to be used by only one thread at a time. Bear in mind that the + * results of aggregate status methods including {@code size}, {@code + * isEmpty}, and {@code containsValue} are typically useful only when + * a map is not undergoing concurrent updates in other threads. + * Otherwise the results of these methods reflect transient states + * that may be adequate for monitoring or estimation purposes, but not + * for program control. * *

The table is dynamically expanded when there are too many * collisions (i.e., keys that have distinct hash codes but fall into @@ -537,9 +540,13 @@ public class ConcurrentHashMapV8 * unlocking lock (via a failed CAS from non-waiting LOCKED * state), unlockers acquire the sync lock and perform a * notifyAll. + * + * The initial sanity check on tab and bounds is not currently + * necessary in the only usages of this method, but enables + * use in other future contexts. */ final void tryAwaitLock(Node[] tab, int i) { - if (tab != null && i >= 0 && i < tab.length) { // bounds check + if (tab != null && i >= 0 && i < tab.length) { // sanity check int r = ThreadLocalRandom.current().nextInt(); // randomize spins int spins = MAX_SPINS, h; while (tabAt(tab, i) == this && ((h = hash) & LOCKED) != 0) { @@ -712,11 +719,11 @@ public class ConcurrentHashMapV8 } /** - * Return the TreeNode (or null if not found) for the given key + * Returns the TreeNode (or null if not found) for the given key * starting at given root. */ - @SuppressWarnings("unchecked") // suppress Comparable cast warning - final TreeNode getTreeNode(int h, Object k, TreeNode p) { + @SuppressWarnings("unchecked") final TreeNode getTreeNode + (int h, Object k, TreeNode p) { Class c = k.getClass(); while (p != null) { int dir, ph; Object pk; Class pc; @@ -776,8 +783,8 @@ public class ConcurrentHashMapV8 * Finds or adds a node. * @return null if added */ - @SuppressWarnings("unchecked") // suppress Comparable cast warning - final TreeNode putTreeNode(int h, Object k, Object v) { + @SuppressWarnings("unchecked") final TreeNode putTreeNode + (int h, Object k, Object v) { Class c = k.getClass(); TreeNode pp = root, p = null; int dir = 0; @@ -1204,7 +1211,7 @@ public class ConcurrentHashMapV8 } /* - * Internal versions of the five insertion methods, each a + * Internal versions of the six insertion methods, each a * little more complicated than the last. All have * the same basic structure as the first (internalPut): * 1. If table uninitialized, create @@ -1222,6 +1229,8 @@ public class ConcurrentHashMapV8 * returns from function call. * * compute uses the same function-call mechanics, but without * the prescans + * * merge acts as putIfAbsent in the absent case, but invokes the + * update function if present * * putAll attempts to pre-allocate enough table space * and more lazily performs count updates and checks. * @@ -1545,9 +1554,8 @@ public class ConcurrentHashMapV8 } /** Implementation for compute */ - @SuppressWarnings("unchecked") - private final Object internalCompute(K k, boolean onlyIfPresent, - BiFun mf) { + @SuppressWarnings("unchecked") private final Object internalCompute + (K k, boolean onlyIfPresent, BiFun mf) { int h = spread(k.hashCode()); Object val = null; int delta = 0; @@ -1670,8 +1678,9 @@ public class ConcurrentHashMapV8 return val; } - private final Object internalMerge(K k, V v, - BiFun mf) { + /** Implementation for merge */ + @SuppressWarnings("unchecked") private final Object internalMerge + (K k, V v, BiFun mf) { int h = spread(k.hashCode()); Object val = null; int delta = 0; @@ -2001,7 +2010,7 @@ public class ConcurrentHashMapV8 for (int i = bin;;) { // start upwards sweep int fh; Node f; if ((f = tabAt(tab, i)) == null) { - if (bin >= 0) { // no lock needed (or available) + if (bin >= 0) { // Unbuffered; no lock needed (or available) if (!casTabAt(tab, i, f, fwd)) continue; } @@ -2177,8 +2186,10 @@ public class ConcurrentHashMapV8 try { if (tabAt(tab, i) == f) { for (Node p = t.first; p != null; p = p.next) { - p.val = null; - --delta; + if (p.val != null) { // (currently always true) + p.val = null; + --delta; + } } t.first = null; t.root = null; @@ -2200,8 +2211,10 @@ public class ConcurrentHashMapV8 try { if (tabAt(tab, i) == f) { for (Node e = f; e != null; e = e.next) { - e.val = null; - --delta; + if (e.val != null) { // (currently always true) + e.val = null; + --delta; + } } setTabAt(tab, i, null); ++i; @@ -2222,7 +2235,7 @@ public class ConcurrentHashMapV8 /** * Encapsulates traversal for methods such as containsValue; also - * serves as a base class for other iterators. + * serves as a base class for other iterators and bulk tasks. * * At each step, the iterator snapshots the key ("nextKey") and * value ("nextVal") of a valid node (i.e., one that, at point of @@ -2260,9 +2273,11 @@ public class ConcurrentHashMapV8 * This class extends ForkJoinTask to streamline parallel * iteration in bulk operations (see BulkTask). This adds only an * int of space overhead, which is close enough to negligible in - * cases where it is not needed to not worry about it. + * cases where it is not needed to not worry about it. Because + * ForkJoinTask is Serializable, but iterators need not be, we + * need to add warning suppressions. */ - static class Traverser extends ForkJoinTask { + @SuppressWarnings("serial") static class Traverser extends ForkJoinTask { final ConcurrentHashMapV8 map; Node next; // the next entry to use Node last; // the last entry used @@ -2281,18 +2296,12 @@ public class ConcurrentHashMapV8 } /** Creates iterator for split() methods */ - Traverser(Traverser it, boolean split) { + Traverser(Traverser it) { this.map = it.map; this.tab = it.tab; this.baseSize = it.baseSize; - int lo = it.baseIndex; - int hi = this.baseLimit = it.baseLimit; - int i; - if (split) // adjust parent - i = it.baseLimit = (lo + hi + 1) >>> 1; - else // clone parent - i = lo; - this.index = this.baseIndex = i; + it.baseLimit = this.index = this.baseIndex = + ((this.baseLimit = it.baseLimit) + it.baseIndex + 1) >>> 1; } /** @@ -2327,7 +2336,7 @@ public class ConcurrentHashMapV8 } public final void remove() { - if (nextVal == null) + if (nextVal == null && last == null) advance(); Node e = last; if (e == null) @@ -2458,13 +2467,13 @@ public class ConcurrentHashMapV8 * instead of {@link #size} because a ConcurrentHashMap 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 of removals. + * there are ongoing concurrent insertions or removals. * * @return the number of mappings */ public long mappingCount() { long n = counter.sum(); - return (n < 0L) ? 0L : n; + return (n < 0L) ? 0L : n; // ignore transient negative values } /** @@ -2478,8 +2487,7 @@ public class ConcurrentHashMapV8 * * @throws NullPointerException if the specified key is null */ - @SuppressWarnings("unchecked") - public V get(Object key) { + @SuppressWarnings("unchecked") public V get(Object key) { if (key == null) throw new NullPointerException(); return (V)internalGet(key); @@ -2554,8 +2562,7 @@ public class ConcurrentHashMapV8 * {@code null} if there was no mapping for {@code key} * @throws NullPointerException if the specified key or value is null */ - @SuppressWarnings("unchecked") - public V put(K key, V value) { + @SuppressWarnings("unchecked") public V put(K key, V value) { if (key == null || value == null) throw new NullPointerException(); return (V)internalPut(key, value); @@ -2568,8 +2575,7 @@ public class ConcurrentHashMapV8 * or {@code null} if there was no mapping for the key * @throws NullPointerException if the specified key or value is null */ - @SuppressWarnings("unchecked") - public V putIfAbsent(K key, V value) { + @SuppressWarnings("unchecked") public V putIfAbsent(K key, V value) { if (key == null || value == null) throw new NullPointerException(); return (V)internalPutIfAbsent(key, value); @@ -2625,8 +2631,8 @@ public class ConcurrentHashMapV8 * @throws RuntimeException or Error if the mappingFunction does so, * in which case the mapping is left unestablished */ - @SuppressWarnings("unchecked") - public V computeIfAbsent(K key, Fun mappingFunction) { + @SuppressWarnings("unchecked") public V computeIfAbsent + (K key, Fun mappingFunction) { if (key == null || mappingFunction == null) throw new NullPointerException(); return (V)internalComputeIfAbsent(key, mappingFunction); @@ -2657,8 +2663,7 @@ public class ConcurrentHashMapV8 * * @param key key with which the specified value is to be associated * @param remappingFunction the function to compute a value - * @return the new value associated with - * the specified key, or null if none. + * @return the new value associated with the specified key, or null if none * @throws NullPointerException if the specified key or remappingFunction * is null * @throws IllegalStateException if the computation detectably @@ -2667,7 +2672,8 @@ public class ConcurrentHashMapV8 * @throws RuntimeException or Error if the remappingFunction does so, * in which case the mapping is unchanged */ - public V computeIfPresent(K key, BiFun remappingFunction) { + @SuppressWarnings("unchecked") public V computeIfPresent + (K key, BiFun remappingFunction) { if (key == null || remappingFunction == null) throw new NullPointerException(); return (V)internalCompute(key, true, remappingFunction); @@ -2704,8 +2710,7 @@ public class ConcurrentHashMapV8 * * @param key key with which the specified value is to be associated * @param remappingFunction the function to compute a value - * @return the new value associated with - * the specified key, or null if none. + * @return the new value associated with the specified key, or null if none * @throws NullPointerException if the specified key or remappingFunction * is null * @throws IllegalStateException if the computation detectably @@ -2714,8 +2719,8 @@ public class ConcurrentHashMapV8 * @throws RuntimeException or Error if the remappingFunction does so, * in which case the mapping is unchanged */ - // @SuppressWarnings("unchecked") - public V compute(K key, BiFun remappingFunction) { + @SuppressWarnings("unchecked") public V compute + (K key, BiFun remappingFunction) { if (key == null || remappingFunction == null) throw new NullPointerException(); return (V)internalCompute(key, false, remappingFunction); @@ -2746,8 +2751,8 @@ public class ConcurrentHashMapV8 * so the computation should be short and simple, and must not * attempt to update any other mappings of this Map. */ - // @SuppressWarnings("unchecked") - public V merge(K key, V value, BiFun remappingFunction) { + @SuppressWarnings("unchecked") public V merge + (K key, V value, BiFun remappingFunction) { if (key == null || value == null || remappingFunction == null) throw new NullPointerException(); return (V)internalMerge(key, value, remappingFunction); @@ -2762,8 +2767,7 @@ public class ConcurrentHashMapV8 * {@code null} if there was no mapping for {@code key} * @throws NullPointerException if the specified key is null */ - @SuppressWarnings("unchecked") - public V remove(Object key) { + @SuppressWarnings("unchecked") public V remove(Object key) { if (key == null) throw new NullPointerException(); return (V)internalReplace(key, null, null); @@ -2800,8 +2804,7 @@ public class ConcurrentHashMapV8 * or {@code null} if there was no mapping for the key * @throws NullPointerException if the specified key or value is null */ - @SuppressWarnings("unchecked") - public V replace(K key, V value) { + @SuppressWarnings("unchecked") public V replace(K key, V value) { if (key == null || value == null) throw new NullPointerException(); return (V)internalReplace(key, value, null); @@ -2898,27 +2901,27 @@ public class ConcurrentHashMapV8 } /** - * Returns a partionable iterator of the keys in this map. + * Returns a partitionable iterator of the keys in this map. * - * @return a partionable iterator of the keys in this map + * @return a partitionable iterator of the keys in this map */ public Spliterator keySpliterator() { return new KeyIterator(this); } /** - * Returns a partionable iterator of the values in this map. + * Returns a partitionable iterator of the values in this map. * - * @return a partionable iterator of the values in this map + * @return a partitionable iterator of the values in this map */ public Spliterator valueSpliterator() { return new ValueIterator(this); } /** - * Returns a partionable iterator of the entries in this map. + * Returns a partitionable iterator of the entries in this map. * - * @return a partionable iterator of the entries in this map + * @return a partitionable iterator of the entries in this map */ public Spliterator> entrySpliterator() { return new EntryIterator(this); @@ -3007,19 +3010,18 @@ public class ConcurrentHashMapV8 /* ----------------Iterators -------------- */ - static final class KeyIterator extends Traverser + @SuppressWarnings("serial") static final class KeyIterator extends Traverser implements Spliterator, Enumeration { KeyIterator(ConcurrentHashMapV8 map) { super(map); } - KeyIterator(Traverser it, boolean split) { - super(it, split); + KeyIterator(Traverser it) { + super(it); } public KeyIterator split() { if (last != null || (next != null && nextVal == null)) throw new IllegalStateException(); - return new KeyIterator(this, true); + return new KeyIterator(this); } - @SuppressWarnings("unchecked") - public final K next() { + @SuppressWarnings("unchecked") public final K next() { if (nextVal == null && advance() == null) throw new NoSuchElementException(); Object k = nextKey; @@ -3030,20 +3032,19 @@ public class ConcurrentHashMapV8 public final K nextElement() { return next(); } } - static final class ValueIterator extends Traverser + @SuppressWarnings("serial") static final class ValueIterator extends Traverser implements Spliterator, Enumeration { ValueIterator(ConcurrentHashMapV8 map) { super(map); } - ValueIterator(Traverser it, boolean split) { - super(it, split); + ValueIterator(Traverser it) { + super(it); } public ValueIterator split() { if (last != null || (next != null && nextVal == null)) throw new IllegalStateException(); - return new ValueIterator(this, true); + return new ValueIterator(this); } - @SuppressWarnings("unchecked") - public final V next() { + @SuppressWarnings("unchecked") public final V next() { Object v; if ((v = nextVal) == null && (v = advance()) == null) throw new NoSuchElementException(); @@ -3054,20 +3055,19 @@ public class ConcurrentHashMapV8 public final V nextElement() { return next(); } } - static final class EntryIterator extends Traverser + @SuppressWarnings("serial") static final class EntryIterator extends Traverser implements Spliterator> { EntryIterator(ConcurrentHashMapV8 map) { super(map); } - EntryIterator(Traverser it, boolean split) { - super(it, split); + EntryIterator(Traverser it) { + super(it); } public EntryIterator split() { if (last != null || (next != null && nextVal == null)) throw new IllegalStateException(); - return new EntryIterator(this, true); + return new EntryIterator(this); } - @SuppressWarnings("unchecked") - public final Map.Entry next() { + @SuppressWarnings("unchecked") public final Map.Entry next() { Object v; if ((v = nextVal) == null && (v = advance()) == null) throw new NoSuchElementException(); @@ -3162,8 +3162,7 @@ public class ConcurrentHashMapV8 return (i == n) ? r : Arrays.copyOf(r, i); } - @SuppressWarnings("unchecked") - public final T[] toArray(T[] a) { + @SuppressWarnings("unchecked") public final T[] toArray(T[] a) { long sz = map.mappingCount(); if (sz > (long)(MAX_ARRAY_SIZE)) throw new OutOfMemoryError(oomeMsg); @@ -3359,8 +3358,7 @@ public class ConcurrentHashMapV8 * for each key-value mapping, followed by a null pair. * The key-value mappings are emitted in no particular order. */ - @SuppressWarnings("unchecked") - private void writeObject(java.io.ObjectOutputStream s) + @SuppressWarnings("unchecked") private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException { if (segments == null) { // for serialization compatibility segments = (Segment[]) @@ -3384,8 +3382,7 @@ public class ConcurrentHashMapV8 * Reconstitutes the instance from a stream (that is, deserializes it). * @param s the stream */ - @SuppressWarnings("unchecked") - private void readObject(java.io.ObjectInputStream s) + @SuppressWarnings("unchecked") private void readObject(java.io.ObjectInputStream s) throws java.io.IOException, ClassNotFoundException { s.defaultReadObject(); this.segments = null; // unneeded @@ -3658,10 +3655,10 @@ public class ConcurrentHashMapV8 /** * Returns a non-null result from applying the given search - * function on each (key, value), or null if none. Further - * element processing is suppressed upon success. However, - * this method does not return until other in-progress - * parallel invocations of the search function also complete. + * 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 @@ -3720,8 +3717,7 @@ public class ConcurrentHashMapV8 * @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 using the given reducer to - * combine values, and the given basis as an identity value. + * of all (key, value) pairs */ public long reduceToLong(ObjectByObjectToLong transformer, long basis, @@ -3750,7 +3746,7 @@ public class ConcurrentHashMapV8 } /** - * Performs the given action for each key + * Performs the given action for each key. * * @param action the action */ @@ -3761,7 +3757,7 @@ public class ConcurrentHashMapV8 /** * Performs the given action for each non-null transformation - * of each key + * of each key. * * @param transformer a function returning the transformation * for an element, or null of there is no transformation (in @@ -3776,10 +3772,10 @@ public class ConcurrentHashMapV8 /** * Returns a non-null result from applying the given search - * function on each key, or null if none. Further element - * processing is suppressed upon success. However, this method - * does not return until other in-progress parallel - * invocations of the search function also complete. + * 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 @@ -3880,7 +3876,7 @@ public class ConcurrentHashMapV8 } /** - * Performs the given action for each value + * Performs the given action for each value. * * @param action the action */ @@ -3891,7 +3887,7 @@ public class ConcurrentHashMapV8 /** * Performs the given action for each non-null transformation - * of each value + * of each value. * * @param transformer a function returning the transformation * for an element, or null of there is no transformation (in @@ -3905,10 +3901,10 @@ public class ConcurrentHashMapV8 /** * Returns a non-null result from applying the given search - * function on each value, or null if none. Further element - * processing is suppressed upon success. However, this method - * does not return until other in-progress parallel - * invocations of the search function also complete. + * 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 @@ -4009,7 +4005,7 @@ public class ConcurrentHashMapV8 } /** - * Perform the given action for each entry + * Performs the given action for each entry. * * @param action the action */ @@ -4019,8 +4015,8 @@ public class ConcurrentHashMapV8 } /** - * Perform the given action for each non-null transformation - * of each entry + * 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 @@ -4035,10 +4031,10 @@ public class ConcurrentHashMapV8 /** * Returns a non-null result from applying the given search - * function on each entry, or null if none. Further element - * processing is suppressed upon success. However, this method - * does not return until other in-progress parallel - * invocations of the search function also complete. + * 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 @@ -4188,12 +4184,11 @@ public class ConcurrentHashMapV8 } /** - * Returns a task that when invoked, returns a non-null - * result from applying the given search function on each - * (key, value), or null if none. Further element processing - * is suppressed upon success. However, this method does not - * return until other in-progress parallel invocations of the - * search function also complete. + * Returns a task that when invoked, 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 map the map * @param searchFunction a function returning a non-null @@ -4304,7 +4299,7 @@ public class ConcurrentHashMapV8 /** * Returns a task that when invoked, performs the given action - * for each key + * for each key. * * @param map the map * @param action the action @@ -4319,7 +4314,7 @@ public class ConcurrentHashMapV8 /** * Returns a task that when invoked, performs the given action - * for each non-null transformation of each key + * for each non-null transformation of each key. * * @param map the map * @param transformer a function returning the transformation @@ -4341,10 +4336,9 @@ public class ConcurrentHashMapV8 /** * Returns a task that when invoked, returns a non-null result * from applying the given search function on each key, or - * null if none. Further element processing is suppressed - * upon success. However, this method does not return until - * other in-progress parallel invocations of the search - * function also complete. + * 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 map the map * @param searchFunction a function returning a non-null @@ -4376,6 +4370,7 @@ public class ConcurrentHashMapV8 return new ReduceKeysTask (map, reducer); } + /** * Returns a task that when invoked, returns the result of * accumulating the given transformation of all keys using the given @@ -4472,7 +4467,7 @@ public class ConcurrentHashMapV8 /** * Returns a task that when invoked, performs the given action - * for each value + * for each value. * * @param map the map * @param action the action @@ -4486,7 +4481,7 @@ public class ConcurrentHashMapV8 /** * Returns a task that when invoked, performs the given action - * for each non-null transformation of each value + * for each non-null transformation of each value. * * @param map the map * @param transformer a function returning the transformation @@ -4507,10 +4502,9 @@ public class ConcurrentHashMapV8 /** * Returns a task that when invoked, returns a non-null result * from applying the given search function on each value, or - * null if none. Further element processing is suppressed - * upon success. However, this method does not return until - * other in-progress parallel invocations of the search - * function also complete. + * 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 map the map * @param searchFunction a function returning a non-null @@ -4640,7 +4634,7 @@ public class ConcurrentHashMapV8 /** * Returns a task that when invoked, perform the given action - * for each entry + * for each entry. * * @param map the map * @param action the action @@ -4654,7 +4648,7 @@ public class ConcurrentHashMapV8 /** * Returns a task that when invoked, perform the given action - * for each non-null transformation of each entry + * for each non-null transformation of each entry. * * @param map the map * @param transformer a function returning the transformation @@ -4675,10 +4669,9 @@ public class ConcurrentHashMapV8 /** * Returns a task that when invoked, returns a non-null result * from applying the given search function on each entry, or - * null if none. Further element processing is suppressed - * upon success. However, this method does not return until - * other in-progress parallel invocations of the search - * function also complete. + * 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 map the map * @param searchFunction a function returning a non-null @@ -4811,7 +4804,7 @@ public class ConcurrentHashMapV8 /** * Base for FJ tasks for bulk operations. This adds a variant of - * CountedCompleters and some split and merge bookeeping to + * CountedCompleters and some split and merge bookkeeping to * iterator functionality. The forEach and reduce methods are * similar to those illustrated in CountedCompleter documentation, * except that bottom-up reduction completions perform them within @@ -4820,7 +4813,7 @@ public class ConcurrentHashMapV8 * exceptions are handled in a simpler manner, by just trying to * complete root task exceptionally. */ - static abstract class BulkTask extends Traverser { + @SuppressWarnings("serial") static abstract class BulkTask extends Traverser { final BulkTask parent; // completion target int batch; // split control int pending; // completion control @@ -4833,8 +4826,8 @@ public class ConcurrentHashMapV8 } /** Constructor for subtasks */ - BulkTask(BulkTask parent, int batch, boolean split) { - super(parent, split); + BulkTask(BulkTask parent, int batch) { + super(parent); this.parent = parent; this.batch = batch; } @@ -4842,7 +4835,7 @@ public class ConcurrentHashMapV8 // FJ methods /** - * Propagate completion. Note that all reduce actions + * Propagates completion. Note that all reduce actions * bypass this method to combine while completing. */ final void tryComplete() { @@ -4860,31 +4853,31 @@ public class ConcurrentHashMapV8 } /** - * Force root task to throw exception unless already complete. + * Forces root task to complete. + * @param ex if null, complete normally, else exceptionally + * @return false to simplify use */ - final void tryAbortComputation(Throwable ex) { + final boolean tryCompleteComputation(Throwable ex) { for (BulkTask a = this;;) { BulkTask p = a.parent; if (p == null) { - a.completeExceptionally(ex); - break; + if (ex != null) + a.completeExceptionally(ex); + else + a.quietlyComplete(); + return false; } a = p; } } - public final boolean exec() { - try { - compute(); - } - catch (Throwable ex) { - tryAbortComputation(ex); - } - return false; + /** + * Version of tryCompleteComputation for function screening checks + */ + final boolean abortOnNullFunction() { + return tryCompleteComputation(new Error("Unexpected null function")); } - public abstract void compute(); - // utilities /** CompareAndSet pending count */ @@ -4893,7 +4886,7 @@ public class ConcurrentHashMapV8 } /** - * Return approx exp2 of the number of times (minus one) to + * Returns approx exp2 of the number of times (minus one) to * split task by two before executing leaf action. This value * is faster to compute and more convenient to use as a guide * to splitting than is the depth, since it is used while @@ -4910,16 +4903,10 @@ public class ConcurrentHashMapV8 } /** - * Error message for hoisted null checks of functions - */ - static final String NullFunctionMessage = - "Unexpected null function"; - - /** - * Return exportable snapshot entry + * Returns exportable snapshot entry. */ static AbstractMap.SimpleEntry entryFor(K k, V v) { - return new AbstractMap.SimpleEntry(k, v); + return new AbstractMap.SimpleEntry(k, v); } // Unsafe mechanics @@ -4927,7 +4914,7 @@ public class ConcurrentHashMapV8 private static final long PENDING; static { try { - U = sun.misc.Unsafe.getUnsafe(); + U = getUnsafe(); PENDING = U.objectFieldOffset (BulkTask.class.getDeclaredField("pending")); } catch (Exception e) { @@ -4942,7 +4929,7 @@ public class ConcurrentHashMapV8 * others. */ - static final class ForEachKeyTask + @SuppressWarnings("serial") static final class ForEachKeyTask extends BulkTask { final Action action; ForEachKeyTask @@ -4952,27 +4939,32 @@ public class ConcurrentHashMapV8 this.action = action; } ForEachKeyTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, Action action) { - super(p, b, split); + super(p, b); this.action = action; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { final Action action = this.action; if (action == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - new ForEachKeyTask(this, b >>>= 1, true, action).fork(); + return abortOnNullFunction(); + try { + int b = batch(), c; + while (b > 1 && baseIndex != baseLimit) { + do {} while (!casPending(c = pending, c+1)); + new ForEachKeyTask(this, b >>>= 1, action).fork(); + } + while (advance() != null) + action.apply((K)nextKey); + tryComplete(); + } catch (Throwable ex) { + return tryCompleteComputation(ex); } - while (advance() != null) - action.apply((K)nextKey); - tryComplete(); + return false; } } - static final class ForEachValueTask + @SuppressWarnings("serial") static final class ForEachValueTask extends BulkTask { final Action action; ForEachValueTask @@ -4982,28 +4974,33 @@ public class ConcurrentHashMapV8 this.action = action; } ForEachValueTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, Action action) { - super(p, b, split); + super(p, b); this.action = action; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { final Action action = this.action; if (action == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - new ForEachValueTask(this, b >>>= 1, true, action).fork(); + return abortOnNullFunction(); + try { + int b = batch(), c; + while (b > 1 && baseIndex != baseLimit) { + do {} while (!casPending(c = pending, c+1)); + new ForEachValueTask(this, b >>>= 1, action).fork(); + } + Object v; + while ((v = advance()) != null) + action.apply((V)v); + tryComplete(); + } catch (Throwable ex) { + return tryCompleteComputation(ex); } - Object v; - while ((v = advance()) != null) - action.apply((V)v); - tryComplete(); + return false; } } - static final class ForEachEntryTask + @SuppressWarnings("serial") static final class ForEachEntryTask extends BulkTask { final Action> action; ForEachEntryTask @@ -5013,28 +5010,33 @@ public class ConcurrentHashMapV8 this.action = action; } ForEachEntryTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, Action> action) { - super(p, b, split); + super(p, b); this.action = action; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { final Action> action = this.action; if (action == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - new ForEachEntryTask(this, b >>>= 1, true, action).fork(); + return abortOnNullFunction(); + try { + int b = batch(), c; + while (b > 1 && baseIndex != baseLimit) { + do {} while (!casPending(c = pending, c+1)); + new ForEachEntryTask(this, b >>>= 1, action).fork(); + } + Object v; + while ((v = advance()) != null) + action.apply(entryFor((K)nextKey, (V)v)); + tryComplete(); + } catch (Throwable ex) { + return tryCompleteComputation(ex); } - Object v; - while ((v = advance()) != null) - action.apply(entryFor((K)nextKey, (V)v)); - tryComplete(); + return false; } } - static final class ForEachMappingTask + @SuppressWarnings("serial") static final class ForEachMappingTask extends BulkTask { final BiAction action; ForEachMappingTask @@ -5044,30 +5046,35 @@ public class ConcurrentHashMapV8 this.action = action; } ForEachMappingTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, BiAction action) { - super(p, b, split); + super(p, b); this.action = action; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { final BiAction action = this.action; if (action == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - new ForEachMappingTask(this, b >>>= 1, true, - action).fork(); + return abortOnNullFunction(); + try { + int b = batch(), c; + while (b > 1 && baseIndex != baseLimit) { + do {} while (!casPending(c = pending, c+1)); + new ForEachMappingTask(this, b >>>= 1, + action).fork(); + } + Object v; + while ((v = advance()) != null) + action.apply((K)nextKey, (V)v); + tryComplete(); + } catch (Throwable ex) { + return tryCompleteComputation(ex); } - Object v; - while ((v = advance()) != null) - action.apply((K)nextKey, (V)v); - tryComplete(); + return false; } } - static final class ForEachTransformedKeyTask + @SuppressWarnings("serial") static final class ForEachTransformedKeyTask extends BulkTask { final Fun transformer; final Action action; @@ -5081,35 +5088,40 @@ public class ConcurrentHashMapV8 } ForEachTransformedKeyTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, Fun transformer, Action action) { - super(p, b, split); + super(p, b); this.transformer = transformer; this.action = action; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { final Fun transformer = this.transformer; final Action action = this.action; if (transformer == null || action == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - new ForEachTransformedKeyTask - (this, b >>>= 1, true, transformer, action).fork(); - } - U u; - while (advance() != null) { - if ((u = transformer.apply((K)nextKey)) != null) - action.apply(u); + return abortOnNullFunction(); + 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(); + } + U u; + while (advance() != null) { + if ((u = transformer.apply((K)nextKey)) != null) + action.apply(u); + } + tryComplete(); + } catch (Throwable ex) { + return tryCompleteComputation(ex); } - tryComplete(); + return false; } } - static final class ForEachTransformedValueTask + @SuppressWarnings("serial") static final class ForEachTransformedValueTask extends BulkTask { final Fun transformer; final Action action; @@ -5123,35 +5135,40 @@ public class ConcurrentHashMapV8 } ForEachTransformedValueTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, Fun transformer, Action action) { - super(p, b, split); + super(p, b); this.transformer = transformer; this.action = action; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { final Fun transformer = this.transformer; final Action action = this.action; if (transformer == null || action == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - new ForEachTransformedValueTask - (this, b >>>= 1, true, transformer, action).fork(); - } - Object v; U u; - while ((v = advance()) != null) { - if ((u = transformer.apply((V)v)) != null) - action.apply(u); + return abortOnNullFunction(); + 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(); + } + 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(); + return false; } } - static final class ForEachTransformedEntryTask + @SuppressWarnings("serial") static final class ForEachTransformedEntryTask extends BulkTask { final Fun, ? extends U> transformer; final Action action; @@ -5165,35 +5182,40 @@ public class ConcurrentHashMapV8 } ForEachTransformedEntryTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, Fun, ? extends U> transformer, Action action) { - super(p, b, split); + super(p, b); this.transformer = transformer; this.action = action; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { final Fun, ? extends U> transformer = this.transformer; final Action action = this.action; if (transformer == null || action == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - new ForEachTransformedEntryTask - (this, b >>>= 1, true, transformer, action).fork(); - } - Object v; U u; - while ((v = advance()) != null) { - if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null) - action.apply(u); + return abortOnNullFunction(); + 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(); + } + 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(); + return false; } } - static final class ForEachTransformedMappingTask + @SuppressWarnings("serial") static final class ForEachTransformedMappingTask extends BulkTask { final BiFun transformer; final Action action; @@ -5207,35 +5229,40 @@ public class ConcurrentHashMapV8 } ForEachTransformedMappingTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, BiFun transformer, Action action) { - super(p, b, split); + super(p, b); this.transformer = transformer; this.action = action; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { final BiFun transformer = this.transformer; final Action action = this.action; if (transformer == null || action == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - new ForEachTransformedMappingTask - (this, b >>>= 1, true, transformer, action).fork(); - } - Object v; U u; - while ((v = advance()) != null) { - if ((u = transformer.apply((K)nextKey, (V)v)) != null) - action.apply(u); + return abortOnNullFunction(); + 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(); + } + 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(); + return false; } } - static final class SearchKeysTask + @SuppressWarnings("serial") static final class SearchKeysTask extends BulkTask { final Fun searchFunction; final AtomicReference result; @@ -5247,37 +5274,43 @@ public class ConcurrentHashMapV8 this.searchFunction = searchFunction; this.result = result; } SearchKeysTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, Fun searchFunction, AtomicReference result) { - super(p, b, split); + super(p, b); this.searchFunction = searchFunction; this.result = result; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { AtomicReference result = this.result; final Fun searchFunction = this.searchFunction; if (searchFunction == null || result == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit && result.get() == null) { - do {} while (!casPending(c = pending, c+1)); - new SearchKeysTask(this, b >>>= 1, true, - searchFunction, result).fork(); - } - U u; - while (result.get() == null && advance() != null) { - if ((u = searchFunction.apply((K)nextKey)) != null) { - result.compareAndSet(null, u); - break; + return abortOnNullFunction(); + 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(); } + U u; + while (result.get() == null && advance() != null) { + if ((u = searchFunction.apply((K)nextKey)) != null) { + if (result.compareAndSet(null, u)) + tryCompleteComputation(null); + break; + } + } + tryComplete(); + } catch (Throwable ex) { + return tryCompleteComputation(ex); } - tryComplete(); + return false; } public final U getRawResult() { return result.get(); } } - static final class SearchValuesTask + @SuppressWarnings("serial") static final class SearchValuesTask extends BulkTask { final Fun searchFunction; final AtomicReference result; @@ -5289,37 +5322,43 @@ public class ConcurrentHashMapV8 this.searchFunction = searchFunction; this.result = result; } SearchValuesTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, Fun searchFunction, AtomicReference result) { - super(p, b, split); + super(p, b); this.searchFunction = searchFunction; this.result = result; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { AtomicReference result = this.result; final Fun searchFunction = this.searchFunction; if (searchFunction == null || result == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit && result.get() == null) { - do {} while (!casPending(c = pending, c+1)); - new SearchValuesTask(this, b >>>= 1, true, - searchFunction, result).fork(); - } - Object v; U u; - while (result.get() == null && (v = advance()) != null) { - if ((u = searchFunction.apply((V)v)) != null) { - result.compareAndSet(null, u); - break; + return abortOnNullFunction(); + 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(); + } + Object v; U u; + while (result.get() == null && (v = advance()) != null) { + if ((u = searchFunction.apply((V)v)) != null) { + if (result.compareAndSet(null, u)) + tryCompleteComputation(null); + break; + } } + tryComplete(); + } catch (Throwable ex) { + return tryCompleteComputation(ex); } - tryComplete(); + return false; } public final U getRawResult() { return result.get(); } } - static final class SearchEntriesTask + @SuppressWarnings("serial") static final class SearchEntriesTask extends BulkTask { final Fun, ? extends U> searchFunction; final AtomicReference result; @@ -5331,37 +5370,43 @@ public class ConcurrentHashMapV8 this.searchFunction = searchFunction; this.result = result; } SearchEntriesTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, Fun, ? extends U> searchFunction, AtomicReference result) { - super(p, b, split); + super(p, b); this.searchFunction = searchFunction; this.result = result; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { AtomicReference result = this.result; final Fun, ? extends U> searchFunction = this.searchFunction; if (searchFunction == null || result == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit && result.get() == null) { - do {} while (!casPending(c = pending, c+1)); - new SearchEntriesTask(this, b >>>= 1, true, - searchFunction, result).fork(); - } - Object v; U u; - while (result.get() == null && (v = advance()) != null) { - if ((u = searchFunction.apply(entryFor((K)nextKey, (V)v))) != null) { - result.compareAndSet(null, u); - break; + return abortOnNullFunction(); + 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(); + } + Object v; U u; + while (result.get() == null && (v = advance()) != null) { + if ((u = searchFunction.apply(entryFor((K)nextKey, (V)v))) != null) { + if (result.compareAndSet(null, u)) + tryCompleteComputation(null); + break; + } } + tryComplete(); + } catch (Throwable ex) { + return tryCompleteComputation(ex); } - tryComplete(); + return false; } public final U getRawResult() { return result.get(); } } - static final class SearchMappingsTask + @SuppressWarnings("serial") static final class SearchMappingsTask extends BulkTask { final BiFun searchFunction; final AtomicReference result; @@ -5373,41 +5418,47 @@ public class ConcurrentHashMapV8 this.searchFunction = searchFunction; this.result = result; } SearchMappingsTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, BiFun searchFunction, AtomicReference result) { - super(p, b, split); + super(p, b); this.searchFunction = searchFunction; this.result = result; } - public final void compute() { + @SuppressWarnings("unchecked") public final boolean exec() { AtomicReference result = this.result; final BiFun searchFunction = this.searchFunction; if (searchFunction == null || result == null) - throw new Error(NullFunctionMessage); - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit && result.get() == null) { - do {} while (!casPending(c = pending, c+1)); - new SearchMappingsTask(this, b >>>= 1, true, - searchFunction, result).fork(); - } - Object v; U u; - while (result.get() == null && (v = advance()) != null) { - if ((u = searchFunction.apply((K)nextKey, (V)v)) != null) { - result.compareAndSet(null, u); - break; + return abortOnNullFunction(); + 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(); + } + Object v; U u; + while (result.get() == null && (v = advance()) != null) { + if ((u = searchFunction.apply((K)nextKey, (V)v)) != null) { + if (result.compareAndSet(null, u)) + tryCompleteComputation(null); + break; + } } + tryComplete(); + } catch (Throwable ex) { + return tryCompleteComputation(ex); } - tryComplete(); + return false; } public final U getRawResult() { return result.get(); } } - static final class ReduceKeysTask + @SuppressWarnings("serial") static final class ReduceKeysTask extends BulkTask { final BiFun reducer; K result; - ReduceKeysTask sibling; + ReduceKeysTask rights, nextRight; ReduceKeysTask (ConcurrentHashMapV8 m, BiFun reducer) { @@ -5415,61 +5466,60 @@ public class ConcurrentHashMapV8 this.reducer = reducer; } ReduceKeysTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + ReduceKeysTask nextRight, BiFun reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.reducer = reducer; } - public final void compute() { - ReduceKeysTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final BiFun reducer = this.reducer; if (reducer == null) - throw new Error(NullFunctionMessage); - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - ReduceKeysTask rt = - new ReduceKeysTask - (t, b, true, reducer); - t = new ReduceKeysTask - (t, b, false, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - K r = null; - while (t.advance() != null) { - K u = (K)t.nextKey; - r = (r == null) ? u : reducer.apply(r, u); - } - t.result = r; - for (;;) { - int c; BulkTask par; ReduceKeysTask s, p; K u; - if ((par = t.parent) == null || - !(par instanceof ReduceKeysTask)) { - t.quietlyComplete(); - break; + return abortOnNullFunction(); + try { + 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(); + } + K r = null; + while (advance() != null) { + K u = (K)nextKey; + r = (r == null) ? u : reducer.apply(r, u); } - else if ((c = (p = (ReduceKeysTask)par).pending) == 0) { - if ((s = t.sibling) != null && (u = s.result) != null) - r = (r == null) ? u : reducer.apply(r, u); - (t = p).result = r; + result = r; + for (ReduceKeysTask t = this, s;;) { + int c; BulkTask par; K tr, sr; + 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); + } + if ((par = t.parent) == null || + !(par instanceof ReduceKeysTask)) { + t.quietlyComplete(); + break; + } + t = (ReduceKeysTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final K getRawResult() { return result; } } - static final class ReduceValuesTask + @SuppressWarnings("serial") static final class ReduceValuesTask extends BulkTask { final BiFun reducer; V result; - ReduceValuesTask sibling; + ReduceValuesTask rights, nextRight; ReduceValuesTask (ConcurrentHashMapV8 m, BiFun reducer) { @@ -5477,62 +5527,61 @@ public class ConcurrentHashMapV8 this.reducer = reducer; } ReduceValuesTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + ReduceValuesTask nextRight, BiFun reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.reducer = reducer; } - public final void compute() { - ReduceValuesTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final BiFun reducer = this.reducer; if (reducer == null) - throw new Error(NullFunctionMessage); - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - ReduceValuesTask rt = - new ReduceValuesTask - (t, b, true, reducer); - t = new ReduceValuesTask - (t, b, false, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - V r = null; - Object v; - while ((v = t.advance()) != null) { - V u = (V)v; - r = (r == null) ? u : reducer.apply(r, u); - } - t.result = r; - for (;;) { - int c; BulkTask par; ReduceValuesTask s, p; V u; - if ((par = t.parent) == null || - !(par instanceof ReduceValuesTask)) { - t.quietlyComplete(); - break; + return abortOnNullFunction(); + try { + 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(); + } + V r = null; + Object v; + while ((v = advance()) != null) { + V u = (V)v; + r = (r == null) ? u : reducer.apply(r, u); } - else if ((c = (p = (ReduceValuesTask)par).pending) == 0) { - if ((s = t.sibling) != null && (u = s.result) != null) - r = (r == null) ? u : reducer.apply(r, u); - (t = p).result = r; + result = r; + for (ReduceValuesTask t = this, s;;) { + int c; BulkTask par; V tr, sr; + 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); + } + if ((par = t.parent) == null || + !(par instanceof ReduceValuesTask)) { + t.quietlyComplete(); + break; + } + t = (ReduceValuesTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final V getRawResult() { return result; } } - static final class ReduceEntriesTask + @SuppressWarnings("serial") static final class ReduceEntriesTask extends BulkTask> { final BiFun, Map.Entry, ? extends Map.Entry> reducer; Map.Entry result; - ReduceEntriesTask sibling; + ReduceEntriesTask rights, nextRight; ReduceEntriesTask (ConcurrentHashMapV8 m, BiFun, Map.Entry, ? extends Map.Entry> reducer) { @@ -5540,64 +5589,62 @@ public class ConcurrentHashMapV8 this.reducer = reducer; } ReduceEntriesTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + ReduceEntriesTask nextRight, BiFun, Map.Entry, ? extends Map.Entry> reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.reducer = reducer; } - public final void compute() { - ReduceEntriesTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final BiFun, Map.Entry, ? extends Map.Entry> reducer = this.reducer; if (reducer == null) - throw new Error(NullFunctionMessage); - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - ReduceEntriesTask rt = - new ReduceEntriesTask - (t, b, true, reducer); - t = new ReduceEntriesTask - (t, b, false, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - Map.Entry r = null; - Object v; - while ((v = t.advance()) != null) { - Map.Entry u = entryFor((K)t.nextKey, (V)v); - r = (r == null) ? u : reducer.apply(r, u); - } - t.result = r; - for (;;) { - int c; BulkTask par; ReduceEntriesTask s, p; - Map.Entry u; - if ((par = t.parent) == null || - !(par instanceof ReduceEntriesTask)) { - t.quietlyComplete(); - break; + return abortOnNullFunction(); + try { + 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.Entry r = null; + Object v; + while ((v = advance()) != null) { + Map.Entry u = entryFor((K)nextKey, (V)v); + r = (r == null) ? u : reducer.apply(r, u); } - else if ((c = (p = (ReduceEntriesTask)par).pending) == 0) { - if ((s = t.sibling) != null && (u = s.result) != null) - r = (r == null) ? u : reducer.apply(r, u); - (t = p).result = r; + result = r; + for (ReduceEntriesTask t = this, s;;) { + int c; BulkTask par; Map.Entry tr, sr; + 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); + } + if ((par = t.parent) == null || + !(par instanceof ReduceEntriesTask)) { + t.quietlyComplete(); + break; + } + t = (ReduceEntriesTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Map.Entry getRawResult() { return result; } } - static final class MapReduceKeysTask + @SuppressWarnings("serial") static final class MapReduceKeysTask extends BulkTask { final Fun transformer; final BiFun reducer; U result; - MapReduceKeysTask sibling; + MapReduceKeysTask rights, nextRight; MapReduceKeysTask (ConcurrentHashMapV8 m, Fun transformer, @@ -5607,65 +5654,64 @@ public class ConcurrentHashMapV8 this.reducer = reducer; } MapReduceKeysTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceKeysTask nextRight, Fun transformer, BiFun reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.reducer = reducer; } - public final void compute() { - MapReduceKeysTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final Fun transformer = this.transformer; final BiFun reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceKeysTask rt = - new MapReduceKeysTask - (t, b, true, transformer, reducer); - t = new MapReduceKeysTask - (t, b, false, transformer, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - U r = null, u; - while (t.advance() != null) { - if ((u = transformer.apply((K)t.nextKey)) != null) - r = (r == null) ? u : reducer.apply(r, u); - } - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceKeysTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceKeysTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceKeysTask)par).pending) == 0) { - if ((s = t.sibling) != null && (u = s.result) != null) + return abortOnNullFunction(); + try { + 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(); + } + U r = null, u; + while (advance() != null) { + if ((u = transformer.apply((K)nextKey)) != null) r = (r == null) ? u : reducer.apply(r, u); - (t = p).result = r; } - else if (p.casPending(c, 0)) - break; + result = r; + for (MapReduceKeysTask t = this, s;;) { + int c; BulkTask par; U tr, sr; + 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); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceKeysTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceKeysTask)par; + } + else if (t.casPending(c, c - 1)) + break; + } + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final U getRawResult() { return result; } } - static final class MapReduceValuesTask + @SuppressWarnings("serial") static final class MapReduceValuesTask extends BulkTask { final Fun transformer; final BiFun reducer; U result; - MapReduceValuesTask sibling; + MapReduceValuesTask rights, nextRight; MapReduceValuesTask (ConcurrentHashMapV8 m, Fun transformer, @@ -5675,66 +5721,65 @@ public class ConcurrentHashMapV8 this.reducer = reducer; } MapReduceValuesTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceValuesTask nextRight, Fun transformer, BiFun reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.reducer = reducer; } - public final void compute() { - MapReduceValuesTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final Fun transformer = this.transformer; final BiFun reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceValuesTask rt = - new MapReduceValuesTask - (t, b, true, transformer, reducer); - t = new MapReduceValuesTask - (t, b, false, transformer, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - U r = null, u; - Object v; - while ((v = t.advance()) != null) { - if ((u = transformer.apply((V)v)) != null) - r = (r == null) ? u : reducer.apply(r, u); - } - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceValuesTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceValuesTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceValuesTask)par).pending) == 0) { - if ((s = t.sibling) != null && (u = s.result) != null) + return abortOnNullFunction(); + try { + 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(); + } + U r = null, u; + Object v; + while ((v = advance()) != null) { + if ((u = transformer.apply((V)v)) != null) r = (r == null) ? u : reducer.apply(r, u); - (t = p).result = r; } - else if (p.casPending(c, 0)) - break; + result = r; + for (MapReduceValuesTask t = this, s;;) { + int c; BulkTask par; U tr, sr; + 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); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceValuesTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceValuesTask)par; + } + else if (t.casPending(c, c - 1)) + break; + } + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final U getRawResult() { return result; } } - static final class MapReduceEntriesTask + @SuppressWarnings("serial") static final class MapReduceEntriesTask extends BulkTask { final Fun, ? extends U> transformer; final BiFun reducer; U result; - MapReduceEntriesTask sibling; + MapReduceEntriesTask rights, nextRight; MapReduceEntriesTask (ConcurrentHashMapV8 m, Fun, ? extends U> transformer, @@ -5744,66 +5789,65 @@ public class ConcurrentHashMapV8 this.reducer = reducer; } MapReduceEntriesTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceEntriesTask nextRight, Fun, ? extends U> transformer, BiFun reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.reducer = reducer; } - public final void compute() { - MapReduceEntriesTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final Fun, ? extends U> transformer = this.transformer; final BiFun reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceEntriesTask rt = - new MapReduceEntriesTask - (t, b, true, transformer, reducer); - t = new MapReduceEntriesTask - (t, b, false, transformer, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - U r = null, u; - Object v; - while ((v = t.advance()) != null) { - if ((u = transformer.apply(entryFor((K)t.nextKey, (V)v))) != null) - r = (r == null) ? u : reducer.apply(r, u); - } - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceEntriesTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceEntriesTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceEntriesTask)par).pending) == 0) { - if ((s = t.sibling) != null && (u = s.result) != null) + return abortOnNullFunction(); + try { + 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(); + } + U r = null, u; + Object v; + while ((v = advance()) != null) { + if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null) r = (r == null) ? u : reducer.apply(r, u); - (t = p).result = r; } - else if (p.casPending(c, 0)) - break; + result = r; + for (MapReduceEntriesTask t = this, s;;) { + int c; BulkTask par; U tr, sr; + 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); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceEntriesTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceEntriesTask)par; + } + else if (t.casPending(c, c - 1)) + break; + } + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final U getRawResult() { return result; } } - static final class MapReduceMappingsTask + @SuppressWarnings("serial") static final class MapReduceMappingsTask extends BulkTask { final BiFun transformer; final BiFun reducer; U result; - MapReduceMappingsTask sibling; + MapReduceMappingsTask rights, nextRight; MapReduceMappingsTask (ConcurrentHashMapV8 m, BiFun transformer, @@ -5813,66 +5857,66 @@ public class ConcurrentHashMapV8 this.reducer = reducer; } MapReduceMappingsTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceMappingsTask nextRight, BiFun transformer, BiFun reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.reducer = reducer; } - public final void compute() { - MapReduceMappingsTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final BiFun transformer = this.transformer; final BiFun reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceMappingsTask rt = - new MapReduceMappingsTask - (t, b, true, transformer, reducer); - t = new MapReduceMappingsTask - (t, b, false, transformer, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - U r = null, u; - Object v; - while ((v = t.advance()) != null) { - if ((u = transformer.apply((K)t.nextKey, (V)v)) != null) - r = (r == null) ? u : reducer.apply(r, u); - } - for (;;) { - int c; BulkTask par; MapReduceMappingsTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceMappingsTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceMappingsTask)par).pending) == 0) { - if ((s = t.sibling) != null && (u = s.result) != null) + return abortOnNullFunction(); + try { + 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(); + } + U r = null, u; + Object v; + while ((v = advance()) != null) { + if ((u = transformer.apply((K)nextKey, (V)v)) != null) r = (r == null) ? u : reducer.apply(r, u); - (t = p).result = r; } - else if (p.casPending(c, 0)) - break; + result = r; + for (MapReduceMappingsTask t = this, s;;) { + int c; BulkTask par; U tr, sr; + 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); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceMappingsTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceMappingsTask)par; + } + else if (t.casPending(c, c - 1)) + break; + } + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final U getRawResult() { return result; } } - static final class MapReduceKeysToDoubleTask + @SuppressWarnings("serial") static final class MapReduceKeysToDoubleTask extends BulkTask { final ObjectToDouble transformer; final DoubleByDoubleToDouble reducer; final double basis; double result; - MapReduceKeysToDoubleTask sibling; + MapReduceKeysToDoubleTask rights, nextRight; MapReduceKeysToDoubleTask (ConcurrentHashMapV8 m, ObjectToDouble transformer, @@ -5883,65 +5927,63 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceKeysToDoubleTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceKeysToDoubleTask nextRight, ObjectToDouble transformer, double basis, DoubleByDoubleToDouble reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceKeysToDoubleTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectToDouble transformer = this.transformer; final DoubleByDoubleToDouble reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final double id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceKeysToDoubleTask rt = - new MapReduceKeysToDoubleTask - (t, b, true, transformer, id, reducer); - t = new MapReduceKeysToDoubleTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - double r = id; - while (t.advance() != null) - r = reducer.apply(r, transformer.apply((K)t.nextKey)); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceKeysToDoubleTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceKeysToDoubleTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceKeysToDoubleTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final double id = this.basis; + 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(); + } + double r = id; + while (advance() != null) + r = reducer.apply(r, transformer.apply((K)nextKey)); + result = r; + for (MapReduceKeysToDoubleTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceKeysToDoubleTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceKeysToDoubleTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Double getRawResult() { return result; } } - static final class MapReduceValuesToDoubleTask + @SuppressWarnings("serial") static final class MapReduceValuesToDoubleTask extends BulkTask { final ObjectToDouble transformer; final DoubleByDoubleToDouble reducer; final double basis; double result; - MapReduceValuesToDoubleTask sibling; + MapReduceValuesToDoubleTask rights, nextRight; MapReduceValuesToDoubleTask (ConcurrentHashMapV8 m, ObjectToDouble transformer, @@ -5952,66 +5994,64 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceValuesToDoubleTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceValuesToDoubleTask nextRight, ObjectToDouble transformer, double basis, DoubleByDoubleToDouble reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceValuesToDoubleTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectToDouble transformer = this.transformer; final DoubleByDoubleToDouble reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final double id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceValuesToDoubleTask rt = - new MapReduceValuesToDoubleTask - (t, b, true, transformer, id, reducer); - t = new MapReduceValuesToDoubleTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - double r = id; - Object v; - while ((v = t.advance()) != null) - r = reducer.apply(r, transformer.apply((V)v)); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceValuesToDoubleTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceValuesToDoubleTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceValuesToDoubleTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final double id = this.basis; + 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(); + } + double r = id; + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((V)v)); + result = r; + for (MapReduceValuesToDoubleTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceValuesToDoubleTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceValuesToDoubleTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Double getRawResult() { return result; } } - static final class MapReduceEntriesToDoubleTask + @SuppressWarnings("serial") static final class MapReduceEntriesToDoubleTask extends BulkTask { final ObjectToDouble> transformer; final DoubleByDoubleToDouble reducer; final double basis; double result; - MapReduceEntriesToDoubleTask sibling; + MapReduceEntriesToDoubleTask rights, nextRight; MapReduceEntriesToDoubleTask (ConcurrentHashMapV8 m, ObjectToDouble> transformer, @@ -6022,66 +6062,64 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceEntriesToDoubleTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceEntriesToDoubleTask nextRight, ObjectToDouble> transformer, double basis, DoubleByDoubleToDouble reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceEntriesToDoubleTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectToDouble> transformer = this.transformer; final DoubleByDoubleToDouble reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final double id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceEntriesToDoubleTask rt = - new MapReduceEntriesToDoubleTask - (t, b, true, transformer, id, reducer); - t = new MapReduceEntriesToDoubleTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - double r = id; - Object v; - while ((v = t.advance()) != null) - r = reducer.apply(r, transformer.apply(entryFor((K)t.nextKey, (V)v))); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceEntriesToDoubleTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceEntriesToDoubleTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceEntriesToDoubleTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final double id = this.basis; + 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(); + } + double r = id; + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v))); + result = r; + for (MapReduceEntriesToDoubleTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceEntriesToDoubleTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceEntriesToDoubleTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Double getRawResult() { return result; } } - static final class MapReduceMappingsToDoubleTask + @SuppressWarnings("serial") static final class MapReduceMappingsToDoubleTask extends BulkTask { final ObjectByObjectToDouble transformer; final DoubleByDoubleToDouble reducer; final double basis; double result; - MapReduceMappingsToDoubleTask sibling; + MapReduceMappingsToDoubleTask rights, nextRight; MapReduceMappingsToDoubleTask (ConcurrentHashMapV8 m, ObjectByObjectToDouble transformer, @@ -6092,66 +6130,64 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceMappingsToDoubleTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceMappingsToDoubleTask nextRight, ObjectByObjectToDouble transformer, double basis, DoubleByDoubleToDouble reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceMappingsToDoubleTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectByObjectToDouble transformer = this.transformer; final DoubleByDoubleToDouble reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final double id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceMappingsToDoubleTask rt = - new MapReduceMappingsToDoubleTask - (t, b, true, transformer, id, reducer); - t = new MapReduceMappingsToDoubleTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - double r = id; - Object v; - while ((v = t.advance()) != null) - r = reducer.apply(r, transformer.apply((K)t.nextKey, (V)v)); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceMappingsToDoubleTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceMappingsToDoubleTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceMappingsToDoubleTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final double id = this.basis; + 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(); + } + double r = id; + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((K)nextKey, (V)v)); + result = r; + for (MapReduceMappingsToDoubleTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceMappingsToDoubleTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceMappingsToDoubleTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Double getRawResult() { return result; } } - static final class MapReduceKeysToLongTask + @SuppressWarnings("serial") static final class MapReduceKeysToLongTask extends BulkTask { final ObjectToLong transformer; final LongByLongToLong reducer; final long basis; long result; - MapReduceKeysToLongTask sibling; + MapReduceKeysToLongTask rights, nextRight; MapReduceKeysToLongTask (ConcurrentHashMapV8 m, ObjectToLong transformer, @@ -6162,65 +6198,63 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceKeysToLongTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceKeysToLongTask nextRight, ObjectToLong transformer, long basis, LongByLongToLong reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceKeysToLongTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectToLong transformer = this.transformer; final LongByLongToLong reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final long id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceKeysToLongTask rt = - new MapReduceKeysToLongTask - (t, b, true, transformer, id, reducer); - t = new MapReduceKeysToLongTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - long r = id; - while (t.advance() != null) - r = reducer.apply(r, transformer.apply((K)t.nextKey)); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceKeysToLongTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceKeysToLongTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceKeysToLongTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final long id = this.basis; + 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(); + } + long r = id; + while (advance() != null) + r = reducer.apply(r, transformer.apply((K)nextKey)); + result = r; + for (MapReduceKeysToLongTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceKeysToLongTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceKeysToLongTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Long getRawResult() { return result; } } - static final class MapReduceValuesToLongTask + @SuppressWarnings("serial") static final class MapReduceValuesToLongTask extends BulkTask { final ObjectToLong transformer; final LongByLongToLong reducer; final long basis; long result; - MapReduceValuesToLongTask sibling; + MapReduceValuesToLongTask rights, nextRight; MapReduceValuesToLongTask (ConcurrentHashMapV8 m, ObjectToLong transformer, @@ -6231,66 +6265,64 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceValuesToLongTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceValuesToLongTask nextRight, ObjectToLong transformer, long basis, LongByLongToLong reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceValuesToLongTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectToLong transformer = this.transformer; final LongByLongToLong reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final long id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceValuesToLongTask rt = - new MapReduceValuesToLongTask - (t, b, true, transformer, id, reducer); - t = new MapReduceValuesToLongTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - long r = id; - Object v; - while ((v = t.advance()) != null) - r = reducer.apply(r, transformer.apply((V)v)); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceValuesToLongTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceValuesToLongTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceValuesToLongTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final long id = this.basis; + 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(); + } + long r = id; + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((V)v)); + result = r; + for (MapReduceValuesToLongTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceValuesToLongTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceValuesToLongTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Long getRawResult() { return result; } } - static final class MapReduceEntriesToLongTask + @SuppressWarnings("serial") static final class MapReduceEntriesToLongTask extends BulkTask { final ObjectToLong> transformer; final LongByLongToLong reducer; final long basis; long result; - MapReduceEntriesToLongTask sibling; + MapReduceEntriesToLongTask rights, nextRight; MapReduceEntriesToLongTask (ConcurrentHashMapV8 m, ObjectToLong> transformer, @@ -6301,66 +6333,64 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceEntriesToLongTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceEntriesToLongTask nextRight, ObjectToLong> transformer, long basis, LongByLongToLong reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceEntriesToLongTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectToLong> transformer = this.transformer; final LongByLongToLong reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final long id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceEntriesToLongTask rt = - new MapReduceEntriesToLongTask - (t, b, true, transformer, id, reducer); - t = new MapReduceEntriesToLongTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - long r = id; - Object v; - while ((v = t.advance()) != null) - r = reducer.apply(r, transformer.apply(entryFor((K)t.nextKey, (V)v))); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceEntriesToLongTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceEntriesToLongTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceEntriesToLongTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final long id = this.basis; + 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(); + } + long r = id; + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v))); + result = r; + for (MapReduceEntriesToLongTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceEntriesToLongTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceEntriesToLongTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Long getRawResult() { return result; } } - static final class MapReduceMappingsToLongTask + @SuppressWarnings("serial") static final class MapReduceMappingsToLongTask extends BulkTask { final ObjectByObjectToLong transformer; final LongByLongToLong reducer; final long basis; long result; - MapReduceMappingsToLongTask sibling; + MapReduceMappingsToLongTask rights, nextRight; MapReduceMappingsToLongTask (ConcurrentHashMapV8 m, ObjectByObjectToLong transformer, @@ -6371,66 +6401,64 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceMappingsToLongTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceMappingsToLongTask nextRight, ObjectByObjectToLong transformer, long basis, LongByLongToLong reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceMappingsToLongTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectByObjectToLong transformer = this.transformer; final LongByLongToLong reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final long id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceMappingsToLongTask rt = - new MapReduceMappingsToLongTask - (t, b, true, transformer, id, reducer); - t = new MapReduceMappingsToLongTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - long r = id; - Object v; - while ((v = t.advance()) != null) - r = reducer.apply(r, transformer.apply((K)t.nextKey, (V)v)); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceMappingsToLongTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceMappingsToLongTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceMappingsToLongTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final long id = this.basis; + 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(); + } + long r = id; + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((K)nextKey, (V)v)); + result = r; + for (MapReduceMappingsToLongTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceMappingsToLongTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceMappingsToLongTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Long getRawResult() { return result; } } - static final class MapReduceKeysToIntTask + @SuppressWarnings("serial") static final class MapReduceKeysToIntTask extends BulkTask { final ObjectToInt transformer; final IntByIntToInt reducer; final int basis; int result; - MapReduceKeysToIntTask sibling; + MapReduceKeysToIntTask rights, nextRight; MapReduceKeysToIntTask (ConcurrentHashMapV8 m, ObjectToInt transformer, @@ -6441,65 +6469,63 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceKeysToIntTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceKeysToIntTask nextRight, ObjectToInt transformer, int basis, IntByIntToInt reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceKeysToIntTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectToInt transformer = this.transformer; final IntByIntToInt reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final int id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceKeysToIntTask rt = - new MapReduceKeysToIntTask - (t, b, true, transformer, id, reducer); - t = new MapReduceKeysToIntTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - int r = id; - while (t.advance() != null) - r = reducer.apply(r, transformer.apply((K)t.nextKey)); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceKeysToIntTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceKeysToIntTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceKeysToIntTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final int id = this.basis; + 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(); + } + int r = id; + while (advance() != null) + r = reducer.apply(r, transformer.apply((K)nextKey)); + result = r; + for (MapReduceKeysToIntTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceKeysToIntTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceKeysToIntTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Integer getRawResult() { return result; } } - static final class MapReduceValuesToIntTask + @SuppressWarnings("serial") static final class MapReduceValuesToIntTask extends BulkTask { final ObjectToInt transformer; final IntByIntToInt reducer; final int basis; int result; - MapReduceValuesToIntTask sibling; + MapReduceValuesToIntTask rights, nextRight; MapReduceValuesToIntTask (ConcurrentHashMapV8 m, ObjectToInt transformer, @@ -6510,66 +6536,64 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceValuesToIntTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceValuesToIntTask nextRight, ObjectToInt transformer, int basis, IntByIntToInt reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceValuesToIntTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectToInt transformer = this.transformer; final IntByIntToInt reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final int id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceValuesToIntTask rt = - new MapReduceValuesToIntTask - (t, b, true, transformer, id, reducer); - t = new MapReduceValuesToIntTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - int r = id; - Object v; - while ((v = t.advance()) != null) - r = reducer.apply(r, transformer.apply((V)v)); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceValuesToIntTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceValuesToIntTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceValuesToIntTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final int id = this.basis; + 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(); + } + int r = id; + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((V)v)); + result = r; + for (MapReduceValuesToIntTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceValuesToIntTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceValuesToIntTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Integer getRawResult() { return result; } } - static final class MapReduceEntriesToIntTask + @SuppressWarnings("serial") static final class MapReduceEntriesToIntTask extends BulkTask { final ObjectToInt> transformer; final IntByIntToInt reducer; final int basis; int result; - MapReduceEntriesToIntTask sibling; + MapReduceEntriesToIntTask rights, nextRight; MapReduceEntriesToIntTask (ConcurrentHashMapV8 m, ObjectToInt> transformer, @@ -6580,66 +6604,64 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceEntriesToIntTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceEntriesToIntTask nextRight, ObjectToInt> transformer, int basis, IntByIntToInt reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceEntriesToIntTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectToInt> transformer = this.transformer; final IntByIntToInt reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final int id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceEntriesToIntTask rt = - new MapReduceEntriesToIntTask - (t, b, true, transformer, id, reducer); - t = new MapReduceEntriesToIntTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - int r = id; - Object v; - while ((v = t.advance()) != null) - r = reducer.apply(r, transformer.apply(entryFor((K)t.nextKey, (V)v))); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceEntriesToIntTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceEntriesToIntTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceEntriesToIntTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final int id = this.basis; + 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(); + } + int r = id; + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v))); + result = r; + for (MapReduceEntriesToIntTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceEntriesToIntTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceEntriesToIntTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Integer getRawResult() { return result; } } - static final class MapReduceMappingsToIntTask + @SuppressWarnings("serial") static final class MapReduceMappingsToIntTask extends BulkTask { final ObjectByObjectToInt transformer; final IntByIntToInt reducer; final int basis; int result; - MapReduceMappingsToIntTask sibling; + MapReduceMappingsToIntTask rights, nextRight; MapReduceMappingsToIntTask (ConcurrentHashMapV8 m, ObjectByObjectToInt transformer, @@ -6650,55 +6672,53 @@ public class ConcurrentHashMapV8 this.basis = basis; this.reducer = reducer; } MapReduceMappingsToIntTask - (BulkTask p, int b, boolean split, + (BulkTask p, int b, + MapReduceMappingsToIntTask nextRight, ObjectByObjectToInt transformer, int basis, IntByIntToInt reducer) { - super(p, b, split); + super(p, b); this.nextRight = nextRight; this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - public final void compute() { - MapReduceMappingsToIntTask t = this; + @SuppressWarnings("unchecked") public final boolean exec() { final ObjectByObjectToInt transformer = this.transformer; final IntByIntToInt reducer = this.reducer; if (transformer == null || reducer == null) - throw new Error(NullFunctionMessage); - final int id = this.basis; - int b = batch(); - while (b > 1 && t.baseIndex != t.baseLimit) { - b >>>= 1; - t.pending = 1; - MapReduceMappingsToIntTask rt = - new MapReduceMappingsToIntTask - (t, b, true, transformer, id, reducer); - t = new MapReduceMappingsToIntTask - (t, b, false, transformer, id, reducer); - t.sibling = rt; - rt.sibling = t; - rt.fork(); - } - int r = id; - Object v; - while ((v = t.advance()) != null) - r = reducer.apply(r, transformer.apply((K)t.nextKey, (V)v)); - t.result = r; - for (;;) { - int c; BulkTask par; MapReduceMappingsToIntTask s, p; - if ((par = t.parent) == null || - !(par instanceof MapReduceMappingsToIntTask)) { - t.quietlyComplete(); - break; - } - else if ((c = (p = (MapReduceMappingsToIntTask)par).pending) == 0) { - if ((s = t.sibling) != null) - r = reducer.apply(r, s.result); - (t = p).result = r; + return abortOnNullFunction(); + try { + final int id = this.basis; + 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(); + } + int r = id; + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((K)nextKey, (V)v)); + result = r; + for (MapReduceMappingsToIntTask t = this, s;;) { + int c; BulkTask par; + if ((c = t.pending) == 0) { + for (s = t.rights; s != null; s = t.rights = s.nextRight) { + t.result = reducer.apply(t.result, s.result); + } + if ((par = t.parent) == null || + !(par instanceof MapReduceMappingsToIntTask)) { + t.quietlyComplete(); + break; + } + t = (MapReduceMappingsToIntTask)par; + } + else if (t.casPending(c, c - 1)) + break; } - else if (p.casPending(c, 0)) - break; + } catch (Throwable ex) { + return tryCompleteComputation(ex); } + return false; } public final Integer getRawResult() { return result; } }