X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=f7e7e5ea0febd7251ff91e49654807ed9e437a95;hb=b5cdd7ee16b73bbfe53040d23994351f85f83785;hp=c5179bcfa81a77de58b79b5c57077a28d32cfb24;hpb=15190694fd79202132be5f6e056fa5c00893664e;p=model-checker.git

diff --git a/action.h b/action.h
index c5179bc..f7e7e5e 100644
--- a/action.h
+++ b/action.h
@@ -7,11 +7,14 @@
 
 #include <list>
 #include <cstddef>
+#include <inttypes.h>
 
-#include "threads.h"
 #include "mymemory.h"
-#include "clockvector.h"
 #include "memoryorder.h"
+#include "modeltypes.h"
+
+class ClockVector;
+class Thread;
 
 using std::memory_order;
 using std::memory_order_relaxed;
@@ -23,13 +26,20 @@ 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 */
+
 #define VALUE_TRYSUCCESS 1
+
+/** A special value to represent a failed trylock */
 #define VALUE_TRYFAILED 0
 
 /** @brief Represents an action type, identifying one of several types of
  * ModelAction */
 typedef enum action_type {
+	MODEL_FIXUP_RELSEQ,   /**< Special ModelAction: finalize a release
+	                       *   sequence */
 	THREAD_CREATE,        /**< A thread creation action */
 	THREAD_START,         /**< First action in each thread */
 	THREAD_YIELD,         /**< A thread yield action */
@@ -42,10 +52,13 @@ typedef enum action_type {
 	ATOMIC_RMWC,          /**< Convert an atomic RMW action into a READ */
 	ATOMIC_INIT,          /**< Initialization of an atomic object (e.g.,
 	                       *   atomic_init()) */
-	ATOMIC_FENCE,
-	ATOMIC_LOCK,
-	ATOMIC_TRYLOCK,
-	ATOMIC_UNLOCK
+	ATOMIC_FENCE,         /**< A fence action */
+	ATOMIC_LOCK,          /**< A lock action */
+	ATOMIC_TRYLOCK,       /**< A trylock 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 */
@@ -57,9 +70,9 @@ class ClockVector;
  */
 class ModelAction {
 public:
-	ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE);
+	ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE, Thread *thread = NULL);
 	~ModelAction();
-	void print(void) const;
+	void print() const;
 
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return type; }
@@ -72,15 +85,22 @@ public:
 	Node * get_node() const { return node; }
 	void set_node(Node *n) { node = n; }
 
+	void copy_from_new(ModelAction *newaction);
+	void set_seq_number(modelclock_t num);
 	void set_try_lock(bool obtainedlock);
+	bool is_relseq_fixup() const;
 	bool is_mutex_op() const;
 	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;
@@ -91,12 +111,13 @@ public:
 	bool is_seqcst() const;
 	bool same_var(const ModelAction *act) const;
 	bool same_thread(const ModelAction *act) const;
-	bool is_synchronizing(const ModelAction *act) const;
+	bool is_conflicting_lock(const ModelAction *act) const;
+	bool could_synchronize_with(const ModelAction *act) const;
 
 	void create_cv(const ModelAction *parent = NULL);
 	ClockVector * get_cv() const { return cv; }
-	void read_from(const ModelAction *act);
-	void synchronize_with(const ModelAction *act);
+	bool read_from(const ModelAction *act);
+	bool synchronize_with(const ModelAction *act);
 
 	bool has_synchronized_with(const ModelAction *act) const;
 	bool happens_before(const ModelAction *act) const;
@@ -111,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:
 
@@ -141,8 +166,10 @@ 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 *> action_list_t;
+typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
 
 #endif /* __ACTION_H__ */