Add back model_thread; it is still needed

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index c022e9e3baab9c716498992bc09e525fca61ce69..f73377062c7a09b6e4108d56cb5421b7674785a2 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -21,6 +21,7 @@
 #include "plugins.h"
 
 ModelChecker *model = NULL;
+int inside_model = 0;
 
 void placeholder(void *) {
        ASSERT(0);
@@ -54,7 +55,16 @@ void install_handler() {
                perror("sigaction(SIGSEGV)");
                exit(EXIT_FAILURE);
        }
+}
 
+void createModelIfNotExist() {
+       if (!model) {
+               ENTER_MODEL_FLAG;
+               snapshot_system_init(100000);
+               model = new ModelChecker();
+               model->startChecker();
+               EXIT_MODEL_FLAG;
+       }
 }
 
 /** @brief Constructor */
@@ -65,7 +75,7 @@ ModelChecker::ModelChecker() :
        history(new ModelHistory()),
        execution(new ModelExecution(this, scheduler)),
        execution_number(1),
-       curr_thread_num(1),
+       curr_thread_num(MAIN_THREAD_ID),
        trace_analyses(),
        inspect_plugin(NULL)
 {
@@ -73,7 +83,8 @@ ModelChecker::ModelChecker() :
                                                        "Copyright (c) 2013 and 2019 Regents of the University of California. All rights reserved.\n"
                                                        "Distributed under the GPLv2\n"
                                                        "Written by Weiyu Luo, Brian Norris, and Brian Demsky\n\n");
-       memset(&stats,0,sizeof(struct execution_stats));
+       init_memory_ops();
+       real_memset(&stats,0,sizeof(struct execution_stats));
        init_thread = new Thread(execution->get_next_id(), (thrd_t *) model_malloc(sizeof(thrd_t)), &placeholder, NULL, NULL);
 #ifdef TLS
        init_thread->setTLS((char *)get_tls_addr());
@@ -135,6 +146,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,12 +353,11 @@ void ModelChecker::startRunExecution(Thread *old) {
                        execution->collectActions();
                }
 
-               thread_chosen = false;
-               curr_thread_num = 1;
+               curr_thread_num = MAIN_THREAD_ID;
                Thread *thr = getNextThread(old);
                if (thr != nullptr) {
                        scheduler->set_current_thread(thr);
-
+                       EXIT_MODEL_FLAG;
                        if (Thread::swap(old, thr) < 0) {
                                perror("swap threads");
                                exit(EXIT_FAILURE);
@@ -367,27 +389,25 @@ Thread* ModelChecker::getNextThread(Thread *old)
                }
 
                ModelAction *act = thr->get_pending();
-               if (act && execution->is_enabled(tid)){
+               if (act && scheduler->is_enabled(tid)){
                        /* Don't schedule threads which should be disabled */
                        if (!execution->check_action_enabled(act)) {
                                scheduler->sleep(thr);
                        }
 
                        /* 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;
                                }
                        }
                }
@@ -401,7 +421,7 @@ void ModelChecker::finishRunExecution(Thread *old)
        scheduler->set_current_thread(NULL);
 
        /** Reset curr_thread_num to initial value for next execution. */
-       curr_thread_num = 1;
+       curr_thread_num = MAIN_THREAD_ID;
 
        /** If we have more executions, we won't make it past this call. */
        finish_execution(execution_number < params.maxexecutions);
@@ -436,6 +456,8 @@ uint64_t ModelChecker::switch_thread(ModelAction *act)
                delete act;
                return 0;
        }
+       ENTER_MODEL_FLAG;
+
        DBG();
        Thread *old = thread_current();
        old->set_state(THREAD_READY);
@@ -475,7 +497,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;
        }