fix mutex_trylock bug

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index c022e9e3baab9c716498992bc09e525fca61ce69..8f974762043065de618aea980d89ac2321ec9dcd 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -135,6 +135,18 @@ Thread * ModelChecker::get_current_thread() const
        return scheduler->get_current_thread();
 }
 
+/**
+ * Must be called from user-thread context (e.g., through the global
+ * thread_current_id() interface)
+ *
+ * @return The id of the currently executing Thread.
+ */
+thread_id_t ModelChecker::get_current_thread_id() const
+{
+       ASSERT(int_to_id(curr_thread_num) == get_current_thread()->get_id());
+       return int_to_id(curr_thread_num);
+}
+
 /**
  * @brief Choose the next thread to execute.
  *
@@ -330,7 +342,6 @@ void ModelChecker::startRunExecution(Thread *old) {
                        execution->collectActions();
                }
 
-               thread_chosen = false;
                curr_thread_num = 1;
                Thread *thr = getNextThread(old);
                if (thr != nullptr) {
@@ -374,20 +385,18 @@ Thread* ModelChecker::getNextThread(Thread *old)
                        }
 
                        /* Allow pending relaxed/release stores or thread actions to perform first */
-                       else if (!thread_chosen) {
+                       else if (!chosen_thread) {
                                if (act->is_write()) {
                                        std::memory_order order = act->get_mo();
                                        if (order == std::memory_order_relaxed || \
                                                        order == std::memory_order_release) {
                                                chosen_thread = thr;
-                                               thread_chosen = true;
                                        }
                                } else if (act->get_type() == THREAD_CREATE || \
                                                                         act->get_type() == PTHREAD_CREATE || \
                                                                         act->get_type() == THREAD_START || \
                                                                         act->get_type() == THREAD_FINISH) {
                                        chosen_thread = thr;
-                                       thread_chosen = true;
                                }
                        }
                }
@@ -475,7 +484,7 @@ bool ModelChecker::handleChosenThread(Thread *old)
        if (!chosen_thread) {
                chosen_thread = get_next_thread();
        }
-       if (!chosen_thread || chosen_thread->is_model_thread()) {
+       if (!chosen_thread) {
                finishRunExecution(old);
                return false;
        }