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.29 by jsr166, Sun Sep 20 02:41:36 2015 UTC vs.
Revision 1.33 by dl, Sat Nov 12 00:12:05 2016 UTC

# Line 219 | Line 219 | public final 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          }
238        return (mix64(System.currentTimeMillis()) ^
239                mix64(System.nanoTime()));
247      }
248  
242    // IllegalArgumentException messages
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
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 528 | Line 530 | public final class SplittableRandom {
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).

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines