X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=66e119066cc88c80d26c49448750644f1f882106;hp=00289355be9db60dd14c4cec2eace3381ac2e79a;hb=ecd9104af35b2a0298042b13145767ef7382ac18;hpb=ce83d6dece4406efc62a60fe79ea4c9731dc7d5f

diff --git a/action.h b/action.h
index 00289355..66e11906 100644
--- a/action.h
+++ b/action.h
@@ -53,10 +53,11 @@ typedef enum action_type {
 	THREAD_JOIN,	// < A thread join action
 	THREAD_FINISH,	// < A thread completion action
 	THREADONLY_FINISH,	// < A thread completion action
+	THREAD_SLEEP,	// < A sleep operation
+
 	PTHREAD_CREATE,	// < A pthread creation action
 	PTHREAD_JOIN,	// < A pthread join action
-	THREAD_SLEEP,	// < A sleep operation
-	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
@@ -70,11 +71,14 @@ typedef enum action_type {
 	ATOMIC_LOCK,	// < A lock action
 	ATOMIC_TRYLOCK,	// < A trylock action
 	ATOMIC_UNLOCK,	// < An unlock action
+
 	ATOMIC_NOTIFY_ONE,	// < A notify_one action
 	ATOMIC_NOTIFY_ALL,	// < A notify all action
 	ATOMIC_WAIT,	// < A wait action
+	ATOMIC_TIMEDWAIT,	// < A timed wait action
 	ATOMIC_ANNOTATION,	// < An annotation action to pass information to a trace analysis
-	NOOP	// no operation, which returns control to scheduler
+	READY_FREE,	// < Write is ready to be freed
+	ATOMIC_NOP	// < Placeholder
 } action_type_t;
 
 
@@ -82,8 +86,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 {
@@ -98,6 +102,8 @@ 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; }
 	void set_mo(memory_order order) { this->order = order; }
@@ -122,6 +128,7 @@ public:
 
 	void copy_from_new(ModelAction *newaction);
 	void set_seq_number(modelclock_t num);
+	void reset_seq_number();
 	void set_try_lock(bool obtainedlock);
 	bool is_thread_start() const;
 	bool is_thread_join() const;
@@ -131,14 +138,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;
@@ -183,8 +191,12 @@ public:
 	/* 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; }
 	SNAPSHOTALLOC
 private:
 	const char * get_type_str() const;
@@ -209,7 +221,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
@@ -220,6 +231,10 @@ 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;
@@ -239,7 +254,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;