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.24 by dl, Mon Oct 7 10:54:27 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.net.NetworkInterface;
28   import java.util.concurrent.atomic.AtomicLong;
29   import java.util.function.IntConsumer;
30   import java.util.function.LongConsumer;
# Line 140 | Line 139 | public final 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
147 <     * 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 237 | Line 235 | public final class SplittableRandom {
235                  s = (s << 8) | ((long)(seedBytes[i]) & 0xffL);
236              return s;
237          }
238 <        long h = 0L;
241 <        try {
242 <            Enumeration<NetworkInterface> ifcs =
243 <                    NetworkInterface.getNetworkInterfaces();
244 <            boolean retry = false; // retry once if getHardwareAddress is null
245 <            while (ifcs.hasMoreElements()) {
246 <                NetworkInterface ifc = ifcs.nextElement();
247 <                if (!ifc.isVirtual()) { // skip fake addresses
248 <                    byte[] bs = ifc.getHardwareAddress();
249 <                    if (bs != null) {
250 <                        int n = bs.length;
251 <                        int m = Math.min(n >>> 1, 4);
252 <                        for (int i = 0; i < m; ++i)
253 <                            h = (h << 16) ^ (bs[i] << 8) ^ bs[n-1-i];
254 <                        if (m < 4)
255 <                            h = (h << 8) ^ bs[n-1-m];
256 <                        h = mix64(h);
257 <                        break;
258 <                    }
259 <                    else if (!retry)
260 <                        retry = true;
261 <                    else
262 <                        break;
263 <                }
264 <            }
265 <        } catch (Exception ignore) {
266 <        }
267 <        return (h ^ mix64(System.currentTimeMillis()) ^
238 >        return (mix64(System.currentTimeMillis()) ^
239                  mix64(System.nanoTime()));
240      }
241  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines