X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=action.h;h=8a7743ff7f2c5cac90413d5e96ff137a2817f1c5;hb=0d3c4eca7d657d93c5a30681f22d9856847370f9;hp=0ecb5c365b080ec5d9dee4827ece1a959080cfc5;hpb=91579dadd25579b9aa7e1dd7a537892c9b1e9311;p=c11tester.git

diff --git a/action.h b/action.h
index 0ecb5c36..8a7743ff 100644
--- a/action.h
+++ b/action.h
@@ -25,7 +25,6 @@ using std::memory_order_acquire;
 using std::memory_order_release;
 using std::memory_order_acq_rel;
 using std::memory_order_seq_cst;
-using std::volatile_order;
 
 /**
  * @brief A recognizable don't-care value for use in the ModelAction::value
@@ -53,8 +52,12 @@ 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
+	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())
@@ -69,13 +72,12 @@ 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
-	VOLATILE_READ,
-	VOLATILE_WRITE,
-	NOOP	// no operation, which returns control to scheduler
 } action_type_t;
 
 
@@ -92,6 +94,7 @@ 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;
@@ -109,6 +112,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);
@@ -121,11 +125,13 @@ 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;
@@ -202,6 +208,7 @@ private:
 		 */
 		ModelAction *reads_from;
 		int size;
+		uint64_t time;	//used for sleep
 	};
 
 	/** @brief The last fence release from the same thread */