threads/model: allocate Thread from w/in ModelChecker

[model-checker.git] / libthreads.cc

diff --git a/libthreads.cc b/libthreads.cc
index fce87daf5bc0d8969d4546ce6837a30dda4019eb..0a5699695f9e856f413bddec9714751a0313c99d 100644 (file)
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -10,17 +10,15 @@
  */
 int thrd_create(thrd_t *t, thrd_start_t start_routine, void *arg)
 {
-       Thread *thread;
-       thread = new Thread(t, start_routine, arg);
-       model->add_thread(thread);
+       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));
+       model->switch_to_master(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));
+       Thread *th = t.priv;
        model->switch_to_master(new ModelAction(THREAD_JOIN, std::memory_order_seq_cst, th, id_to_int(thrd_to_id(t))));
        return 0;
 }