threads_internal: pass the current 'action' to the internal thread system

[model-checker.git] / libthreads.cc

diff --git a/libthreads.cc b/libthreads.cc
index c0439ffa8bc60b6754bbe744b335775a5dccebc0..fb828b18aa079e2d726d0cfc851600d7ec6d53d0 100644 (file)
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -4,6 +4,7 @@
 #include "libthreads.h"
 #include "schedule.h"
 #include "common.h"
+#include "threads_internal.h"
 
 /* global "model" object */
 #include "model.h"
@@ -97,6 +98,18 @@ static void thread_wait_finish(void)
        while (!thread_system_next());
 }
 
+int thread_switch_to_master(ModelAction *act)
+{
+       struct thread *old, *next;
+
+       DBG();
+       model->set_current_action(act);
+       old = thread_current();
+       old->state = THREAD_READY;
+       next = model->system_thread;
+       return thread_swap(old, next);
+}
+
 /*
  * User program API functions
  */
@@ -126,19 +139,16 @@ int thread_create(struct thread *t, void (*start_routine)(), void *arg)
 
 void thread_join(struct thread *t)
 {
-       while (t->state != THREAD_COMPLETED)
-               thread_yield();
+       int ret = 0;
+       while (t->state != THREAD_COMPLETED && !ret)
+               /* seq_cst is just a 'don't care' parameter */
+               ret = thread_switch_to_master(new ModelAction(THREAD_JOIN, memory_order_seq_cst, NULL, VALUE_NONE));
 }
 
 int thread_yield(void)
 {
-       struct thread *old, *next;
-
-       DBG();
-       old = thread_current();
-       old->state = THREAD_READY;
-       next = model->system_thread;
-       return thread_swap(old, next);
+       /* seq_cst is just a 'don't care' parameter */
+       return thread_switch_to_master(new ModelAction(THREAD_YIELD, memory_order_seq_cst, NULL, VALUE_NONE));
 }
 
 struct thread *thread_current(void)