X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=c455ea780883b371d80caed2d25c95e3d16edf1b;hp=e43955dda2826d980f632bf62af4e08397594d45;hb=4614578e1632eb4e1962f9635ad4950097003137;hpb=9fc455aa88e0fe0415081e282bd1bda4c633fa8f

diff --git a/action.h b/action.h
index e43955dd..c455ea78 100644
--- a/action.h
+++ b/action.h
@@ -11,13 +11,27 @@
 #include "threads.h"
 #include "mymemory.h"
 #include "clockvector.h"
-#include "libatomic.h"
+#include "memoryorder.h"
+
+using std::memory_order;
+using std::memory_order_relaxed;
+using std::memory_order_acquire;
+using std::memory_order_release;
+using std::memory_order_acq_rel;
+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
 
+/** 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 {
@@ -25,11 +39,18 @@ typedef enum action_type {
 	THREAD_START,         /**< First action in each thread */
 	THREAD_YIELD,         /**< A thread yield action */
 	THREAD_JOIN,          /**< A thread join action */
+	THREAD_FINISH,        /**< A thread completion action */
 	ATOMIC_READ,          /**< An atomic read action */
 	ATOMIC_WRITE,         /**< An atomic write action */
-	ATOMIC_RMW,           /**< An atomic read-modify-write action */
-	ATOMIC_INIT           /**< Initialization of an atomic object (e.g.,
+	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()) */
+	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 */
@@ -56,21 +77,35 @@ public:
 	Node * get_node() const { return node; }
 	void set_node(Node *n) { node = n; }
 
+	void copy_from_new(ModelAction *newaction);
+	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 has_synchronized_with(const ModelAction *act) const;
 	bool happens_before(const ModelAction *act) const;
 
 	inline bool operator <(const ModelAction& act) const {
@@ -80,7 +115,8 @@ public:
 		return get_seq_number() > act.get_seq_number();
 	}
 
-	void upgrade_rmw(ModelAction * act);
+	void process_rmw(ModelAction * act);
+	void copy_typeandorder(ModelAction * act);
 
 	MEMALLOC
 private: