X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=7c457076501f77f93550da6fe629e2e625a0f2cb;hp=ae4afb29d27f928cbe63a34d79629a6d6310b28b;hb=5e4a7d161cba81152ddcf295ee72fbb25ba3afaa;hpb=cf7518cb8c2d9cd3033ca7540ea9dc448b21912a

diff --git a/action.h b/action.h
index ae4afb29..7c457076 100644
--- a/action.h
+++ b/action.h
@@ -9,17 +9,36 @@
 #include <cstddef>
 
 #include "threads.h"
-#include "libatomic.h"
 #include "mymemory.h"
-#define VALUE_NONE -1
+#include "clockvector.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
+
+/** @brief Represents an action type, identifying one of several types of
+ * ModelAction */
 typedef enum action_type {
-	THREAD_CREATE,
-	THREAD_YIELD,
-	THREAD_JOIN,
-	ATOMIC_READ,
-	ATOMIC_WRITE,
-	ATOMIC_RMW
+	THREAD_CREATE,        /**< A thread creation action */
+	THREAD_START,         /**< First action in each thread */
+	THREAD_YIELD,         /**< A thread yield action */
+	THREAD_JOIN,          /**< A thread join action */
+	ATOMIC_READ,          /**< An atomic read action */
+	ATOMIC_WRITE,         /**< An atomic write action */
+	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()) */
 } action_type_t;
 
 /* Forward declaration */
@@ -31,22 +50,27 @@ class ClockVector;
  */
 class ModelAction {
 public:
-	ModelAction(action_type_t type, memory_order order, void *loc, int value);
+	ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE);
 	~ModelAction();
-	void print(void);
+	void print(void) const;
 
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return type; }
 	memory_order get_mo() const { return order; }
 	void * get_location() const { return location; }
-	int get_seq_number() const { return seq_number; }
+	modelclock_t get_seq_number() const { return seq_number; }
+	uint64_t get_value() const { return value; }
+	const ModelAction * get_reads_from() const { return reads_from; }
 
 	Node * get_node() const { return node; }
 	void set_node(Node *n) { node = n; }
 
 	bool is_read() const;
 	bool is_write() const;
+	bool is_rmwr() const;
+	bool is_rmwc() const;
 	bool is_rmw() const;
+	bool is_initialization() const;
 	bool is_acquire() const;
 	bool is_release() const;
 	bool is_seqcst() const;
@@ -54,11 +78,13 @@ public:
 	bool same_thread(const ModelAction *act) const;
 	bool is_synchronizing(const ModelAction *act) const;
 
-	void create_cv(ModelAction *parent = NULL);
+	void create_cv(const ModelAction *parent = NULL);
 	ClockVector * get_cv() const { return cv; }
-	void read_from(ModelAction *act);
+	void read_from(const ModelAction *act);
+	void synchronized(const ModelAction *act);
+
 
-	bool happens_before(ModelAction *act);
+	bool happens_before(const ModelAction *act) const;
 
 	inline bool operator <(const ModelAction& act) const {
 		return get_seq_number() < act.get_seq_number();
@@ -67,6 +93,9 @@ public:
 		return get_seq_number() > act.get_seq_number();
 	}
 
+	void process_rmw(ModelAction * act);
+	void copy_typeandorder(ModelAction * act);
+
 	MEMALLOC
 private:
 
@@ -81,22 +110,24 @@ private:
 
 	/** The thread id that performed this action. */
 	thread_id_t tid;
-	
-	/** The value read or written (if RMW, then the value written). This
-	 * should probably be something longer. */
-	int value;
+
+	/** The value written (for write or RMW; undefined for read) */
+	uint64_t value;
+
+	/** The action that this action reads from. Only valid for reads */
+	const ModelAction *reads_from;
 
 	/** A back reference to a Node in NodeStack, if this ModelAction is
 	 * saved on the NodeStack. */
 	Node *node;
-	
-	int seq_number;
+
+	modelclock_t seq_number;
 
 	/** The clock vector stored with this action; only needed if this
 	 * action is a store release? */
 	ClockVector *cv;
 };
 
-typedef std::list<class ModelAction *> action_list_t;
+typedef std::list<ModelAction *> action_list_t;
 
 #endif /* __ACTION_H__ */