ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/SplittableRandom.java
(Generate patch)

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.25 by dl, Tue Dec 2 12:17:38 2014 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.IntConsumer;
30   import java.util.function.LongConsumer;
# 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 239 | Line 235 | public class SplittableRandom {
235                  s = (s << 8) | ((long)(seedBytes[i]) & 0xffL);
236              return s;
237          }
238 <        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()) ^
238 >        return (mix64(System.currentTimeMillis()) ^
239                  mix64(System.nanoTime()));
240      }
241  
# Line 375 | Line 344 | public class SplittableRandom {
344       * @return a pseudorandom value
345       */
346      final double internalNextDouble(double origin, double bound) {
347 <        double r = (nextLong() >>> 11) * DOUBLE_ULP;
347 >        double r = (nextLong() >>> 11) * DOUBLE_UNIT;
348          if (origin < bound) {
349              r = r * (bound - origin) + origin;
350              if (r >= bound) // correct for rounding
# Line 404 | Line 373 | public class SplittableRandom {
373       * may, and typically does, vary across program invocations.
374       */
375      public SplittableRandom() { // emulate defaultGen.split()
376 <        long s = defaultGen.getAndAdd(2*GOLDEN_GAMMA);
376 >        long s = defaultGen.getAndAdd(2 * GOLDEN_GAMMA);
377          this.seed = mix64(s);
378          this.gamma = mixGamma(s + GOLDEN_GAMMA);
379      }
# Line 539 | Line 508 | public class SplittableRandom {
508       *         (inclusive) and one (exclusive)
509       */
510      public double nextDouble() {
511 <        return (mix64(nextSeed()) >>> 11) * DOUBLE_ULP;
511 >        return (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT;
512      }
513  
514      /**
# Line 554 | Line 523 | public class SplittableRandom {
523      public double nextDouble(double bound) {
524          if (!(bound > 0.0))
525              throw new IllegalArgumentException(BadBound);
526 <        double result = (mix64(nextSeed()) >>> 11) * DOUBLE_ULP * 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);
529      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines