uncomment out code
authorDerek Yeh <djyeh@plrg-1.ics.uci.edu>
Mon, 24 Aug 2020 06:13:48 +0000 (23:13 -0700)
committerDerek Yeh <djyeh@plrg-1.ics.uci.edu>
Mon, 24 Aug 2020 06:13:48 +0000 (23:13 -0700)
model.cc

index 54f0185..078a1ce 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -346,13 +346,13 @@ uint64_t ModelChecker::switch_to_master(ModelAction *act)
 
 void ModelChecker::continueRunExecution(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();
@@ -368,13 +368,13 @@ void ModelChecker::continueRunExecution(Thread *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();
@@ -406,7 +406,7 @@ Thread* ModelChecker::getNextThread()
                        scheduler->sleep(thr);
                }
 
-//             chooseThread(act, thr);
+       chooseThread(act, thr);
        }
        return nextThread;
 }
@@ -490,7 +490,7 @@ uint64_t ModelChecker::switch_thread(ModelAction *act)
        if (act && execution->is_enabled(old) && !execution->check_action_enabled(act)) {
                scheduler->sleep(old);
        }
-//     chooseThread(act, old);
+       chooseThread(act, old);
 
        curr_thread_num++;
        Thread* next = getNextThread();
@@ -550,7 +550,7 @@ void ModelChecker::handleChosenThread(ucontext_t *old)
                chosen_thread = get_next_thread();
        if (!chosen_thread || chosen_thread->is_model_thread())
                finishRunExecution(old);
-/*     if (chosen_thread->just_woken_up()) {
+       if (chosen_thread->just_woken_up()) {
                chosen_thread->set_wakeup_state(false);
                chosen_thread->set_pending(NULL);
                chosen_thread = NULL;
@@ -559,7 +559,7 @@ void ModelChecker::handleChosenThread(ucontext_t *old)
                        finishRunExecution(old);
                else
                        startRunExecution(old); 
-       } else*/
+       } else
 
        {
                /* Consume the next action for a Thread */