--- jsr166/src/jsr166e/ConcurrentHashMapV8.java 2012/11/18 18:03:10 1.78 +++ jsr166/src/jsr166e/ConcurrentHashMapV8.java 2012/11/23 17:50:51 1.79 @@ -28,6 +28,28 @@ import java.util.concurrent.atomic.Atomi import java.io.Serializable; +import java.util.Comparator; +import java.util.Arrays; +import java.util.Map; +import java.util.Set; +import java.util.Collection; +import java.util.AbstractMap; +import java.util.AbstractSet; +import java.util.AbstractCollection; +import java.util.Hashtable; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Enumeration; +import java.util.ConcurrentModificationException; +import java.util.NoSuchElementException; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.locks.LockSupport; +import java.util.concurrent.locks.AbstractQueuedSynchronizer; +import java.util.concurrent.atomic.AtomicReference; + +import java.io.Serializable; + /** * A hash table supporting full concurrency of retrievals and * high expected concurrency for updates. This class obeys the @@ -671,7 +693,10 @@ public class ConcurrentHashMapV8 try { wait(); } catch (InterruptedException ie) { - Thread.currentThread().interrupt(); + try { + Thread.currentThread().interrupt(); + } catch (SecurityException ignore) { + } } } else @@ -2380,14 +2405,14 @@ public class ConcurrentHashMapV8 * across threads, iteration terminates if a bounds checks fails * for a table read. * - * 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. Because - * ForkJoinTask is Serializable, but iterators need not be, we - * need to add warning suppressions. + * This class extends CountedCompleter to streamline parallel + * iteration in bulk operations. This adds only a few fields of + * space overhead, which is small enough in cases where it is not + * needed to not worry about it. Because CountedCompleter is + * Serializable, but iterators need not be, we need to add warning + * suppressions. */ - @SuppressWarnings("serial") static class Traverser extends ForkJoinTask { + @SuppressWarnings("serial") static class Traverser extends CountedCompleter { final ConcurrentHashMapV8 map; Node next; // the next entry to use Object nextKey; // cached key field of next @@ -2397,24 +2422,28 @@ public class ConcurrentHashMapV8 int baseIndex; // current index of initial table int baseLimit; // index bound for initial table int baseSize; // initial table size + int batch; // split control /** Creates iterator for all entries in the table. */ Traverser(ConcurrentHashMapV8 map) { this.map = map; } - /** Creates iterator for split() methods */ - Traverser(Traverser it) { - ConcurrentHashMapV8 m; Node[] t; - if ((m = this.map = it.map) == null) - t = null; - else if ((t = it.tab) == null && // force parent tab initialization - (t = it.tab = m.table) != null) - it.baseLimit = it.baseSize = t.length; - this.tab = t; - this.baseSize = it.baseSize; - it.baseLimit = this.index = this.baseIndex = - ((this.baseLimit = it.baseLimit) + it.baseIndex + 1) >>> 1; + /** Creates iterator for split() methods and task constructors */ + Traverser(ConcurrentHashMapV8 map, Traverser it, int batch) { + super(it); + this.batch = batch; + if ((this.map = map) != null && it != null) { // split parent + Node[] t; + if ((t = it.tab) == null && + (t = it.tab = map.table) != null) + it.baseLimit = it.baseSize = t.length; + this.tab = t; + this.baseSize = it.baseSize; + int hi = this.baseLimit = it.baseLimit; + it.baseLimit = this.index = this.baseIndex = + (hi + it.baseIndex + 1) >>> 1; + } } /** @@ -2467,9 +2496,39 @@ public class ConcurrentHashMapV8 } public final boolean hasMoreElements() { return hasNext(); } - public final void setRawResult(Object x) { } - public R getRawResult() { return null; } - public boolean exec() { return true; } + + public void compute() { } // default no-op CountedCompleter body + + /** + * Returns a batch value > 0 if this task should (and must) be + * split, if so, adding to pending count, and in any case + * updating batch value. The initial batch value is 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 dividing by two + * anyway. + */ + final int preSplit() { + ConcurrentHashMapV8 m; int b; Node[] t; ForkJoinPool pool; + if ((b = batch) < 0 && (m = map) != null) { // force initialization + if ((t = tab) == null && (t = tab = m.table) != null) + baseLimit = baseSize = t.length; + if (t != null) { + long n = m.counter.sum(); + int par = ((pool = getPool()) == null) ? + ForkJoinPool.getCommonPoolParallelism() : + pool.getParallelism(); + int sp = par << 3; // slack of 8 + b = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp; + } + } + b = (b <= 1 || baseIndex == baseLimit)? 0 : (b >>> 1); + if ((batch = b) > 0) + addToPendingCount(1); + return b; + } + } /* ---------------- Public operations -------------- */ @@ -2609,8 +2668,8 @@ public class ConcurrentHashMapV8 * Returns the number of mappings. This method should be used * instead of {@link #size} because a ConcurrentHashMapV8 may * contain more mappings than can be represented as an int. The - * value returned is a snapshot; the actual count may differ if - * there are ongoing concurrent insertions or removals. + * value returned is an estimate; the actual count may differ if + * there are concurrent insertions or removals. * * @return the number of mappings */ @@ -3171,13 +3230,13 @@ public class ConcurrentHashMapV8 @SuppressWarnings("serial") static final class KeyIterator extends Traverser implements Spliterator, Enumeration { KeyIterator(ConcurrentHashMapV8 map) { super(map); } - KeyIterator(Traverser it) { - super(it); + KeyIterator(ConcurrentHashMapV8 map, Traverser it) { + super(map, it, -1); } public KeyIterator split() { if (nextKey != null) throw new IllegalStateException(); - return new KeyIterator(this); + return new KeyIterator(map, this); } @SuppressWarnings("unchecked") public final K next() { if (nextVal == null && advance() == null) @@ -3193,13 +3252,13 @@ public class ConcurrentHashMapV8 @SuppressWarnings("serial") static final class ValueIterator extends Traverser implements Spliterator, Enumeration { ValueIterator(ConcurrentHashMapV8 map) { super(map); } - ValueIterator(Traverser it) { - super(it); + ValueIterator(ConcurrentHashMapV8 map, Traverser it) { + super(map, it, -1); } public ValueIterator split() { if (nextKey != null) throw new IllegalStateException(); - return new ValueIterator(this); + return new ValueIterator(map, this); } @SuppressWarnings("unchecked") public final V next() { @@ -3216,13 +3275,13 @@ public class ConcurrentHashMapV8 @SuppressWarnings("serial") static final class EntryIterator extends Traverser implements Spliterator> { EntryIterator(ConcurrentHashMapV8 map) { super(map); } - EntryIterator(Traverser it) { - super(it); + EntryIterator(ConcurrentHashMapV8 map, Traverser it) { + super(map, it, -1); } public EntryIterator split() { if (nextKey != null) throw new IllegalStateException(); - return new EntryIterator(this); + return new EntryIterator(map, this); } @SuppressWarnings("unchecked") public final Map.Entry next() { @@ -3278,6 +3337,14 @@ public class ConcurrentHashMapV8 } } + /** + * Returns exportable snapshot entry for the given key and value + * when write-through can't or shouldn't be used. + */ + static AbstractMap.SimpleEntry entryFor(K k, V v) { + return new AbstractMap.SimpleEntry(k, v); + } + /* ---------------- Serialization Support -------------- */ /** @@ -4665,7 +4732,7 @@ public class ConcurrentHashMapV8 (ConcurrentHashMapV8 map, BiAction action) { if (action == null) throw new NullPointerException(); - return new ForEachMappingTask(map, null, -1, null, action); + return new ForEachMappingTask(map, null, -1, action); } /** @@ -4686,7 +4753,7 @@ public class ConcurrentHashMapV8 if (transformer == null || action == null) throw new NullPointerException(); return new ForEachTransformedMappingTask - (map, null, -1, null, transformer, action); + (map, null, -1, transformer, action); } /** @@ -4706,7 +4773,7 @@ public class ConcurrentHashMapV8 BiFun searchFunction) { if (searchFunction == null) throw new NullPointerException(); return new SearchMappingsTask - (map, null, -1, null, searchFunction, + (map, null, -1, searchFunction, new AtomicReference()); } @@ -4815,7 +4882,7 @@ public class ConcurrentHashMapV8 (ConcurrentHashMapV8 map, Action action) { if (action == null) throw new NullPointerException(); - return new ForEachKeyTask(map, null, -1, null, action); + return new ForEachKeyTask(map, null, -1, action); } /** @@ -4836,7 +4903,7 @@ public class ConcurrentHashMapV8 if (transformer == null || action == null) throw new NullPointerException(); return new ForEachTransformedKeyTask - (map, null, -1, null, transformer, action); + (map, null, -1, transformer, action); } /** @@ -4856,7 +4923,7 @@ public class ConcurrentHashMapV8 Fun searchFunction) { if (searchFunction == null) throw new NullPointerException(); return new SearchKeysTask - (map, null, -1, null, searchFunction, + (map, null, -1, searchFunction, new AtomicReference()); } @@ -4982,7 +5049,7 @@ public class ConcurrentHashMapV8 (ConcurrentHashMapV8 map, Action action) { if (action == null) throw new NullPointerException(); - return new ForEachValueTask(map, null, -1, null, action); + return new ForEachValueTask(map, null, -1, action); } /** @@ -5002,7 +5069,7 @@ public class ConcurrentHashMapV8 if (transformer == null || action == null) throw new NullPointerException(); return new ForEachTransformedValueTask - (map, null, -1, null, transformer, action); + (map, null, -1, transformer, action); } /** @@ -5022,7 +5089,7 @@ public class ConcurrentHashMapV8 Fun searchFunction) { if (searchFunction == null) throw new NullPointerException(); return new SearchValuesTask - (map, null, -1, null, searchFunction, + (map, null, -1, searchFunction, new AtomicReference()); } @@ -5148,7 +5215,7 @@ public class ConcurrentHashMapV8 (ConcurrentHashMapV8 map, Action> action) { if (action == null) throw new NullPointerException(); - return new ForEachEntryTask(map, null, -1, null, action); + return new ForEachEntryTask(map, null, -1, action); } /** @@ -5168,7 +5235,7 @@ public class ConcurrentHashMapV8 if (transformer == null || action == null) throw new NullPointerException(); return new ForEachTransformedEntryTask - (map, null, -1, null, transformer, action); + (map, null, -1, transformer, action); } /** @@ -5188,7 +5255,7 @@ public class ConcurrentHashMapV8 Fun, ? extends U> searchFunction) { if (searchFunction == null) throw new NullPointerException(); return new SearchEntriesTask - (map, null, -1, null, searchFunction, + (map, null, -1, searchFunction, new AtomicReference()); } @@ -5306,162 +5373,6 @@ public class ConcurrentHashMapV8 // ------------------------------------------------------- - /** - * Base for FJ tasks for bulk operations. This adds a variant of - * 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 - * their compute methods. The search methods are like forEach - * except they continually poll for success and exit early. Also, - * exceptions are handled in a simpler manner, by just trying to - * complete root task exceptionally. - */ - @SuppressWarnings("serial") static abstract class BulkTask extends Traverser { - final BulkTask parent; // completion target - int batch; // split control; -1 for unknown - int pending; // completion control - - BulkTask(ConcurrentHashMapV8 map, BulkTask parent, - int batch) { - super(map); - this.parent = parent; - this.batch = batch; - if (parent != null && map != null) { // split parent - Node[] t; - if ((t = parent.tab) == null && - (t = parent.tab = map.table) != null) - parent.baseLimit = parent.baseSize = t.length; - this.tab = t; - this.baseSize = parent.baseSize; - int hi = this.baseLimit = parent.baseLimit; - parent.baseLimit = this.index = this.baseIndex = - (hi + parent.baseIndex + 1) >>> 1; - } - } - - /** - * Forces root task to complete. - * @param ex if null, complete normally, else exceptionally - * @return false to simplify use - */ - final boolean tryCompleteComputation(Throwable ex) { - for (BulkTask a = this;;) { - BulkTask p = a.parent; - if (p == null) { - if (ex != null) - a.completeExceptionally(ex); - else - a.quietlyComplete(); - return false; - } - a = p; - } - } - - /** - * Version of tryCompleteComputation for function screening checks - */ - final boolean abortOnNullFunction() { - return tryCompleteComputation(new Error("Unexpected null function")); - } - - // utilities - - /** CompareAndSet pending count */ - final boolean casPending(int cmp, int val) { - return U.compareAndSwapInt(this, PENDING, cmp, val); - } - - /** - * 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 - * dividing by two anyway. - */ - final int batch() { - ConcurrentHashMapV8 m; int b; Node[] t; ForkJoinPool pool; - if ((b = batch) < 0 && (m = map) != null) { // force initialization - if ((t = tab) == null && (t = tab = m.table) != null) - baseLimit = baseSize = t.length; - if (t != null) { - long n = m.counter.sum(); - int par = ((pool = getPool()) == null) ? - ForkJoinPool.getCommonPoolParallelism() : - pool.getParallelism(); - int sp = par << 3; // slack of 8 - b = batch = (n <= 0L) ? 0 : (n < (long)sp) ? (int)n : sp; - } - } - return b; - } - - /** - * Returns exportable snapshot entry. - */ - static AbstractMap.SimpleEntry entryFor(K k, V v) { - return new AbstractMap.SimpleEntry(k, v); - } - - // Unsafe mechanics - private static final sun.misc.Unsafe U; - private static final long PENDING; - static { - try { - U = getUnsafe(); - PENDING = U.objectFieldOffset - (BulkTask.class.getDeclaredField("pending")); - } catch (Exception e) { - throw new Error(e); - } - } - } - - /** - * Base class for non-reductive actions - */ - @SuppressWarnings("serial") static abstract class BulkAction extends BulkTask { - BulkAction nextTask; - BulkAction(ConcurrentHashMapV8 map, BulkTask parent, - int batch, BulkAction nextTask) { - super(map, parent, batch); - this.nextTask = nextTask; - } - - /** - * Try to complete task and upward parents. Upon hitting - * non-completed parent, if a non-FJ task, try to help out the - * computation. - */ - final void tryComplete(BulkAction subtasks) { - BulkTask a = this, s = a; - for (int c;;) { - if ((c = a.pending) == 0) { - if ((a = (s = a).parent) == null) { - s.quietlyComplete(); - break; - } - } - else if (a.casPending(c, c - 1)) { - if (subtasks != null && !inForkJoinPool()) { - while ((s = a.parent) != null) - a = s; - while (!a.isDone()) { - BulkAction next = subtasks.nextTask; - if (subtasks.tryUnfork()) - subtasks.exec(); - if ((subtasks = next) == null) - break; - } - } - break; - } - } - } - - } - /* * Task classes. Coded in a regular but ugly format/style to * simplify checks that each variant differs in the right way from @@ -5469,665 +5380,508 @@ public class ConcurrentHashMapV8 */ @SuppressWarnings("serial") static final class ForEachKeyTask - extends BulkAction { + extends Traverser { final Action action; ForEachKeyTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - ForEachKeyTask nextTask, + (ConcurrentHashMapV8 m, Traverser p, int b, Action action) { - super(m, p, b, nextTask); + super(m, p, b); this.action = action; } - @SuppressWarnings("unchecked") public final boolean exec() { - final Action action = this.action; - if (action == null) - return abortOnNullFunction(); - ForEachKeyTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new ForEachKeyTask - (map, this, b >>>= 1, subtasks, action)).fork(); - } - while (advance() != null) - action.apply((K)nextKey); - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - tryComplete(subtasks); - return false; + @SuppressWarnings("unchecked") public final void compute() { + final Action action; + if ((action = this.action) == null) + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + new ForEachKeyTask(map, this, b, action).fork(); + while (advance() != null) + action.apply((K)nextKey); + propagateCompletion(); } } @SuppressWarnings("serial") static final class ForEachValueTask - extends BulkAction { + extends Traverser { final Action action; ForEachValueTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - ForEachValueTask nextTask, + (ConcurrentHashMapV8 m, Traverser p, int b, Action action) { - super(m, p, b, nextTask); + super(m, p, b); this.action = action; } - @SuppressWarnings("unchecked") public final boolean exec() { - final Action action = this.action; - if (action == null) - return abortOnNullFunction(); - ForEachValueTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new ForEachValueTask - (map, this, b >>>= 1, subtasks, action)).fork(); - } - Object v; - while ((v = advance()) != null) - action.apply((V)v); - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - tryComplete(subtasks); - return false; + @SuppressWarnings("unchecked") public final void compute() { + final Action action; + if ((action = this.action) == null) + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + new ForEachValueTask(map, this, b, action).fork(); + Object v; + while ((v = advance()) != null) + action.apply((V)v); + propagateCompletion(); } } @SuppressWarnings("serial") static final class ForEachEntryTask - extends BulkAction { + extends Traverser { final Action> action; ForEachEntryTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - ForEachEntryTask nextTask, + (ConcurrentHashMapV8 m, Traverser p, int b, Action> action) { - super(m, p, b, nextTask); + super(m, p, b); this.action = action; } - @SuppressWarnings("unchecked") public final boolean exec() { - final Action> action = this.action; - if (action == null) - return abortOnNullFunction(); - ForEachEntryTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new ForEachEntryTask - (map, this, b >>>= 1, subtasks, action)).fork(); - } - Object v; - while ((v = advance()) != null) - action.apply(entryFor((K)nextKey, (V)v)); - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - tryComplete(subtasks); - return false; + @SuppressWarnings("unchecked") public final void compute() { + final Action> action; + if ((action = this.action) == null) + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + new ForEachEntryTask(map, this, b, action).fork(); + Object v; + while ((v = advance()) != null) + action.apply(entryFor((K)nextKey, (V)v)); + propagateCompletion(); } } @SuppressWarnings("serial") static final class ForEachMappingTask - extends BulkAction { + extends Traverser { final BiAction action; ForEachMappingTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - ForEachMappingTask nextTask, + (ConcurrentHashMapV8 m, Traverser p, int b, BiAction action) { - super(m, p, b, nextTask); + super(m, p, b); this.action = action; } - @SuppressWarnings("unchecked") public final boolean exec() { - final BiAction action = this.action; - if (action == null) - return abortOnNullFunction(); - ForEachMappingTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new ForEachMappingTask - (map, this, b >>>= 1, subtasks, action)).fork(); - } - Object v; - while ((v = advance()) != null) - action.apply((K)nextKey, (V)v); - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - tryComplete(subtasks); - return false; + @SuppressWarnings("unchecked") public final void compute() { + final BiAction action; + if ((action = this.action) == null) + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + new ForEachMappingTask(map, this, b, action).fork(); + Object v; + while ((v = advance()) != null) + action.apply((K)nextKey, (V)v); + propagateCompletion(); } } @SuppressWarnings("serial") static final class ForEachTransformedKeyTask - extends BulkAction { + extends Traverser { final Fun transformer; final Action action; ForEachTransformedKeyTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - ForEachTransformedKeyTask nextTask, - Fun transformer, - Action action) { - super(m, p, b, nextTask); - this.transformer = transformer; - this.action = action; - - } - @SuppressWarnings("unchecked") public final boolean exec() { - final Fun transformer = - this.transformer; - final Action action = this.action; - if (transformer == null || action == null) - return abortOnNullFunction(); - ForEachTransformedKeyTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new ForEachTransformedKeyTask - (map, this, b >>>= 1, subtasks, transformer, action)).fork(); - } - U u; - while (advance() != null) { - if ((u = transformer.apply((K)nextKey)) != null) - action.apply(u); - } - } catch (Throwable ex) { - return tryCompleteComputation(ex); + (ConcurrentHashMapV8 m, Traverser p, int b, + Fun transformer, Action action) { + super(m, p, b); + this.transformer = transformer; this.action = action; + } + @SuppressWarnings("unchecked") public final void compute() { + final Fun transformer; + final Action action; + if ((transformer = this.transformer) == null || + (action = this.action) == null) + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + new ForEachTransformedKeyTask + (map, this, b, transformer, action).fork(); + U u; + while (advance() != null) { + if ((u = transformer.apply((K)nextKey)) != null) + action.apply(u); } - tryComplete(subtasks); - return false; + propagateCompletion(); } } @SuppressWarnings("serial") static final class ForEachTransformedValueTask - extends BulkAction { + extends Traverser { final Fun transformer; final Action action; ForEachTransformedValueTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - ForEachTransformedValueTask nextTask, - Fun transformer, - Action action) { - super(m, p, b, nextTask); - this.transformer = transformer; - this.action = action; - - } - @SuppressWarnings("unchecked") public final boolean exec() { - final Fun transformer = - this.transformer; - final Action action = this.action; - if (transformer == null || action == null) - return abortOnNullFunction(); - ForEachTransformedValueTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new ForEachTransformedValueTask - (map, this, b >>>= 1, subtasks, transformer, action)).fork(); - } - Object v; U u; - while ((v = advance()) != null) { - if ((u = transformer.apply((V)v)) != null) - action.apply(u); - } - } catch (Throwable ex) { - return tryCompleteComputation(ex); + (ConcurrentHashMapV8 m, Traverser p, int b, + Fun transformer, Action action) { + super(m, p, b); + this.transformer = transformer; this.action = action; + } + @SuppressWarnings("unchecked") public final void compute() { + final Fun transformer; + final Action action; + if ((transformer = this.transformer) == null || + (action = this.action) == null) + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + new ForEachTransformedValueTask + (map, this, b, transformer, action).fork(); + Object v; U u; + while ((v = advance()) != null) { + if ((u = transformer.apply((V)v)) != null) + action.apply(u); } - tryComplete(subtasks); - return false; + propagateCompletion(); } } @SuppressWarnings("serial") static final class ForEachTransformedEntryTask - extends BulkAction { + extends Traverser { final Fun, ? extends U> transformer; final Action action; ForEachTransformedEntryTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - ForEachTransformedEntryTask nextTask, - Fun, ? extends U> transformer, - Action action) { - super(m, p, b, nextTask); - this.transformer = transformer; - this.action = action; - - } - @SuppressWarnings("unchecked") public final boolean exec() { - final Fun, ? extends U> transformer = - this.transformer; - final Action action = this.action; - if (transformer == null || action == null) - return abortOnNullFunction(); - ForEachTransformedEntryTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new ForEachTransformedEntryTask - (map, this, b >>>= 1, subtasks, transformer, action)).fork(); - } - Object v; U u; - while ((v = advance()) != null) { - if ((u = transformer.apply(entryFor((K)nextKey, (V)v))) != null) - action.apply(u); - } - } catch (Throwable ex) { - return tryCompleteComputation(ex); + (ConcurrentHashMapV8 m, Traverser p, int b, + Fun, ? extends U> transformer, Action action) { + super(m, p, b); + this.transformer = transformer; this.action = action; + } + @SuppressWarnings("unchecked") public final void compute() { + final Fun, ? extends U> transformer; + final Action action; + if ((transformer = this.transformer) == null || + (action = this.action) == null) + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + new ForEachTransformedEntryTask + (map, this, b, 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(subtasks); - return false; + propagateCompletion(); } } @SuppressWarnings("serial") static final class ForEachTransformedMappingTask - extends BulkAction { + extends Traverser { final BiFun transformer; final Action action; ForEachTransformedMappingTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - ForEachTransformedMappingTask nextTask, + (ConcurrentHashMapV8 m, Traverser p, int b, BiFun transformer, Action action) { - super(m, p, b, nextTask); - this.transformer = transformer; - this.action = action; - + super(m, p, b); + this.transformer = transformer; this.action = action; } - @SuppressWarnings("unchecked") public final boolean exec() { - final BiFun transformer = - this.transformer; - final Action action = this.action; - if (transformer == null || action == null) - return abortOnNullFunction(); - ForEachTransformedMappingTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new ForEachTransformedMappingTask - (map, this, b >>>= 1, subtasks, transformer, action)).fork(); - } - Object v; U u; - while ((v = advance()) != null) { - if ((u = transformer.apply((K)nextKey, (V)v)) != null) - action.apply(u); - } - } catch (Throwable ex) { - return tryCompleteComputation(ex); + @SuppressWarnings("unchecked") public final void compute() { + final BiFun transformer; + final Action action; + if ((transformer = this.transformer) == null || + (action = this.action) == null) + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + new ForEachTransformedMappingTask + (map, this, b, transformer, action).fork(); + Object v; U u; + while ((v = advance()) != null) { + if ((u = transformer.apply((K)nextKey, (V)v)) != null) + action.apply(u); } - tryComplete(subtasks); - return false; + propagateCompletion(); } } @SuppressWarnings("serial") static final class SearchKeysTask - extends BulkAction { + extends Traverser { final Fun searchFunction; final AtomicReference result; SearchKeysTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - SearchKeysTask nextTask, + (ConcurrentHashMapV8 m, Traverser p, int b, Fun searchFunction, AtomicReference result) { - super(m, p, b, nextTask); + super(m, p, b); this.searchFunction = searchFunction; this.result = result; } - @SuppressWarnings("unchecked") public final boolean exec() { - AtomicReference result = this.result; - final Fun searchFunction = - this.searchFunction; - if (searchFunction == null || result == null) - return abortOnNullFunction(); - SearchKeysTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit && result.get() == null) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new SearchKeysTask - (map, this, b >>>= 1, subtasks, searchFunction, result)).fork(); - } + public final U getRawResult() { return result.get(); } + @SuppressWarnings("unchecked") public final void compute() { + final Fun searchFunction; + final AtomicReference result; + if ((searchFunction = this.searchFunction) == null || + (result = this.result) == null) + throw new NullPointerException(); + for (int b;;) { + if (result.get() != null) + return; + if ((b = preSplit()) <= 0) + break; + new SearchKeysTask + (map, this, b, searchFunction, result).fork(); + } + while (result.get() == null) { U u; - while (result.get() == null && advance() != null) { - if ((u = searchFunction.apply((K)nextKey)) != null) { - if (result.compareAndSet(null, u)) - tryCompleteComputation(null); - break; - } + if (advance() == null) { + propagateCompletion(); + break; + } + if ((u = searchFunction.apply((K)nextKey)) != null) { + if (result.compareAndSet(null, u)) + quietlyCompleteRoot(); + break; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); } - tryComplete(subtasks); - return false; } - public final U getRawResult() { return result.get(); } } @SuppressWarnings("serial") static final class SearchValuesTask - extends BulkAction { + extends Traverser { final Fun searchFunction; final AtomicReference result; SearchValuesTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - SearchValuesTask nextTask, + (ConcurrentHashMapV8 m, Traverser p, int b, Fun searchFunction, AtomicReference result) { - super(m, p, b, nextTask); + super(m, p, b); this.searchFunction = searchFunction; this.result = result; } - @SuppressWarnings("unchecked") public final boolean exec() { - AtomicReference result = this.result; - final Fun searchFunction = - this.searchFunction; - if (searchFunction == null || result == null) - return abortOnNullFunction(); - SearchValuesTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit && result.get() == null) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new SearchValuesTask - (map, this, b >>>= 1, subtasks, searchFunction, result)).fork(); - } + public final U getRawResult() { return result.get(); } + @SuppressWarnings("unchecked") public final void compute() { + final Fun searchFunction; + final AtomicReference result; + if ((searchFunction = this.searchFunction) == null || + (result = this.result) == null) + throw new NullPointerException(); + for (int b;;) { + if (result.get() != null) + return; + if ((b = preSplit()) <= 0) + break; + new SearchValuesTask + (map, this, b, searchFunction, result).fork(); + } + while (result.get() == null) { 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; - } + if ((v = advance()) == null) { + propagateCompletion(); + break; + } + if ((u = searchFunction.apply((V)v)) != null) { + if (result.compareAndSet(null, u)) + quietlyCompleteRoot(); + break; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); } - tryComplete(subtasks); - return false; } - public final U getRawResult() { return result.get(); } } @SuppressWarnings("serial") static final class SearchEntriesTask - extends BulkAction { + extends Traverser { final Fun, ? extends U> searchFunction; final AtomicReference result; SearchEntriesTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - SearchEntriesTask nextTask, + (ConcurrentHashMapV8 m, Traverser p, int b, Fun, ? extends U> searchFunction, AtomicReference result) { - super(m, p, b, nextTask); + super(m, p, b); this.searchFunction = searchFunction; this.result = result; } - @SuppressWarnings("unchecked") public final boolean exec() { - AtomicReference result = this.result; - final Fun, ? extends U> searchFunction = - this.searchFunction; - if (searchFunction == null || result == null) - return abortOnNullFunction(); - SearchEntriesTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit && result.get() == null) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new SearchEntriesTask - (map, this, b >>>= 1, subtasks, searchFunction, result)).fork(); - } + public final U getRawResult() { return result.get(); } + @SuppressWarnings("unchecked") public final void compute() { + final Fun, ? extends U> searchFunction; + final AtomicReference result; + if ((searchFunction = this.searchFunction) == null || + (result = this.result) == null) + throw new NullPointerException(); + for (int b;;) { + if (result.get() != null) + return; + if ((b = preSplit()) <= 0) + break; + new SearchEntriesTask + (map, this, b, searchFunction, result).fork(); + } + while (result.get() == null) { 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; - } + if ((v = advance()) == null) { + propagateCompletion(); + break; + } + if ((u = searchFunction.apply(entryFor((K)nextKey, (V)v))) != null) { + if (result.compareAndSet(null, u)) + quietlyCompleteRoot(); + return; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); } - tryComplete(subtasks); - return false; } - public final U getRawResult() { return result.get(); } } @SuppressWarnings("serial") static final class SearchMappingsTask - extends BulkAction { + extends Traverser { final BiFun searchFunction; final AtomicReference result; SearchMappingsTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - SearchMappingsTask nextTask, + (ConcurrentHashMapV8 m, Traverser p, int b, BiFun searchFunction, AtomicReference result) { - super(m, p, b, nextTask); + super(m, p, b); this.searchFunction = searchFunction; this.result = result; } - @SuppressWarnings("unchecked") public final boolean exec() { - AtomicReference result = this.result; - final BiFun searchFunction = - this.searchFunction; - if (searchFunction == null || result == null) - return abortOnNullFunction(); - SearchMappingsTask subtasks = null; - try { - int b = batch(), c; - while (b > 1 && baseIndex != baseLimit && result.get() == null) { - do {} while (!casPending(c = pending, c+1)); - (subtasks = new SearchMappingsTask - (map, this, b >>>= 1, subtasks, searchFunction, result)).fork(); - } + public final U getRawResult() { return result.get(); } + @SuppressWarnings("unchecked") public final void compute() { + final BiFun searchFunction; + final AtomicReference result; + if ((searchFunction = this.searchFunction) == null || + (result = this.result) == null) + throw new NullPointerException(); + for (int b;;) { + if (result.get() != null) + return; + if ((b = preSplit()) <= 0) + break; + new SearchMappingsTask + (map, this, b, searchFunction, result).fork(); + } + while (result.get() == null) { 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; - } + if ((v = advance()) == null) { + propagateCompletion(); + break; + } + if ((u = searchFunction.apply((K)nextKey, (V)v)) != null) { + if (result.compareAndSet(null, u)) + quietlyCompleteRoot(); + break; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); } - tryComplete(subtasks); - return false; } - public final U getRawResult() { return result.get(); } } @SuppressWarnings("serial") static final class ReduceKeysTask - extends BulkTask { + extends Traverser { final BiFun reducer; K result; ReduceKeysTask rights, nextRight; ReduceKeysTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, ReduceKeysTask nextRight, BiFun reducer) { super(m, p, b); this.nextRight = nextRight; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final K getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final BiFun reducer = this.reducer; if (reducer == null) - return abortOnNullFunction(); - try { - for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { - do {} while (!casPending(c = pending, c+1)); - (rights = new ReduceKeysTask - (map, this, b >>>= 1, rights, reducer)).fork(); - } - K r = null; - while (advance() != null) { - K u = (K)nextKey; - r = (r == null) ? u : reducer.apply(r, u); - } - 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; + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + (rights = new ReduceKeysTask + (map, this, b, rights, reducer)).fork(); + K r = null; + while (advance() != null) { + K u = (K)nextKey; + r = (r == null) ? u : reducer.apply(r, u); + } + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + ReduceKeysTask + t = (ReduceKeysTask)c, + s = t.rights; + while (s != null) { + K tr, sr; + if ((sr = s.result) != null) + t.result = (((tr = t.result) == null) ? sr : + reducer.apply(tr, sr)); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - ReduceKeysTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); } - return false; } - public final K getRawResult() { return result; } } @SuppressWarnings("serial") static final class ReduceValuesTask - extends BulkTask { + extends Traverser { final BiFun reducer; V result; ReduceValuesTask rights, nextRight; ReduceValuesTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, ReduceValuesTask nextRight, BiFun reducer) { super(m, p, b); this.nextRight = nextRight; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final V getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final BiFun reducer = this.reducer; if (reducer == null) - return abortOnNullFunction(); - try { - for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { - do {} while (!casPending(c = pending, c+1)); - (rights = new ReduceValuesTask - (map, 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); - } - 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; + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + (rights = new ReduceValuesTask + (map, this, b, rights, reducer)).fork(); + V r = null; + Object v; + while ((v = advance()) != null) { + V u = (V)v; + r = (r == null) ? u : reducer.apply(r, u); + } + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + ReduceValuesTask + t = (ReduceValuesTask)c, + s = t.rights; + while (s != null) { + V tr, sr; + if ((sr = s.result) != null) + t.result = (((tr = t.result) == null) ? sr : + reducer.apply(tr, sr)); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); } - ReduceValuesTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); - } - return false; } - public final V getRawResult() { return result; } } @SuppressWarnings("serial") static final class ReduceEntriesTask - extends BulkTask> { + extends Traverser> { final BiFun, Map.Entry, ? extends Map.Entry> reducer; Map.Entry result; ReduceEntriesTask rights, nextRight; ReduceEntriesTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, ReduceEntriesTask nextRight, BiFun, Map.Entry, ? extends Map.Entry> reducer) { super(m, p, b); this.nextRight = nextRight; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Map.Entry getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final BiFun, Map.Entry, ? extends Map.Entry> reducer = this.reducer; if (reducer == null) - return abortOnNullFunction(); - try { - for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { - do {} while (!casPending(c = pending, c+1)); - (rights = new ReduceEntriesTask - (map, 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); - } - 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; + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + (rights = new ReduceEntriesTask + (map, this, b, 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); + } + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + ReduceEntriesTask + t = (ReduceEntriesTask)c, + s = t.rights; + while (s != null) { + Map.Entry tr, sr; + if ((sr = s.result) != null) + t.result = (((tr = t.result) == null) ? sr : + reducer.apply(tr, sr)); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); } - ReduceEntriesTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); - } - return false; } - public final Map.Entry getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceKeysTask - extends BulkTask { + extends Traverser { final Fun transformer; final BiFun reducer; U result; MapReduceKeysTask rights, nextRight; MapReduceKeysTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceKeysTask nextRight, Fun transformer, BiFun reducer) { @@ -6135,65 +5889,47 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final U getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final Fun transformer = this.transformer; final BiFun reducer = this.reducer; if (transformer == null || reducer == null) - return abortOnNullFunction(); - try { - for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { - do {} while (!casPending(c = pending, c+1)); - (rights = new MapReduceKeysTask - (map, 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); - } - 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); + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceKeysTask + (map, this, b, 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); } - MapReduceKeysTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceKeysTask + t = (MapReduceKeysTask)c, + s = t.rights; + while (s != null) { + U tr, sr; + if ((sr = s.result) != null) + t.result = (((tr = t.result) == null) ? sr : + reducer.apply(tr, sr)); + s = t.rights = s.nextRight; + } } - return false; } - public final U getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceValuesTask - extends BulkTask { + extends Traverser { final Fun transformer; final BiFun reducer; U result; MapReduceValuesTask rights, nextRight; MapReduceValuesTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceValuesTask nextRight, Fun transformer, BiFun reducer) { @@ -6201,66 +5937,48 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final U getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final Fun transformer = this.transformer; final BiFun reducer = this.reducer; if (transformer == null || reducer == null) - return abortOnNullFunction(); - try { - for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { - do {} while (!casPending(c = pending, c+1)); - (rights = new MapReduceValuesTask - (map, 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); - } - 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); + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceValuesTask + (map, this, b, 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); } - MapReduceValuesTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceValuesTask + t = (MapReduceValuesTask)c, + s = t.rights; + while (s != null) { + U tr, sr; + if ((sr = s.result) != null) + t.result = (((tr = t.result) == null) ? sr : + reducer.apply(tr, sr)); + s = t.rights = s.nextRight; + } } - return false; } - public final U getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceEntriesTask - extends BulkTask { + extends Traverser { final Fun, ? extends U> transformer; final BiFun reducer; U result; MapReduceEntriesTask rights, nextRight; MapReduceEntriesTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceEntriesTask nextRight, Fun, ? extends U> transformer, BiFun reducer) { @@ -6268,66 +5986,48 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final U getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final Fun, ? extends U> transformer = this.transformer; final BiFun reducer = this.reducer; if (transformer == null || reducer == null) - return abortOnNullFunction(); - try { - for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { - do {} while (!casPending(c = pending, c+1)); - (rights = new MapReduceEntriesTask - (map, 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); - } - 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); + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceEntriesTask + (map, this, b, 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); } - MapReduceEntriesTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceEntriesTask + t = (MapReduceEntriesTask)c, + s = t.rights; + while (s != null) { + U tr, sr; + if ((sr = s.result) != null) + t.result = (((tr = t.result) == null) ? sr : + reducer.apply(tr, sr)); + s = t.rights = s.nextRight; + } } - return false; } - public final U getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceMappingsTask - extends BulkTask { + extends Traverser { final BiFun transformer; final BiFun reducer; U result; MapReduceMappingsTask rights, nextRight; MapReduceMappingsTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceMappingsTask nextRight, BiFun transformer, BiFun reducer) { @@ -6335,67 +6035,49 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final U getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final BiFun transformer = this.transformer; final BiFun reducer = this.reducer; if (transformer == null || reducer == null) - return abortOnNullFunction(); - try { - for (int c, b = batch(); b > 1 && baseIndex != baseLimit;) { - do {} while (!casPending(c = pending, c+1)); - (rights = new MapReduceMappingsTask - (map, 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); - } - 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); + throw new NullPointerException(); + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceMappingsTask + (map, this, b, 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); } - MapReduceMappingsTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceMappingsTask + t = (MapReduceMappingsTask)c, + s = t.rights; + while (s != null) { + U tr, sr; + if ((sr = s.result) != null) + t.result = (((tr = t.result) == null) ? sr : + reducer.apply(tr, sr)); + s = t.rights = s.nextRight; + } } - return false; } - public final U getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceKeysToDoubleTask - extends BulkTask { + extends Traverser { final ObjectToDouble transformer; final DoubleByDoubleToDouble reducer; final double basis; double result; MapReduceKeysToDoubleTask rights, nextRight; MapReduceKeysToDoubleTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceKeysToDoubleTask nextRight, ObjectToDouble transformer, double basis, @@ -6404,63 +6086,42 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Double getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectToDouble transformer = this.transformer; final DoubleByDoubleToDouble reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + double r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceKeysToDoubleTask + (map, this, b, rights, transformer, r, reducer)).fork(); + while (advance() != null) + r = reducer.apply(r, transformer.apply((K)nextKey)); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceKeysToDoubleTask + t = (MapReduceKeysToDoubleTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - MapReduceKeysToDoubleTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); } - return false; } - public final Double getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceValuesToDoubleTask - extends BulkTask { + extends Traverser { final ObjectToDouble transformer; final DoubleByDoubleToDouble reducer; final double basis; double result; MapReduceValuesToDoubleTask rights, nextRight; MapReduceValuesToDoubleTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceValuesToDoubleTask nextRight, ObjectToDouble transformer, double basis, @@ -6469,64 +6130,43 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Double getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectToDouble transformer = this.transformer; final DoubleByDoubleToDouble reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + double r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceValuesToDoubleTask + (map, this, b, rights, transformer, r, reducer)).fork(); + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((V)v)); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceValuesToDoubleTask + t = (MapReduceValuesToDoubleTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - MapReduceValuesToDoubleTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); } - return false; } - public final Double getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceEntriesToDoubleTask - extends BulkTask { + extends Traverser { final ObjectToDouble> transformer; final DoubleByDoubleToDouble reducer; final double basis; double result; MapReduceEntriesToDoubleTask rights, nextRight; MapReduceEntriesToDoubleTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceEntriesToDoubleTask nextRight, ObjectToDouble> transformer, double basis, @@ -6535,64 +6175,43 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Double getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectToDouble> transformer = this.transformer; final DoubleByDoubleToDouble reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + double r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceEntriesToDoubleTask + (map, this, b, rights, transformer, r, reducer)).fork(); + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v))); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceEntriesToDoubleTask + t = (MapReduceEntriesToDoubleTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - MapReduceEntriesToDoubleTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); } - return false; } - public final Double getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceMappingsToDoubleTask - extends BulkTask { + extends Traverser { final ObjectByObjectToDouble transformer; final DoubleByDoubleToDouble reducer; final double basis; double result; MapReduceMappingsToDoubleTask rights, nextRight; MapReduceMappingsToDoubleTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceMappingsToDoubleTask nextRight, ObjectByObjectToDouble transformer, double basis, @@ -6601,64 +6220,43 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Double getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectByObjectToDouble transformer = this.transformer; final DoubleByDoubleToDouble reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + double r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceMappingsToDoubleTask + (map, this, b, rights, transformer, r, reducer)).fork(); + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((K)nextKey, (V)v)); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceMappingsToDoubleTask + t = (MapReduceMappingsToDoubleTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - MapReduceMappingsToDoubleTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); } - return false; } - public final Double getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceKeysToLongTask - extends BulkTask { + extends Traverser { final ObjectToLong transformer; final LongByLongToLong reducer; final long basis; long result; MapReduceKeysToLongTask rights, nextRight; MapReduceKeysToLongTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceKeysToLongTask nextRight, ObjectToLong transformer, long basis, @@ -6667,63 +6265,42 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Long getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectToLong transformer = this.transformer; final LongByLongToLong reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + long r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceKeysToLongTask + (map, this, b, rights, transformer, r, reducer)).fork(); + while (advance() != null) + r = reducer.apply(r, transformer.apply((K)nextKey)); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceKeysToLongTask + t = (MapReduceKeysToLongTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - MapReduceKeysToLongTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); } - return false; } - public final Long getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceValuesToLongTask - extends BulkTask { + extends Traverser { final ObjectToLong transformer; final LongByLongToLong reducer; final long basis; long result; MapReduceValuesToLongTask rights, nextRight; MapReduceValuesToLongTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceValuesToLongTask nextRight, ObjectToLong transformer, long basis, @@ -6732,64 +6309,43 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Long getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectToLong transformer = this.transformer; final LongByLongToLong reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + long r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceValuesToLongTask + (map, this, b, rights, transformer, r, reducer)).fork(); + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((V)v)); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceValuesToLongTask + t = (MapReduceValuesToLongTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - MapReduceValuesToLongTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); } - return false; } - public final Long getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceEntriesToLongTask - extends BulkTask { + extends Traverser { final ObjectToLong> transformer; final LongByLongToLong reducer; final long basis; long result; MapReduceEntriesToLongTask rights, nextRight; MapReduceEntriesToLongTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceEntriesToLongTask nextRight, ObjectToLong> transformer, long basis, @@ -6798,64 +6354,43 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Long getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectToLong> transformer = this.transformer; final LongByLongToLong reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + long r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceEntriesToLongTask + (map, this, b, rights, transformer, r, reducer)).fork(); + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v))); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceEntriesToLongTask + t = (MapReduceEntriesToLongTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); } - MapReduceEntriesToLongTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); - } - return false; } - public final Long getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceMappingsToLongTask - extends BulkTask { + extends Traverser { final ObjectByObjectToLong transformer; final LongByLongToLong reducer; final long basis; long result; MapReduceMappingsToLongTask rights, nextRight; MapReduceMappingsToLongTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceMappingsToLongTask nextRight, ObjectByObjectToLong transformer, long basis, @@ -6864,64 +6399,43 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Long getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectByObjectToLong transformer = this.transformer; final LongByLongToLong reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + long r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceMappingsToLongTask + (map, this, b, rights, transformer, r, reducer)).fork(); + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((K)nextKey, (V)v)); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceMappingsToLongTask + t = (MapReduceMappingsToLongTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - MapReduceMappingsToLongTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); } - return false; } - public final Long getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceKeysToIntTask - extends BulkTask { + extends Traverser { final ObjectToInt transformer; final IntByIntToInt reducer; final int basis; int result; MapReduceKeysToIntTask rights, nextRight; MapReduceKeysToIntTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceKeysToIntTask nextRight, ObjectToInt transformer, int basis, @@ -6930,63 +6444,42 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Integer getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectToInt transformer = this.transformer; final IntByIntToInt reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + int r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceKeysToIntTask + (map, this, b, rights, transformer, r, reducer)).fork(); + while (advance() != null) + r = reducer.apply(r, transformer.apply((K)nextKey)); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceKeysToIntTask + t = (MapReduceKeysToIntTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - MapReduceKeysToIntTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); } - return false; } - public final Integer getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceValuesToIntTask - extends BulkTask { + extends Traverser { final ObjectToInt transformer; final IntByIntToInt reducer; final int basis; int result; MapReduceValuesToIntTask rights, nextRight; MapReduceValuesToIntTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceValuesToIntTask nextRight, ObjectToInt transformer, int basis, @@ -6995,64 +6488,43 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Integer getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectToInt transformer = this.transformer; final IntByIntToInt reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + int r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceValuesToIntTask + (map, this, b, rights, transformer, r, reducer)).fork(); + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((V)v)); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceValuesToIntTask + t = (MapReduceValuesToIntTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); - } - MapReduceValuesToIntTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); } - return false; } - public final Integer getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceEntriesToIntTask - extends BulkTask { + extends Traverser { final ObjectToInt> transformer; final IntByIntToInt reducer; final int basis; int result; MapReduceEntriesToIntTask rights, nextRight; MapReduceEntriesToIntTask - (ConcurrentHashMapV8 m, BulkTask p, int b, + (ConcurrentHashMapV8 m, Traverser p, int b, MapReduceEntriesToIntTask nextRight, ObjectToInt> transformer, int basis, @@ -7061,65 +6533,44 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Integer getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectToInt> transformer = this.transformer; final IntByIntToInt reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + int r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceEntriesToIntTask + (map, this, b, rights, transformer, r, reducer)).fork(); + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply(entryFor((K)nextKey, (V)v))); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceEntriesToIntTask + t = (MapReduceEntriesToIntTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); } - MapReduceEntriesToIntTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); - } - return false; } - public final Integer getRawResult() { return result; } } @SuppressWarnings("serial") static final class MapReduceMappingsToIntTask - extends BulkTask { + extends Traverser { final ObjectByObjectToInt transformer; final IntByIntToInt reducer; final int basis; int result; MapReduceMappingsToIntTask rights, nextRight; MapReduceMappingsToIntTask - (ConcurrentHashMapV8 m, BulkTask p, int b, - MapReduceMappingsToIntTask rights, + (ConcurrentHashMapV8 m, Traverser p, int b, + MapReduceMappingsToIntTask nextRight, ObjectByObjectToInt transformer, int basis, IntByIntToInt reducer) { @@ -7127,53 +6578,32 @@ public class ConcurrentHashMapV8 this.transformer = transformer; this.basis = basis; this.reducer = reducer; } - @SuppressWarnings("unchecked") public final boolean exec() { + public final Integer getRawResult() { return result; } + @SuppressWarnings("unchecked") public final void compute() { final ObjectByObjectToInt transformer = this.transformer; final IntByIntToInt reducer = this.reducer; if (transformer == null || reducer == null) - 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 - (map, 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; + throw new NullPointerException(); + int r = this.basis; + for (int b; (b = preSplit()) > 0;) + (rights = new MapReduceMappingsToIntTask + (map, this, b, rights, transformer, r, reducer)).fork(); + Object v; + while ((v = advance()) != null) + r = reducer.apply(r, transformer.apply((K)nextKey, (V)v)); + result = r; + CountedCompleter c; + for (c = firstComplete(); c != null; c = c.nextComplete()) { + MapReduceMappingsToIntTask + t = (MapReduceMappingsToIntTask)c, + s = t.rights; + while (s != null) { + t.result = reducer.apply(t.result, s.result); + s = t.rights = s.nextRight; } - } catch (Throwable ex) { - return tryCompleteComputation(ex); } - MapReduceMappingsToIntTask s = rights; - if (s != null && !inForkJoinPool()) { - do { - if (s.tryUnfork()) - s.exec(); - } while ((s = s.nextRight) != null); - } - return false; } - public final Integer getRawResult() { return result; } } // Unsafe mechanics