X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=action.h;h=36c72079b165a6a7462d5a32698e61dbdef12dbd;hb=5b7cd081428d15ff59fbf9252df86dbd1709457f;hp=111ac31124ef89d796e8d163c1b39a097c9a2c7c;hpb=fb2ab76b04c83faa654c8819c8e39b1e5fcc7d75;p=c11tester.git

diff --git a/action.h b/action.h
index 111ac311..36c72079 100644
--- a/action.h
+++ b/action.h
@@ -13,12 +13,16 @@
 #include "mymemory.h"
 #include "clockvector.h"
 
-#define VALUE_NONE -1
+/** 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,        /**< 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 */
@@ -37,7 +41,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,11 +50,11 @@ 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; }
-	void set_value(int val) { value = val; }
 
 	bool is_read() const;
 	bool is_write() const;
@@ -90,15 +94,18 @@ 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;
+	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