---

yaml
---
r: 53111
b: refs/heads/dist-snap
c: 9a78dc9
h: refs/heads/master
i:
  53109: ca40ee8
  53107: 5f88b06
  53103: fda0578
v: v3

Author: cpeterso

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 665e900edeb611a7bfc9b0b911489cb802740945
+refs/heads/dist-snap: 9a78dc93db551f325b3b3d90540de6ebe7873b4b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/rt/rust_builtin.cpp

@@ -173,7 +173,8 @@ rand_new_seeded2(rust_vec_box** seed) {
 
 extern "C" CDECL uint32_t
 rand_next(rust_rng *rng) {
-    return rng_gen_u32(rng);
+    rust_task *task = rust_get_current_task();
+    return rng_gen_u32(task->kernel, rng);
 }
 
 extern "C" CDECL void

branches/dist-snap/src/rt/rust_rng.cpp

@@ -73,11 +73,35 @@ isaac_init(rust_kernel *kernel, randctx *rctx, rust_vec_box* user_seed) {
 void
 rng_init(rust_kernel* kernel, rust_rng* rng, rust_vec_box* user_seed) {
     isaac_init(kernel, &rng->rctx, user_seed);
+    rng->reseedable = !user_seed && !kernel->env->rust_seed;
+}
+
+static void
+rng_maybe_reseed(rust_kernel* kernel, rust_rng* rng) {
+    // If this RNG has generated more than 32KB of random data and was not
+    // seeded by the user or RUST_SEED, then we should reseed now.
+    const size_t RESEED_THRESHOLD = 32 * 1024;
+    size_t bytes_generated = rng->rctx.randc * sizeof(ub4);
+    if (bytes_generated < RESEED_THRESHOLD || !rng->reseedable) {
+        return;
+    }
+
+    uint32_t new_seed[RANDSIZ];
+    rng_gen_seed(kernel, (uint8_t*) new_seed, RANDSIZ * sizeof(uint32_t));
+
+    // Stir new seed into PRNG's entropy pool.
+    for (size_t i = 0; i < RANDSIZ; i++) {
+        rng->rctx.randrsl[i] ^= new_seed[i];
+    }
+
+    randinit(&rng->rctx, 1);
 }
 
 uint32_t
-rng_gen_u32(rust_rng* rng) {
-    return isaac_rand(&rng->rctx);
+rng_gen_u32(rust_kernel* kernel, rust_rng* rng) {
+    uint32_t x = isaac_rand(&rng->rctx);
+    rng_maybe_reseed(kernel, rng);
+    return x;
 }
 
 //

branches/dist-snap/src/rt/rust_rng.h

@@ -20,11 +20,12 @@ struct rust_vec_box;
 
 struct rust_rng {
     randctx rctx;
+    bool reseedable;
 };
 
 void rng_gen_seed(rust_kernel* kernel, uint8_t* dest, size_t size);
 void rng_init(rust_kernel *kernel, rust_rng *rng, rust_vec_box* user_seed);
-uint32_t rng_gen_u32(rust_rng *rng);
+uint32_t rng_gen_u32(rust_kernel *kernel, rust_rng *rng);
 
 //
 // Local Variables:

branches/dist-snap/src/rt/rust_sched_loop.cpp

@@ -151,7 +151,7 @@ rust_task *
 rust_sched_loop::schedule_task() {
     lock.must_have_lock();
     if (running_tasks.length() > 0) {
-        size_t k = rng_gen_u32(&rng);
+        size_t k = rng_gen_u32(kernel, &rng);
         size_t i = k % running_tasks.length();
         return (rust_task *)running_tasks[i];
     }