ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/SplittableRandom.java

Comparing jsr166/src/main/java/util/SplittableRandom.java (file contents):
Revision 1.18 by dl, Thu Aug 22 23:36:06 2013 UTC vs.
Revision 1.29 by jsr166, Sun Sep 20 02:41:36 2015 UTC

#	Line 25 | Line 25
25
26		package java.util;
27
28	–	import java.security.SecureRandom;
29	–	import java.net.InetAddress;
28		import java.util.concurrent.atomic.AtomicLong;
29	+	import java.util.function.DoubleConsumer;
30		import java.util.function.IntConsumer;
31		import java.util.function.LongConsumer;
32	<	import java.util.function.DoubleConsumer;
34	<	import java.util.stream.StreamSupport;
32	>	import java.util.stream.DoubleStream;
33		import java.util.stream.IntStream;
34		import java.util.stream.LongStream;
35	<	import java.util.stream.DoubleStream;
35	>	import java.util.stream.StreamSupport;
36
37		/**
38		* A generator of uniform pseudorandom values applicable for use in
#	Line 54 | Line 52 | import java.util.stream.DoubleStream;
52		* types and ranges, but similar properties are expected to hold, at
53		* least approximately, for others as well. The <em>period</em>
54		* (length of any series of generated values before it repeats) is at
55	<	* least 2<sup>64</sup>. </li>
55	>	* least 2<sup>64</sup>.
56		*
57	<	* <li> Method {@link #split} constructs and returns a new
57	>	* <li>Method {@link #split} constructs and returns a new
58		* SplittableRandom instance that shares no mutable state with the
59		* current instance. However, with very high probability, the
60		* values collectively generated by the two objects have the same
61		* statistical properties as if the same quantity of values were
62		* generated by a single thread using a single {@code
63	<	* SplittableRandom} object.  </li>
63	>	* SplittableRandom} object.
64		*
65		* <li>Instances of SplittableRandom are <em>not</em> thread-safe.
66		* They are designed to be split, not shared, across threads. For
#	Line 73 | Line 71 | import java.util.stream.DoubleStream;
71		*
72		* <li>This class provides additional methods for generating random
73		* streams, that employ the above techniques when used in {@code
74	<	* stream.parallel()} mode.</li>
74	>	* stream.parallel()} mode.
75		*
76		* </ul>
77		*
#	Line 83 | Line 81 | import java.util.stream.DoubleStream;
81		* default-constructed instances do not use a cryptographically random
82		* seed unless the {@linkplain System#getProperty system property}
83		* {@code java.util.secureRandomSeed} is set to {@code true}.
86	–
84		*
85		* @author  Guy Steele
86		* @author  Doug Lea
87		* @since   1.8
88		*/
89	<	public class SplittableRandom {
89	>	public final class SplittableRandom {
90
91		/*
92		* Implementation Overview.
#	Line 109 | Line 106 | public class SplittableRandom {
106		* Methods nextLong, nextInt, and derivatives do not return the
107		* sequence (seed) values, but instead a hash-like bit-mix of
108		* their bits, producing more independently distributed sequences.
109	<	* For nextLong, the mix64 bit-mixing function computes the same
110	<	* value as the "64-bit finalizer" function in Austin Appleby's
111	<	* MurmurHash3 algorithm.  See
112	<	* http://code.google.com/p/smhasher/wiki/MurmurHash3 , which
113	<	* comments: "The constants for the finalizers were generated by a
114	<	* simple simulated-annealing algorithm, and both avalanche all
115	<	* bits of 'h' to within 0.25% bias." The mix32 function is
119	<	* equivalent to (int)(mix64(seed) >>> 32), but faster because it
120	<	* omits a step that doesn't contribute to result.
109	>	* For nextLong, the mix64 function is based on David Stafford's
110	>	* (http://zimbry.blogspot.com/2011/09/better-bit-mixing-improving-on.html)
111	>	* "Mix13" variant of the "64-bit finalizer" function in Austin
112	>	* Appleby's MurmurHash3 algorithm (see
113	>	* http://code.google.com/p/smhasher/wiki/MurmurHash3). The mix32
114	>	* function is based on Stafford's Mix04 mix function, but returns
115	>	* the upper 32 bits cast as int.
116		*
117		* The split operation uses the current generator to form the seed
118		* and gamma for another SplittableRandom.  To conservatively
119		* avoid potential correlations between seed and value generation,
120	<	* gamma selection (method nextGamma) uses the "Mix13" constants
121	<	* for MurmurHash3 described by David Stafford
122	<	* (http://zimbry.blogspot.com/2011/09/better-bit-mixing-improving-on.html)
123	<	* To avoid potential weaknesses in bit-mixing transformations, we
124	<	* restrict gammas to odd values with at least 12 and no more than
125	<	* 52 bits set.  Rather than rejecting candidates with too few or
126	<	* too many bits set, method nextGamma flips some bits (which has
127	<	* the effect of mapping at most 4 to any given gamma value).
133	<	* This reduces the effective set of 64bit odd gamma values by
134	<	* about 2<sup>14</sup>, a very tiny percentage, and serves as an
120	>	* gamma selection (method mixGamma) uses different
121	>	* (Murmurhash3's) mix constants.  To avoid potential weaknesses
122	>	* in bit-mixing transformations, we restrict gammas to odd values
123	>	* with at least 24 0-1 or 1-0 bit transitions.  Rather than
124	>	* rejecting candidates with too few or too many bits set, method
125	>	* mixGamma flips some bits (which has the effect of mapping at
126	>	* most 4 to any given gamma value).  This reduces the effective
127	>	* set of 64bit odd gamma values by about 2%, and serves as an
128		* automated screening for sequence constant selection that is
129		* left as an empirical decision in some other hashing and crypto
130		* algorithms.
#	Line 142 | Line 135 | public class SplittableRandom {
135		* avalanching.
136		*
137		* The default (no-argument) constructor, in essence, invokes
138	<	* split() for a common "seeder" SplittableRandom.  Unlike other
139	<	* cases, this split must be performed in a thread-safe manner, so
140	<	* we use an AtomicLong to represent the seed rather than use an
141	<	* explicit SplittableRandom. To bootstrap the seeder, we start
142	<	* off using a seed based on current time and host unless the
143	<	* SecureRandomSeed property is set. This serves as a
144	<	* slimmed-down (and insecure) variant of SecureRandom that also
145	<	* avoids stalls that may occur when using /dev/random.
138	>	* split() for a common "defaultGen" SplittableRandom.  Unlike
139	>	* other cases, this split must be performed in a thread-safe
140	>	* manner, so we use an AtomicLong to represent the seed rather
141	>	* than use an explicit SplittableRandom. To bootstrap the
142	>	* defaultGen, we start off using a seed based on current time
143	>	* unless the java.util.secureRandomSeed property is set. This
144	>	* serves as a slimmed-down (and insecure) variant of SecureRandom
145	>	* that also avoids stalls that may occur when using /dev/random.
146		*
147		* It is a relatively simple matter to apply the basic design here
148		* to use 128 bit seeds. However, emulating 128bit arithmetic and
#	Line 162 | Line 155 | public class SplittableRandom {
155		*/
156
157		/**
158	<	* The initial gamma value for (unsplit) SplittableRandoms. Must
159	<	* be odd with at least 12 and no more than 52 bits set. Currently
167	<	* set to the golden ratio scaled to 64bits.
158	>	* The golden ratio scaled to 64bits, used as the initial gamma
159	>	* value for (unsplit) SplittableRandoms.
160		*/
161	<	private static final long INITIAL_GAMMA = 0x9e3779b97f4a7c15L;
161	>	private static final long GOLDEN_GAMMA = 0x9e3779b97f4a7c15L;
162
163		/**
164		* The least non-zero value returned by nextDouble(). This value
165		* is scaled by a random value of 53 bits to produce a result.
166		*/
167	<	private static final double DOUBLE_UNIT = 1.0 / (1L << 53);
167	>	private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53);
168
169		/**
170		* The seed. Updated only via method nextSeed.
#	Line 193 | Line 185 | public class SplittableRandom {
185		}
186
187		/**
188	<	* Computes MurmurHash3 64bit mix function.
188	>	* Computes Stafford variant 13 of 64bit mix function.
189		*/
190		private static long mix64(long z) {
191	<	z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL;
192	<	z = (z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L;
193	<	return z ^ (z >>> 33);
191	>	z = (z ^ (z >>> 30)) * 0xbf58476d1ce4e5b9L;
192	>	z = (z ^ (z >>> 27)) * 0x94d049bb133111ebL;
193	>	return z ^ (z >>> 31);
194		}
195
196		/**
197	<	* Returns the 32 high bits of mix64(z) as int.
197	>	* Returns the 32 high bits of Stafford variant 4 mix64 function as int.
198		*/
199		private static int mix32(long z) {
200	<	z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL;
201	<	return (int)(((z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L) >>> 32);
200	>	z = (z ^ (z >>> 33)) * 0x62a9d9ed799705f5L;
201	>	return (int)(((z ^ (z >>> 28)) * 0xcb24d0a5c88c35b3L) >>> 32);
202		}
203
204		/**
205		* Returns the gamma value to use for a new split instance.
206		*/
207	<	private static long nextGamma(long z) {
208	<	z = (z ^ (z >>> 30)) * 0xbf58476d1ce4e5b9L; // Stafford "Mix13"
209	<	z = (z ^ (z >>> 27)) * 0x94d049bb133111ebL;
210	<	z = (z ^ (z >>> 31)) | 1L; // force to be odd
211	<	int n = Long.bitCount(z);  // ensure enough 0 and 1 bits
212	<	return (n < 12 || n > 52) ? z ^ 0xaaaaaaaaaaaaaaaaL : z;
207	>	private static long mixGamma(long z) {
208	>	z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL; // MurmurHash3 mix constants
209	>	z = (z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L;
210	>	z = (z ^ (z >>> 33)) | 1L;                  // force to be odd
211	>	int n = Long.bitCount(z ^ (z >>> 1));       // ensure enough transitions
212	>	return (n < 24) ? z ^ 0xaaaaaaaaaaaaaaaaL : z;
213		}
214
215		/**
#	Line 230 | Line 222 | public class SplittableRandom {
222		/**
223		* The seed generator for default constructors.
224		*/
225	<	private static final AtomicLong seeder = new AtomicLong(initialSeed());
225	>	private static final AtomicLong defaultGen = new AtomicLong(initialSeed());
226
227		private static long initialSeed() {
228	<	try {  // ignore exceptions in accessing/parsing properties
229	<	String pp = System.getProperty
230	<	("java.util.secureRandomSeed");
231	<	if (pp != null && pp.equalsIgnoreCase("true")) {
232	<	byte[] seedBytes = java.security.SecureRandom.getSeed(8);
233	<	long s = (long)(seedBytes[0]) & 0xffL;
234	<	for (int i = 1; i < 8; ++i)
235	<	s = (s << 8) | ((long)(seedBytes[i]) & 0xffL);
236	<	return s;
245	<	}
246	<	} catch (Exception ignore) {
247	<	}
248	<	int hh = 0; // hashed host address
249	<	try {
250	<	hh = InetAddress.getLocalHost().hashCode();
251	<	} catch (Exception ignore) {
228	>	String pp = java.security.AccessController.doPrivileged(
229	>	new sun.security.action.GetPropertyAction(
230	>	"java.util.secureRandomSeed"));
231	>	if (pp != null && pp.equalsIgnoreCase("true")) {
232	>	byte[] seedBytes = java.security.SecureRandom.getSeed(8);
233	>	long s = (long)(seedBytes[0]) & 0xffL;
234	>	for (int i = 1; i < 8; ++i)
235	>	s = (s << 8) | ((long)(seedBytes[i]) & 0xffL);
236	>	return s;
237		}
238	<	return (mix64((((long)hh) << 32) ^ System.currentTimeMillis()) ^
238	>	return (mix64(System.currentTimeMillis()) ^
239		mix64(System.nanoTime()));
240		}
241
242		// IllegalArgumentException messages
243	<	static final String BadBound = "bound must be positive";
244	<	static final String BadRange = "bound must be greater than origin";
245	<	static final String BadSize  = "size must be non-negative";
243	>	static final String BAD_BOUND = "bound must be positive";
244	>	static final String BAD_RANGE = "bound must be greater than origin";
245	>	static final String BAD_SIZE  = "size must be non-negative";
246
247		/*
248		* Internal versions of nextX methods used by streams, as well as
#	Line 378 | Line 363 | public class SplittableRandom {
363		* @param seed the initial seed
364		*/
365		public SplittableRandom(long seed) {
366	<	this(seed, INITIAL_GAMMA);
366	>	this(seed, GOLDEN_GAMMA);
367		}
368
369		/**
#	Line 387 | Line 372 | public class SplittableRandom {
372		* of those of any other instances in the current program; and
373		* may, and typically does, vary across program invocations.
374		*/
375	<	public SplittableRandom() { // emulate seeder.split()
376	<	this.gamma = nextGamma(this.seed = seeder.addAndGet(INITIAL_GAMMA));
375	>	public SplittableRandom() { // emulate defaultGen.split()
376	>	long s = defaultGen.getAndAdd(2 * GOLDEN_GAMMA);
377	>	this.seed = mix64(s);
378	>	this.gamma = mixGamma(s + GOLDEN_GAMMA);
379		}
380
381		/**
#	Line 406 | Line 393 | public class SplittableRandom {
393		* @return the new SplittableRandom instance
394		*/
395		public SplittableRandom split() {
396	<	long s = nextSeed();
410	<	return new SplittableRandom(s, nextGamma(s));
396	>	return new SplittableRandom(nextLong(), mixGamma(nextSeed()));
397		}
398
399		/**
#	Line 430 | Line 416 | public class SplittableRandom {
416		*/
417		public int nextInt(int bound) {
418		if (bound <= 0)
419	<	throw new IllegalArgumentException(BadBound);
419	>	throw new IllegalArgumentException(BAD_BOUND);
420		// Specialize internalNextInt for origin 0
421		int r = mix32(nextSeed());
422		int m = bound - 1;
#	Line 458 | Line 444 | public class SplittableRandom {
444		*/
445		public int nextInt(int origin, int bound) {
446		if (origin >= bound)
447	<	throw new IllegalArgumentException(BadRange);
447	>	throw new IllegalArgumentException(BAD_RANGE);
448		return internalNextInt(origin, bound);
449		}
450
#	Line 482 | Line 468 | public class SplittableRandom {
468		*/
469		public long nextLong(long bound) {
470		if (bound <= 0)
471	<	throw new IllegalArgumentException(BadBound);
471	>	throw new IllegalArgumentException(BAD_BOUND);
472		// Specialize internalNextLong for origin 0
473		long r = mix64(nextSeed());
474		long m = bound - 1;
#	Line 510 | Line 496 | public class SplittableRandom {
496		*/
497		public long nextLong(long origin, long bound) {
498		if (origin >= bound)
499	<	throw new IllegalArgumentException(BadRange);
499	>	throw new IllegalArgumentException(BAD_RANGE);
500		return internalNextLong(origin, bound);
501		}
502
#	Line 536 | Line 522 | public class SplittableRandom {
522		*/
523		public double nextDouble(double bound) {
524		if (!(bound > 0.0))
525	<	throw new IllegalArgumentException(BadBound);
525	>	throw new IllegalArgumentException(BAD_BOUND);
526		double result = (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT * bound;
527		return (result < bound) ?  result : // correct for rounding
528		Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1);
#	Line 555 | Line 541 | public class SplittableRandom {
541		*/
542		public double nextDouble(double origin, double bound) {
543		if (!(origin < bound))
544	<	throw new IllegalArgumentException(BadRange);
544	>	throw new IllegalArgumentException(BAD_RANGE);
545		return internalNextDouble(origin, bound);
546		}
547
#	Line 583 | Line 569 | public class SplittableRandom {
569		*/
570		public IntStream ints(long streamSize) {
571		if (streamSize < 0L)
572	<	throw new IllegalArgumentException(BadSize);
572	>	throw new IllegalArgumentException(BAD_SIZE);
573		return StreamSupport.intStream
574		(new RandomIntsSpliterator
575		(this, 0L, streamSize, Integer.MAX_VALUE, 0),
#	Line 624 | Line 610 | public class SplittableRandom {
610		public IntStream ints(long streamSize, int randomNumberOrigin,
611		int randomNumberBound) {
612		if (streamSize < 0L)
613	<	throw new IllegalArgumentException(BadSize);
613	>	throw new IllegalArgumentException(BAD_SIZE);
614		if (randomNumberOrigin >= randomNumberBound)
615	<	throw new IllegalArgumentException(BadRange);
615	>	throw new IllegalArgumentException(BAD_RANGE);
616		return StreamSupport.intStream
617		(new RandomIntsSpliterator
618		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 650 | Line 636 | public class SplittableRandom {
636		*/
637		public IntStream ints(int randomNumberOrigin, int randomNumberBound) {
638		if (randomNumberOrigin >= randomNumberBound)
639	<	throw new IllegalArgumentException(BadRange);
639	>	throw new IllegalArgumentException(BAD_RANGE);
640		return StreamSupport.intStream
641		(new RandomIntsSpliterator
642		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 669 | Line 655 | public class SplittableRandom {
655		*/
656		public LongStream longs(long streamSize) {
657		if (streamSize < 0L)
658	<	throw new IllegalArgumentException(BadSize);
658	>	throw new IllegalArgumentException(BAD_SIZE);
659		return StreamSupport.longStream
660		(new RandomLongsSpliterator
661		(this, 0L, streamSize, Long.MAX_VALUE, 0L),
#	Line 710 | Line 696 | public class SplittableRandom {
696		public LongStream longs(long streamSize, long randomNumberOrigin,
697		long randomNumberBound) {
698		if (streamSize < 0L)
699	<	throw new IllegalArgumentException(BadSize);
699	>	throw new IllegalArgumentException(BAD_SIZE);
700		if (randomNumberOrigin >= randomNumberBound)
701	<	throw new IllegalArgumentException(BadRange);
701	>	throw new IllegalArgumentException(BAD_RANGE);
702		return StreamSupport.longStream
703		(new RandomLongsSpliterator
704		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 736 | Line 722 | public class SplittableRandom {
722		*/
723		public LongStream longs(long randomNumberOrigin, long randomNumberBound) {
724		if (randomNumberOrigin >= randomNumberBound)
725	<	throw new IllegalArgumentException(BadRange);
725	>	throw new IllegalArgumentException(BAD_RANGE);
726		return StreamSupport.longStream
727		(new RandomLongsSpliterator
728		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 755 | Line 741 | public class SplittableRandom {
741		*/
742		public DoubleStream doubles(long streamSize) {
743		if (streamSize < 0L)
744	<	throw new IllegalArgumentException(BadSize);
744	>	throw new IllegalArgumentException(BAD_SIZE);
745		return StreamSupport.doubleStream
746		(new RandomDoublesSpliterator
747		(this, 0L, streamSize, Double.MAX_VALUE, 0.0),
#	Line 798 | Line 784 | public class SplittableRandom {
784		public DoubleStream doubles(long streamSize, double randomNumberOrigin,
785		double randomNumberBound) {
786		if (streamSize < 0L)
787	<	throw new IllegalArgumentException(BadSize);
787	>	throw new IllegalArgumentException(BAD_SIZE);
788		if (!(randomNumberOrigin < randomNumberBound))
789	<	throw new IllegalArgumentException(BadRange);
789	>	throw new IllegalArgumentException(BAD_RANGE);
790		return StreamSupport.doubleStream
791		(new RandomDoublesSpliterator
792		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 824 | Line 810 | public class SplittableRandom {
810		*/
811		public DoubleStream doubles(double randomNumberOrigin, double randomNumberBound) {
812		if (!(randomNumberOrigin < randomNumberBound))
813	<	throw new IllegalArgumentException(BadRange);
813	>	throw new IllegalArgumentException(BAD_RANGE);
814		return StreamSupport.doubleStream
815		(new RandomDoublesSpliterator
816		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 839 | Line 825 | public class SplittableRandom {
825		* approach. The long and double versions of this class are
826		* identical except for types.
827		*/
828	<	static final class RandomIntsSpliterator implements Spliterator.OfInt {
828	>	private static final class RandomIntsSpliterator
829	>	implements Spliterator.OfInt {
830		final SplittableRandom rng;
831		long index;
832		final long fence;
#	Line 894 | Line 881 | public class SplittableRandom {
881		/**
882		* Spliterator for long streams.
883		*/
884	<	static final class RandomLongsSpliterator implements Spliterator.OfLong {
884	>	private static final class RandomLongsSpliterator
885	>	implements Spliterator.OfLong {
886		final SplittableRandom rng;
887		long index;
888		final long fence;
#	Line 950 | Line 938 | public class SplittableRandom {
938		/**
939		* Spliterator for double streams.
940		*/
941	<	static final class RandomDoublesSpliterator implements Spliterator.OfDouble {
941	>	private static final class RandomDoublesSpliterator
942	>	implements Spliterator.OfDouble {
943		final SplittableRandom rng;
944		long index;
945		final long fence;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines