X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=b078939da637f6297d5383b50d21a3bb507698db;hp=3f1103e543fa987164cc8d75f7c0c92779a6ff86;hb=20f8e2bc8677046c4bd7cb0bb80696ced41301f2;hpb=63805dcdd30b0d728233eff298eec01977a50ee6

diff --git a/model.h b/model.h
index 3f1103e5..b078939d 100644
--- a/model.h
+++ b/model.h
@@ -5,7 +5,6 @@
 #ifndef __MODEL_H__
 #define __MODEL_H__
 
-#include <list>
 #include <vector>
 #include <cstddef>
 #include <ucontext.h>
@@ -76,7 +75,11 @@ struct PendingFutureValue {
 struct release_seq {
 	/** @brief The acquire operation */
 	ModelAction *acquire;
-	/** @brief The head of the RMW chain from which 'acquire' reads; may be
+	/** @brief The read operation that may read from a release sequence;
+	 *  may be the same as acquire, or else an earlier action in the same
+	 *  thread (i.e., when 'acquire' is a fence-acquire) */
+	const ModelAction *read;
+	/** @brief The head of the RMW chain from which 'read' reads; may be
 	 *  equal to 'release' */
 	const ModelAction *rf;
 	/** @brief The head of the potential longest release sequence chain */
@@ -111,24 +114,21 @@ public:
 
 	thread_id_t get_next_id();
 	unsigned int get_num_threads() const;
-	Thread * get_current_thread();
+	Thread * get_current_thread() const;
 
 	int switch_to_master(ModelAction *act);
-	ClockVector * get_cv(thread_id_t tid);
-	ModelAction * get_parent_action(thread_id_t tid);
+	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 get_release_seq_heads(ModelAction *act, rel_heads_list_t *release_heads);
 	bool isfeasibleprefix() const;
 
 	bool assert_bug(const char *msg);
 	void assert_user_bug(const char *msg);
 
-	void set_bad_synchronization();
-
 	const model_params params;
-	Node * get_curr_node();
+	Node * get_curr_node() const;
 
 	MEMALLOC
 private:
@@ -140,6 +140,7 @@ private:
 	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);
@@ -154,6 +155,7 @@ private:
 	bool process_mutex(ModelAction *curr);
 	bool process_thread_action(ModelAction *curr);
 	void process_relseq_fixup(ModelAction *curr, work_queue_t *work_queue);
+	bool read_from(ModelAction *act, const ModelAction *rf);
 	bool check_action_enabled(ModelAction *curr);
 
 	bool take_step();
@@ -171,13 +173,16 @@ private:
 	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_seq_cst(ModelAction *curr) const;
+	ModelAction * get_last_fence_release(thread_id_t tid) const;
+	ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
+	ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const;
 	ModelAction * get_last_unlock(ModelAction *curr) const;
 	void build_reads_from_past(ModelAction *curr);
 	ModelAction * process_rmw(ModelAction *curr);
 	void post_r_modification_order(ModelAction *curr, const ModelAction *rf);
 	bool r_modification_order(ModelAction *curr, const ModelAction *rf);
 	bool w_modification_order(ModelAction *curr);
+	void get_release_seq_heads(ModelAction *acquire, ModelAction *read, rel_heads_list_t *release_heads);
 	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);
 
@@ -213,6 +218,7 @@ private:
 	std::vector< struct release_seq *, SnapshotAlloc<struct release_seq *> > *pending_rel_seqs;
 
 	std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > *thrd_last_action;
+	std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > *thrd_last_fence_release;
 	NodeStack *node_stack;
 
 	/** Private data members that should be snapshotted. They are grouped
@@ -243,7 +249,7 @@ private:
 	struct execution_stats stats;
 	void record_stats();
 
-	bool isfinalfeasible() const;
+	bool is_feasible_prefix_ignore_relseq() const;
 	bool is_infeasible_ignoreRMW() const;
 	bool is_infeasible() const;
 	bool is_deadlocked() const;