X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=abf55318cd3ba379ea198420fad4ce70bfc570ea;hb=d225d983eb6b52f032fcdc54b7dc612cd4e061fb;hp=8a3650b64c8e1ad8103d6767522a4aa36c56f879;hpb=559511b7622dcbc48501f57b7adafb57aab5de3e;p=model-checker.git

diff --git a/action.h b/action.h
index 8a3650b..abf5531 100644
--- a/action.h
+++ b/action.h
@@ -5,7 +5,6 @@
 #ifndef __ACTION_H__
 #define __ACTION_H__
 
-#include <list>
 #include <cstddef>
 #include <inttypes.h>
 
@@ -17,6 +16,10 @@ class ClockVector;
 class Thread;
 class Promise;
 
+namespace std {
+	class mutex;
+}
+
 using std::memory_order;
 using std::memory_order_relaxed;
 using std::memory_order_acquire;
@@ -81,8 +84,11 @@ public:
 	modelclock_t get_seq_number() const { return seq_number; }
 	uint64_t get_value() const { return value; }
 	uint64_t get_reads_from_value() const;
+	uint64_t get_write_value() const;
+	uint64_t get_return_value() const;
 	const ModelAction * get_reads_from() const { return reads_from; }
 	Promise * get_reads_from_promise() const { return reads_from_promise; }
+	std::mutex * get_mutex() const;
 
 	Node * get_node() const;
 	void set_node(Node *n) { node = n; }
@@ -100,6 +106,7 @@ public:
 	void set_seq_number(modelclock_t num);
 	void set_try_lock(bool obtainedlock);
 	bool is_thread_start() const;
+	bool is_thread_join() const;
 	bool is_relseq_fixup() const;
 	bool is_mutex_op() const;
 	bool is_lock() const;
@@ -114,6 +121,7 @@ public:
 	bool is_uninitialized() const;
 	bool is_read() const;
 	bool is_write() const;
+	bool is_yield() const;
 	bool could_be_write() const;
 	bool is_rmwr() const;
 	bool is_rmwc() const;
@@ -154,6 +162,9 @@ public:
 
 	bool equals(const ModelAction *x) const { return this == x; }
 	bool equals(const Promise *x) const { return false; }
+
+	bool may_read_from(const ModelAction *write) const;
+	bool may_read_from(const Promise *promise) const;
 	MEMALLOC
 private: