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.22 by dl, Fri Sep 20 09:38:07 2013 UTC vs.
Revision 1.35 by jsr166, Sun Nov 13 02:23:22 2016 UTC

#	Line 25 | Line 25
25
26		package java.util;
27
28	–	import java.security.SecureRandom;
29	–	import java.net.NetworkInterface;
30	–	import java.util.Enumeration;
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;
35	<	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 55 | 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 74 | 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 89 | Line 86 | import java.util.stream.DoubleStream;
86		* @author  Doug Lea
87		* @since   1.8
88		*/
89	<	public class SplittableRandom {
89	>	public final class SplittableRandom {
90
91		/*
92		* Implementation Overview.
#	Line 112 | Line 109 | public class SplittableRandom {
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
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		*
#	Line 142 | Line 139 | public class SplittableRandom {
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 and
143	<	* network interface address unless the java.util.secureRandomSeed
144	<	* property is set. This serves as a slimmed-down (and insecure)
145	<	* variant of SecureRandom that also avoids stalls that may occur
149	<	* when using /dev/random.
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 168 | Line 164 | public class SplittableRandom {
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_ULP = 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 192 | Line 188 | public class SplittableRandom {
188		* Computes Stafford variant 13 of 64bit mix function.
189		*/
190		private static long mix64(long z) {
191	<	z *= 0xbf58476d1ce4e5b9L;
192	<	z = (z ^ (z >>> 32)) * 0x94d049bb133111ebL;
193	<	return z ^ (z >>> 32);
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 Stafford variant 4 mix64 function as int.
198		*/
199		private static int mix32(long z) {
200	<	z *= 0x62a9d9ed799705f5L;
200	>	z = (z ^ (z >>> 33)) * 0x62a9d9ed799705f5L;
201		return (int)(((z ^ (z >>> 28)) * 0xcb24d0a5c88c35b3L) >>> 32);
202		}
203
#	Line 209 | Line 205 | public class SplittableRandom {
205		* Returns the gamma value to use for a new split instance.
206		*/
207		private static long mixGamma(long z) {
208	<	z *= 0xff51afd7ed558ccdL;                   // MurmurHash3 mix constants
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
#	Line 223 | Line 219 | public class SplittableRandom {
219		return seed += gamma;
220		}
221
222	+	// IllegalArgumentException messages
223	+	static final String BAD_BOUND = "bound must be positive";
224	+	static final String BAD_RANGE = "bound must be greater than origin";
225	+	static final String BAD_SIZE  = "size must be non-negative";
226	+
227		/**
228		* The seed generator for default constructors.
229		*/
230	<	private static final AtomicLong defaultGen = new AtomicLong(initialSeed());
231	<
232	<	private static long initialSeed() {
233	<	String pp = java.security.AccessController.doPrivileged(
234	<	new sun.security.action.GetPropertyAction(
235	<	"java.util.secureRandomSeed"));
236	<	if (pp != null && pp.equalsIgnoreCase("true")) {
230	>	private static final AtomicLong defaultGen
231	>	= new AtomicLong(mix64(System.currentTimeMillis()) ^
232	>	mix64(System.nanoTime()));
233	>
234	>	// at end of <clinit> to survive static initialization circularity
235	>	static {
236	>	if (java.security.AccessController.doPrivileged(
237	>	new java.security.PrivilegedAction<Boolean>() {
238	>	public Boolean run() {
239	>	return Boolean.getBoolean("java.util.secureRandomSeed");
240	>	}})) {
241		byte[] seedBytes = java.security.SecureRandom.getSeed(8);
242	<	long s = (long)(seedBytes[0]) & 0xffL;
242	>	long s = (long)seedBytes[0] & 0xffL;
243		for (int i = 1; i < 8; ++i)
244	<	s = (s << 8) | ((long)(seedBytes[i]) & 0xffL);
245	<	return s;
244	>	s = (s << 8) | ((long)seedBytes[i] & 0xffL);
245	>	defaultGen.set(s);
246		}
242	–	long h = 0L;
243	–	try {
244	–	Enumeration<NetworkInterface> ifcs =
245	–	NetworkInterface.getNetworkInterfaces();
246	–	boolean retry = false; // retry once if getHardwareAddress is null
247	–	while (ifcs.hasMoreElements()) {
248	–	NetworkInterface ifc = ifcs.nextElement();
249	–	if (!ifc.isVirtual()) { // skip fake addresses
250	–	byte[] bs = ifc.getHardwareAddress();
251	–	if (bs != null) {
252	–	int n = bs.length;
253	–	int m = Math.min(n >>> 1, 4);
254	–	for (int i = 0; i < m; ++i)
255	–	h = (h << 16) ^ (bs[i] << 8) ^ bs[n-1-i];
256	–	if (m < 4)
257	–	h = (h << 8) ^ bs[n-1-m];
258	–	h = mix64(h);
259	–	break;
260	–	}
261	–	else if (!retry)
262	–	retry = true;
263	–	else
264	–	break;
265	–	}
266	–	}
267	–	} catch (Exception ignore) {
268	–	}
269	–	return (h ^ mix64(System.currentTimeMillis()) ^
270	–	mix64(System.nanoTime()));
247		}
248
273	–	// IllegalArgumentException messages
274	–	static final String BadBound = "bound must be positive";
275	–	static final String BadRange = "bound must be greater than origin";
276	–	static final String BadSize  = "size must be non-negative";
277	–
249		/*
250		* Internal versions of nextX methods used by streams, as well as
251		* the public nextX(origin, bound) methods.  These exist mainly to
#	Line 375 | Line 346 | public class SplittableRandom {
346		* @return a pseudorandom value
347		*/
348		final double internalNextDouble(double origin, double bound) {
349	<	double r = (nextLong() >>> 11) * DOUBLE_ULP;
349	>	double r = (nextLong() >>> 11) * DOUBLE_UNIT;
350		if (origin < bound) {
351		r = r * (bound - origin) + origin;
352		if (r >= bound) // correct for rounding
#	Line 404 | Line 375 | public class SplittableRandom {
375		* may, and typically does, vary across program invocations.
376		*/
377		public SplittableRandom() { // emulate defaultGen.split()
378	<	long s = defaultGen.getAndAdd(2*GOLDEN_GAMMA);
378	>	long s = defaultGen.getAndAdd(2 * GOLDEN_GAMMA);
379		this.seed = mix64(s);
380		this.gamma = mixGamma(s + GOLDEN_GAMMA);
381		}
#	Line 447 | Line 418 | public class SplittableRandom {
418		*/
419		public int nextInt(int bound) {
420		if (bound <= 0)
421	<	throw new IllegalArgumentException(BadBound);
421	>	throw new IllegalArgumentException(BAD_BOUND);
422		// Specialize internalNextInt for origin 0
423		int r = mix32(nextSeed());
424		int m = bound - 1;
#	Line 475 | Line 446 | public class SplittableRandom {
446		*/
447		public int nextInt(int origin, int bound) {
448		if (origin >= bound)
449	<	throw new IllegalArgumentException(BadRange);
449	>	throw new IllegalArgumentException(BAD_RANGE);
450		return internalNextInt(origin, bound);
451		}
452
#	Line 499 | Line 470 | public class SplittableRandom {
470		*/
471		public long nextLong(long bound) {
472		if (bound <= 0)
473	<	throw new IllegalArgumentException(BadBound);
473	>	throw new IllegalArgumentException(BAD_BOUND);
474		// Specialize internalNextLong for origin 0
475		long r = mix64(nextSeed());
476		long m = bound - 1;
#	Line 527 | Line 498 | public class SplittableRandom {
498		*/
499		public long nextLong(long origin, long bound) {
500		if (origin >= bound)
501	<	throw new IllegalArgumentException(BadRange);
501	>	throw new IllegalArgumentException(BAD_RANGE);
502		return internalNextLong(origin, bound);
503		}
504
#	Line 539 | Line 510 | public class SplittableRandom {
510		*         (inclusive) and one (exclusive)
511		*/
512		public double nextDouble() {
513	<	return (mix64(nextSeed()) >>> 11) * DOUBLE_ULP;
513	>	return (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT;
514		}
515
516		/**
#	Line 553 | Line 524 | public class SplittableRandom {
524		*/
525		public double nextDouble(double bound) {
526		if (!(bound > 0.0))
527	<	throw new IllegalArgumentException(BadBound);
528	<	double result = (mix64(nextSeed()) >>> 11) * DOUBLE_ULP * bound;
527	>	throw new IllegalArgumentException(BAD_BOUND);
528	>	double result = (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT * bound;
529		return (result < bound) ?  result : // correct for rounding
530		Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1);
531		}
532
533		/**
534	+	* Generates a pseudorandom number with the indicated number of
535	+	* bits. Unlike in superclass {@link Random}, this method is never
536	+	* internally called or used by any other publicly accessible
537	+	* method.
538	+	*
539	+	* @param  bits random bits
540	+	* @return the next pseudorandom value from this random number
541	+	*         generator's sequence
542	+	*/
543	+	protected int next(int bits) {
544	+	return (int)(nextLong() >>> (64 - bits));
545	+	}
546	+
547	+	/**
548		* Returns a pseudorandom {@code double} value between the specified
549		* origin (inclusive) and bound (exclusive).
550		*
#	Line 572 | Line 557 | public class SplittableRandom {
557		*/
558		public double nextDouble(double origin, double bound) {
559		if (!(origin < bound))
560	<	throw new IllegalArgumentException(BadRange);
560	>	throw new IllegalArgumentException(BAD_RANGE);
561		return internalNextDouble(origin, bound);
562		}
563
#	Line 600 | Line 585 | public class SplittableRandom {
585		*/
586		public IntStream ints(long streamSize) {
587		if (streamSize < 0L)
588	<	throw new IllegalArgumentException(BadSize);
588	>	throw new IllegalArgumentException(BAD_SIZE);
589		return StreamSupport.intStream
590		(new RandomIntsSpliterator
591		(this, 0L, streamSize, Integer.MAX_VALUE, 0),
#	Line 641 | Line 626 | public class SplittableRandom {
626		public IntStream ints(long streamSize, int randomNumberOrigin,
627		int randomNumberBound) {
628		if (streamSize < 0L)
629	<	throw new IllegalArgumentException(BadSize);
629	>	throw new IllegalArgumentException(BAD_SIZE);
630		if (randomNumberOrigin >= randomNumberBound)
631	<	throw new IllegalArgumentException(BadRange);
631	>	throw new IllegalArgumentException(BAD_RANGE);
632		return StreamSupport.intStream
633		(new RandomIntsSpliterator
634		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 667 | Line 652 | public class SplittableRandom {
652		*/
653		public IntStream ints(int randomNumberOrigin, int randomNumberBound) {
654		if (randomNumberOrigin >= randomNumberBound)
655	<	throw new IllegalArgumentException(BadRange);
655	>	throw new IllegalArgumentException(BAD_RANGE);
656		return StreamSupport.intStream
657		(new RandomIntsSpliterator
658		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 686 | Line 671 | public class SplittableRandom {
671		*/
672		public LongStream longs(long streamSize) {
673		if (streamSize < 0L)
674	<	throw new IllegalArgumentException(BadSize);
674	>	throw new IllegalArgumentException(BAD_SIZE);
675		return StreamSupport.longStream
676		(new RandomLongsSpliterator
677		(this, 0L, streamSize, Long.MAX_VALUE, 0L),
#	Line 727 | Line 712 | public class SplittableRandom {
712		public LongStream longs(long streamSize, long randomNumberOrigin,
713		long randomNumberBound) {
714		if (streamSize < 0L)
715	<	throw new IllegalArgumentException(BadSize);
715	>	throw new IllegalArgumentException(BAD_SIZE);
716		if (randomNumberOrigin >= randomNumberBound)
717	<	throw new IllegalArgumentException(BadRange);
717	>	throw new IllegalArgumentException(BAD_RANGE);
718		return StreamSupport.longStream
719		(new RandomLongsSpliterator
720		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 753 | Line 738 | public class SplittableRandom {
738		*/
739		public LongStream longs(long randomNumberOrigin, long randomNumberBound) {
740		if (randomNumberOrigin >= randomNumberBound)
741	<	throw new IllegalArgumentException(BadRange);
741	>	throw new IllegalArgumentException(BAD_RANGE);
742		return StreamSupport.longStream
743		(new RandomLongsSpliterator
744		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 772 | Line 757 | public class SplittableRandom {
757		*/
758		public DoubleStream doubles(long streamSize) {
759		if (streamSize < 0L)
760	<	throw new IllegalArgumentException(BadSize);
760	>	throw new IllegalArgumentException(BAD_SIZE);
761		return StreamSupport.doubleStream
762		(new RandomDoublesSpliterator
763		(this, 0L, streamSize, Double.MAX_VALUE, 0.0),
#	Line 815 | Line 800 | public class SplittableRandom {
800		public DoubleStream doubles(long streamSize, double randomNumberOrigin,
801		double randomNumberBound) {
802		if (streamSize < 0L)
803	<	throw new IllegalArgumentException(BadSize);
803	>	throw new IllegalArgumentException(BAD_SIZE);
804		if (!(randomNumberOrigin < randomNumberBound))
805	<	throw new IllegalArgumentException(BadRange);
805	>	throw new IllegalArgumentException(BAD_RANGE);
806		return StreamSupport.doubleStream
807		(new RandomDoublesSpliterator
808		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 841 | Line 826 | public class SplittableRandom {
826		*/
827		public DoubleStream doubles(double randomNumberOrigin, double randomNumberBound) {
828		if (!(randomNumberOrigin < randomNumberBound))
829	<	throw new IllegalArgumentException(BadRange);
829	>	throw new IllegalArgumentException(BAD_RANGE);
830		return StreamSupport.doubleStream
831		(new RandomDoublesSpliterator
832		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 856 | Line 841 | public class SplittableRandom {
841		* approach. The long and double versions of this class are
842		* identical except for types.
843		*/
844	<	static final class RandomIntsSpliterator implements Spliterator.OfInt {
844	>	private static final class RandomIntsSpliterator
845	>	implements Spliterator.OfInt {
846		final SplittableRandom rng;
847		long index;
848		final long fence;
#	Line 911 | Line 897 | public class SplittableRandom {
897		/**
898		* Spliterator for long streams.
899		*/
900	<	static final class RandomLongsSpliterator implements Spliterator.OfLong {
900	>	private static final class RandomLongsSpliterator
901	>	implements Spliterator.OfLong {
902		final SplittableRandom rng;
903		long index;
904		final long fence;
#	Line 967 | Line 954 | public class SplittableRandom {
954		/**
955		* Spliterator for double streams.
956		*/
957	<	static final class RandomDoublesSpliterator implements Spliterator.OfDouble {
957	>	private static final class RandomDoublesSpliterator
958	>	implements Spliterator.OfDouble {
959		final SplittableRandom rng;
960		long index;
961		final long fence;

Diff Legend

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