X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.cc;h=d1e94e5efa4f70c08486abf646b0ef46a3fae324;hp=b8d9f7cb4ce46b7c01ed7aa08fe982985a7a9cd0;hb=1371ca80e0012e533ad450f955cb95d3d9dcc862;hpb=a1280c133564afec30de10cc1de12a23b02a13d0

diff --git a/model.cc b/model.cc
index b8d9f7cb..d1e94e5e 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"
@@ -19,40 +18,49 @@
 #include "history.h"
 #include "bugmessage.h"
 #include "params.h"
+#include "plugins.h"
 
 ModelChecker *model = NULL;
 
-/** Wrapper to run the user's main function, with appropriate arguments */
-void user_main_wrapper(void *)
-{
-	user_main(model->params.argc, model->params.argv);
+void placeholder(void *) {
+	ASSERT(0);
 }
 
 /** @brief Constructor */
 ModelChecker::ModelChecker() :
 	/* Initialize default scheduler */
 	params(),
-	restart_flag(false),
 	scheduler(new Scheduler()),
-	node_stack(new NodeStack()),
-	execution(new ModelExecution(this, scheduler, node_stack)),
 	history(new ModelHistory()),
+	execution(new ModelExecution(this, scheduler)),
 	execution_number(1),
 	trace_analyses(),
 	inspect_plugin(NULL)
 {
+	model_print("C11Tester\n"
+							"Copyright (c) 2013 and 2019 Regents of the University of California. All rights reserved.\n"
+							"Distributed under the GPLv2\n"
+							"Written by Weiyu Luo, Brian Norris, and Brian Demsky\n\n");
 	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
+	init_thread = new Thread(execution->get_next_id(), (thrd_t *) model_malloc(sizeof(thrd_t)), &placeholder, NULL, NULL);
+#ifdef TLS
+	init_thread->setTLS((char *)get_tls_addr());
+#endif
 	execution->add_thread(init_thread);
 	scheduler->set_current_thread(init_thread);
+	register_plugins();
 	execution->setParams(&params);
 	param_defaults(&params);
+	parse_options(&params);
+	initRaceDetector();
+	/* Configure output redirection for the model-checker */
+	redirect_output();
+	install_trace_analyses(get_execution());
 }
 
 /** @brief Destructor */
 ModelChecker::~ModelChecker()
 {
-	delete node_stack;
 	delete scheduler;
 }
 
@@ -76,7 +84,7 @@ void ModelChecker::reset_to_initial_state()
 	for (unsigned int i = 0;i < get_num_threads();i++)
 		delete get_thread(int_to_id(i))->get_pending();
 
-	snapshot_backtrack_before(0);
+	snapshot_roll_back(snapshot);
 }
 
 /** @return the number of user threads created during this execution */
@@ -114,7 +122,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();
 }
 
 /**
@@ -129,7 +137,7 @@ Thread * ModelChecker::get_next_thread()
  * @param msg Descriptive message for the bug (do not include newline char)
  * @return True if bug is immediately-feasible
  */
-bool ModelChecker::assert_bug(const char *msg, ...)
+void ModelChecker::assert_bug(const char *msg, ...)
 {
 	char str[800];
 
@@ -138,7 +146,7 @@ bool ModelChecker::assert_bug(const char *msg, ...)
 	vsnprintf(str, sizeof(str), msg, ap);
 	va_end(ap);
 
-	return execution->assert_bug(str);
+	execution->assert_bug(str);
 }
 
 /**
@@ -149,8 +157,8 @@ bool ModelChecker::assert_bug(const char *msg, ...)
 void ModelChecker::assert_user_bug(const char *msg)
 {
 	/* If feasible bug, bail out now */
-	if (assert_bug(msg))
-		switch_to_master(NULL);
+	assert_bug(msg);
+	switch_to_master(NULL);
 }
 
 /** @brief Print bug report listing for this execution (if any bugs exist) */
@@ -174,15 +182,12 @@ void ModelChecker::print_bugs() const
 void ModelChecker::record_stats()
 {
 	stats.num_total ++;
-	if (!execution->isfeasibleprefix())
-		stats.num_infeasible ++;
-	else if (execution->have_bug_reports())
+	if (execution->have_bug_reports())
 		stats.num_buggy_executions ++;
 	else if (execution->is_complete_execution())
 		stats.num_complete ++;
 	else {
-		stats.num_redundant ++;
-
+		//All threads are sleeping
 		/**
 		 * @todo We can violate this ASSERT() when fairness/sleep sets
 		 * conflict to cause an execution to terminate, e.g. with:
@@ -196,9 +201,7 @@ void ModelChecker::record_stats()
 void ModelChecker::print_stats() const
 {
 	model_print("Number of complete, bug-free executions: %d\n", stats.num_complete);
-	model_print("Number of redundant executions: %d\n", stats.num_redundant);
 	model_print("Number of buggy executions: %d\n", stats.num_buggy_executions);
-	model_print("Number of infeasible executions: %d\n", stats.num_infeasible);
 	model_print("Total executions: %d\n", stats.num_total);
 }
 
@@ -233,12 +236,11 @@ void ModelChecker::print_execution(bool printbugs) const
  * @return If there are more executions to explore, return true. Otherwise,
  * return false.
  */
-bool ModelChecker::next_execution()
+void ModelChecker::finish_execution(bool more_executions)
 {
 	DBG();
 	/* Is this execution a feasible execution that's worth bug-checking? */
-	bool complete = execution->isfeasibleprefix() &&
-									(execution->is_complete_execution() ||
+	bool complete = (execution->is_complete_execution() ||
 									 execution->have_bug_reports());
 
 	/* End-of-execution bug checks */
@@ -246,7 +248,6 @@ bool ModelChecker::next_execution()
 		if (execution->is_deadlocked())
 			assert_bug("Deadlock detected");
 
-		checkDataRaces();
 		run_trace_analyses();
 	}
 
@@ -257,14 +258,11 @@ bool ModelChecker::next_execution()
 	else
 		clear_program_output();
 
-	if (restart_flag) {
-		do_restart();
-		return true;
-	}
 // test code
 	execution_number ++;
-	reset_to_initial_state();
-	return false;
+	if (more_executions)
+		reset_to_initial_state();
+	history->set_new_exec_flag();
 }
 
 /** @brief Run trace analyses on complete trace */
@@ -319,6 +317,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,51 +351,17 @@ static void runChecker() {
 
 void ModelChecker::startChecker() {
 	startExecution(get_system_context(), runChecker);
+	snapshot = take_snapshot();
+	initMainThread();
 }
 
 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()) {
+	if (execution->have_bug_reports()) {
 		execution->set_assert();
 		return true;
-	}
-	return false;
-}
-
-/** @brief Restart ModelChecker upon returning to the run loop of the
- *	model checker. */
-void ModelChecker::restart()
-{
-	restart_flag = true;
-}
-
-void ModelChecker::do_restart()
-{
-	restart_flag = false;
-	reset_to_initial_state();
-	memset(&stats,0,sizeof(struct execution_stats));
-	execution_number = 1;
-}
-
-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;
-		}
+	} else if (execution->isFinished()) {
+		return true;
 	}
 	return false;
 }
@@ -398,23 +372,30 @@ void ModelChecker::run()
 	//Need to initial random number generator state to avoid resets on rollback
 	char random_state[256];
 	initstate(423121, random_state, sizeof(random_state));
-
+	modelclock_t checkfree = params.checkthreshold;
 	for(int exec = 0;exec < params.maxexecutions;exec++) {
 		Thread * t = init_thread;
 
 		do {
+			/* Check whether we need to free model actions. */
+
+			if (params.traceminsize != 0 &&
+					execution->get_curr_seq_num() > checkfree) {
+				checkfree += params.checkthreshold;
+				execution->collectActions();
+			}
+
 			/*
 			 * Stash next pending action(s) for thread(s). There
 			 * should only need to stash one thread's action--the
 			 * 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)) ) {
-					switch_from_master(thr);	// L: context swapped, and action type of thr changed.
+				if (!thr->is_model_thread() && !thr->is_complete() && !thr->get_pending()) {
+					switch_from_master(thr);
 					if (thr->is_waiting_on(thr))
 						assert_bug("Deadlock detected (thread %u)", i);
 				}
@@ -459,13 +440,19 @@ void ModelChecker::run()
 				t = get_next_thread();
 			if (!t || t->is_model_thread())
 				break;
+			if (t->just_woken_up()) {
+				t->set_wakeup_state(false);
+				t->set_pending(NULL);
+				t = NULL;
+				continue;	// Allow this thread to stash the next pending action
+			}
 
 			/* Consume the next action for a Thread */
 			ModelAction *curr = t->get_pending();
 			t->set_pending(NULL);
 			t = execution->take_step(curr);
 		} while (!should_terminate_execution());
-		next_execution();
+		finish_execution((exec+1) < params.maxexecutions);
 		//restore random number generator state after rollback
 		setstate(random_state);
 	}
@@ -476,4 +463,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);
 }