Merge branch 'master' of /home/git/random-fuzzer into thread-switch
[c11tester.git] / model.cc
index 136898e913808803972f63d5b7bcd67b1b945a5e..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,48 +375,32 @@ uint64_t ModelChecker::switch_to_master(ModelAction *act)
        return old->get_return_value();
 }
 
-void ModelChecker::continueRunExecution(Thread *old) 
+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 (Thread::swap(old, thr) < 0) {
-                       perror("swap threads");
-                       exit(EXIT_FAILURE);
-               }
-       } else
-               handleChosenThread(old);        
-}
 
-void ModelChecker::startRunExecution(ucontext_t *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 (Thread::swap(old, thr) < 0) {
-                       perror("swap threads");
-                       exit(EXIT_FAILURE);
+               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);        
+               handleChosenThread(old);
 }
 
 Thread* ModelChecker::getNextThread()
@@ -405,31 +420,39 @@ Thread* ModelChecker::getNextThread()
                if (act && execution->is_enabled(thr) && !execution->check_action_enabled(act)) {
                        scheduler->sleep(thr);
                }
-
-//             chooseThread(act, 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 (Thread::swap(old, &system_context) < 0) {
-               perror("swap threads");
-               exit(EXIT_FAILURE);
+       if (old != NULL) {
+               if (Thread::swap(old, &system_context) < 0) {
+                       perror("swap threads");
+                       exit(EXIT_FAILURE);
+               }
        }
-}
-
-void ModelChecker::finishRunExecution(ucontext_t *old) 
-{
-       scheduler->set_current_thread(NULL);
+       break_execution = true;
 }
 
 void ModelChecker::consumeAction()
 {
        ModelAction *curr = chosen_thread->get_pending();
-       chosen_thread->set_pending(NULL);
-       chosen_thread = execution->take_step(curr);
+       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)
@@ -477,12 +500,10 @@ uint64_t ModelChecker::switch_thread(ModelAction *act)
        if (old->is_waiting_on(old))
                assert_bug("Deadlock detected (thread %u)", curr_thread_num);
 
-       ModelAction *act2 = old->get_pending();
-               
-       if (act2 && execution->is_enabled(old) && !execution->check_action_enabled(act2)) {
+       if (act && execution->is_enabled(old) && !execution->check_action_enabled(act)) {
                scheduler->sleep(old);
        }
-//     chooseThread(act2, old);
+       chooseThread(act, old);
 
        curr_thread_num++;
        Thread* next = getNextThread();
@@ -498,73 +519,47 @@ uint64_t ModelChecker::switch_thread(ModelAction *act)
 
 void ModelChecker::handleNewValidThread(Thread *old, Thread *next)
 {
-       scheduler->set_current_thread(next);    
+       scheduler->set_current_thread(next);
 
        if (Thread::swap(old, next) < 0) {
                perror("swap threads");
                exit(EXIT_FAILURE);
-       }               
+       }
 }
 
 void ModelChecker::handleChosenThread(Thread *old)
 {
-       if (execution->has_asserted())
-               finishRunExecution(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(old);
+       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(old);
-               else
-                       continueRunExecution(old);      
+//             if (should_terminate_execution())
+//                     finishRunExecution(th);
+//             else
+                       startRunExecution(th);
        } else {
                /* Consume the next action for a Thread */
                consumeAction();
 
                if (should_terminate_execution())
-                       finishRunExecution(old);
-               else
-                       continueRunExecution(old);              
-       }
-}
-
-void ModelChecker::handleChosenThread(ucontext_t *old)
-{
-       if (execution->has_asserted())
-               finishRunExecution(old);
-       if (!chosen_thread)
-               chosen_thread = get_next_thread();
-       if (!chosen_thread || chosen_thread->is_model_thread())
-               finishRunExecution(old);
-/*     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(old);
-               else
-                       startRunExecution(old); 
-       } else*/
-
-       {
-               /* Consume the next action for a Thread */
-               consumeAction();
-
-               if (should_terminate_execution())
-                       finishRunExecution(old);
+                       finishRunExecution(th);
                else
-                       startRunExecution(old);         
+                       startRunExecution(th);
        }
 }
 
-
 static void runChecker() {
        model->run();
        delete model;
@@ -573,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();
 }
 
@@ -596,10 +594,12 @@ void ModelChecker::run()
        checkfree = params.checkthreshold;
        for(int exec = 0;exec < params.maxexecutions;exec++) {
                chosen_thread = init_thread;
+               break_execution = false;
                do {
-                       thread_chosen = false;
-                       curr_thread_num = 1;
-                       startRunExecution(&system_context);
+                       if (break_execution)
+                               break;
+
+                       startRunExecution(NULL);
                } while (!should_terminate_execution());
 
                finish_execution((exec+1) < params.maxexecutions);