X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=runtime%2Fruntime.c;h=14a09f9bb11f19b8a828ca1473c3681d0f9f3910;hp=0731bfdc70226d81ba2c87a95d9405a7dcfd500c;hb=a03cf3b0c40e6c3b8b4877b49a64288cb3fcb919;hpb=9ec5405d406696c6cbdb7a47ade7fccc736a8b53

diff --git a/runtime/runtime.c b/runtime/runtime.c
index 0731bfd..14a09f9 100644
--- a/runtime/runtime.c
+++ b/runtime/runtime.c
@@ -5,14 +5,12 @@
 #include <pthread.h>
 #include "common.h"
 #include "runtime.h"
-#include "runtime_local.h"
+#include "rlocal.h"
 #include "mem.h"
 #include "tls.h"
 
-#undef malloc
-#undef free
-
 DECLARE_THREAD_LOCAL(tid_, int);
+DECLARE_THREAD_LOCAL(rand_seed_, unsigned);
 
 typedef struct thread_info {
     int thread_id;
@@ -20,10 +18,12 @@ typedef struct thread_info {
     void *restrict arg;
 } thread_info_t;
 
-void nbd_init (void) {
-    INIT_THREAD_LOCAL(tid_, NULL);
+__attribute__ ((constructor)) void nbd_init (void) {
+    sranddev();
+    INIT_THREAD_LOCAL(rand_seed_);
+    INIT_THREAD_LOCAL(tid_);
+    SET_THREAD_LOCAL(tid_, 0);
     mem_init();
-    lwt_init();
     lwt_thread_init(0);
     rcu_thread_init(0);
 }
@@ -31,17 +31,26 @@ 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);
+    SET_THREAD_LOCAL(rand_seed_, tid_+1);
     lwt_thread_init(ti->thread_id);
     rcu_thread_init(ti->thread_id);
     void *ret = ti->start_routine(ti->arg);
-    free(ti);
+    nbd_free(ti);
     return ret;
 }
 
 int nbd_thread_create (pthread_t *restrict thread, int thread_id, void *(*start_routine)(void *), void *restrict arg) {
-    thread_info_t *ti = (thread_info_t *)malloc(sizeof(thread_info_t));
+    thread_info_t *ti = (thread_info_t *)nbd_malloc(sizeof(thread_info_t));
     ti->thread_id = thread_id;
     ti->start_routine = start_routine;
     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;
+}