X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=5543eb8a0f79af705301c9201eb1b656a74b7cb6;hb=84d0cd2f078f4cb15c318a0fef2515feab570375;hp=a2bbab2eee0aef821ae9e7ef1e79820a71da958c;hpb=67e374f0a24b266f2ea81913770e89a4aac68ff3;p=model-checker.git

diff --git a/model.h b/model.h
index a2bbab2..5543eb8 100644
--- a/model.h
+++ b/model.h
@@ -75,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 */
@@ -148,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);
@@ -178,7 +183,7 @@ private:
 	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 *act, rel_heads_list_t *release_heads);
+	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);