X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=d357066ad5850f2c61ac3115d4cebc1235658d04;hp=2bde6b856e63379cbeb21bd1efec259662ae4898;hb=651e9182baf50ef1e235ad7a587730b989bb44c7;hpb=5d0368dd546d03580ae69f8058a3a4fdc31de83b

diff --git a/action.h b/action.h
index 2bde6b85..d357066a 100644
--- a/action.h
+++ b/action.h
@@ -52,16 +52,19 @@ typedef enum action_type {
 	THREAD_YIELD,	// < A thread yield action
 	THREAD_JOIN,	// < A thread join action
 	THREAD_FINISH,	// < A thread completion action
+	THREADONLY_FINISH,	// < A thread completion action
 	PTHREAD_CREATE,	// < A pthread creation action
 	PTHREAD_JOIN,	// < A pthread join action
 	ATOMIC_UNINIT,	// < Represents an uninitialized atomic
-	ATOMIC_READ,	// < An atomic read action
+	NONATOMIC_WRITE,	// < Represents a non-atomic store
+	ATOMIC_INIT,	// < Initialization of an atomic object (e.g., atomic_init())
 	ATOMIC_WRITE,	// < An atomic write action
+	ATOMIC_RMW,	// < The write part of an atomic RMW action
+	ATOMIC_READ,	// < An atomic read action
 	ATOMIC_RMWR,	// < The read part of an atomic RMW action
 	ATOMIC_RMWRCAS,	// < 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
@@ -70,7 +73,7 @@ typedef enum action_type {
 	ATOMIC_NOTIFY_ALL,	// < A notify all action
 	ATOMIC_WAIT,	// < A wait action
 	ATOMIC_ANNOTATION,	// < An annotation action to pass information to a trace analysis
-	NOOP
+	NOOP	// no operation, which returns control to scheduler
 } action_type_t;
 
 
@@ -86,6 +89,8 @@ class ModelAction {
 public:
 	ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE, Thread *thread = NULL);
 	ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value, int size);
+	ModelAction(action_type_t type, const char * position, memory_order order, void *loc, uint64_t value, int size);
+	ModelAction(action_type_t type, const char * position, memory_order order, void *loc, uint64_t value = VALUE_NONE, Thread *thread = NULL);
 	~ModelAction();
 	void print() const;
 
@@ -95,18 +100,16 @@ public:
 	memory_order get_original_mo() const { return original_order; }
 	void set_mo(memory_order order) { this->order = order; }
 	void * get_location() const { return location; }
+	const char * get_position() const { return position; }
 	modelclock_t get_seq_number() const { return seq_number; }
 	uint64_t get_value() const { return value; }
 	uint64_t get_reads_from_value() const;
 	uint64_t get_write_value() const;
 	uint64_t get_return_value() const;
-	const ModelAction * get_reads_from() const { return reads_from; }
+	ModelAction * get_reads_from() const { return reads_from; }
 	cdsc::mutex * get_mutex() const;
 
-	Node * get_node() const;
-	void set_node(Node *n) { node = n; }
-
-	void set_read_from(const ModelAction *act);
+	void set_read_from(ModelAction *act);
 
 	/** Store the most recent fence-release from the same thread
 	 *  @param fence The fence-release that occured prior to this */
@@ -153,6 +156,8 @@ public:
 	Thread * get_thread_operand() const;
 	void create_cv(const ModelAction *parent = NULL);
 	ClockVector * get_cv() const { return cv; }
+	ClockVector * get_rfcv() const { return rf_cv; }
+	void set_rfcv(ClockVector * rfcv) { rf_cv = rfcv; }
 	bool synchronize_with(const ModelAction *act);
 
 	bool has_synchronized_with(const ModelAction *act) const;
@@ -174,7 +179,9 @@ public:
 	/* to accomodate pthread create and join */
 	Thread * thread_operand;
 	void set_thread_operand(Thread *th) { thread_operand = th; }
-	MEMALLOC
+	void set_uninit_action(ModelAction *act) { uninitaction = act; }
+	ModelAction * get_uninit_action() { return uninitaction; }
+	SNAPSHOTALLOC
 private:
 	const char * get_type_str() const;
 	const char * get_mo_str() const;
@@ -182,26 +189,22 @@ private:
 	/** @brief A pointer to the memory location for this action. */
 	void *location;
 
+	/** @brief A pointer to the source line for this atomic action. */
+	const char * position;
+
 	union {
 		/**
 		 * @brief The store that this action reads from
 		 *
 		 * Only valid for reads
 		 */
-		const ModelAction *reads_from;
+		ModelAction *reads_from;
 		int size;
 	};
 
 	/** @brief The last fence release from the same thread */
 	const ModelAction *last_fence_release;
-
-	/**
-	 * @brief A back reference to a Node in NodeStack
-	 *
-	 * Only set if this ModelAction is saved on the NodeStack. (A
-	 * ModelAction can be thrown away before it ever enters the NodeStack.)
-	 */
-	Node *node;
+	ModelAction * uninitaction;
 
 	/**
 	 * @brief The clock vector for this operation
@@ -211,6 +214,7 @@ private:
 	 * vectors for all operations.
 	 */
 	ClockVector *cv;
+	ClockVector *rf_cv;
 
 	/** @brief The value written (for write or RMW; undefined for read) */
 	uint64_t value;