X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=f792de215994097605ec084b83c9d671f60f6ceb;hp=8a7743ff7f2c5cac90413d5e96ff137a2817f1c5;hb=527eb9241e1b39b6ad4125a71b951d445d4e251e;hpb=8b70aaea8a650607df5361c47aee0bd0c74e6e72

diff --git a/action.h b/action.h
index 8a7743ff..f792de21 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
@@ -58,7 +59,6 @@ typedef enum action_type {
 	PTHREAD_CREATE,	// < A pthread creation action
 	PTHREAD_JOIN,	// < A pthread join action
 
-	ATOMIC_UNINIT,	// < Represents an uninitialized atomic
 	NONATOMIC_WRITE,	// < Represents a non-atomic store
 	ATOMIC_INIT,	// < Initialization of an atomic object (e.g., atomic_init())
 	ATOMIC_WRITE,	// < An atomic write action
@@ -78,6 +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,	// < Write is ready to be freed
+	ATOMIC_NOP	// < Placeholder
 } action_type_t;
 
 
@@ -85,8 +87,8 @@ typedef enum action_type {
  * @brief Represents a single atomic action
  *
  * A ModelAction is always allocated as non-snapshotting, because it is used in
- * multiple executions during backtracking. Except for fake uninitialized
- * (ATOMIC_UNINIT) ModelActions, each action is assigned a unique sequence
+ * multiple executions during backtracking. Except for non-atomic write
+ * ModelActions, each action is assigned a unique sequence
  * number.
  */
 class ModelAction {
@@ -101,6 +103,10 @@ public:
 
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return type; }
+	void set_type(action_type _type) { type = _type; }
+	action_type get_original_type() const { return original_type; }
+	void set_original_type(action_type _type) { original_type = _type; }
+	void set_free() { type = READY_FREE; }
 	memory_order get_mo() const { return order; }
 	memory_order get_original_mo() const { return original_order; }
 	void set_mo(memory_order order) { this->order = order; }
@@ -114,6 +120,7 @@ public:
 	ModelAction * get_reads_from() const { return reads_from; }
 	uint64_t get_time() const {return time;}
 	cdsc::mutex * get_mutex() const;
+	bool get_swap_flag() const { return swap_flag; }
 
 	void set_read_from(ModelAction *act);
 
@@ -135,14 +142,15 @@ public:
 	bool is_trylock() const;
 	bool is_unlock() const;
 	bool is_wait() const;
+	bool is_create() const;
 	bool is_notify() const;
 	bool is_notify_one() const;
 	bool is_success_lock() const;
 	bool is_failed_trylock() const;
 	bool is_atomic_var() const;
-	bool is_uninitialized() const;
 	bool is_read() const;
 	bool is_write() const;
+	bool is_free() const;
 	bool is_yield() const;
 	bool could_be_write() const;
 	bool is_rmwr() const;
@@ -184,11 +192,22 @@ public:
 	bool equals(const ModelAction *x) const { return this == x; }
 	void set_value(uint64_t val) { value = val; }
 
+	void use_original_type();
+
 	/* to accomodate pthread create and join */
 	Thread * thread_operand;
 	void set_thread_operand(Thread *th) { thread_operand = th; }
-	void set_uninit_action(ModelAction *act) { uninitaction = act; }
-	ModelAction * get_uninit_action() { return uninitaction; }
+	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; }
+
+	void incr_func_ref_count() { func_ref_count++; }
+	void decr_func_ref_count() { if (func_ref_count > 0) func_ref_count--; }
+	uint32_t get_func_ref_count() { return func_ref_count; }
+
 	SNAPSHOTALLOC
 private:
 	const char * get_type_str() const;
@@ -213,7 +232,6 @@ private:
 
 	/** @brief The last fence release from the same thread */
 	const ModelAction *last_fence_release;
-	ModelAction * uninitaction;
 
 	/**
 	 * @brief The clock vector for this operation
@@ -224,6 +242,12 @@ private:
 	 */
 	ClockVector *cv;
 	ClockVector *rf_cv;
+	sllnode<ModelAction *> * trace_ref;
+	sllnode<ModelAction *> * thrdmap_ref;
+	sllnode<ModelAction *> * action_ref;
+
+	/** @brief Number of read actions that are reading from this store */
+	uint32_t func_ref_count;
 
 	/** @brief The value written (for write or RMW; undefined for read) */
 	uint64_t value;
@@ -231,6 +255,14 @@ private:
 	/** @brief Type of action (read, write, RMW, fence, thread create, etc.) */
 	action_type type;
 
+	/** @brief The original type of action (read, write, RMW) before it was 
+	 * set as READY_FREE or weaken from a RMW to a write */
+	action_type original_type;
+
+	/** @brief Indicate whether the action type and the original action type 
+	 *  has been swapped. */
+	bool swap_flag;
+
 	/** @brief The memory order for this operation. */
 	memory_order order;
 
@@ -243,7 +275,7 @@ private:
 	/**
 	 * @brief The sequence number of this action
 	 *
-	 * Except for ATOMIC_UNINIT actions, this number should be unique and
+	 * Except for non atomic write actions, this number should be unique and
 	 * should represent the action's position in the execution order.
 	 */
 	modelclock_t seq_number;