From 8f82e4c697b8f4ca7b3d4e79ace1b9cf1dc259d2 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Mon, 19 Nov 2012 20:03:35 -0800
Subject: [PATCH] model: privatize some functions

Just kill finish_execution() while we're at it.
---
 model.cc |  9 +--------
 model.h  | 14 ++++++--------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/model.cc b/model.cc
index 43700989..72610f65 100644
--- a/model.cc
+++ b/model.cc
@@ -2510,13 +2510,6 @@ bool ModelChecker::take_step() {
 	return (Thread::swap(&system_context, next) == 0);
 }
 
-/** Runs the current execution until threre are no more steps to take. */
-void ModelChecker::finish_execution() {
-	DBG();
-
-	while (take_step());
-}
-
 /** Wrapper to run the user's main function, with appropriate arguments */
 void user_main_wrapper(void *)
 {
@@ -2533,7 +2526,7 @@ void ModelChecker::run()
 		add_thread(new Thread(&user_thread, &user_main_wrapper, NULL));
 
 		/* Wait for all threads to complete */
-		finish_execution();
+		while (take_step());
 	} while (next_execution());
 
 	print_stats();
diff --git a/model.h b/model.h
index 5f389c5b..e4cefd1e 100644
--- a/model.h
+++ b/model.h
@@ -116,24 +116,16 @@ public:
 	int switch_to_master(ModelAction *act);
 	ClockVector * get_cv(thread_id_t tid);
 	ModelAction * get_parent_action(thread_id_t tid);
-	bool next_execution();
-	bool isfeasible() const;
-	bool isfeasibleotherthanRMW() const;
 	bool isfinalfeasible() const;
 	void check_promises_thread_disabled();
 	void mo_check_promises(thread_id_t tid, const ModelAction *write);
 	void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector * merge_cv);
 	void get_release_seq_heads(ModelAction *act, rel_heads_list_t *release_heads);
-	void finish_execution();
 	bool isfeasibleprefix() const;
 
 	bool assert_bug(const char *msg);
 	void assert_user_bug(const char *msg);
 
-	bool is_deadlocked() const;
-	bool is_complete_execution() const;
-	void print_stats() const;
-
 	void set_bad_synchronization();
 
 	const model_params params;
@@ -154,6 +146,7 @@ private:
 	void wake_up_sleeping_actions(ModelAction * curr);
 	modelclock_t get_next_seq_num();
 
+	bool next_execution();
 	void set_current_action(ModelAction *act);
 	Thread * check_current_action(ModelAction *curr);
 	bool initialize_curr_action(ModelAction **curr);
@@ -251,9 +244,14 @@ private:
 	struct execution_stats stats;
 	void record_stats();
 
+	bool isfeasibleotherthanRMW() const;
+	bool isfeasible() const;
+	bool is_deadlocked() const;
+	bool is_complete_execution() const;
 	bool have_bug_reports() const;
 	void print_bugs() const;
 	void print_execution(bool printbugs) const;
+	void print_stats() const;
 
 	friend void user_main_wrapper();
 };
-- 
2.34.1