X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=753860984a2f2df79869deb11bb0053fdb05d7a5;hb=b8a6522deb073737e7f07fdf7561c2879fa48033;hp=4504fd8c089c71eaa60e10d25ecbbba61c26ec5f;hpb=c9719c5b5bebeed83f9864825fa93ff6bae2b575;p=model-checker.git

diff --git a/action.h b/action.h
index 4504fd8..7538609 100644
--- a/action.h
+++ b/action.h
@@ -9,23 +9,43 @@
 #include <cstddef>
 
 #include "threads.h"
-#include "libatomic.h"
 #include "mymemory.h"
 #include "clockvector.h"
+#include "memoryorder.h"
 
-#define VALUE_NONE -1
+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
+#define VALUE_TRYSUCCESS 1
+#define VALUE_TRYFAILED 0
 
 /** @brief Represents an action type, identifying one of several types of
  * ModelAction */
 typedef enum action_type {
 	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 */
+	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,
+	ATOMIC_LOCK,
+	ATOMIC_TRYLOCK,
+	ATOMIC_UNLOCK
 } action_type_t;
 
 /* Forward declaration */
@@ -37,7 +57,7 @@ class ClockVector;
  */
 class ModelAction {
 public:
-	ModelAction(action_type_t type, memory_order order, void *loc, int value = VALUE_NONE);
+	ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE);
 	~ModelAction();
 	void print(void) const;
 
@@ -46,14 +66,20 @@ public:
 	memory_order get_mo() const { return order; }
 	void * get_location() const { return location; }
 	modelclock_t get_seq_number() const { return seq_number; }
-	int get_value() const { return value; }
+	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_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;
@@ -65,7 +91,9 @@ public:
 	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 {
@@ -75,6 +103,9 @@ public:
 		return get_seq_number() > act.get_seq_number();
 	}
 
+	void process_rmw(ModelAction * act);
+	void copy_typeandorder(ModelAction * act);
+
 	MEMALLOC
 private:
 
@@ -89,15 +120,17 @@ 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;
-	
+
 	modelclock_t seq_number;
 
 	/** The clock vector stored with this action; only needed if this