From: Brian Norris <banorris@uci.edu>
Date: Fri, 10 Aug 2012 21:23:29 +0000 (-0700)
Subject: main, model: move main execution loop into ModelChecker class
X-Git-Tag: pldi2013~271^2~9
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=b7a6b3c7fb66628a4b14af804418dbfff4072e95

main, model: move main execution loop into ModelChecker class
---

diff --git a/main.cc b/main.cc
index 9a6c2d8..6f1483b 100644
--- a/main.cc
+++ b/main.cc
@@ -12,52 +12,6 @@
 #include "model.h"
 #include "snapshot-interface.h"
 
-/**
- * The thread_system_next function takes the next step in the execution, if
- * possible.
- * @return Returns 0 (success) if there is another step and non-zero otherwise.
- */
-static int thread_system_next(void) {
-	Thread *curr, *next;
-
-	curr = thread_current();
-	if (curr) {
-		if (curr->get_state() == THREAD_READY) {
-			model->check_current_action();
-			model->scheduler->add_thread(curr);
-		} else if (curr->get_state() == THREAD_RUNNING) {
-			/* Stopped while running; i.e., completed */
-			curr->complete();
-		} else {
-			ASSERT(false);
-		}
-	}
-	next = model->scheduler->next_thread();
-
-	/* Infeasible -> don't take any more steps */
-	if (!model->isfeasible())
-		return 1;
-
-	if (next)
-		next->set_state(THREAD_RUNNING);
-	DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
-
-	/* next == NULL -> don't take any more steps */
-	if (!next)
-		return 1;
-	/* Return non-zero only if swap fails with an error */
-	return Thread::swap(model->get_system_context(), next);
-}
-
-/** The thread_wait_finish method runs the current execution until we
- *  have no more steps to take.
- */
-static void thread_wait_finish(void) {
-	DBG();
-
-	while (!thread_system_next());
-}
-
 static void parse_options(struct model_params *params, int argc, char **argv) {
 }
 
@@ -91,7 +45,7 @@ static void real_main() {
 		model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));
 
 		/* Wait for all threads to complete */
-		thread_wait_finish();
+		model->finish_execution();
 	} while (model->next_execution());
 
 	delete model;
diff --git a/model.cc b/model.cc
index c4ee253..964e83f 100644
--- a/model.cc
+++ b/model.cc
@@ -747,3 +747,46 @@ int ModelChecker::switch_to_master(ModelAction *act)
 	old->set_state(THREAD_READY);
 	return Thread::swap(old, get_system_context());
 }
+
+/**
+ * Takes the next step in the execution, if possible.
+ * @return Returns true (success) if a step was taken and false otherwise.
+ */
+bool ModelChecker::take_step() {
+	Thread *curr, *next;
+
+	curr = thread_current();
+	if (curr) {
+		if (curr->get_state() == THREAD_READY) {
+			check_current_action();
+			scheduler->add_thread(curr);
+		} else if (curr->get_state() == THREAD_RUNNING) {
+			/* Stopped while running; i.e., completed */
+			curr->complete();
+		} else {
+			ASSERT(false);
+		}
+	}
+	next = scheduler->next_thread();
+
+	/* Infeasible -> don't take any more steps */
+	if (!isfeasible())
+		return false;
+
+	if (next)
+		next->set_state(THREAD_RUNNING);
+	DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
+
+	/* next == NULL -> don't take any more steps */
+	if (!next)
+		return false;
+	/* Return false only if swap fails with an error */
+	return (Thread::swap(get_system_context(), next) == 0);
+}
+
+/** Runs the current execution until threre are no more steps to take. */
+void ModelChecker::finish_execution() {
+	DBG();
+
+	while (take_step());
+}
diff --git a/model.h b/model.h
index dc6ef6a..2b878b3 100644
--- a/model.h
+++ b/model.h
@@ -70,6 +70,8 @@ public:
 	bool isfinalfeasible();
 	void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 
+	void finish_execution();
+
 	MEMALLOC
 private:
 	int next_thread_id;
@@ -86,6 +88,8 @@ private:
 	 */
 	void set_current_action(ModelAction *act) { current_action = act; }
 
+	bool take_step();
+
 	ModelAction * get_last_conflict(ModelAction *act);
 	void set_backtracking(ModelAction *act);
 	thread_id_t get_next_replay_thread();