Bug fix in ht_iter_next() from Rui Ueyama

[nbds] / runtime / runtime.c

diff --git a/runtime/runtime.c b/runtime/runtime.c
index b145faa872e5826ed70a979d724a561cdc24738a..415a1617816f18133728538b7059bf1b89ee9980 100644 (file)
--- a/runtime/runtime.c
+++ b/runtime/runtime.c
@@ -20,11 +20,12 @@ typedef struct thread_info {
     void *restrict arg;
 } thread_info_t;
 
-__attribute__ ((constructor(102))) 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();
     lwt_thread_init(0);
     rcu_thread_init(0);
 }
@@ -33,7 +34,11 @@ 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);
@@ -55,3 +60,13 @@ int nbd_rand (void) {
     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;
+}