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

diff --git a/action.h b/action.h
index c5179bc..f6fb062 100644
--- a/action.h
+++ b/action.h
@@ -24,7 +24,12 @@ using std::memory_order_seq_cst;
 		hence by iteself does not indicate no value. */
 
 #define VALUE_NONE 1234567890
+
+/** 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
@@ -42,10 +47,10 @@ 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 */
 } action_type_t;
 
 /* Forward declaration */
@@ -59,7 +64,7 @@ class ModelAction {
 public:
 	ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE);
 	~ModelAction();
-	void print(void) const;
+	void print(bool print_cv = true) const;
 
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return type; }
@@ -72,6 +77,8 @@ 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_mutex_op() const;
 	bool is_lock() const;
@@ -91,12 +98,13 @@ public:
 	bool is_seqcst() const;
 	bool same_var(const ModelAction *act) const;
 	bool same_thread(const ModelAction *act) const;
+	bool is_conflicting_lock(const ModelAction *act) const;
 	bool is_synchronizing(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 synchronize_with(const ModelAction *act);
 
 	bool has_synchronized_with(const ModelAction *act) const;
 	bool happens_before(const ModelAction *act) const;