Remove the code that checks store visibility, not being used at this time

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index cffaea874740ada79a5ee89e0901e31e9dbcdb2c..a934d0adcb7be451907d3141243f4239564743d2 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -18,13 +18,12 @@
 #include "history.h"
 #include "bugmessage.h"
 #include "params.h"
+#include "plugins.h"
 
 ModelChecker *model = NULL;
 
-/** Wrapper to run the user's main function, with appropriate arguments */
-void user_main_wrapper(void *)
-{
-       user_main(model->params.argc, model->params.argv);
+void placeholder(void *) {
+       ASSERT(0);
 }
 
 /** @brief Constructor */
@@ -39,16 +38,25 @@ ModelChecker::ModelChecker() :
        trace_analyses(),
        inspect_plugin(NULL)
 {
+       model_print("C11Tester\n"
+                                                       "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_thread = new Thread(execution->get_next_id(), (thrd_t *) model_malloc(sizeof(thrd_t)), &user_main_wrapper, NULL, NULL);
+       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());
 #endif
        execution->add_thread(init_thread);
        scheduler->set_current_thread(init_thread);
+       register_plugins();
        execution->setParams(&params);
        param_defaults(&params);
+       parse_options(&params);
        initRaceDetector();
+       /* Configure output redirection for the model-checker */
+       redirect_output();
+       install_trace_analyses(get_execution());
 }
 
 /** @brief Destructor */
@@ -77,7 +85,7 @@ void ModelChecker::reset_to_initial_state()
        for (unsigned int i = 0;i < get_num_threads();i++)
                delete get_thread(int_to_id(i))->get_pending();
 
-       snapshot_backtrack_before(0);
+       snapshot_roll_back(snapshot);
 }
 
 /** @return the number of user threads created during this execution */
@@ -130,7 +138,7 @@ Thread * ModelChecker::get_next_thread()
  * @param msg Descriptive message for the bug (do not include newline char)
  * @return True if bug is immediately-feasible
  */
-bool ModelChecker::assert_bug(const char *msg, ...)
+void ModelChecker::assert_bug(const char *msg, ...)
 {
        char str[800];
 
@@ -139,7 +147,7 @@ bool ModelChecker::assert_bug(const char *msg, ...)
        vsnprintf(str, sizeof(str), msg, ap);
        va_end(ap);
 
-       return execution->assert_bug(str);
+       execution->assert_bug(str);
 }
 
 /**
@@ -150,8 +158,8 @@ bool ModelChecker::assert_bug(const char *msg, ...)
 void ModelChecker::assert_user_bug(const char *msg)
 {
        /* If feasible bug, bail out now */
-       if (assert_bug(msg))
-               switch_to_master(NULL);
+       assert_bug(msg);
+       switch_to_master(NULL);
 }
 
 /** @brief Print bug report listing for this execution (if any bugs exist) */
@@ -175,15 +183,12 @@ void ModelChecker::print_bugs() const
 void ModelChecker::record_stats()
 {
        stats.num_total ++;
-       if (!execution->isfeasibleprefix())
-               stats.num_infeasible ++;
-       else if (execution->have_bug_reports())
+       if (execution->have_bug_reports())
                stats.num_buggy_executions ++;
        else if (execution->is_complete_execution())
                stats.num_complete ++;
        else {
-               stats.num_redundant ++;
-
+               //All threads are sleeping
                /**
                 * @todo We can violate this ASSERT() when fairness/sleep sets
                 * conflict to cause an execution to terminate, e.g. with:
@@ -197,9 +202,7 @@ void ModelChecker::record_stats()
 void ModelChecker::print_stats() const
 {
        model_print("Number of complete, bug-free executions: %d\n", stats.num_complete);
-       model_print("Number of redundant executions: %d\n", stats.num_redundant);
        model_print("Number of buggy executions: %d\n", stats.num_buggy_executions);
-       model_print("Number of infeasible executions: %d\n", stats.num_infeasible);
        model_print("Total executions: %d\n", stats.num_total);
 }
 
@@ -238,8 +241,7 @@ bool ModelChecker::next_execution()
 {
        DBG();
        /* Is this execution a feasible execution that's worth bug-checking? */
-       bool complete = execution->isfeasibleprefix() &&
-                                                                       (execution->is_complete_execution() ||
+       bool complete = (execution->is_complete_execution() ||
                                                                         execution->have_bug_reports());
 
        /* End-of-execution bug checks */
@@ -354,16 +356,13 @@ static void runChecker() {
 
 void ModelChecker::startChecker() {
        startExecution(get_system_context(), runChecker);
-       snapshot_stack_init();
-       snapshot_record(0);
+       snapshot = take_snapshot();
+       initMainThread();
 }
 
 bool ModelChecker::should_terminate_execution()
 {
-       /* Infeasible -> don't take any more steps */
-       if (execution->is_infeasible())
-               return true;
-       else if (execution->isfeasibleprefix() && execution->have_bug_reports()) {
+       if (execution->have_bug_reports()) {
                execution->set_assert();
                return true;
        } else if (execution->isFinished()) {
@@ -387,12 +386,6 @@ void ModelChecker::do_restart()
        execution_number = 1;
 }
 
-void ModelChecker::startMainThread() {
-       init_thread->set_state(THREAD_RUNNING);
-       scheduler->set_current_thread(init_thread);
-       main_thread_startup();
-}
-
 /** @brief Run ModelChecker for the user program */
 void ModelChecker::run()
 {