--- jsr166/src/main/java/util/ArrayPrefixHelpers.java 2014/12/31 04:53:37 1.3 +++ jsr166/src/main/java/util/ArrayPrefixHelpers.java 2015/09/20 17:29:14 1.8 @@ -5,12 +5,12 @@ */ package java.util; -import java.util.concurrent.ForkJoinPool; + import java.util.concurrent.CountedCompleter; import java.util.function.BinaryOperator; +import java.util.function.DoubleBinaryOperator; import java.util.function.IntBinaryOperator; import java.util.function.LongBinaryOperator; -import java.util.function.DoubleBinaryOperator; /** * ForkJoin tasks to perform Arrays.parallelPrefix operations. @@ -79,20 +79,6 @@ class ArrayPrefixHelpers { T in, out; final int lo, hi, origin, fence, threshold; - /** Root task constructor */ - public CumulateTask(CumulateTask parent, - BinaryOperator function, - T[] array, int lo, int hi) { - super(parent); - this.function = function; this.array = array; - this.lo = this.origin = lo; this.hi = this.fence = hi; - int p; - this.threshold = - (p = (hi - lo) / (ForkJoinPool.getCommonPoolParallelism() << 3)) - <= MIN_PARTITION ? MIN_PARTITION : p; - } - - /** Subtask constructor */ CumulateTask(CumulateTask parent, BinaryOperator function, T[] array, int origin, int fence, int threshold, int lo, int hi) { @@ -231,20 +217,6 @@ class ArrayPrefixHelpers { long in, out; final int lo, hi, origin, fence, threshold; - /** Root task constructor */ - public LongCumulateTask(LongCumulateTask parent, - LongBinaryOperator function, - long[] array, int lo, int hi) { - super(parent); - this.function = function; this.array = array; - this.lo = this.origin = lo; this.hi = this.fence = hi; - int p; - this.threshold = - (p = (hi - lo) / (ForkJoinPool.getCommonPoolParallelism() << 3)) - <= MIN_PARTITION ? MIN_PARTITION : p; - } - - /** Subtask constructor */ LongCumulateTask(LongCumulateTask parent, LongBinaryOperator function, long[] array, int origin, int fence, int threshold, int lo, int hi) { @@ -381,23 +353,9 @@ class ArrayPrefixHelpers { double in, out; final int lo, hi, origin, fence, threshold; - /** Root task constructor */ - public DoubleCumulateTask(DoubleCumulateTask parent, - DoubleBinaryOperator function, - double[] array, int lo, int hi) { - super(parent); - this.function = function; this.array = array; - this.lo = this.origin = lo; this.hi = this.fence = hi; - int p; - this.threshold = - (p = (hi - lo) / (ForkJoinPool.getCommonPoolParallelism() << 3)) - <= MIN_PARTITION ? MIN_PARTITION : p; - } - - /** Subtask constructor */ DoubleCumulateTask(DoubleCumulateTask parent, DoubleBinaryOperator function, - double[] array, int origin, int fence, int threshold, - int lo, int hi) { + double[] array, int origin, int fence, int threshold, + int lo, int hi) { super(parent); this.function = function; this.array = array; this.origin = origin; this.fence = fence; @@ -531,23 +489,9 @@ class ArrayPrefixHelpers { int in, out; final int lo, hi, origin, fence, threshold; - /** Root task constructor */ - public IntCumulateTask(IntCumulateTask parent, - IntBinaryOperator function, - int[] array, int lo, int hi) { - super(parent); - this.function = function; this.array = array; - this.lo = this.origin = lo; this.hi = this.fence = hi; - int p; - this.threshold = - (p = (hi - lo) / (ForkJoinPool.getCommonPoolParallelism() << 3)) - <= MIN_PARTITION ? MIN_PARTITION : p; - } - - /** Subtask constructor */ IntCumulateTask(IntCumulateTask parent, IntBinaryOperator function, - int[] array, int origin, int fence, int threshold, - int lo, int hi) { + int[] array, int origin, int fence, int threshold, + int lo, int hi) { super(parent); this.function = function; this.array = array; this.origin = origin; this.fence = fence;