X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=9b63f0fcdbce350fa04c272d2091c676af3dd42b;hb=05d91de8ac8098425d51e9af2704eb91e04a7f9b;hp=b078939da637f6297d5383b50d21a3bb507698db;hpb=20f8e2bc8677046c4bd7cb0bb80696ced41301f2;p=model-checker.git

diff --git a/model.h b/model.h
index b078939..9b63f0f 100644
--- a/model.h
+++ b/model.h
@@ -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();
@@ -152,6 +152,7 @@ private:
 	bool initialize_curr_action(ModelAction **curr);
 	bool process_read(ModelAction *curr, bool second_part_of_rmw);
 	bool process_write(ModelAction *curr);
+	bool process_fence(ModelAction *curr);
 	bool process_mutex(ModelAction *curr);
 	bool process_thread_action(ModelAction *curr);
 	void process_relseq_fixup(ModelAction *curr, work_queue_t *work_queue);
@@ -170,7 +171,7 @@ private:
 	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;
@@ -186,6 +187,8 @@ private:
 	bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads, struct release_seq *pending) const;
 	bool resolve_release_sequences(void *location, work_queue_t *work_queue);
 
+	ModelAction * new_uninitialized_action(void *location) const;
+
 	ModelAction *diverge;
 	ModelAction *earliest_diverge;