X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.cc;fp=model.cc;h=ea8f268ff270fa8d59674570103699c1eb36eb03;hp=1e425b2ece627b877e5b33dd2d7bfde60d65b47e;hb=edf082882ea7a2d27d3a3322a84e42b040f186a4;hpb=ed4c0c4095856c1cfadf14ec868acd487ed88600

diff --git a/model.cc b/model.cc
index 1e425b2e..ea8f268f 100644
--- 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;
 }
@@ -491,7 +491,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();
@@ -555,7 +555,7 @@ void ModelChecker::handleChosenThread(ucontext_t *old)
 		finishRunExecution(old);
 		return;
 	}
-/*	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;
@@ -564,9 +564,7 @@ void ModelChecker::handleChosenThread(ucontext_t *old)
 			finishRunExecution(old);
 		else
 			startRunExecution(old);	
-	} */
-
-	{
+	} else {
 		/* Consume the next action for a Thread */
 		consumeAction();