X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=f7e7e5ea0febd7251ff91e49654807ed9e437a95;hb=fe7b400edb33255770fb47ad520afbd05d13a231;hp=96b791ee50bb12695de577b21f75e8926347103b;hpb=d96312573c237eb9648976be85de39261c9531c6;p=model-checker.git

diff --git a/action.h b/action.h
index 96b791e..f7e7e5e 100644
--- a/action.h
+++ b/action.h
@@ -26,7 +26,7 @@ using std::memory_order_seq_cst;
 /** Note that this value can be legitimately used by a program, and
 		hence by iteself does not indicate no value. */
 
-#define VALUE_NONE 1234567890
+#define VALUE_NONE 0xdeadbeef
 
 /** A special value to represent a successful trylock */
 
@@ -55,7 +55,10 @@ typedef enum action_type {
 	ATOMIC_FENCE,         /**< A fence action */
 	ATOMIC_LOCK,          /**< A lock action */
 	ATOMIC_TRYLOCK,       /**< A trylock action */
-	ATOMIC_UNLOCK         /**< An unlock action */
+	ATOMIC_UNLOCK,        /**< An unlock action */
+	ATOMIC_NOTIFY_ONE,    /**< A notify_one action */
+	ATOMIC_NOTIFY_ALL,    /**< A notify all action */
+	ATOMIC_WAIT           /**< A wait action */
 } action_type_t;
 
 /* Forward declaration */
@@ -90,10 +93,14 @@ public:
 	bool is_lock() const;
 	bool is_trylock() const;
 	bool is_unlock() const;
+	bool is_wait() const;
+	bool is_notify() const;
+	bool is_notify_one() const;
 	bool is_success_lock() const;
 	bool is_failed_trylock() const;
 	bool is_read() const;
 	bool is_write() const;
+	bool could_be_write() const;
 	bool is_rmwr() const;
 	bool is_rmwc() const;
 	bool is_rmw() const;
@@ -125,6 +132,10 @@ public:
 	void process_rmw(ModelAction * act);
 	void copy_typeandorder(ModelAction * act);
 
+	void set_sleep_flag() { sleep_flag=true; }
+	bool get_sleep_flag() { return sleep_flag; }
+	unsigned int hash() const;
+
 	MEMALLOC
 private:
 
@@ -155,6 +166,8 @@ private:
 	/** The clock vector stored with this action; only needed if this
 	 * action is a store release? */
 	ClockVector *cv;
+
+	bool sleep_flag;
 };
 
 typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;