Merge branch 'master' of /home/git/random-fuzzer into thread-switch
[c11tester.git] / model.cc
index ad2e0d90f4ea7a659006b3e2283314d5ad195196..a37e00521ea7761608db62b32cec81faadbcf5c4 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -26,6 +26,37 @@ void placeholder(void *) {
        ASSERT(0);
 }
 
+#include <signal.h>
+
+#define SIGSTACKSIZE 65536
+static void mprot_handle_pf(int sig, siginfo_t *si, void *unused)
+{
+       model_print("Segmentation fault at %p\n", si->si_addr);
+       model_print("For debugging, place breakpoint at: %s:%d\n",
+                                                       __FILE__, __LINE__);
+       print_trace();  // Trace printing may cause dynamic memory allocation
+       while(1)
+               ;
+}
+
+void install_handler() {
+       stack_t ss;
+       ss.ss_sp = model_malloc(SIGSTACKSIZE);
+       ss.ss_size = SIGSTACKSIZE;
+       ss.ss_flags = 0;
+       sigaltstack(&ss, NULL);
+       struct sigaction sa;
+       sa.sa_flags = SA_SIGINFO | SA_NODEFER | SA_RESTART | SA_ONSTACK;
+       sigemptyset(&sa.sa_mask);
+       sa.sa_sigaction = mprot_handle_pf;
+
+       if (sigaction(SIGSEGV, &sa, NULL) == -1) {
+               perror("sigaction(SIGSEGV)");
+               exit(EXIT_FAILURE);
+       }
+
+}
+
 /** @brief Constructor */
 ModelChecker::ModelChecker() :
        /* Initialize default scheduler */
@@ -54,8 +85,7 @@ ModelChecker::ModelChecker() :
        parse_options(&params);
        initRaceDetector();
        /* Configure output redirection for the model-checker */
-       redirect_output();
-       install_trace_analyses(get_execution());
+       install_handler();
 }
 
 /** @brief Destructor */
@@ -262,6 +292,7 @@ void ModelChecker::finish_execution(bool more_executions)
        execution_number ++;
        if (more_executions)
                reset_to_initial_state();
+
        history->set_new_exec_flag();
 }
 
@@ -344,6 +375,106 @@ uint64_t ModelChecker::switch_to_master(ModelAction *act)
        return old->get_return_value();
 }
 
+void ModelChecker::startRunExecution(Thread *old) 
+{
+       if (params.traceminsize != 0 &&
+                       execution->get_curr_seq_num() > checkfree) {
+               checkfree += params.checkthreshold;
+               execution->collectActions();
+       }
+
+       thread_chosen = false;
+       curr_thread_num = 1;
+       Thread *thr = getNextThread();
+       if (thr != nullptr) {
+               scheduler->set_current_thread(thr);
+               if (old) {
+                       if (Thread::swap(old, thr) < 0) {
+                               perror("swap threads");
+                               exit(EXIT_FAILURE);
+                       }
+               } else {
+                       if (Thread::swap(&system_context, thr) < 0) {
+                               perror("swap threads");
+                               exit(EXIT_FAILURE);
+                       }       
+               }
+       } else
+               handleChosenThread(old);
+}
+
+Thread* ModelChecker::getNextThread()
+{
+       Thread *nextThread = nullptr;
+       for (unsigned int i = curr_thread_num; i < get_num_threads(); i++) {
+               thread_id_t tid = int_to_id(i);
+               Thread *thr = get_thread(tid);
+               
+               if (!thr->is_complete() && !thr->get_pending()) {
+                       curr_thread_num = i;
+                       nextThread = thr;
+                       break;
+               }
+               ModelAction *act = thr->get_pending();
+               
+               if (act && execution->is_enabled(thr) && !execution->check_action_enabled(act)) {
+                       scheduler->sleep(thr);
+               }
+               chooseThread(act, thr);
+       }
+       return nextThread;
+}
+
+/* Swap back to system_context and terminate this execution */
+void ModelChecker::finishRunExecution(Thread *old) 
+{
+       scheduler->set_current_thread(NULL);
+       if (old != NULL) {
+               if (Thread::swap(old, &system_context) < 0) {
+                       perror("swap threads");
+                       exit(EXIT_FAILURE);
+               }
+       }
+       break_execution = true;
+}
+
+void ModelChecker::consumeAction()
+{
+       ModelAction *curr = chosen_thread->get_pending();
+       Thread * th = thread_current();
+       if (curr->get_type() == THREAD_FINISH && th != NULL)  {
+               // Thread finish must be consumed in the master context
+               scheduler->set_current_thread(NULL);
+               if (Thread::swap(th, &system_context) < 0) {
+                       perror("swap threads");
+                       exit(EXIT_FAILURE);
+               }
+       } else {
+               chosen_thread->set_pending(NULL);
+               chosen_thread = execution->take_step(curr);
+       }
+}
+
+void ModelChecker::chooseThread(ModelAction *act, Thread *thr)
+{
+       if (!thread_chosen && act && execution->is_enabled(thr) && (thr->get_state() != THREAD_BLOCKED) ) {
+               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;
+               }
+       }       
+}
+
 uint64_t ModelChecker::switch_thread(ModelAction *act)
 {
        if (modellock) {
@@ -365,56 +496,68 @@ uint64_t ModelChecker::switch_thread(ModelAction *act)
        }
 
        old->set_pending(act);
+       
+       if (old->is_waiting_on(old))
+               assert_bug("Deadlock detected (thread %u)", curr_thread_num);
+
+       if (act && execution->is_enabled(old) && !execution->check_action_enabled(act)) {
+               scheduler->sleep(old);
+       }
+       chooseThread(act, old);
 
-       Thread *next = NULL;
        curr_thread_num++;
-       while (curr_thread_num < get_num_threads()) {
-               thread_id_t tid = int_to_id(curr_thread_num);
-               next = get_thread(tid);
-               if (!next->is_model_thread() && !next->is_complete() && !next->get_pending())
-                       break;
-               curr_thread_num++;
+       Thread* next = getNextThread();
+       if (next != nullptr) 
+               handleNewValidThread(old, next);
+       else {
+               old->set_state(THREAD_READY);   // Just to avoid the first ASSERT in ModelExecution::take_step 
+               handleChosenThread(old);
        }
-       if (curr_thread_num < get_num_threads()) {
-               scheduler->set_current_thread(next);
-               if (old->is_waiting_on(old))
-                       assert_bug("Deadlock detected (thread %u)", curr_thread_num);
 
-               ModelAction *act = old->get_pending();
-               
-               if (act && execution->is_enabled(old) && !execution->check_action_enabled(act)) {
-                       scheduler->sleep(old);
-               }
-               if (!thread_chosen && act && execution->is_enabled(old) && (old->get_state() != THREAD_BLOCKED) ) {
-                       if (act->is_write()) {
-                               std::memory_order order = act->get_mo();
-                               if (order == std::memory_order_relaxed || \
-                                               order == std::memory_order_release) {
-                                       chosen_thread = old;
-                                       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 = old;
-                               thread_chosen = true;
-                       }
-               }
+       return old->get_return_value();
+}
 
-               if (Thread::swap(old, next) < 0) {
-                       perror("swap threads");
-                       exit(EXIT_FAILURE);
-               }               
+void ModelChecker::handleNewValidThread(Thread *old, Thread *next)
+{
+       scheduler->set_current_thread(next);
+
+       if (Thread::swap(old, next) < 0) {
+               perror("swap threads");
+               exit(EXIT_FAILURE);
+       }
+}
+
+void ModelChecker::handleChosenThread(Thread *old)
+{
+       Thread * th = old ? old : thread_current();
+       if (execution->has_asserted()) {
+               finishRunExecution(th);
+               return;
+       }
+       if (!chosen_thread)
+               chosen_thread = get_next_thread();
+       if (!chosen_thread || chosen_thread->is_model_thread()) {
+               finishRunExecution(th);
+               return;
+       }
+       if (chosen_thread->just_woken_up()) {
+               chosen_thread->set_wakeup_state(false);
+               chosen_thread->set_pending(NULL);
+               chosen_thread = NULL;
+               // Allow this thread to stash the next pending action
+//             if (should_terminate_execution())
+//                     finishRunExecution(th);
+//             else
+                       startRunExecution(th);
        } else {
-               scheduler->set_current_thread(NULL);
+               /* Consume the next action for a Thread */
+               consumeAction();
 
-               if (Thread::swap(old, &system_context) < 0) {
-                       perror("swap threads");
-                       exit(EXIT_FAILURE);
-               }
+               if (should_terminate_execution())
+                       finishRunExecution(th);
+               else
+                       startRunExecution(th);
        }
-       return old->get_return_value();
 }
 
 static void runChecker() {
@@ -425,6 +568,9 @@ static void runChecker() {
 void ModelChecker::startChecker() {
        startExecution(get_system_context(), runChecker);
        snapshot = take_snapshot();
+
+       install_trace_analyses(get_execution());
+       redirect_output();
        initMainThread();
 }
 
@@ -445,91 +591,17 @@ void ModelChecker::run()
        //Need to initial random number generator state to avoid resets on rollback
        char random_state[256];
        initstate(423121, random_state, sizeof(random_state));
-       modelclock_t checkfree = params.checkthreshold;
+       checkfree = params.checkthreshold;
        for(int exec = 0;exec < params.maxexecutions;exec++) {
                chosen_thread = init_thread;
-               thread_chosen = false;
+               break_execution = false;
                do {
-                       /* Check whether we need to free model actions. */
-
-                       if (params.traceminsize != 0 &&
-                                       execution->get_curr_seq_num() > checkfree) {
-                               checkfree += params.checkthreshold;
-                               execution->collectActions();
-                       }
-
-                       /*
-                        * Stash next pending action(s) for thread(s). There
-                        * should only need to stash one thread's action--the
-                        * thread which just took a step--plus the first step
-                        * for any newly-created thread
-                        */
-                       curr_thread_num = 0;
-                       thread_id_t tid = int_to_id(0);
-                       Thread *thr = get_thread(tid);
-                       switch_from_master(thr);
-                       /*
-                       for (unsigned int i = 0;i < get_num_threads();i++) {
-                               thread_id_t tid = int_to_id(i);
-                               Thread *thr = get_thread(tid);
-                               if (!thr->is_model_thread() && !thr->is_complete() && !thr->get_pending()) {
-                                       switch_from_master(thr);
-                                       if (thr->is_waiting_on(thr))
-                                               assert_bug("Deadlock detected (thread %u)", i);
-                               }
-                       }
-                       */
-                       /* Don't schedule threads which should be disabled */
-                       /*for (unsigned int i = 0;i < get_num_threads();i++) {
-                               Thread *th = get_thread(int_to_id(i));
-                               ModelAction *act = th->get_pending();
-                               if (act && execution->is_enabled(th) && !execution->check_action_enabled(act)) {
-                                       scheduler->sleep(th);
-                               }
-                       }
-                       */
-                       /*for (unsigned int i = 1;i < get_num_threads();i++) {
-                               Thread *th = get_thread(int_to_id(i));
-                               ModelAction *act = th->get_pending();
-                               if (act && execution->is_enabled(th) && (th->get_state() != THREAD_BLOCKED) ) {
-                                       if (act->is_write()) {
-                                               std::memory_order order = act->get_mo();
-                                               if (order == std::memory_order_relaxed || \
-                                                               order == std::memory_order_release) {
-                                                       t = th;
-                                                       break;
-                                               }
-                                       } else if (act->get_type() == THREAD_CREATE || \
-                                                                                act->get_type() == PTHREAD_CREATE || \
-                                                                                act->get_type() == THREAD_START || \
-                                                                                act->get_type() == THREAD_FINISH) {
-                                               t = th;
-                                               break;
-                                       }
-                               }
-                       }
-                       */
-                       /* Catch assertions from prior take_step or from
-                       * between-ModelAction bugs (e.g., data races) */
-
-                       if (execution->has_asserted())
-                               break;
-                       if (!chosen_thread)
-                               chosen_thread = get_next_thread();
-                       if (!chosen_thread || chosen_thread->is_model_thread())
+                       if (break_execution)
                                break;
-                       if (chosen_thread->just_woken_up()) {
-                               chosen_thread->set_wakeup_state(false);
-                               chosen_thread->set_pending(NULL);
-                               chosen_thread = NULL;
-                               continue;       // Allow this thread to stash the next pending action
-                       }
 
-                       /* Consume the next action for a Thread */
-                       ModelAction *curr = chosen_thread->get_pending();
-                       chosen_thread->set_pending(NULL);
-                       chosen_thread = execution->take_step(curr);
+                       startRunExecution(NULL);
                } while (!should_terminate_execution());
+
                finish_execution((exec+1) < params.maxexecutions);
                //restore random number generator state after rollback
                setstate(random_state);