X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=runtime%2Fruntime.c;h=19024e2f389f237ecbd6f0e2edf906b0b198a1d2;hp=ed93e8f8764f57e4e95176f94850a3ec85e267c8;hb=HEAD;hpb=efd90a1b8a9d3bbb1bdd8e6ae41b3462e7193fb2

diff --git a/runtime/runtime.c b/runtime/runtime.c
index ed93e8f..19024e2 100644
--- a/runtime/runtime.c
+++ b/runtime/runtime.c
@@ -1,24 +1,35 @@
-/* 
+/*
  * Written by Josh Dybnis and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
+#include <stdlib.h>
+#include <pthread.h>
 #include "common.h"
-#include "rcu.h"
-#include "lwt.h"
+#include "runtime.h"
+#include "rlocal.h"
 #include "mem.h"
-#include "nbd.h"
 #include "tls.h"
 
-DECLARE_THREAD_LOCAL(tid_, int);
+DECLARE_THREAD_LOCAL(ThreadId, int);
+static int ThreadIndex
 
-void nbd_init (void) {
-    INIT_THREAD_LOCAL(tid_, NULL);
+static int MaxThreadId = 0;
+
+__attribute__ ((constructor)) void nbd_init (void) {
+    rnd_init();
     mem_init();
-    lwt_init();
 }
 
-void nbd_thread_init (int id) {
-    SET_THREAD_LOCAL(tid_, id);
-    lwt_thread_init(id);
-    rcu_thread_init(id);
+void nbd_thread_init (void) {
+    LOCALIZE_THREAD_LOCAL(ThreadId, int);
+
+    if (ThreadId == 0) {
+        ++MaxThreadId; // TODO: reuse thread id's of threads that have been destroyed
+        ASSERT(MaxThreadId <= MAX_NUM_THREADS);
+        SET_THREAD_LOCAL(ThreadId, MaxThreadId);
+        rnd_thread_init();
+    } 
+
+    lwt_thread_init();
+    rcu_thread_init();
 }