Change initialize a bit

[c11tester.git] / libthreads.cc

diff --git a/libthreads.cc b/libthreads.cc
index 28982582eb15fadf2e3f4d5a5152ca0e26489ef3..4d61e536c9c4e44d603616d92d205ce0f193a7e5 100644 (file)
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -1,6 +1,8 @@
-#include "libthreads.h"
-#include "common.h"
 #include "threads.h"
+#include "common.h"
+#include "threads-model.h"
+#include "action.h"
+
 
 /* global "model" object */
 #include "model.h"
@@ -10,29 +12,23 @@
  */
 int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 {
-       Thread *thread;
-       int ret;
-       DBG();
-       thread = new Thread(t, start_routine, arg);
-       ret = model->add_thread(thread);
-       DEBUG("create thread %d\n", id_to_int(thrd_to_id(*t)));
+       struct thread_params params = { start_routine, arg };
        /* seq_cst is just a 'don't care' parameter */
-       model->switch_to_master(new ModelAction(THREAD_CREATE, std::memory_order_seq_cst, thread, VALUE_NONE));
-       return ret;
+       model->switch_thread(new ModelAction(THREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)&params));
+       return 0;
 }
 
 int thrd_join(thrd_t t)
 {
-       Thread *th = model->get_thread(thrd_to_id(t));
-       while (th->get_state() != THREAD_COMPLETED)
-               model->switch_to_master(NULL);
+       Thread *th = t.priv;
+       model->switch_thread(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th, id_to_int(thrd_to_id(t))));
        return 0;
 }
 
-int thrd_yield(void)
+/** A no-op, for now */
+void thrd_yield(void)
 {
-       /* seq_cst is just a 'don't care' parameter */
-       return model->switch_to_master(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, NULL, VALUE_NONE));
+       model->switch_thread(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, thread_current(), VALUE_NONE));
 }
 
 thrd_t thrd_current(void)