From: Derek Yeh <djyeh@plrg-1.ics.uci.edu>
Date: Fri, 7 Aug 2020 03:41:42 +0000 (-0700)
Subject: add consume to run
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=c4f504bb8deb86c8e2b06cb8ddaec5d92ec17e9d;ds=sidebyside

add consume to run
---

diff --git a/model.cc b/model.cc
index ac394d9a..a1204d0a 100644
--- a/model.cc
+++ b/model.cc
@@ -344,7 +344,27 @@ uint64_t ModelChecker::switch_to_master(ModelAction *act)
 	return old->get_return_value();
 }
 
-void ModelChecker::continueExecution(Thread *old) 
+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();
+	if (thr != nullptr) {
+		scheduler->set_current_thread(thr);
+		if (Thread::swap(old, thr) < 0) {
+			perror("swap threads");
+			exit(EXIT_FAILURE);
+		}
+	} else
+		handleChosenThread(old);	
+}
+
+void ModelChecker::startRunExecution(ucontext_t *old) 
 {
 	if (params.traceminsize != 0 &&
 			execution->get_curr_seq_num() > checkfree) {
@@ -387,7 +407,7 @@ Thread* ModelChecker::getNextThread()
 	return nextThread;
 }
 
-void ModelChecker::finishExecution(Thread *old) 
+void ModelChecker::finishRunExecution(Thread *old) 
 {
 	scheduler->set_current_thread(NULL);
 	if (Thread::swap(old, &system_context) < 0) {
@@ -396,6 +416,11 @@ void ModelChecker::finishExecution(Thread *old)
 	}
 }
 
+void ModelChecker::finishRunExecution(ucontext_t *old) 
+{
+	scheduler->set_current_thread(NULL);
+}
+
 void ModelChecker::consumeAction()
 {
 	ModelAction *curr = chosen_thread->get_pending();
@@ -478,31 +503,60 @@ void ModelChecker::handleNewValidThread(Thread *old, Thread *next)
 void ModelChecker::handleChosenThread(Thread *old)
 {
 	if (execution->has_asserted())
-		finishExecution(old);
+		finishRunExecution(old);
 	if (!chosen_thread)
 		chosen_thread = get_next_thread();
 	if (!chosen_thread || chosen_thread->is_model_thread())
-		finishExecution(old);
+		finishRunExecution(old);
 	if (chosen_thread->just_woken_up()) {
 		chosen_thread->set_wakeup_state(false);
 		chosen_thread->set_pending(NULL);
 		chosen_thread = NULL;
 		// Allow this thread to stash the next pending action
 		if (should_terminate_execution())
-			finishExecution(old);
+			finishRunExecution(old);
 		else
-			continueExecution(old);	
+			continueRunExecution(old);	
 	} else {
 		/* Consume the next action for a Thread */
 		consumeAction();
 
 		if (should_terminate_execution())
-			finishExecution(old);
+			finishRunExecution(old);
 		else
-			continueExecution(old);		
+			continueRunExecution(old);		
 	}
 }
 
+void ModelChecker::handleChosenThread(ucontext_t *old)
+{
+	if (execution->has_asserted())
+		finishRunExecution(old);
+	if (!chosen_thread)
+		chosen_thread = get_next_thread();
+	if (!chosen_thread || chosen_thread->is_model_thread())
+		finishRunExecution(old);
+	if (chosen_thread->just_woken_up()) {
+		chosen_thread->set_wakeup_state(false);
+		chosen_thread->set_pending(NULL);
+		chosen_thread = NULL;
+		// Allow this thread to stash the next pending action
+		if (should_terminate_execution())
+			finishRunExecution(old);
+		else
+			startRunExecution(old);	
+	} else {
+		/* Consume the next action for a Thread */
+		consumeAction();
+
+		if (should_terminate_execution())
+			finishRunExecution(old);
+		else
+			startRunExecution(old);		
+	}
+}
+
+
 static void runChecker() {
 	model->run();
 	delete model;
@@ -536,14 +590,7 @@ void ModelChecker::run()
 		chosen_thread = init_thread;
 		thread_chosen = false;
 		curr_thread_num = 1;
-		thread_id_t tid = int_to_id(1);
-		Thread *thr = get_thread(tid);
-		if (!thr->get_pending())
-			switch_from_master(thr);
-		else {
-			consumeAction();
-			switch_from_master(thr);
-		}
+		startRunExecution(&system_context);
 		finish_execution((exec+1) < params.maxexecutions);
 		//restore random number generator state after rollback
 		setstate(random_state);
diff --git a/model.h b/model.h
index 503b225d..b98e7505 100644
--- a/model.h
+++ b/model.h
@@ -55,12 +55,15 @@ public:
 	uint64_t switch_to_master(ModelAction *act);
 	uint64_t switch_thread(ModelAction *act);
 
-	void continueExecution(Thread *old);
-	void finishExecution(Thread *old);
+	void continueRunExecution(Thread *old);
+	void startRunExecution(ucontext_t *old);
+	void finishRunExecution(Thread *old);
+	void finishRunExecution(ucontext_t *old);
 	void consumeAction();
 	void chooseThread(ModelAction *act, Thread *thr);
 	Thread * getNextThread();
 	void handleChosenThread(Thread *old);
+	void handleChosenThread(ucontext_t *old);
 	void handleNewValidThread(Thread *old, Thread *next);
 
 	void assert_bug(const char *msg, ...);