--- jsr166/src/main/java/util/SplittableRandom.java 2016/11/12 00:12:05 1.33 +++ jsr166/src/main/java/util/SplittableRandom.java 2018/12/02 23:06:16 1.41 @@ -80,7 +80,7 @@ import java.util.stream.StreamSupport; * in security-sensitive applications. Additionally, * default-constructed instances do not use a cryptographically random * seed unless the {@linkplain System#getProperty system property} - * {@code java.util.secureRandomSeed} is set to {@code true}. + * {@systemProperty java.util.secureRandomSeed} is set to {@code true}. * * @author Guy Steele * @author Doug Lea @@ -375,7 +375,7 @@ public final class SplittableRandom { * may, and typically does, vary across program invocations. */ public SplittableRandom() { // emulate defaultGen.split() - long s = defaultGen.getAndAdd(2 * GOLDEN_GAMMA); + long s = defaultGen.getAndAdd(GOLDEN_GAMMA << 1); this.seed = mix64(s); this.gamma = mixGamma(s + GOLDEN_GAMMA); } @@ -399,6 +399,26 @@ public final class SplittableRandom { } /** + * Fills a user-supplied byte array with generated pseudorandom bytes. + * + * @param bytes the byte array to fill with pseudorandom bytes + * @throws NullPointerException if bytes is null + * @since 10 + */ + public void nextBytes(byte[] bytes) { + int i = 0; + int len = bytes.length; + for (int words = len >> 3; words--> 0; ) { + long rnd = nextLong(); + for (int n = 8; n--> 0; rnd >>>= Byte.SIZE) + bytes[i++] = (byte)rnd; + } + if (i < len) + for (long rnd = nextLong(); i < len; rnd >>>= Byte.SIZE) + bytes[i++] = (byte)rnd; + } + + /** * Returns a pseudorandom {@code int} value. * * @return a pseudorandom {@code int} value @@ -530,20 +550,6 @@ public final class SplittableRandom { Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1); } - /** - * Generates a pseudorandom number with the indicated number of - * bits. Unlike in superclass @{link Random}, this method is never - * internally called or used by any other publicly accessible - * method. - * - * @param bits random bits - * @return the next pseudorandom value from this random number - * generator's sequence - */ - protected int next(int bits) { - return (int)(nextLong() >>> (64 - bits)); - } - /** * Returns a pseudorandom {@code double} value between the specified * origin (inclusive) and bound (exclusive). @@ -793,8 +799,7 @@ public final class SplittableRandom { * @return a stream of pseudorandom {@code double} values, * each with the given origin (inclusive) and bound (exclusive) * @throws IllegalArgumentException if {@code streamSize} is - * less than zero - * @throws IllegalArgumentException if {@code randomNumberOrigin} + * less than zero, or {@code randomNumberOrigin} * is greater than or equal to {@code randomNumberBound} */ public DoubleStream doubles(long streamSize, double randomNumberOrigin,