X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=5357fe4b6501ca0025737c8c3f400b18e38cb6a7;hb=HEAD;hp=2b4b4141da042161dfe1db76f7b4573339b92001;hpb=ef795ab915a9311fc24c7ea7048f40d0a3bb34b3;p=c11tester.git

diff --git a/action.h b/action.h
index 2b4b4141..5357fe4b 100644
--- a/action.h
+++ b/action.h
@@ -34,6 +34,7 @@ using std::memory_order_seq_cst;
  * iteself does not indicate no value.
  */
 #define VALUE_NONE 0xdeadbeef
+#define WRITE_REFERENCED ((void *)0x1)
 
 /**
  * @brief The "location" at which a fence occurs
@@ -77,7 +78,8 @@ typedef enum action_type {
 	ATOMIC_WAIT,	// < A wait action
 	ATOMIC_TIMEDWAIT,	// < A timed wait action
 	ATOMIC_ANNOTATION,	// < An annotation action to pass information to a trace analysis
-	READY_FREE
+	READY_FREE,	// < Write is ready to be freed
+	ATOMIC_NOP	// < Placeholder
 } action_type_t;
 
 
@@ -101,6 +103,7 @@ public:
 
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return type; }
+	void set_type(action_type _type) { type = _type; }
 	void set_free() { type = READY_FREE; }
 	memory_order get_mo() const { return order; }
 	memory_order get_original_mo() const { return original_order; }
@@ -113,7 +116,8 @@ public:
 	uint64_t get_write_value() const;
 	uint64_t get_return_value() const;
 	ModelAction * get_reads_from() const { return reads_from; }
-	uint64_t get_time() const {return time;}
+	uint64_t get_time() const { return time; }
+	void set_time(uint64_t _time) { time = _time; }
 	cdsc::mutex * get_mutex() const;
 
 	void set_read_from(ModelAction *act);
@@ -136,6 +140,7 @@ public:
 	bool is_trylock() const;
 	bool is_unlock() const;
 	bool is_wait() const;
+	bool is_timedwait() const;
 	bool is_create() const;
 	bool is_notify() const;
 	bool is_notify_one() const;
@@ -189,12 +194,10 @@ public:
 	/* to accomodate pthread create and join */
 	Thread * thread_operand;
 	void set_thread_operand(Thread *th) { thread_operand = th; }
-	void setTraceRef(sllnode<ModelAction *> *ref) { trace_ref = ref; }
-	void setThrdMapRef(sllnode<ModelAction *> *ref) { thrdmap_ref = ref; }
+
 	void setActionRef(sllnode<ModelAction *> *ref) { action_ref = ref; }
-	sllnode<ModelAction *> * getTraceRef() { return trace_ref; }
-	sllnode<ModelAction *> * getThrdMapRef() { return thrdmap_ref; }
 	sllnode<ModelAction *> * getActionRef() { return action_ref; }
+
 	SNAPSHOTALLOC
 private:
 	const char * get_type_str() const;
@@ -229,11 +232,8 @@ private:
 	 */
 	ClockVector *cv;
 	ClockVector *rf_cv;
-	sllnode<ModelAction *> * trace_ref;
-	sllnode<ModelAction *> * thrdmap_ref;
 	sllnode<ModelAction *> * action_ref;
 
-
 	/** @brief The value written (for write or RMW; undefined for read) */
 	uint64_t value;