X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Frandom.c;h=c0bc659d19392430afd3d85d9100c735d6b73941;hb=2d04b6ea214daf96020ce5ca994fcb5380556247;hp=96713c505b09b9faf7f646fa374c81cc81193c8d;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=sliver-openvswitch.git

diff --git a/lib/random.c b/lib/random.c
index 96713c505..c0bc659d1 100644
--- a/lib/random.c
+++ b/lib/random.c
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
  *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #include <config.h>
@@ -21,70 +21,99 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
+#include "entropy.h"
+#include "hash.h"
+#include "ovs-thread.h"
+#include "timeval.h"
 #include "util.h"
 
+/* This is the 32-bit PRNG recommended in G. Marsaglia, "Xorshift RNGs",
+ * _Journal of Statistical Software_ 8:14 (July 2003).  According to the paper,
+ * it has a period of 2**32 - 1 and passes almost all tests of randomness.
+ *
+ * We use this PRNG instead of libc's rand() because rand() varies in quality
+ * and because its maximum value also varies between 32767 and INT_MAX, whereas
+ * we often want random numbers in the full range of uint32_t.
+ *
+ * This random number generator is intended for purposes that do not require
+ * cryptographic-quality randomness. */
+
+/* Current random state. */
+DEFINE_STATIC_PER_THREAD_DATA(uint32_t, seed, 0);
+
+static uint32_t random_next(void);
+
 void
 random_init(void)
 {
-    static bool inited = false;
-    if (!inited) {
+    uint32_t *seedp = seed_get();
+    while (!*seedp) {
         struct timeval tv;
-        inited = true;
-        if (gettimeofday(&tv, NULL) < 0) {
-            ovs_fatal(errno, "gettimeofday");
-        }
-        srand(tv.tv_sec ^ tv.tv_usec);
+        uint32_t entropy;
+        pthread_t self;
+
+        xgettimeofday(&tv);
+        get_entropy_or_die(&entropy, 4);
+        self = pthread_self();
+
+        *seedp = (tv.tv_sec ^ tv.tv_usec ^ entropy
+                  ^ hash_bytes(&self, sizeof self, 0));
     }
 }
 
+void
+random_set_seed(uint32_t seed_)
+{
+    ovs_assert(seed_);
+    *seed_get() = seed_;
+}
+
 void
 random_bytes(void *p_, size_t n)
 {
     uint8_t *p = p_;
+
     random_init();
-    while (n--) {
-        *p++ = rand();
+
+    for (; n > 4; p += 4, n -= 4) {
+        uint32_t x = random_next();
+        memcpy(p, &x, 4);
+    }
+
+    if (n) {
+        uint32_t x = random_next();
+        memcpy(p, &x, n);
     }
 }
 
-uint8_t
-random_uint8(void)
+
+uint32_t
+random_uint32(void)
 {
     random_init();
-    return rand();
+    return random_next();
 }
 
-uint16_t
-random_uint16(void)
+uint64_t
+random_uint64(void)
 {
-    if (RAND_MAX >= UINT16_MAX) {
-        random_init();
-        return rand();
-    } else {
-        uint16_t x;
-        random_bytes(&x, sizeof x);
-        return x;
-    }
-}
+    uint64_t x;
 
-uint32_t
-random_uint32(void)
-{
-    if (RAND_MAX >= UINT32_MAX) {
-        random_init();
-        return rand();
-    } else if (RAND_MAX == INT32_MAX) {
-        random_init();
-        return rand() | ((rand() & 1u) << 31);
-    } else {
-        uint32_t x;
-        random_bytes(&x, sizeof x);
-        return x;
-    }
+    random_init();
+
+    x = random_next();
+    x |= (uint64_t) random_next() << 32;
+    return x;
 }
 
-int
-random_range(int max) 
+static uint32_t
+random_next(void)
 {
-    return random_uint32() % max;
+    uint32_t *seedp = seed_get_unsafe();
+
+    *seedp ^= *seedp << 13;
+    *seedp ^= *seedp >> 17;
+    *seedp ^= *seedp << 5;
+
+    return *seedp;
 }