X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=5f62ff835df1d1e9df13dde2e8cd204d2bafd9d2;hb=ac8e176cd4a8756244c12dbbcaf961d27bfc8a74;hp=af6802a0216612dab30b412d2955fbd1d85f25c3;hpb=19df39f5f8af9fbe0f67df290681e8663938aacc;p=model-checker.git

diff --git a/model.h b/model.h
index af6802a..5f62ff8 100644
--- a/model.h
+++ b/model.h
@@ -101,7 +101,7 @@ public:
 
 	void print_summary() const;
 #if SUPPORT_MOD_ORDER_DUMP
-	void dumpGraph(char *filename);
+	void dumpGraph(char *filename) const;
 #endif
 
 	void add_thread(Thread *t);
@@ -116,12 +116,12 @@ public:
 	unsigned int get_num_threads() const;
 	Thread * get_current_thread() const;
 
-	int switch_to_master(ModelAction *act);
+	uint64_t switch_to_master(ModelAction *act);
 	ClockVector * get_cv(thread_id_t tid) const;
 	ModelAction * get_parent_action(thread_id_t tid) 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 check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
 	bool isfeasibleprefix() const;
 
 	bool assert_bug(const char *msg);
@@ -135,15 +135,15 @@ private:
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler *scheduler;
 
-	bool sleep_can_read_from(ModelAction * curr, const ModelAction *write);
-	bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
-	bool mo_may_allow(const ModelAction * writer, const ModelAction *reader);
+	bool sleep_can_read_from(ModelAction *curr, const ModelAction *write);
+	bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader);
+	bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
 	bool has_asserted() const;
 	void set_assert();
 	void set_bad_synchronization();
 	bool promises_expired() const;
 	void execute_sleep_set();
-	void wake_up_sleeping_actions(ModelAction * curr);
+	void wake_up_sleeping_actions(ModelAction *curr);
 	modelclock_t get_next_seq_num();
 
 	bool next_execution();
@@ -159,19 +159,20 @@ private:
 	bool read_from(ModelAction *act, const ModelAction *rf);
 	bool check_action_enabled(ModelAction *curr);
 
-	bool take_step();
+	bool take_step(ModelAction *curr);
 
 	void check_recency(ModelAction *curr, const ModelAction *rf);
 	ModelAction * get_last_conflict(ModelAction *act);
 	void set_backtracking(ModelAction *act);
 	Thread * get_next_thread(ModelAction *curr);
+	bool set_latest_backtrack(ModelAction *act);
 	ModelAction * get_next_backtrack();
 	void reset_to_initial_state();
 	bool resolve_promises(ModelAction *curr);
 	void compute_promises(ModelAction *curr);
 	void compute_relseq_breakwrites(ModelAction *curr);
 
-	void check_curr_backtracking(ModelAction * curr);
+	void check_curr_backtracking(ModelAction *curr);
 	void add_action_to_lists(ModelAction *act);
 	ModelAction * get_last_action(thread_id_t tid) const;
 	ModelAction * get_last_fence_release(thread_id_t tid) const;