X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=runtime%2Fruntime.c;h=415a1617816f18133728538b7059bf1b89ee9980;hb=973c2b13fe82d6ebd030cd58869fa237b1fe5370;hp=8056660694888b4b596e66a0c0c01655e2ac01ce;hpb=fb536c12185fd1e339b5fd479d9ef84554b436df;p=nbds

diff --git a/runtime/runtime.c b/runtime/runtime.c
index 8056660..415a161 100644
--- a/runtime/runtime.c
+++ b/runtime/runtime.c
@@ -2,14 +2,17 @@
  * Written by Josh Dybnis and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
+#define _POSIX_C_SOURCE 1 // for rand_r()
+#include <stdlib.h>
 #include <pthread.h>
 #include "common.h"
 #include "runtime.h"
-#include "runtime_local.h"
+#include "rlocal.h"
 #include "mem.h"
 #include "tls.h"
 
 DECLARE_THREAD_LOCAL(tid_, int);
+DECLARE_THREAD_LOCAL(rand_seed_, unsigned);
 
 typedef struct thread_info {
     int thread_id;
@@ -17,7 +20,9 @@ typedef struct thread_info {
     void *restrict arg;
 } thread_info_t;
 
-void nbd_init (void) {
+__attribute__ ((constructor)) void nbd_init (void) {
+    //sranddev();
+    INIT_THREAD_LOCAL(rand_seed_);
     INIT_THREAD_LOCAL(tid_);
     SET_THREAD_LOCAL(tid_, 0);
     mem_init();
@@ -28,6 +33,12 @@ void nbd_init (void) {
 static void *worker (void *arg) {
     thread_info_t *ti = (thread_info_t *)arg;
     SET_THREAD_LOCAL(tid_, ti->thread_id);
+    LOCALIZE_THREAD_LOCAL(tid_, int);
+#ifndef NDEBUG
+    SET_THREAD_LOCAL(rand_seed_, tid_+1);
+#else
+    SET_THREAD_LOCAL(rand_seed_, nbd_rand_seed(tid_+1));
+#endif
     lwt_thread_init(ti->thread_id);
     rcu_thread_init(ti->thread_id);
     void *ret = ti->start_routine(ti->arg);
@@ -42,3 +53,20 @@ int nbd_thread_create (pthread_t *restrict thread, int thread_id, void *(*start_
     ti->arg = arg;
     return pthread_create(thread, NULL, worker, ti);
 }
+
+int nbd_rand (void) {
+    LOCALIZE_THREAD_LOCAL(rand_seed_, unsigned);
+    unsigned r = rand_r(&rand_seed_);
+    SET_THREAD_LOCAL(rand_seed_, r);
+    return r;
+}
+
+uint64_t nbd_rand_seed (int i) {
+    return rdtsc() + -715159705 + i * 129;
+}
+
+// Fairly fast random numbers
+int nbd_next_rand (uint64_t *r) {
+    *r = (*r * 0x5DEECE66DLL + 0xBLL) & MASK(48);
+    return (*r >> 17) & 0x7FFFFFFF;
+}