X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=2b4b4141da042161dfe1db76f7b4573339b92001;hp=d357066ad5850f2c61ac3115d4cebc1235658d04;hb=ef795ab915a9311fc24c7ea7048f40d0a3bb34b3;hpb=1a2e39876cbd4a779e7c387a57ba1d26740e9c6a

diff --git a/action.h b/action.h
index d357066a..2b4b4141 100644
--- a/action.h
+++ b/action.h
@@ -53,9 +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
-	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
@@ -69,11 +71,13 @@ 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
 } action_type_t;
 
 
@@ -81,8 +85,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 {
@@ -90,12 +94,14 @@ 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, memory_order order, uint64_t value, uint64_t time);
 	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;
 
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return 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; }
@@ -107,6 +113,7 @@ 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;}
 	cdsc::mutex * get_mutex() const;
 
 	void set_read_from(ModelAction *act);
@@ -119,22 +126,25 @@ 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;
 	bool is_mutex_op() const;
 	bool is_lock() const;
+	bool is_sleep() const;
 	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;
@@ -179,8 +189,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;
@@ -200,11 +214,11 @@ private:
 		 */
 		ModelAction *reads_from;
 		int size;
+		uint64_t time;	//used for sleep
 	};
 
 	/** @brief The last fence release from the same thread */
 	const ModelAction *last_fence_release;
-	ModelAction * uninitaction;
 
 	/**
 	 * @brief The clock vector for this operation
@@ -215,6 +229,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;
@@ -234,7 +252,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;