X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=f1bc320b417e7c7f0938a73d50eff20b2a6b7301;hb=8a7dd35db7542ad66f87060cf637172249494e47;hp=85ad11aacbf9b255a8372b11e82fc1ad8ad74a7e;hpb=cc60d0e08cbe3bb8060bc535884574e347666a92;p=model-checker.git

diff --git a/model.cc b/model.cc
index 85ad11a..f1bc320 100644
--- a/model.cc
+++ b/model.cc
@@ -50,11 +50,6 @@ int ModelChecker::get_next_id()
 	return ++used_thread_id;
 }
 
-void ModelChecker::add_system_thread(Thread *t)
-{
-	this->system_thread = t;
-}
-
 Thread * ModelChecker::schedule_next_thread()
 {
 	Thread *t;
@@ -112,6 +107,7 @@ thread_id_t ModelChecker::advance_backtracking_state()
 bool ModelChecker::next_execution()
 {
 	num_executions++;
+	print_summary();
 	if ((exploring = model->get_next_backtrack()) == NULL)
 		return false;
 	model->reset_to_initial_state();
@@ -145,7 +141,7 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act)
 			continue;
 		/* Conflict from the same thread is not really a conflict */
 		if (id == prev->get_tid())
-			return NULL;
+			continue;
 		return prev;
 	}
 	return NULL;
@@ -196,6 +192,7 @@ void ModelChecker::check_current_action(void)
 		DEBUG("trying to push NULL action...\n");
 		return;
 	}
+	current_action = NULL;
 	nextThread = advance_backtracking_state();
 	next->set_node(currentNode);
 	set_backtracking(next);
@@ -203,7 +200,7 @@ void ModelChecker::check_current_action(void)
 	this->action_trace->push_back(next);
 }
 
-void ModelChecker::print_trace(void)
+void ModelChecker::print_summary(void)
 {
 	action_list_t::iterator it;
 
@@ -214,7 +211,7 @@ void ModelChecker::print_trace(void)
 
 	scheduler->print();
 
-	printf("\nTrace:\n\n");
+	printf("Trace:\n\n");
 
 	for (it = action_trace->begin(); it != action_trace->end(); it++) {
 		DBG();
@@ -237,14 +234,13 @@ void ModelChecker::remove_thread(Thread *t)
 
 int ModelChecker::switch_to_master(ModelAction *act)
 {
-	Thread *old, *next;
+	Thread *old;
 
 	DBG();
 	old = thread_current();
 	set_current_action(act);
 	old->set_state(THREAD_READY);
-	next = system_thread;
-	return old->swap(next);
+	return Thread::swap(old, get_system_context());
 }
 
 ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value)