X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=action.h;h=32cada2b9db88f306cf3dc52df6b1bd473640709;hp=3e590aae7f34a115cefb9fafed941a91d3bc5f92;hb=a27eec056d90e248a071bea6912e5ab09dea8242;hpb=f472540b6ab3b65c91221f6f0790d8327333a5c2

diff --git a/action.h b/action.h
index 3e590aa..32cada2 100644
--- a/action.h
+++ b/action.h
@@ -7,11 +7,13 @@
 
 #include <list>
 #include <cstddef>
+#include <inttypes.h>
 
-#include "threads.h"
 #include "mymemory.h"
-#include "clockvector.h"
 #include "memoryorder.h"
+#include "modeltypes.h"
+
+class ClockVector;
 
 using std::memory_order;
 using std::memory_order_relaxed;
@@ -25,6 +27,13 @@ using std::memory_order_seq_cst;
 
 #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
  * ModelAction */
 typedef enum action_type {
@@ -38,8 +47,12 @@ typedef enum action_type {
 	ATOMIC_RMWR,          /**< The read part of an atomic RMW action */
 	ATOMIC_RMW,           /**< The write part of an atomic RMW action */
 	ATOMIC_RMWC,          /**< Convert an atomic RMW action into a READ */
-	ATOMIC_INIT           /**< Initialization of an atomic object (e.g.,
+	ATOMIC_INIT,          /**< Initialization of an atomic object (e.g.,
 	                       *   atomic_init()) */
+	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 */
@@ -53,7 +66,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() const;
 
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return type; }
@@ -66,23 +79,34 @@ 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;
+	bool is_trylock() const;
+	bool is_unlock() const;
+	bool is_success_lock() const;
+	bool is_failed_trylock() const;
 	bool is_read() const;
 	bool is_write() const;
 	bool is_rmwr() const;
 	bool is_rmwc() const;
 	bool is_rmw() const;
+	bool is_fence() const;
 	bool is_initialization() const;
 	bool is_acquire() const;
 	bool is_release() const;
 	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;