X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=e4cefd1eccae8d4aa4313baa2c987583e92dac57;hp=5f389c5b9d245d359434772240e7212a27c7c8ba;hb=8f82e4c697b8f4ca7b3d4e79ace1b9cf1dc259d2;hpb=4b03f676b719a8e10990f33d746ce5dd94d1337d;ds=sidebyside

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();
 };