Add back model_thread; it is still needed

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index 450aac5a51f2201c62d4743d94339c0cab0c2469..f73377062c7a09b6e4108d56cb5421b7674785a2 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -59,9 +59,11 @@ void install_handler() {
 
 void createModelIfNotExist() {
        if (!model) {
+               ENTER_MODEL_FLAG;
                snapshot_system_init(100000);
                model = new ModelChecker();
                model->startChecker();
+               EXIT_MODEL_FLAG;
        }
 }
 
@@ -73,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)
 {
@@ -82,7 +84,7 @@ ModelChecker::ModelChecker() :
                                                        "Distributed under the GPLv2\n"
                                                        "Written by Weiyu Luo, Brian Norris, and Brian Demsky\n\n");
        init_memory_ops();
-       memset(&stats,0,sizeof(struct execution_stats));
+       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());
@@ -351,11 +353,11 @@ void ModelChecker::startRunExecution(Thread *old) {
                        execution->collectActions();
                }
 
-               curr_thread_num = 1;
+               curr_thread_num = MAIN_THREAD_ID;
                Thread *thr = getNextThread(old);
                if (thr != nullptr) {
                        scheduler->set_current_thread(thr);
-                       inside_model = 0;
+                       EXIT_MODEL_FLAG;
                        if (Thread::swap(old, thr) < 0) {
                                perror("swap threads");
                                exit(EXIT_FAILURE);
@@ -419,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);
@@ -454,7 +456,7 @@ uint64_t ModelChecker::switch_thread(ModelAction *act)
                delete act;
                return 0;
        }
-       inside_model = 1;
+       ENTER_MODEL_FLAG;
 
        DBG();
        Thread *old = thread_current();