From fe279d3f02a3fa04356d244e8dd74a77b40deb49 Mon Sep 17 00:00:00 2001
From: Trustin Lee <t@motd.kr>
Date: Fri, 21 Mar 2014 13:43:15 +0900
Subject: [PATCH] Use SecureRandom.generateSeed() to generate
 ThreadLocalRandom's initialSeedUniquifier

Motivation:

Previously, we used SecureRandom.nextLong() to generate the initialSeedUniquifier.  This required more entrophy than necessary because it has to 1) generate the seed of SecureRandom first and then 2) generate a random long integer.  Instead, we can use generateSeed() to skip the step (2)

Modifications:

Use generateSeed() instead of nextLong()

Result:

ThreadLocalRandom requires less amount of entrphy to start up
---
 .../util/internal/ThreadLocalRandom.java      | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/io/netty/util/internal/ThreadLocalRandom.java b/common/src/main/java/io/netty/util/internal/ThreadLocalRandom.java
index 3049e48274..0e9838adf4 100644
--- a/common/src/main/java/io/netty/util/internal/ThreadLocalRandom.java
+++ b/common/src/main/java/io/netty/util/internal/ThreadLocalRandom.java
@@ -82,12 +82,12 @@ public class ThreadLocalRandom extends Random {
         if (initialSeedUniquifier == 0) {
             // Try to generate a real random number from /dev/random.
             // Get from a different thread to avoid blocking indefinitely on a machine without much entrophy.
-            final BlockingQueue<Long> queue = new LinkedBlockingQueue<Long>();
+            final BlockingQueue<byte[]> queue = new LinkedBlockingQueue<byte[]>();
             Thread generatorThread = new Thread("initialSeedUniquifierGenerator") {
                 @Override
                 public void run() {
                     SecureRandom random = new SecureRandom(); // Get the real random seed from /dev/random
-                    queue.add(random.nextLong());
+                    queue.add(random.generateSeed(8));
                 }
             };
             generatorThread.start();
@@ -99,15 +99,23 @@ public class ThreadLocalRandom extends Random {
                 long waitTime = deadLine - System.nanoTime();
                 if (waitTime <= 0) {
                     logger.warn(
-                            "Failed to get the secure random number from SecureRandom within {} seconds. " +
+                            "Failed to generate a seed from SecureRandom within {} seconds. " +
                             "Not enough entrophy?", timeoutSeconds);
                     break;
                 }
 
                 try {
-                    Long result = queue.poll(waitTime, TimeUnit.NANOSECONDS);
-                    if (result != null) {
-                        initialSeedUniquifier = result;
+                    byte[] seed = queue.poll(waitTime, TimeUnit.NANOSECONDS);
+                    if (seed != null) {
+                        initialSeedUniquifier =
+                                ((long) seed[0] & 0xff) << 56 |
+                                ((long) seed[1] & 0xff) << 48 |
+                                ((long) seed[2] & 0xff) << 40 |
+                                ((long) seed[3] & 0xff) << 32 |
+                                ((long) seed[4] & 0xff) << 24 |
+                                ((long) seed[5] & 0xff) << 16 |
+                                ((long) seed[6] & 0xff) <<  8 |
+                                 (long) seed[7] & 0xff;
                         break;
                     }
                 } catch (InterruptedException e) {