X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=5802b5d02dd77da3d799bab6400ee261848b2c58;hb=d29571ea49a6abb1b291e547b497ea914da1bef2;hp=b8d9f7cb4ce46b7c01ed7aa08fe982985a7a9cd0;hpb=a1280c133564afec30de10cc1de12a23b02a13d0;p=c11tester.git

diff --git a/model.cc b/model.cc
index b8d9f7cb..5802b5d0 100644
--- a/model.cc
+++ b/model.cc
@@ -7,7 +7,6 @@
 
 #include "model.h"
 #include "action.h"
-#include "nodestack.h"
 #include "schedule.h"
 #include "snapshot-interface.h"
 #include "common.h"
@@ -34,8 +33,7 @@ ModelChecker::ModelChecker() :
 	params(),
 	restart_flag(false),
 	scheduler(new Scheduler()),
-	node_stack(new NodeStack()),
-	execution(new ModelExecution(this, scheduler, node_stack)),
+	execution(new ModelExecution(this, scheduler)),
 	history(new ModelHistory()),
 	execution_number(1),
 	trace_analyses(),
@@ -43,16 +41,19 @@ ModelChecker::ModelChecker() :
 {
 	memset(&stats,0,sizeof(struct execution_stats));
 	init_thread = new Thread(execution->get_next_id(), (thrd_t *) model_malloc(sizeof(thrd_t)), &user_main_wrapper, NULL, NULL);	// L: user_main_wrapper passes the user program
+#ifdef TLS
+	init_thread->setTLS((char *)get_tls_addr());
+#endif
 	execution->add_thread(init_thread);
 	scheduler->set_current_thread(init_thread);
 	execution->setParams(&params);
 	param_defaults(&params);
+	initRaceDetector();
 }
 
 /** @brief Destructor */
 ModelChecker::~ModelChecker()
 {
-	delete node_stack;
 	delete scheduler;
 }
 
@@ -114,7 +115,7 @@ Thread * ModelChecker::get_next_thread()
 	 * Have we completed exploring the preselected path? Then let the
 	 * scheduler decide
 	 */
-	return scheduler->select_next_thread(node_stack->get_head());
+	return scheduler->select_next_thread();
 }
 
 /**
@@ -246,7 +247,6 @@ bool ModelChecker::next_execution()
 		if (execution->is_deadlocked())
 			assert_bug("Deadlock detected");
 
-		checkDataRaces();
 		run_trace_analyses();
 	}
 
@@ -264,6 +264,7 @@ bool ModelChecker::next_execution()
 // test code
 	execution_number ++;
 	reset_to_initial_state();
+	history->set_new_exec_flag();
 	return false;
 }
 
@@ -319,6 +320,16 @@ void ModelChecker::switch_from_master(Thread *thread)
  */
 uint64_t ModelChecker::switch_to_master(ModelAction *act)
 {
+	if (modellock) {
+		static bool fork_message_printed = false;
+
+		if (!fork_message_printed) {
+			model_print("Fork handler or dead thread trying to call into model checker...\n");
+			fork_message_printed = true;
+		}
+		delete act;
+		return 0;
+	}
 	DBG();
 	Thread *old = thread_current();
 	scheduler->set_current_thread(NULL);
@@ -343,6 +354,8 @@ static void runChecker() {
 
 void ModelChecker::startChecker() {
 	startExecution(get_system_context(), runChecker);
+	snapshot_stack_init();
+	snapshot_record(0);
 }
 
 bool ModelChecker::should_terminate_execution()
@@ -350,9 +363,11 @@ bool ModelChecker::should_terminate_execution()
 	/* Infeasible -> don't take any more steps */
 	if (execution->is_infeasible())
 		return true;
-	else if (execution->isfeasibleprefix() && execution->have_bug_reports()) {
+	else if (execution->isfeasibleprefix() && execution->have_fatal_bug_reports()) {
 		execution->set_assert();
 		return true;
+	} else if (execution->isFinished()) {
+		return true;
 	}
 	return false;
 }
@@ -375,21 +390,7 @@ void ModelChecker::do_restart()
 void ModelChecker::startMainThread() {
 	init_thread->set_state(THREAD_RUNNING);
 	scheduler->set_current_thread(init_thread);
-	thread_startup();
-}
-
-static bool is_nonsc_write(const ModelAction *act) {
-	if (act->get_type() == ATOMIC_WRITE) {
-		std::memory_order order = act->get_mo();
-		switch(order) {
-		case std::memory_order_relaxed:
-		case std::memory_order_release:
-			return true;
-		default:
-			return false;
-		}
-	}
-	return false;
+	main_thread_startup();
 }
 
 /** @brief Run ModelChecker for the user program */
@@ -409,11 +410,10 @@ void ModelChecker::run()
 			 * thread which just took a step--plus the first step
 			 * for any newly-created thread
 			 */
-			ModelAction * pending;
 			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() && ((!(pending=thr->get_pending())) || is_nonsc_write(pending)) ) {
+				if (!thr->is_model_thread() && !thr->is_complete() && (!thr->get_pending())) {
 					switch_from_master(thr);	// L: context swapped, and action type of thr changed.
 					if (thr->is_waiting_on(thr))
 						assert_bug("Deadlock detected (thread %u)", i);
@@ -476,4 +476,9 @@ void ModelChecker::run()
 	/* Have the trace analyses dump their output. */
 	for (unsigned int i = 0;i < trace_analyses.size();i++)
 		trace_analyses[i]->finish();
+
+	/* unlink tmp file created by last child process */
+	char filename[256];
+	snprintf_(filename, sizeof(filename), "C11FuzzerTmp%d", getpid());
+	unlink(filename);
 }