model: factor out a 'switch_from_master()' function

[model-checker.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 6adc053ae2dbfc58a00bbbb2f0e6a7c2e79a7b4c..a8f282a8b32efdb96d1d248570fc8b7574af92f7 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -23,7 +23,13 @@ static void stack_free(void *stack)
        snapshot_free(stack);
 }
 
-/** Return the currently executing thread. */
+/**
+ * @brief Get the current Thread
+ *
+ * Must be called from a user context
+ *
+ * @return The currently executing thread
+ */
 Thread * thread_current(void)
 {
        ASSERT(model);
@@ -84,6 +90,7 @@ int Thread::create_context()
  */
 int Thread::swap(Thread *t, ucontext_t *ctxt)
 {
+       t->set_state(THREAD_READY);
        return swapcontext(&t->context, ctxt);
 }
 
@@ -97,6 +104,7 @@ int Thread::swap(Thread *t, ucontext_t *ctxt)
  */
 int Thread::swap(ucontext_t *ctxt, Thread *t)
 {
+       t->set_state(THREAD_RUNNING);
        return swapcontext(ctxt, &t->context);
 }