remove unused code

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index 4b94d75a9016a2b4d0cffaab2e9e6ced32f808cc..3f811d7d7b11a3ef7c5e7846e58cbbc0a0a4293d 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -15,7 +15,6 @@
 #include "output.h"
 #include "traceanalysis.h"
 #include "execution.h"
-#include "history.h"
 #include "bugmessage.h"
 #include "params.h"
 #include "plugins.h"
@@ -72,10 +71,9 @@ ModelChecker::ModelChecker() :
        /* Initialize default scheduler */
        params(),
        scheduler(new Scheduler()),
-       history(new ModelHistory()),
        execution(new ModelExecution(this, scheduler)),
        execution_number(1),
-       curr_thread_num(INITIAL_THREAD_ID),
+       curr_thread_num(MAIN_THREAD_ID),
        trace_analyses(),
        inspect_plugin(NULL)
 {
@@ -280,7 +278,9 @@ void ModelChecker::print_execution(bool printbugs) const
        }
 
        model_print("\n");
+#ifdef PRINT_TRACE
        execution->print_summary();
+#endif
 }
 
 /**
@@ -313,7 +313,6 @@ void ModelChecker::finish_execution(bool more_executions)
                clear_program_output();
 
        execution_number ++;
-       history->set_new_exec_flag();
 
        if (more_executions)
                reset_to_initial_state();
@@ -353,7 +352,7 @@ void ModelChecker::startRunExecution(Thread *old) {
                        execution->collectActions();
                }
 
-               curr_thread_num = INITIAL_THREAD_ID;
+               curr_thread_num = MAIN_THREAD_ID;
                Thread *thr = getNextThread(old);
                if (thr != nullptr) {
                        scheduler->set_current_thread(thr);
@@ -421,7 +420,7 @@ void ModelChecker::finishRunExecution(Thread *old)
        scheduler->set_current_thread(NULL);
 
        /** Reset curr_thread_num to initial value for next execution. */
-       curr_thread_num = INITIAL_THREAD_ID;
+       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);